feat: adjusted doc and brought back permission

2026-10-08 06:27:40 +00:00 · 2025-09-16 00:08:42 +05:30
parent ffae006191
commit f0277e6f0d
69 changed files with 238 additions and 220 deletions
@@ -32,6 +32,7 @@ export enum OrgPermissionMachineIdentityAuthTemplateActions {

 export enum OrgPermissionSubjects {
  Workspace = "workspace",
+  Project = "project",
  Role = "role",
  Member = "member",
  Settings = "settings",
@@ -109,6 +110,7 @@ export type AppConnectionSubjectFields = {

 export type OrgPermissionSet =
  | [OrgPermissionActions.Create, OrgPermissionSubjects.Workspace]
+  | [OrgPermissionActions.Create, OrgPermissionSubjects.Project]
  | [OrgPermissionActions.Read, OrgPermissionSubjects.Workspace]
  | [OrgPermissionActions, OrgPermissionSubjects.Role]
  | [OrgPermissionActions, OrgPermissionSubjects.Member]
@@ -200,16 +200,20 @@ export const ProjectSelect = () => {
          </div>
          <div className="mt-1 h-1 border-t border-mineshaft-600" />
          <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Workspace}>
-            {(isAllowed) => (
-              <DropdownMenuItem
-                isDisabled={!isAllowed}
-                icon={<FontAwesomeIcon icon={faPlus} />}
-                onClick={() =>
-                  handlePopUpOpen(isAddingProjectsAllowed ? "addNewWs" : "upgradePlan")
-                }
-              >
-                New Project
-              </DropdownMenuItem>
+            {(isOldProjectPermissionAllowed) => (
+              <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Project}>
+                {(isAllowed) => (
+                  <DropdownMenuItem
+                    isDisabled={!isAllowed && !isOldProjectPermissionAllowed}
+                    icon={<FontAwesomeIcon icon={faPlus} />}
+                    onClick={() =>
+                      handlePopUpOpen(isAddingProjectsAllowed ? "addNewWs" : "upgradePlan")
+                    }
+                  >
+                    New Project
+                  </DropdownMenuItem>
+                )}
+              </OrgPermissionCan>
            )}
          </OrgPermissionCan>
        </DropdownMenuContent>
@@ -278,22 +278,26 @@ export const AllProjectView = ({
          </IconButton>
        </div>
        <OrgPermissionCan I={OrgPermissionActions.Create} an={OrgPermissionSubjects.Workspace}>
-          {(isAllowed) => (
-            <Button
-              isDisabled={!isAllowed}
-              colorSchema="secondary"
-              leftIcon={<FontAwesomeIcon icon={faPlus} />}
-              onClick={() => {
-                if (isAddingProjectsAllowed) {
-                  onAddNewProject();
-                } else {
-                  onUpgradePlan();
-                }
-              }}
-              className="ml-2"
-            >
-              Add New Project
-            </Button>
+          {(isOldProjectPermissionAllowed) => (
+            <OrgPermissionCan I={OrgPermissionActions.Create} an={OrgPermissionSubjects.Project}>
+              {(isAllowed) => (
+                <Button
+                  isDisabled={!isAllowed && !isOldProjectPermissionAllowed}
+                  colorSchema="secondary"
+                  leftIcon={<FontAwesomeIcon icon={faPlus} />}
+                  onClick={() => {
+                    if (isAddingProjectsAllowed) {
+                      onAddNewProject();
+                    } else {
+                      onUpgradePlan();
+                    }
+                  }}
+                  className="ml-2"
+                >
+                  Add New Project
+                </Button>
+              )}
+            </OrgPermissionCan>
          )}
        </OrgPermissionCan>
      </div>
@@ -480,22 +480,26 @@ export const MyProjectView = ({
          </IconButton>
        </div>
        <OrgPermissionCan I={OrgPermissionActions.Create} an={OrgPermissionSubjects.Workspace}>
-          {(isAllowed) => (
-            <Button
-              isDisabled={!isAllowed}
-              colorSchema="secondary"
-              leftIcon={<FontAwesomeIcon icon={faPlus} />}
-              onClick={() => {
-                if (isAddingProjectsAllowed) {
-                  onAddNewProject();
-                } else {
-                  onUpgradePlan();
-                }
-              }}
-              className="ml-2"
-            >
-              Add New Project
-            </Button>
+          {(isOldProjectV1Allowed) => (
+            <OrgPermissionCan I={OrgPermissionActions.Create} an={OrgPermissionSubjects.Project}>
+              {(isAllowed) => (
+                <Button
+                  isDisabled={!isAllowed && !isOldProjectV1Allowed}
+                  colorSchema="secondary"
+                  leftIcon={<FontAwesomeIcon icon={faPlus} />}
+                  onClick={() => {
+                    if (isAddingProjectsAllowed) {
+                      onAddNewProject();
+                    } else {
+                      onUpgradePlan();
+                    }
+                  }}
+                  className="ml-2"
+                >
+                  Add New Project
+                </Button>
+              )}
+            </OrgPermissionCan>
          )}
        </OrgPermissionCan>
      </div>
@@ -122,12 +122,11 @@ export const formSchema = z.object({
    .refine((val) => val !== "custom", { message: "Cannot use custom as its a keyword" }),
  permissions: z
    .object({
-      workspace: z
+      project: z
        .object({
          create: z.boolean().optional()
        })
        .optional(),
-
      "audit-logs": auditLogsPermissionSchema,
      member: generalPermissionSchema,
      groups: groupPermissionSchema,
@@ -162,7 +161,11 @@ export const rolePermission2Form = (permissions: TPermission[] = []) => {
  // i would have to write a if loop with both conditions same
  const formVal: Record<string, any> = {};
  permissions.forEach((permission) => {
-    const { subject, action } = permission;
+    const { action } = permission;
+    let { subject } = permission;
+    if (subject === OrgPermissionSubjects.Workspace) {
+      subject = OrgPermissionSubjects.Project;
+    }
    if (!formVal?.[subject]) formVal[subject] = {};
    formVal[subject][action] = true;
  });
@@ -28,7 +28,7 @@ export const OrgRoleWorkspaceRow = ({ isEditable, control, setValue }: Props) =>

  const rule = useWatch({
    control,
-    name: "permissions.workspace"
+    name: "permissions.project"
  });

  const selectedPermissionCategory = useMemo(() => {
@@ -60,7 +60,7 @@ export const OrgRoleWorkspaceRow = ({ isEditable, control, setValue }: Props) =>
    setIsCustom.off();

    if (val === Permission.NoAccess) {
-      setValue("permissions.workspace", { create: false }, { shouldDirty: true });
+      setValue("permissions.project", { create: false }, { shouldDirty: true });
    }
  };

@@ -95,8 +95,8 @@ export const OrgRoleWorkspaceRow = ({ isEditable, control, setValue }: Props) =>
              {PERMISSION_ACTIONS.map(({ action, label }) => {
                return (
                  <Controller
-                    name={`permissions.workspace.${action}`}
-                    key={`permissions.workspace.${action}`}
+                    name={`permissions.project.${action}`}
+                    key={`permissions.project.${action}`}
                    control={control}
                    render={({ field }) => (
                      <Checkbox
@@ -1,9 +1,8 @@
 import { faArrowUpRightFromSquare, faBookOpen, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";

-import { OrgPermissionCan } from "@app/components/permissions";
 import { Button } from "@app/components/v2";
-import { OrgPermissionActions, OrgPermissionSubjects, useOrgPermission } from "@app/context";
+import { useOrgPermission } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";

@@ -15,52 +14,45 @@ export const ExternalMigrationsTab = () => {
  const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp(["selectImportPlatform"] as const);

  return (
-    <OrgPermissionCan
-      I={OrgPermissionActions.Create}
-      a={OrgPermissionSubjects.Workspace}
-      renderGuardBanner
-      passThrough={false}
-    >
-      <div className="rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-        <div className="flex justify-between">
-          <div className="flex items-center gap-2">
-            <p className="text-xl font-semibold text-mineshaft-100">Import from external source</p>
+    <div className="rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
+      <div className="flex justify-between">
+        <div className="flex items-center gap-2">
+          <p className="text-xl font-semibold text-mineshaft-100">Import from external source</p>

-            <div>
-              <a
-                target="_blank"
-                rel="noopener noreferrer"
-                href="https://infisical.com/docs/documentation/platform/external-migrations/overview"
-              >
-                <div className="ml-2 inline-block rounded-md bg-yellow/20 px-1.5 pb-[0.03rem] pt-[0.04rem] text-sm text-yellow opacity-80 hover:opacity-100">
-                  <FontAwesomeIcon icon={faBookOpen} className="mr-1.5" />
-                  Docs
-                  <FontAwesomeIcon
-                    icon={faArrowUpRightFromSquare}
-                    className="mb-[0.07rem] ml-1.5 text-xxs"
-                  />
-                </div>
-              </a>
-            </div>
+          <div>
+            <a
+              target="_blank"
+              rel="noopener noreferrer"
+              href="https://infisical.com/docs/documentation/platform/external-migrations/overview"
+            >
+              <div className="ml-2 inline-block rounded-md bg-yellow/20 px-1.5 pb-[0.03rem] pt-[0.04rem] text-sm text-yellow opacity-80 hover:opacity-100">
+                <FontAwesomeIcon icon={faBookOpen} className="mr-1.5" />
+                Docs
+                <FontAwesomeIcon
+                  icon={faArrowUpRightFromSquare}
+                  className="mb-[0.07rem] ml-1.5 text-xxs"
+                />
+              </div>
+            </a>
          </div>
-
-          <Button
-            onClick={() => {
-              handlePopUpOpen("selectImportPlatform");
-            }}
-            isDisabled={membership?.role !== ProjectMembershipRole.Admin}
-            leftIcon={<FontAwesomeIcon icon={faPlus} />}
-          >
-            Import
-          </Button>
        </div>
-        <p className="mb-4 text-gray-400">Import data from another platform to Infisical.</p>

-        <SelectImportFromPlatformModal
-          isOpen={popUp.selectImportPlatform.isOpen}
-          onToggle={(state) => handlePopUpToggle("selectImportPlatform", state)}
-        />
+        <Button
+          onClick={() => {
+            handlePopUpOpen("selectImportPlatform");
+          }}
+          isDisabled={membership?.role !== ProjectMembershipRole.Admin}
+          leftIcon={<FontAwesomeIcon icon={faPlus} />}
+        >
+          Import
+        </Button>
      </div>
-    </OrgPermissionCan>
+      <p className="mb-4 text-gray-400">Import data from another platform to Infisical.</p>
+
+      <SelectImportFromPlatformModal
+        isOpen={popUp.selectImportPlatform.isOpen}
+        onToggle={(state) => handlePopUpToggle("selectImportPlatform", state)}
+      />
+    </div>
  );
 };