✨ feat(merge): origin

Author: thrownullexception

.lintstagedrc

@@ -1,5 +1,6 @@
 {
   "src/**/*.{json,ts,tsx}": [
+    "node ./scripts/ci",
     "npm run lint:fix"
   ]
 }

package.json

@@ -18,7 +18,7 @@
     "typecheck": "tsc",
     "lint": "eslint --ext ts,tsx .",
     "lint:fix": "eslint --fix",
-    "verify": "npm run typecheck && npm run lint && npm run test:cov",
+    "verify": "node ./scripts/ci && npm run typecheck && npm run lint && npm run test:cov",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
     "prepare": "husky install"

scripts/ci/check-file-segments.js

@@ -0,0 +1,48 @@
+const fs = require("fs");
+const { listAllFilesInDir } = require("./lib");
+
+let files = process.argv.slice(2);
+
+if (files.length === 0) {
+  files = [
+    ...listAllFilesInDir("./src/frontend"),
+    ...listAllFilesInDir("./src/backend"),
+    ...listAllFilesInDir("./src/shared"),
+  ];
+}
+
+const errors = [];
+
+const mustNotContain = (fileName, pathsToNotExist) => {
+  const fileContent = fs.readFileSync(fileName, "utf8");
+
+  pathsToNotExist.forEach((pathToNotExist) => {
+    if (fileContent.includes(pathToNotExist)) {
+      errors.push(`${fileName} contains invalid path to ${pathToNotExist}`);
+    }
+  });
+};
+
+const FILE_PATHS = { frontend: '"frontend/', backend: '"backend/' };
+
+for (const fileName of files) {
+  if (fileName.includes("src/backend")) {
+    mustNotContain(fileName, [FILE_PATHS.frontend]);
+  }
+  if (fileName.includes("src/frontend")) {
+    mustNotContain(fileName, [FILE_PATHS.backend]);
+  }
+  if (fileName.includes("src/shared")) {
+    mustNotContain(fileName, [FILE_PATHS.backend, FILE_PATHS.frontend]);
+  }
+}
+
+if (errors.length > 0) {
+  console.error(`${errors.length} files not placed in the correct folders`);
+
+  errors.forEach((error) => {
+    console.error(error);
+  });
+
+  process.exit(1);
+}

scripts/ci/index.js

@@ -0,0 +1 @@
+require("./check-file-segments");

scripts/ci/lib.js

@@ -0,0 +1,27 @@
+const path = require("path");
+const fs = require("fs");
+
+const listAllFilesInDir = (dir, files = []) => {
+  const directoryPath = dir.startsWith("/")
+    ? dir
+    : path.join(process.cwd(), dir);
+  const filesInDir = fs.readdirSync(directoryPath);
+
+  filesInDir.forEach((file) => {
+    const filePath = path.join(directoryPath, file);
+
+    const isDirectory = fs.statSync(filePath).isDirectory();
+
+    if (isDirectory) {
+      listAllFilesInDir(filePath, files);
+    } else {
+      files.push(filePath);
+    }
+  });
+
+  return files;
+};
+
+module.exports = {
+  listAllFilesInDir,
+};

src/__tests__/_/api-handlers/integrations.ts

@@ -1,5 +1,4 @@
 /* eslint-disable no-param-reassign */
