improvements: address feedback

2026-10-15 12:38:36 +00:00 · 2025-01-20 22:17:20 -08:00
parent 6341b7e989
commit 3c1fc024c2
57 changed files with 981 additions and 432 deletions
@@ -2,6 +2,7 @@
 import { z } from "zod";

 import { OrgPermissionSubjects } from "@app/context";
+import { OrgPermissionAppConnectionActions } from "@app/context/OrgPermissionContext/types";
 import { TPermission } from "@app/hooks/api/roles/types";

 const generalPermissionSchema = z
@@ -13,6 +14,16 @@ const generalPermissionSchema = z
  })
  .optional();

+const appConnectionsPermissionSchema = z
+  .object({
+    [OrgPermissionAppConnectionActions.Read]: z.boolean().optional(),
+    [OrgPermissionAppConnectionActions.Edit]: z.boolean().optional(),
+    [OrgPermissionAppConnectionActions.Create]: z.boolean().optional(),
+    [OrgPermissionAppConnectionActions.Delete]: z.boolean().optional(),
+    [OrgPermissionAppConnectionActions.Connect]: z.boolean().optional()
+  })
+  .optional();
+
 const adminConsolePermissionSchmea = z
  .object({
    "access-all-projects": z.boolean().optional()
@@ -50,7 +61,7 @@ export const formSchema = z.object({
      "organization-admin-console": adminConsolePermissionSchmea,
      [OrgPermissionSubjects.Kms]: generalPermissionSchema,
      [OrgPermissionSubjects.ProjectTemplates]: generalPermissionSchema,
-      [OrgPermissionSubjects.AppConnections]: generalPermissionSchema
+      "app-connections": appConnectionsPermissionSchema
    })
    .optional()
 });
