From f21a13f38871630759ae491c8f875fe013dc443b Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Tue, 4 Jun 2024 23:46:02 +0800
Subject: [PATCH] adjustment: removed artificial limiting of pit versions

---
 .../secret-snapshot/secret-snapshot-service.ts | 18 ++----------------
 .../services/secret-snapshot/snapshot-dal.ts   |  1 -
 backend/src/server/routes/index.ts             |  1 -
 backend/src/services/secret/secret-service.ts  | 13 ++-----------
 .../PointInTimeVersionLimitSection.tsx         |  9 +++++++--
 5 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/backend/src/ee/services/secret-snapshot/secret-snapshot-service.ts b/backend/src/ee/services/secret-snapshot/secret-snapshot-service.ts
index 6197c0825..5a720a9e6 100644
--- a/backend/src/ee/services/secret-snapshot/secret-snapshot-service.ts
+++ b/backend/src/ee/services/secret-snapshot/secret-snapshot-service.ts
@@ -4,7 +4,6 @@ import { TableName, TSecretTagJunctionInsert } from "@app/db/schemas";
 import { BadRequestError, InternalServerError } from "@app/lib/errors";
 import { groupBy } from "@app/lib/fn";
 import { logger } from "@app/lib/logger";
-import { TProjectDALFactory } from "@app/services/project/project-dal";
 import { TSecretDALFactory } from "@app/services/secret/secret-dal";
 import { TSecretVersionDALFactory } from "@app/services/secret/secret-version-dal";
 import { TSecretVersionTagDALFactory } from "@app/services/secret/secret-version-tag-dal";
@@ -38,7 +37,6 @@ type TSecretSnapshotServiceFactoryDep = {
   folderDAL: Pick<TSecretFolderDALFactory, "findById" | "findBySecretPath" | "delete" | "insertMany" | "find">;
   permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
   licenseService: Pick<TLicenseServiceFactory, "isValidLicense">;
-  projectDAL: Pick<TProjectDALFactory, "findById">;
 };
 
 export type TSecretSnapshotServiceFactory = ReturnType<typeof secretSnapshotServiceFactory>;
