feat: Improve Restorable configs Rename and reorder restorable services (#956)

Co-authored-by: garronej <joseph.garrone@protonmail.com>

Author: ddecrulle

web/src/core/adapters/s3Client/s3Client.ts

@@ -327,8 +327,6 @@ export function createS3Client(
 
             const { awsS3Client } = await getAwsS3Client();
 
-            console.log("before");
-
             const { isBucketPolicyAvailable, allowedPrefix, bucketPolicy } =
                 await (async () => {
                     const { GetBucketPolicyCommand, S3ServiceException } = await import(
@@ -436,8 +434,6 @@ export function createS3Client(
                     };
                 })();
 
-            console.log("after");
-
             const Contents: import("@aws-sdk/client-s3")._Object[] = [];
             const CommonPrefixes: import("@aws-sdk/client-s3").CommonPrefix[] = [];
 

web/src/core/usecases/launcher/selectors.ts

@@ -8,7 +8,6 @@ import * as userConfigs from "core/usecases/userConfigs";
 import { exclude } from "tsafe/exclude";
 import { createSelector } from "clean-architecture";
 import * as s3ConfigManagement from "core/usecases/s3ConfigManagement";
-import type { RestorableServiceConfig } from "core/usecases/restorableConfigManagement";
 import { id } from "tsafe/id";
 import { computeRootForm } from "./decoupledLogic";
 import { computeDiff } from "core/tools/Stringifyable";
@@ -210,7 +209,7 @@ const restorableConfig = createSelector(
         s3ConfigId,
         helmValues,
         helmValues_default
-    ): RestorableServiceConfig | null => {
+    ): projectManagement.ProjectConfigs.RestorableServiceConfig | null => {
         if (!isReady) {
             return null;
         }
@@ -244,7 +243,7 @@ const restorableConfig = createSelector(
 const isRestorableConfigSaved = createSelector(
     isReady,
     restorableConfig,
-    restorableConfigManagement.protectedSelectors.restorableConfigs,
+    restorableConfigManagement.selectors.restorableConfigs,
     (isReady, restorableConfig, restorableConfigs) => {
         if (!isReady) {
             return null;
@@ -528,7 +527,7 @@ const willOverwriteExistingConfigOnSave = createSelector(
     chartName,
     catalogId,
     friendlyName,
-    restorableConfigManagement.protectedSelectors.restorableConfigs,
+    restorableConfigManagement.selectors.restorableConfigs,
     (isReady, chartName, catalogId, friendlyName, restorableConfigs) => {
         if (!isReady) {
             return null;

web/src/core/usecases/launcher/thunks.ts

@@ -16,9 +16,10 @@ import type { StringifyableAtomic, Stringifyable } from "core/tools/Stringifyabl
 import { type XOnyxiaContext } from "core/ports/OnyxiaApi";
 import { createUsecaseContextApi } from "clean-architecture";
 import { computeHelmValues, type FormFieldValue } from "./decoupledLogic";
-import type { RestorableServiceConfig } from "core/usecases/restorableConfigManagement";
 import { computeRootForm } from "./decoupledLogic";
 
+type RestorableServiceConfig = projectManagement.ProjectConfigs.RestorableServiceConfig;
+
 type RestorableServiceConfigLike = {
     catalogId: string;
     chartName: string;

web/src/core/usecases/projectManagement/decoupledLogic/projectConfigsMigration/projectConfigsMigration.ts

@@ -22,7 +22,7 @@ export async function projectConfigsMigration(params: {
                 path: pathJoin(projectVaultTopDirPath_reserved, key)
             })
             .then(
-                ({ secret }) => secretToValue(secret) as ProjectConfigs["__modelVersion"],
+                ({ secret }) => secretToValue(secret) as number,
                 () => {
                     console.log("The above error is ok");
                     return undefined;
@@ -33,7 +33,7 @@ export async function projectConfigsMigration(params: {
     })();
 
     try {
-        if (modelVersion === 0) {
+        if (modelVersion < 1) {
             await v0ToV1({
                 projectVaultTopDirPath_reserved,
                 secretsManager

web/src/core/usecases/projectManagement/decoupledLogic/projectConfigsMigration/v0ToV1.ts

@@ -1,4 +1,3 @@
-import type { ProjectConfigs } from "../ProjectConfigs";
 import { assert, type Equals } from "tsafe/assert";
 import type { StringifyableAtomic } from "core/tools/Stringifyable";
 import type { SecretsManager } from "core/ports/SecretsManager";
@@ -62,7 +61,7 @@ namespace v0 {
     }
 }
 
-namespace v1 {
+export namespace v1 {
     export type ProjectConfigs = {
         __modelVersion: 1;
         servicePassword: string;
@@ -107,8 +106,6 @@ namespace v1 {
     }
 }
 
-assert<Equals<v1.ProjectConfigs, ProjectConfigs>>();
-
 export async function v0ToV1(params: {
     projectVaultTopDirPath_reserved: string;
     secretsManager: SecretsManager;

web/src/core/usecases/projectManagement/thunks.ts

@@ -278,12 +278,12 @@ export const protectedThunks = {
         },
     updateConfigValue:
         <K extends keyof ProjectConfigs>(params: ChangeConfigValueParams<K>) =>
-        (...args) => {
+        async (...args) => {
             const [dispatch, getState, rootContext] = args;
 
             const { mutex } = getContext(rootContext);
 
-            mutex.runExclusive(async () => {
+            await mutex.runExclusive(async () => {
                 const { secretsManager } = rootContext;
 
                 const currentProjectConfig = protectedSelectors.projectConfig(getState());

web/src/core/usecases/restorableConfigManagement/decoupledLogic/getAreSameRestorableConfig.ts

@@ -18,7 +18,10 @@ export function getAreSameRestorableConfig(
         assert<
             Equals<
                 typeof key,
-                keyof projectManagement.ProjectConfigs.RestorableServiceConfig
+                Exclude<
+                    keyof projectManagement.ProjectConfigs.RestorableServiceConfig,
+                    "creationTime"
+                >
             >
         >();
 

web/src/core/usecases/restorableConfigManagement/decoupledLogic/getAreSameRestorableConfigRef.ts

@@ -0,0 +1,30 @@
+import { assert, type Equals } from "tsafe/assert";
+
+export type RestorableServiceConfigRef = {
+    friendlyName: string;
+    catalogId: string;
+    chartName: string;
+};
+
+export function getAreSameRestorableConfigRef(
+    a: RestorableServiceConfigRef,
+    b: RestorableServiceConfigRef
+) {
+    const keys = ["friendlyName", "catalogId", "chartName"] as const;
+
+    assert<Equals<(typeof keys)[number], keyof RestorableServiceConfigRef>>;
+
+    for (const key of keys) {
+        const v_a = a[key];
+
+        assert<Equals<typeof v_a, string>>();
+
+        const v_b = b[key];
+
+        if (v_a !== v_b) {
+            return false;
+        }
+    }
+
+    return true;
+}

web/src/core/usecases/restorableConfigManagement/index.ts

@@ -2,3 +2,7 @@ export * from "./state";
 export * from "./selectors";
 export * from "./thunks";
 export { getAreSameRestorableConfig } from "./decoupledLogic/getAreSameRestorableConfig";
+export {
+    type RestorableServiceConfigRef,
+    getAreSameRestorableConfigRef
+} from "./decoupledLogic/getAreSameRestorableConfigRef";

web/src/core/usecases/restorableConfigManagement/selectors.ts

@@ -3,51 +3,23 @@ import type { State as RootState } from "core/bootstrap";
 import { name } from "./state";
 import * as projectManagement from "core/usecases/projectManagement";
 
-export type RestorableServiceConfig =
-    projectManagement.ProjectConfigs.RestorableServiceConfig;
-
 function state(rootState: RootState) {
     return rootState[name];
 }
 
 const restorableConfigs = createSelector(
     projectManagement.protectedSelectors.projectConfig,
-    ({ restorableConfigs }) => [...restorableConfigs].reverse()
-);
-
-const chartIconUrlByRestorableConfigIndex = createSelector(
-    state,
-    restorableConfigs,
-    (state, restorableConfigs): Record<number, string | undefined> => {
-        const { indexedChartsIcons } = state;
-
-        const chartIconUrlByRestorableConfigIndex = Object.fromEntries(
-            restorableConfigs.map((restorableConfig, restorableConfigIndex) => [
-                restorableConfigIndex,
+    createSelector(state, state => state.indexedChartsIcons),
+    ({ restorableConfigs }, indexedChartsIcons) =>
+        restorableConfigs.map(restorableConfig => ({
+            ...restorableConfig,
+            chartIconUrl:
                 indexedChartsIcons[restorableConfig.catalogId]?.[
                     restorableConfig.chartName
                 ]
-            ])
-        );
-
-        return chartIconUrlByRestorableConfigIndex;
-    }
+        }))
 );
 
-const main = createSelector(
-    restorableConfigs,
-    chartIconUrlByRestorableConfigIndex,
-    (restorableConfigs, chartIconUrlByRestorableConfigIndex) => ({
-        restorableConfigs,
-        chartIconUrlByRestorableConfigIndex
-    })
-);
-
-export const protectedSelectors = {
-    restorableConfigs,
-    chartIconUrlByRestorableConfigIndex
-};
-
 export const selectors = {
-    main
+    restorableConfigs
 };