@@ -0,0 +1,186 @@
+import { useEffect, useMemo } from "react";
+import { Control, Controller, UseFormSetValue, useWatch } from "react-hook-form";
+import { faChevronDown, faChevronRight } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import { createNotification } from "@app/components/notifications";
+import { Checkbox, Select, SelectItem, Td, Tr } from "@app/components/v2";
+import { OrgPermissionAppConnectionActions } from "@app/context/OrgPermissionContext/types";
+import { useToggle } from "@app/hooks";
+
+import { TFormSchema } from "../OrgRoleModifySection.utils";
+
+type Props = {
+  isEditable: boolean;
+  setValue: UseFormSetValue<TFormSchema>;
+  control: Control<TFormSchema>;
+};
+
+enum Permission {
+  NoAccess = "no-access",
+  ReadOnly = "read-only",
+  FullAccess = "full-access",
+  Custom = "custom"
+}
+
+const PERMISSION_ACTIONS = [
+  { action: OrgPermissionAppConnectionActions.Read, label: "Read" },
+  { action: OrgPermissionAppConnectionActions.Create, label: "Create" },
+  { action: OrgPermissionAppConnectionActions.Edit, label: "Modify" },
+  { action: OrgPermissionAppConnectionActions.Delete, label: "Remove" },
+  { action: OrgPermissionAppConnectionActions.Connect, label: "Connect" }
+] as const;
+
+export const OrgPermissionAppConnectionRow = ({ isEditable, control, setValue }: Props) => {
+  const [isRowExpanded, setIsRowExpanded] = useToggle();
+  const [isCustom, setIsCustom] = useToggle();
+
+  const rule = useWatch({
+    control,
+    name: "permissions.app-connections"
+  });
+
+  const selectedPermissionCategory = useMemo(() => {
+    const actions = Object.keys(rule || {}) as Array<keyof typeof rule>;
+    const totalActions = PERMISSION_ACTIONS.length;
+    const score = actions.map((key) => (rule?.[key] ? 1 : 0)).reduce((a, b) => a + b, 0 as number);
+
+    if (isCustom) return Permission.Custom;
+    if (score === 0) return Permission.NoAccess;
+    if (score === totalActions) return Permission.FullAccess;
+    if (score === 1 && rule?.[OrgPermissionAppConnectionActions.Read]) return Permission.ReadOnly;
+
+    return Permission.Custom;
+  }, [rule, isCustom]);
+
+  useEffect(() => {
+    if (selectedPermissionCategory === Permission.Custom) setIsCustom.on();
+    else setIsCustom.off();
+  }, [selectedPermissionCategory]);
+
+  useEffect(() => {
+    const isRowCustom = selectedPermissionCategory === Permission.Custom;
+    if (isRowCustom) {
+      setIsRowExpanded.on();
+    }
+  }, []);
+
+  const handlePermissionChange = (val: Permission) => {
+    if (!val) return;
+    if (val === Permission.Custom) {
+      setIsRowExpanded.on();
+      setIsCustom.on();
+      return;
+    }
+    setIsCustom.off();
+
+    switch (val) {
+      case Permission.FullAccess:
+        setValue(
+          "permissions.app-connections",
+          {
+            [OrgPermissionAppConnectionActions.Read]: true,
+            [OrgPermissionAppConnectionActions.Edit]: true,
+            [OrgPermissionAppConnectionActions.Create]: true,
+            [OrgPermissionAppConnectionActions.Delete]: true,
+            [OrgPermissionAppConnectionActions.Connect]: true
+          },
+          { shouldDirty: true }
+        );
+        break;
+      case Permission.ReadOnly:
+        setValue(
+          "permissions.app-connections",
+          {
+            [OrgPermissionAppConnectionActions.Read]: true,
+            [OrgPermissionAppConnectionActions.Edit]: false,
+            [OrgPermissionAppConnectionActions.Create]: false,
+            [OrgPermissionAppConnectionActions.Delete]: false,
+            [OrgPermissionAppConnectionActions.Connect]: false
+          },
+          { shouldDirty: true }
+        );
+        break;
+
+      case Permission.NoAccess:
+      default:
+        setValue(
+          "permissions.app-connections",
+          {
+            [OrgPermissionAppConnectionActions.Read]: false,
+            [OrgPermissionAppConnectionActions.Edit]: false,
+            [OrgPermissionAppConnectionActions.Create]: false,
+            [OrgPermissionAppConnectionActions.Delete]: false,
+            [OrgPermissionAppConnectionActions.Connect]: false
+          },
+          { shouldDirty: true }
+        );
+    }
+  };
+
+  return (
+    <>
+      <Tr
+        className="h-10 cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700"
+        onClick={() => setIsRowExpanded.toggle()}
+      >
+        <Td>
+          <FontAwesomeIcon icon={isRowExpanded ? faChevronDown : faChevronRight} />
+        </Td>
+        <Td>App Connections</Td>
+        <Td>
+          <Select
+            value={selectedPermissionCategory}
+            className="w-40 bg-mineshaft-600"
+            dropdownContainerClassName="border border-mineshaft-600 bg-mineshaft-800"
+            onValueChange={handlePermissionChange}
+            isDisabled={!isEditable}
+          >
+            <SelectItem value={Permission.NoAccess}>No Access</SelectItem>
+            <SelectItem value={Permission.ReadOnly}>Read Only</SelectItem>
+            <SelectItem value={Permission.FullAccess}>Full Access</SelectItem>
+            <SelectItem value={Permission.Custom}>Custom</SelectItem>
+          </Select>
+        </Td>
+      </Tr>
+      {isRowExpanded && (
+        <Tr>
+          <Td
+            colSpan={3}
+            className={`bg-bunker-600 px-0 py-0 ${isRowExpanded && "border-mineshaft-500 p-8"}`}
+          >
+            <div className="grid grid-cols-3 gap-4">
+              {PERMISSION_ACTIONS.map(({ action, label }) => {
+                return (
+                  <Controller
+                    name={`permissions.app-connections.${action}`}
+                    key={`permissions.app-connections.${action}`}
+                    control={control}
+                    render={({ field }) => (
+                      <Checkbox
+                        isChecked={field.value}
+                        onCheckedChange={(e) => {
+                          if (!isEditable) {
+                            createNotification({
+                              type: "error",
+                              text: "Failed to update default role"
+                            });
+                            return;
+                          }
+                          field.onChange(e);
+                        }}
+                        id={`permissions.app-connections.${action}`}
+                      >
+                        {label}
+                      </Checkbox>
+                    )}
+                  />
+                );
+              })}
+            </div>
+          </Td>
+        </Tr>
+      )}
+    </>
+  );
+};
@@ -5,6 +5,7 @@ import { createNotification } from "@app/components/notifications";
 import { Button, Table, TableContainer, TBody, Th, THead, Tr } from "@app/components/v2";
 import { OrgPermissionSubjects, useOrganization } from "@app/context";
 import { useGetOrgRole, useUpdateOrgRole } from "@app/hooks/api";