-import { IKeyValue } from "frontend/views/settings/Variables/types";
 import {
   DefaultBodyType,
   PathParams,
@@ -8,6 +7,7 @@ import {
   RestContext,
   RestRequest,
 } from "msw";
+import { IKeyValue } from "shared/types/options";
 import { BASE_TEST_URL } from "./_utils";
 
 const CONSTANTS = [

src/__tests__/_/forCodeCoverage.spec.ts

@@ -17,7 +17,6 @@ import { FOR_CODE_COV as $16 } from "backend/actions/integrations/slack/types";
 import { FOR_CODE_COV as $17 } from "backend/actions/integrations/smtp/types";
 import { FOR_CODE_COV as $18 } from "backend/actions/integrations/twilio/types";
 import { FOR_CODE_COV as $19 } from "backend/storage/types";
-import { FOR_CODE_COV as $20 } from "frontend/views/settings/Variables/types";
 import { FOR_CODE_COV as $21 } from "shared/form-schemas/roles/permissions/base";
 import { FOR_CODE_COV as $22 } from "backend/lib/config-persistence/portal/index";
 import { FOR_CODE_COV as $23 } from "backend/lib/config-persistence/portal/main/types";
@@ -59,7 +58,6 @@ noop(
   $17,
   $18,
   $19,
-  $20,
   $21,
   $22,
   $23,

src/backend/integrations-configurations/integrations-configurations.controller.ts

@@ -1,6 +1,6 @@
 import { BadRequestError } from "backend/lib/errors";
 import { IntegrationsConfigurationGroup } from "shared/types/integrations";
-import { IKeyValue } from "frontend/views/settings/Variables/types";
+import { IKeyValue } from "shared/types/options";
 import { credentialsApiService } from "./services/credentials.service";
 import {
   appConstantsApiService,

src/backend/menu/menu.service.ts

@@ -6,7 +6,7 @@ import {
   SystemLinks,
 } from "shared/types/menu";
 import { userFriendlyCase } from "shared/lib/strings/friendly-case";
-import { META_USER_PERMISSIONS } from "shared/constants/user";
+import { META_USER_PERMISSIONS, USER_PERMISSIONS } from "shared/constants/user";
 import { GranularEntityPermissions } from "shared/types/user";
 import {
   EntitiesApiService,
@@ -20,10 +20,32 @@ import {
 import { RolesApiService, rolesApiService } from "backend/roles/roles.service";
 import { ILabelValue } from "shared/types/options";
 import { sortListByOrder } from "shared/lib/array/sort";
-import { SYSTEM_LINKS_CONFIG_MAP } from "shared/constants/menu";
 import { portalCheckIfIsMenuAllowed, getPortalMenuItems } from "./portal";
 import { IBaseNavigationMenuApiService } from "./types";
 
+const SYSTEM_LINKS_CONFIG_MAP: Record<
+  SystemLinks,
+  {
+    permission: string;
+  }
+> = {
+  [SystemLinks.Settings]: {
+    permission: USER_PERMISSIONS.CAN_CONFIGURE_APP,
+  },
+  [SystemLinks.Home]: {
+    permission: META_USER_PERMISSIONS.NO_PERMISSION_REQUIRED,
+  },
+  [SystemLinks.Roles]: {
+    permission: USER_PERMISSIONS.CAN_MANAGE_PERMISSIONS,
+  },
+  [SystemLinks.Users]: {
+    permission: USER_PERMISSIONS.CAN_MANAGE_USERS,
+  },
+  [SystemLinks.Integrations]: {
+    permission: USER_PERMISSIONS.CAN_MANAGE_APP_CREDENTIALS,
+  },
+};
+
 export class NavigationMenuApiService
   implements IApplicationService, IBaseNavigationMenuApiService
 {

src/frontend/_layouts/app/LayoutImpl/RenderNavigation.tsx

@@ -15,8 +15,31 @@ import { PlainButton } from "frontend/design-system/components/Button/TextButton
 import { Stack } from "frontend/design-system/primitives/Stack";
 import { useThemeColorShade } from "frontend/design-system/theme/useTheme";
 import { useNavigationStack } from "frontend/lib/routing/useNavigationStack";
-import { SYSTEM_LINKS_CONFIG_MAP } from "shared/constants/menu";
-import { PORTAL_SYSTEM_LINK_CONFIG } from "shared/constants/portal/menu";
+import { ActionIntegrations } from "shared/types/actions";
+import { PORTAL_SYSTEM_LINK_CONFIG_LINKS } from "./portal";
+
+const SYSTEM_LINKS_CONFIG_MAP: Record<
+  SystemLinks,
+  {
+    link: string;
+  }
+> = {
+  [SystemLinks.Settings]: {
+    link: NAVIGATION_LINKS.SETTINGS.DEFAULT,
+  },
+  [SystemLinks.Home]: {
+    link: NAVIGATION_LINKS.DASHBOARD.HOME,
+  },
+  [SystemLinks.Roles]: {
+    link: NAVIGATION_LINKS.ROLES.LIST,
+  },
+  [SystemLinks.Users]: {
+    link: NAVIGATION_LINKS.USERS.LIST,
+  },
+  [SystemLinks.Integrations]: {
+    link: NAVIGATION_LINKS.INTEGRATIONS.ACTIONS(ActionIntegrations.HTTP),
+  },
+};
 
 const LeftSideNavMenuList = styled.li<{}>`
   list-style: none;
@@ -127,7 +150,7 @@ const getNavigationTypeLink = (
     case NavigationMenuItemType.Entities:
       return NAVIGATION_LINKS.ENTITY.TABLE(link);
     case NavigationMenuItemType.System:
-      return { ...SYSTEM_LINKS_CONFIG_MAP, ...PORTAL_SYSTEM_LINK_CONFIG }[
+      return { ...SYSTEM_LINKS_CONFIG_MAP, ...PORTAL_SYSTEM_LINK_CONFIG_LINKS }[
         link as SystemLinks
       ].link;
   }

src/frontend/_layouts/app/LayoutImpl/portal/index.ts

@@ -1 +1,4 @@
-export { useConstantNavigationMenuItems } from "./main";
+export {
+  useConstantNavigationMenuItems,
+  PORTAL_SYSTEM_LINK_CONFIG_LINKS,
+} from "./main";

src/frontend/_layouts/app/LayoutImpl/portal/main.ts

@@ -1,4 +1,5 @@
 import { NAVIGATION_LINKS } from "frontend/lib/routing/links";
+import { PortalSystemLinks } from "shared/constants/portal/menu/main";
 
 export const useConstantNavigationMenuItems = () => {
   return [
@@ -8,3 +9,11 @@ export const useConstantNavigationMenuItems = () => {
     },
   ];
 };
+
+export const PORTAL_SYSTEM_LINK_CONFIG_LINKS: Record<
+  PortalSystemLinks,
+  {
+    link: string;
+    permission?: string;
+  }
+> = {};

src/frontend/components/FEPaginationTable/index.tsx

@@ -1,10 +1,9 @@
 import { useState, ReactNode } from "react";
-import { IPaginatedDataState } from "shared/types/data";
+import { IPaginatedDataState, TableFilterType } from "shared/types/data";
 import { DEFAULT_TABLE_STATE } from "frontend/design-system/components/Table/constants";
 import { TableSkeleton } from "frontend/design-system/components/Skeleton/Table";
 import { Table } from "frontend/design-system/components/Table";
 import { ITableColumn } from "frontend/design-system/components/Table/types";
-import { TableFilterType } from "frontend/design-system/components/Table/filters/types";
 import { IEmptyWrapperProps } from "frontend/design-system/components/EmptyWrapper/types";
 import { useFEPagination } from "./useFEPagination";
 import { ViewStateMachine } from "../ViewStateMachine";

src/frontend/components/SchemaForm/form-run.ts

@@ -1,5 +1,5 @@
-import { evalJavascriptStringSafely } from "frontend/lib/script-runner";
-import { ISchemaFormScriptProps } from "./types";
+import { ISchemaFormScriptProps } from "shared/form-schemas/types";
+import { evalJavascriptStringSafely } from "shared/lib/script-runner";
 
 export const runFormFieldState = <T>(
   fieldStateString: string,

src/frontend/components/SchemaForm/types.ts

@@ -1,26 +1,17 @@
 import { FormApi } from "final-form";
-import { ISharedFormInput } from "frontend/design-system/components/Form/_types";
 import { FieldInputProps, FieldMetaState } from "react-final-form";
-import { ISchemaFormConfig } from "shared/form-schemas/types";
+import {
+  IFormInputRightAction,
+  ISchemaFormConfig,
+} from "shared/form-schemas/types";
 import { IColorableSelection } from "shared/types/ui";
-import { IAuthenticatedUserBag } from "shared/types/user";
 import { FIELD_TYPES_CONFIG_MAP } from "shared/validations";
 
 export interface IFormExtension {
   fieldsState: string;
   beforeSubmit: string;
 }
 
-export interface ISchemaFormScriptContext {
-  routeParams: Record<string, string>;
-  auth: IAuthenticatedUserBag;
-  action: string;
-}
-
-export interface ISchemaFormScriptProps<T> extends ISchemaFormScriptContext {
-  formValues: T;
-}
-
 export interface IRenderFormInputProps {
   type: keyof typeof FIELD_TYPES_CONFIG_MAP;
   renderProps: {
@@ -35,5 +26,5 @@ export interface IRenderFormInputProps {
   label: string;
   placeholder?: string;
   description?: string;
-  rightActions?: ISharedFormInput["rightActions"];
+  rightActions?: IFormInputRightAction[];
 }

src/frontend/components/SchemaForm/useSchemaFormScriptContext.ts

@@ -1,6 +1,6 @@
 import { useRouter } from "next/router";
 import { useAuthenticatedUserBag } from "frontend/hooks/auth/user.store";
-import { ISchemaFormScriptContext } from "./types";
+import { ISchemaFormScriptContext } from "shared/form-schemas/types";
 
 export const useSchemaFormScriptContext = (
   action: string

src/frontend/design-system/Icons/Grab.tsx

@@ -0,0 +1,29 @@
+import styled from "styled-components";
+import { forwardRef } from "react";
+import { USE_ROOT_COLOR } from "../theme/root";
+
+const GrabRoot = styled.svg`
+  cursor: grab;
+  fill: ${USE_ROOT_COLOR("main-text")};
+  touch-action: none;
+`;
+
+export const GrabIcon = forwardRef<
+  SVGSVGElement,
+  {
+    width?: number;
+    className?: string;
+  }
+>(({ className, width }, ref) => {
+  return (
+    <GrabRoot
+      ref={ref}
+      viewBox="0 0 20 20"
+      width={width || 12}
+      className={`${className} grab-icon`}
+    >
+      <path d="M7 2a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 2zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 8zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 14zm6-8a2 2 0 1 0-.001-4.001A2 2 0 0 0 13 6zm0 2a2 2 0 1 0 .001 4.001A2 2 0 0 0 13 8zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 13 14z" />
+    </GrabRoot>
+  );
+});
+//   // :eyes document.body.style.setProperty("cursor", "grabbing");

src/frontend/design-system/components/Form/_types.ts

@@ -1,4 +1,5 @@
 import { FieldInputProps, FieldMetaState } from "react-final-form";
+import { IFormInputRightAction } from "shared/form-schemas/types";
 
 export interface ISharedFormInput {
   input: FieldInputProps<any, HTMLElement>;
@@ -9,10 +10,7 @@ export interface ISharedFormInput {
   required?: boolean;
   disabled?: boolean;
   sm?: true;
-  rightActions?: {
-    label: string;
-    action: () => void;
-  }[];
+  rightActions?: IFormInputRightAction[];
 }
 
 export const FOR_CODE_COV = 1;

src/frontend/design-system/components/ListManager/ListManagerItem/index.tsx

@@ -7,8 +7,8 @@ import Link from "next/link";
 import styled, { css } from "styled-components";
 import { USE_ROOT_COLOR } from "frontend/design-system/theme/root";
 import { Stack } from "frontend/design-system/primitives/Stack";
-import { GrabIcon } from "shared/constants/Icons";
 import { SortableKnob } from "react-easy-sort";
+import { GrabIcon } from "frontend/design-system/Icons/Grab";
 import { FormButton } from "../../Button/FormButton";
 import { FormSwitch } from "../../Form/FormSwitch";
 import { ButtonIconTypes } from "../../Button/constants";

src/frontend/design-system/components/Table/Head.tsx

@@ -5,8 +5,8 @@ import styled, { css } from "styled-components";
 import { Stack } from "frontend/design-system/primitives/Stack";
 import { Typo } from "frontend/design-system/primitives/Typo";
 import { USE_ROOT_COLOR } from "frontend/design-system/theme/root";
+import { TableFilterType } from "shared/types/data";
 import { TableFilter } from "./filters";
-import { TableFilterType } from "./filters/types";
 import { Th } from "./styles";
 
 const THead = styled.thead`

src/frontend/design-system/components/Table/filters/_FilterWrapper.tsx

@@ -5,9 +5,9 @@ import { Icon, ToggleLeft, Filter, Search, Calendar } from "react-feather";
 import styled from "styled-components";
 import { Stack } from "frontend/design-system/primitives/Stack";
 import { USE_ROOT_COLOR } from "frontend/design-system/theme/root";
+import { TableFilterType } from "shared/types/data";
 import { Dropdown } from "../../Dropdown";
 import { SoftButton } from "../../Button/SoftButton";
-import { TableFilterType } from "./types";
 
 const FILTER_TYPE_CONFIG: Record<
   TableFilterType["_type"],