@@ -50,7 +48,6 @@ export const secretSnapshotServiceFactory = ({
   snapshotSecretDAL,
   snapshotFolderDAL,
   folderDAL,
-  projectDAL,
   secretDAL,
   permissionService,
   licenseService,
@@ -84,9 +81,7 @@ export const secretSnapshotServiceFactory = ({
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
     if (!folder) throw new BadRequestError({ message: "Folder not found" });
 
-    const project = await projectDAL.findById(projectId);
-    const count = await snapshotDAL.countOfSnapshotsByFolderId(folder.id);
-    return Math.min(count, project.pitVersionLimit);
+    return snapshotDAL.countOfSnapshotsByFolderId(folder.id);
   };
 
   const listSnapshots = async ({
@@ -118,16 +113,7 @@ export const secretSnapshotServiceFactory = ({
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
     if (!folder) throw new BadRequestError({ message: "Folder not found" });
 
-    const { pitVersionLimit } = await projectDAL.findById(projectId);
-    const computedQueryLimit = Math.min(pitVersionLimit - offset, limit);
-    if (offset > pitVersionLimit || computedQueryLimit <= 0) {
-      return [];
-    }
-
-    const snapshots = await snapshotDAL.find(
-      { folderId: folder.id },
-      { limit: computedQueryLimit, offset, sort: [["createdAt", "desc"]] }
-    );
+    const snapshots = await snapshotDAL.find({ folderId: folder.id }, { limit, offset, sort: [["createdAt", "desc"]] });
     return snapshots;
   };
 
diff --git a/backend/src/ee/services/secret-snapshot/snapshot-dal.ts b/backend/src/ee/services/secret-snapshot/snapshot-dal.ts
index 7c17c4f07..d36a1d00e 100644
--- a/backend/src/ee/services/secret-snapshot/snapshot-dal.ts
+++ b/backend/src/ee/services/secret-snapshot/snapshot-dal.ts
@@ -341,7 +341,6 @@ export const snapshotDALFactory = (db: TDbClient) => {
           .select("id");
 
         const batchEntries = folderBatch.map((folder) => folder.id);
-        logger.info("UUID offset:", uuidOffset);
 
         if (folderBatch.length) {
           try {
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts
index 8c4ff2a70..4442b3bb9 100644
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@ -535,7 +535,6 @@ export const registerRoutes = async (
     licenseService,
     folderDAL,
     secretDAL,
-    projectDAL,
     snapshotDAL,
     snapshotFolderDAL,
     snapshotSecretDAL,
diff --git a/backend/src/services/secret/secret-service.ts b/backend/src/services/secret/secret-service.ts
index 77c4024ac..39e47a28e 100644
--- a/backend/src/services/secret/secret-service.ts
+++ b/backend/src/services/secret/secret-service.ts
@@ -72,7 +72,7 @@ type TSecretServiceFactoryDep = {
   secretDAL: TSecretDALFactory;
   secretTagDAL: TSecretTagDALFactory;
   secretVersionDAL: TSecretVersionDALFactory;
-  projectDAL: Pick<TProjectDALFactory, "checkProjectUpgradeStatus" | "findProjectBySlug" | "findById">;
+  projectDAL: Pick<TProjectDALFactory, "checkProjectUpgradeStatus" | "findProjectBySlug">;
   projectEnvDAL: Pick<TProjectEnvDALFactory, "findOne">;
   folderDAL: Pick<
     TSecretFolderDALFactory,
@@ -1354,16 +1354,7 @@ export const secretServiceFactory = ({
     );
     ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Read, ProjectPermissionSub.SecretRollback);
 
-    const { pitVersionLimit } = await projectDAL.findById(folder.projectId);
-    const computedQueryLimit = Math.min(pitVersionLimit - offset, limit);
-    if (offset > pitVersionLimit || computedQueryLimit <= 0) {
-      return [];
-    }
-
-    const secretVersions = await secretVersionDAL.find(
-      { secretId },
-      { offset, limit: computedQueryLimit, sort: [["createdAt", "desc"]] }
-    );
+    const secretVersions = await secretVersionDAL.find({ secretId }, { offset, limit, sort: [["createdAt", "desc"]] });
     return secretVersions;
   };
 
diff --git a/frontend/src/views/Settings/ProjectSettingsPage/components/PointInTimeVersionLimitSection/PointInTimeVersionLimitSection.tsx b/frontend/src/views/Settings/ProjectSettingsPage/components/PointInTimeVersionLimitSection/PointInTimeVersionLimitSection.tsx
index 8c820b727..4091ec06e 100644
--- a/frontend/src/views/Settings/ProjectSettingsPage/components/PointInTimeVersionLimitSection/PointInTimeVersionLimitSection.tsx
+++ b/frontend/src/views/Settings/ProjectSettingsPage/components/PointInTimeVersionLimitSection/PointInTimeVersionLimitSection.tsx
@@ -22,7 +22,7 @@ export const PointInTimeVersionLimitSection = () => {
 
   const {
     control,
-    formState: { isSubmitting },
+    formState: { isSubmitting, isDirty },
     handleSubmit
   } = useForm<TForm>({
     resolver: zodResolver(formSchema),
@@ -79,7 +79,12 @@ export const PointInTimeVersionLimitSection = () => {
             )}
           />
         </div>
-        <Button colorSchema="secondary" type="submit" isLoading={isSubmitting} disabled={!isAdmin}>
+        <Button
+          colorSchema="secondary"
+          type="submit"
+          isLoading={isSubmitting}
+          disabled={!isAdmin || !isDirty}
+        >
           Save
         </Button>
       </form>