+import { OrgPermissionAppConnectionRow } from "@app/pages/organization/RoleByIDPage/components/RolePermissionsSection/OrgPermissionAppConnectionRow";

 import {
  formRolePermission2API,
@@ -69,8 +70,7 @@ const SIMPLE_PERMISSION_OPTIONS = [
    title: "External KMS",
    formName: OrgPermissionSubjects.Kms
  },
-  { title: "Project Templates", formName: OrgPermissionSubjects.ProjectTemplates },
-  { title: "App Connections", formName: OrgPermissionSubjects.AppConnections }
+  { title: "Project Templates", formName: OrgPermissionSubjects.ProjectTemplates }
 ] as const;

 type Props = {
@@ -165,6 +165,11 @@ export const RolePermissionsSection = ({ roleId }: Props) => {
                  />
                );
              })}
+              <OrgPermissionAppConnectionRow
+                control={control}
+                setValue={setValue}
+                isEditable={isCustomRole}
+              />
              <OrgRoleWorkspaceRow
                control={control}
                setValue={setValue}
@@ -3,7 +3,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";

 import { OrgPermissionCan } from "@app/components/permissions";
 import { Button } from "@app/components/v2";
-import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context";
+import { OrgPermissionSubjects } from "@app/context";
+import { OrgPermissionAppConnectionActions } from "@app/context/OrgPermissionContext/types";
 import { withPermission } from "@app/hoc";
 import { usePopUp } from "@app/hooks";

@@ -41,7 +42,7 @@ export const AppConnectionsTab = withPermission(
              </p>
            </div>
            <OrgPermissionCan
-              I={OrgPermissionActions.Create}
+              I={OrgPermissionAppConnectionActions.Create}
              a={OrgPermissionSubjects.AppConnections}
            >
              {(isAllowed) => (
@@ -70,7 +71,7 @@ export const AppConnectionsTab = withPermission(
    );
  },
  {
-    action: OrgPermissionActions.Read,
+    action: OrgPermissionAppConnectionActions.Read,
    subject: OrgPermissionSubjects.AppConnections
  }
 );
@@ -23,7 +23,8 @@ import {
  Tooltip,
  Tr
 } from "@app/components/v2";
-import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context";
+import { OrgPermissionSubjects } from "@app/context";
+import { OrgPermissionAppConnectionActions } from "@app/context/OrgPermissionContext/types";
 import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
 import { useToggle } from "@app/hooks";
 import { TAppConnection } from "@app/hooks/api/appConnections";
@@ -119,7 +120,7 @@ export const AppConnectionRow = ({
                Copy Connection ID
              </DropdownMenuItem>
              <OrgPermissionCan
-                I={OrgPermissionActions.Edit}
+                I={OrgPermissionAppConnectionActions.Edit}
                a={OrgPermissionSubjects.AppConnections}
              >
                {(isAllowed: boolean) => (
@@ -133,7 +134,7 @@ export const AppConnectionRow = ({
                )}
              </OrgPermissionCan>
              <OrgPermissionCan
-                I={OrgPermissionActions.Edit}
+                I={OrgPermissionAppConnectionActions.Edit}
                a={OrgPermissionSubjects.AppConnections}
              >
                {(isAllowed: boolean) => (
@@ -147,7 +148,7 @@ export const AppConnectionRow = ({
                )}
              </OrgPermissionCan>
              <OrgPermissionCan
-                I={OrgPermissionActions.Delete}
+                I={OrgPermissionAppConnectionActions.Delete}
                a={OrgPermissionSubjects.AppConnections}
              >
                {(isAllowed: boolean) => (
@@ -33,7 +33,7 @@ export const DeleteAppConnectionModal = ({ isOpen, onOpenChange, appConnection }
      console.error(err);

      createNotification({
-        text: `Failed remove ${APP_CONNECTION_MAP[app].name} connection`,
+        text: `Failed to remove ${APP_CONNECTION_MAP[app].name} connection`,
        type: "error"
      });
    }