Finished migration

backend/src/db/migrations/20240202093209_ghost_user.ts

@@ -15,6 +15,7 @@ export async function up(knex: Knex): Promise<void> {
   if (!hasProjectVersionColumn) {
     await knex.schema.alterTable(TableName.Project, (t) => {
       t.string("version").defaultTo(ProjectVersion.V1).notNullable();
+      t.text("upgradeStatus").nullable();
     });
   }
 }
@@ -32,6 +33,7 @@ export async function down(knex: Knex): Promise<void> {
   if (hasProjectVersionColumn) {
     await knex.schema.alterTable(TableName.Project, (t) => {
       t.dropColumn("version");
+      t.dropColumn("upgradeStatus");
     });
   }
 }

backend/src/db/schemas/models.ts

@@ -123,6 +123,24 @@ export enum ProjectUpgradeStatus {
   Failed = "FAILED"
 }
 
+// Case study:
+/*
+
+Q: If the upgrade status is null and the project version is V1:
+A: It would mean that the project has not been attempted to be upgraded
+
+Q: If the upgrade status is not null (FAILED or IN_PROGRESS), we a status
+
+Q: if the project status is null, and the project version is v2, we should display nothing cuz its upgraded!
+
+*/
+
+export enum ProjectUpgradeStatus {
+  InProgress = "IN_PROGRESS",
+  Completed = "Project upgrade completed.", // Will be null if completed. So a completed status is not needed
+  Failed = "FAILED"
+}
+
 export enum IdentityAuthMethod {
   Univeral = "universal-auth"
 }

backend/src/server/routes/index.ts

@@ -327,12 +327,7 @@ export const registerRoutes = async (
     identityProjectDAL,
     identityOrgMembershipDAL,
     projectBotDAL,
-    secretDAL,
-    orgDAL,
-    secretApprovalRequestDAL,
-    secretApprovalSecretDAL: sarSecretDAL,
     projectKeyDAL,
-    secretVersionDAL,
     userDAL,
     projectEnvDAL,
     orgService,

backend/src/services/project/project-dal.ts

@@ -80,6 +80,18 @@ export const projectDALFactory = (db: TDbClient) => {
     }
   };
 
+  const setProjectUpgradeStatus = async (projectId: string, status: ProjectUpgradeStatus) => {
+    try {
+      const data: TProjectsUpdate = {
+        upgradeStatus: status
+      } as const;
+
+      await db(TableName.Project).where({ id: projectId }).update(data);
+    } catch (error) {
+      throw new DatabaseError({ error, name: "Set project upgrade status" });
+    }
+  };
+
   const findAllProjectsByIdentity = async (identityId: string) => {
     try {
       const workspaces = await db(TableName.IdentityProjectMembership)

backend/src/services/project/project-service.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-redeclare */
 /* eslint-disable no-console */
 /* eslint-disable no-await-in-loop */
 import { ForbiddenError } from "@casl/ability";
@@ -8,18 +9,10 @@ import { TLicenseServiceFactory } from "@app/ee/services/license/license-service
 import { OrgPermissionActions, OrgPermissionSubjects } from "@app/ee/services/permission/org-permission";
 import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service";
 import { ProjectPermissionActions, ProjectPermissionSub } from "@app/ee/services/permission/project-permission";
-import { TSecretApprovalRequestDALFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-dal";
-import { TSecretApprovalRequestSecretDALFactory } from "@app/ee/services/secret-approval-request/secret-approval-request-secret-dal";
-import { RequestState } from "@app/ee/services/secret-approval-request/secret-approval-request-types";
 import { isAtLeastAsPrivileged } from "@app/lib/casl";
 import { getConfig } from "@app/lib/config/env";
 import { createSecretBlindIndex } from "@app/lib/crypto";
-import {
-  decryptAsymmetric,
-  encryptSymmetric128BitHexKeyUTF8,
-  infisicalSymmetricDecrypt,
-  infisicalSymmetricEncypt
-} from "@app/lib/crypto/encryption";
+import { infisicalSymmetricEncypt } from "@app/lib/crypto/encryption";
 import { BadRequestError, ForbiddenRequestError } from "@app/lib/errors";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { TProjectPermission } from "@app/lib/types";
@@ -27,14 +20,11 @@ import { TProjectPermission } from "@app/lib/types";
 import { ActorType } from "../auth/auth-type";
 import { TIdentityOrgDALFactory } from "../identity/identity-org-dal";
 import { TIdentityProjectDALFactory } from "../identity-project/identity-project-dal";
-import { TOrgDALFactory } from "../org/org-dal";
 import { TOrgServiceFactory } from "../org/org-service";
 import { TProjectBotDALFactory } from "../project-bot/project-bot-dal";
 import { TProjectEnvDALFactory } from "../project-env/project-env-dal";
 import { TProjectKeyDALFactory } from "../project-key/project-key-dal";
 import { TProjectMembershipDALFactory } from "../project-membership/project-membership-dal";
-import { TSecretDALFactory } from "../secret/secret-dal";
-import { TSecretVersionDALFactory } from "../secret/secret-version-dal";
 import { TSecretBlindIndexDALFactory } from "../secret-blind-index/secret-blind-index-dal";
 import { ROOT_FOLDER_NAME, TSecretFolderDALFactory } from "../secret-folder/secret-folder-dal";
 import { TUserDALFactory } from "../user/user-dal";
@@ -78,18 +68,13 @@ export const projectServiceFactory = ({
   projectDAL,
   projectQueue,
   projectKeyDAL,
-  secretApprovalRequestDAL,
-  secretApprovalSecretDAL,
   permissionService,
   userDAL,
   folderDAL,
   orgService,
-  orgDAL,
   identityProjectDAL,
-  secretVersionDAL,
   projectBotDAL,
   identityOrgMembershipDAL,
-  secretDAL,
   secretBlindIndexDAL,
   projectMembershipDAL,
   projectEnvDAL,

frontend/src/components/v2/UpgradeProjectAlert/UpgradeProjectAlert.tsx

@@ -86,18 +86,18 @@ export const UpgradeProjectAlert = ({ project }: UpgradeProjectAlertProps): JSX.
   if (membership.role !== "admin") return null;
 
   return (
-    <div className="mt-4 w-full border rounded-md p-4 text-base border-primary-600/70 bg-primary/[.07] text-white flex flex-row items-center">
-      <FontAwesomeIcon icon={faWarning} className="text-white/80 text-6xl pr-6"/>
-      <div className="text-sm flex flex-col w-full">
-        <span className="text-lg font-semibold mb-2">Upgrade your project</span>
+    <div className="mt-4 flex w-full flex-row items-center rounded-md border border-primary-600/70 bg-primary/[.07] p-4 text-base text-white">
+      <FontAwesomeIcon icon={faWarning} className="pr-6 text-6xl text-white/80" />
+      <div className="flex w-full flex-col text-sm">
+        <span className="mb-2 text-lg font-semibold">Upgrade your project</span>
         Upgrade your project version to continue receiving the latest improvements and patches.
         {currentStatus && <p className="mt-2 opacity-80">Status: {currentStatus}</p>}
       </div>
       <div className="my-2">
-          <Button isLoading={isLoading} isDisabled={isLoading} onClick={onUpgradeProject}>
-            Upgrade
-          </Button>
-        </div>
+        <Button isLoading={isLoading} isDisabled={isLoading} onClick={onUpgradeProject}>
+          Upgrade
+        </Button>
+      </div>
     </div>
   );
 };

frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import Link from "next/link";
 import { useRouter } from "next/router";
@@ -14,8 +14,6 @@ import { useNotificationContext } from "@app/components/context/Notifications/No
 import NavHeader from "@app/components/navigation/NavHeader";
 import { PermissionDeniedBanner } from "@app/components/permissions";
 import {
-  Alert,
-  AlertDescription,
   Button,
   EmptyState,
   IconButton,
@@ -40,8 +38,7 @@ import {
   useGetFoldersByEnv,
   useGetProjectSecretsAllEnv,
   useGetUserWsKey,
-  useUpdateSecretV3,
-  useUpgradeProject
+  useUpdateSecretV3
 } from "@app/hooks/api";
 import { ProjectVersion } from "@app/hooks/api/workspace/types";
 
@@ -109,7 +106,6 @@ export const SecretOverviewPage = () => {
     environments: userAvailableEnvs.map(({ slug }) => slug)
   });
 
-  const upgradeProject = useUpgradeProject();
   const { mutateAsync: createSecretV3 } = useCreateSecretV3();
   const { mutateAsync: updateSecretV3 } = useUpdateSecretV3();
   const { mutateAsync: deleteSecretV3 } = useDeleteSecretV3();
@@ -203,24 +199,6 @@ export const SecretOverviewPage = () => {
     }
   };
 
-  const onUpgradeProject = useCallback(async () => {
-    const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY");
-
-    if (!PRIVATE_KEY) {
-      createNotification({
-        type: "error",
-        text: "Private key not found"
-      });
-
-      return;
-    }
-
-    await upgradeProject.mutateAsync({
-      projectId: workspaceId,
-      privateKey: PRIVATE_KEY
-    });
-  }, []);
-
   const handleResetSearch = () => setSearchFilter("");
 
   const handleFolderClick = (path: string) => {