Dev

.github/workflows/repo-sync.yml

@@ -97,24 +97,84 @@ jobs:
                 git clean -fdX  # Remove untracked files and directories
                 git gc --prune=now  # Garbage collect and prune unreachable objects
 
-                # Remove unused imports and missing file references
+                # echo "Installing ESLint dependencies..."
+                npm install --save-dev eslint @eslint/js globals
+
+
+                # if [ ! -f "eslint.config.cjs" ]; then
+                #     echo "Creating default ESLint config..."
+                #     cat <<EOL > eslint.config.cjs
+                # const js = require("@eslint/js");
+                # const globals = require("globals");
+
+                # module.exports = [
+                # js.configs.recommended,
+                # {
+                #     languageOptions: {
+                #     ecmaVersion: "latest",
+                #     sourceType: "module",
+                #     globals: globals.node,
+                #     },
+                #     rules: {
+                #     "no-unused-vars": "warn",
+                #     "no-console": "off"
+                #     }
+                # }
+                # ];
+                # EOL
+                # fi
+
+                # # Remove unused imports and missing file references
                 # echo "Running ESLint to remove unused imports..."
                 # npm install eslint -g
                 # eslint . --fix
 
-                echo "Running autoflake to remove unused imports..."
-                pip install autoflake
-                autoflake --remove-all-unused-imports --recursive --in-place .
+                # echo "Running autoflake to remove unused imports..."
+                # pip install autoflake
+                # autoflake --remove-all-unused-imports --recursive --in-place .
 
-                echo "Running ts-prune to remove unused file references..."
-                npm install -g ts-prune
-                ts-prune | awk '{print $1}' | xargs rm -f
+                # echo "Running ts-prune to remove unused file references..."
+                # npm install -g ts-prune
+                # ts-prune | awk '{print $1}' | xargs rm -f
 
                 rsync -av --delete ${{ env.RSYNC_SITECORE_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/
                 rsync -av --delete ../cli/ ./cli/
                 rsync -av --delete ../ui/ ./ui/
                 rsync -av --delete ${{ env.RSYNC_SITECORE_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/
                 rsync -av --delete ../upload-api/migration-sitecore/ ./upload-api/migration-sitecore/
+
+                # Ensure tsconfig.json exists, create a default one if missing
+                # if [ ! -f "tsconfig.json" ]; then
+                #     echo "Creating default tsconfig.json..."
+                #     cat <<EOL > tsconfig.json
+                # {
+                #     "compilerOptions": {
+                #     "target": "ES6",
+                #     "module": "CommonJS",
+                #     "strict": true,
+                #     "esModuleInterop": true,
+                #     "skipLibCheck": true,
+                #     "forceConsistentCasingInFileNames": true
+                #     },
+                #     "include": ["src/**/*"],
+                #     "exclude": ["node_modules", "dist"]
+                # }
+                # EOL
+                # fi
+
+                # Remove unused imports
+                # npx ts-remove-unused-imports api/
+                # npx ts-remove-unused-imports ui/
+                # npx ts-remove-unused-imports upload-api/
+
+                # Remove missing imports
+                # npx ts-prune | grep -E '^(api/|ui/|upload-api/)/' | awk '{print $1}' | xargs -I {} sed -i '/import/d' {}
+
+                # # Format code
+                # npx prettier --write .
+
+                # eslint api/ ui/ upload-api/ --rule 'import/no-unresolved: error' --format compact | awk -F ':' '{print $1}' | sort -u | xargs -I {} sed -i '/import/d' {}
+
                 git add .
                 git commit -m "Sync changes from migration-v2 PR #${{ github.event.pull_request.number }}"
                 git push origin sync-from-migration-v2-${{ github.event.pull_request.number }}
@@ -163,10 +223,37 @@ jobs:
                 git clean -fdX  # Remove untracked files and directories
                 git gc --prune=now  # Garbage collect and prune unreachable objects
 
+                echo "Installing ESLint dependencies..."
+                npm install --save-dev eslint @eslint/js globals
+
+                if [ ! -f "eslint.config.cjs" ]; then
+                    echo "Creating default ESLint config..."
+                    cat <<EOL > eslint.config.cjs
+                const js = require("@eslint/js");
+                const globals = require("globals");
+
+                module.exports = [
+                js.configs.recommended,
+                {
+                    languageOptions: {
+                    ecmaVersion: "latest",
+                    sourceType: "module",
+                    globals: globals.node,
+                    },
+                    rules: {
+                    "no-unused-vars": "warn",
+                    "no-console": "off"
+                    }
+                }
+                ];
+                EOL
+                fi
+
+
                 # Remove unused imports and missing file references
-                # echo "Running ESLint to remove unused imports..."
-                # npm install eslint -g
-                # eslint . --fix
+                echo "Running ESLint to remove unused imports..."
+                npm install eslint -g
+                eslint . --fix
 
                 echo "Running autoflake to remove unused imports..."
                 pip install autoflake
@@ -229,10 +316,37 @@ jobs:
                 git clean -fdX  # Remove untracked files and directories
                 git gc --prune=now  # Garbage collect and prune unreachable objects
 
+                echo "Installing ESLint dependencies..."
+                npm install --save-dev eslint @eslint/js globals
+
+                if [ ! -f "eslint.config.cjs" ]; then
+                    echo "Creating default ESLint config..."
+                    cat <<EOL > eslint.config.cjs
+                const js = require("@eslint/js");
+                const globals = require("globals");
+
+                module.exports = [
+                js.configs.recommended,
+                {
+                    languageOptions: {
+                    ecmaVersion: "latest",
+                    sourceType: "module",
+                    globals: globals.node,
+                    },
+                    rules: {
+                    "no-unused-vars": "warn",
+                    "no-console": "off"
+                    }
+                }
+                ];
+                EOL
+                fi
+
+
                 # Remove unused imports and missing file references
-                # echo "Running ESLint to remove unused imports..."
-                # npm install eslint -g
-                # eslint . --fix
+                echo "Running ESLint to remove unused imports..."
+                npm install eslint -g
+                eslint . --fix
 
                 echo "Running autoflake to remove unused imports..."
                 pip install autoflake

api/src/services/migration.service.ts

@@ -230,8 +230,8 @@ const startTestMigration = async (req: Request): Promise<any> => {
       case CMS.SITECORE_V9:
       case CMS.SITECORE_V10: {
         if (packagePath) {
-          await siteCoreService?.createEntry({ packagePath, contentTypes, master_locale: project?.stackDetails?.master_locale, destinationStackId: project?.current_test_stack_id, projectId, keyMapper: project?.mapperKeys });
-          await siteCoreService?.createLocale(req, project?.current_test_stack_id, projectId);
+          await siteCoreService?.createEntry({ packagePath, contentTypes, master_locale: project?.stackDetails?.master_locale, destinationStackId: project?.current_test_stack_id, projectId, keyMapper: project?.mapperKeys, project });
+          await siteCoreService?.createLocale(req, project?.current_test_stack_id, projectId, project);
           await siteCoreService?.createVersionFile(project?.current_test_stack_id);
         }
         break;
@@ -306,8 +306,8 @@ const startMigration = async (req: Request): Promise<any> => {
       case CMS.SITECORE_V9:
       case CMS.SITECORE_V10: {
         if (packagePath) {
-          await siteCoreService?.createEntry({ packagePath, contentTypes, master_locale: project?.stackDetails?.master_locale, destinationStackId: project?.destination_stack_id, projectId, keyMapper: project?.mapperKeys });
-          await siteCoreService?.createLocale(req, project?.destination_stack_id, projectId);
+          await siteCoreService?.createEntry({ packagePath, contentTypes, master_locale: project?.stackDetails?.master_locale, destinationStackId: project?.destination_stack_id, projectId, keyMapper: project?.mapperKeys, project });
+          await siteCoreService?.createLocale(req, project?.destination_stack_id, projectId, project);
           await siteCoreService?.createVersionFile(project?.destination_stack_id);
         }
         break;
@@ -417,18 +417,18 @@ const getLogs = async (req: Request): Promise<any> => {
  */
 export const createSourceLocales = async (req: Request) => {
 
-  const projectId = req.params.projectId;
-  const locales = req.body.locale
+  const projectId = req?.params?.projectId;
+  const locales = req?.body?.locale;
+  console.info("🚀 ~ createSourceLocales ~ locales:", locales);
 
   try {
     // Find the project with the specified projectId
     await ProjectModelLowdb?.read?.();
     const index = ProjectModelLowdb?.chain?.get?.("projects")?.findIndex?.({ id: projectId })?.value?.();
-    if (index > -1) {
+    if (typeof index === "number" && index > -1) {
       ProjectModelLowdb?.update?.((data: any) => {
         data.projects[index].source_locales = locales;
       });
-      // Write back the updated projects
     } else {
       logger.error(`Project with ID: ${projectId} not found`, {
         status: HTTP_CODES?.NOT_FOUND,

api/src/services/org.service.ts

@@ -8,6 +8,7 @@ import logger from "../utils/logger.js";
 import { HTTP_TEXTS, HTTP_CODES } from "../constants/index.js";
 import { ExceptionFunction } from "../utils/custom-errors.utils.js";
 import { BadRequestError } from "../utils/custom-errors.utils.js";
+import ProjectModelLowdb from "../models/project-lowdb.js";
 
 /**
  * Retrieves all stacks based on the provided request.
@@ -38,7 +39,6 @@ const getAllStacks = async (req: Request): Promise<LoginServiceType> => {
         },
       })
     );
-    // console.info(err, res);
     if (err) {
       logger.error(
         getLogMessage(
@@ -63,11 +63,20 @@ const getAllStacks = async (req: Request): Promise<LoginServiceType> => {
         );
       });
     }
-    // const locale:any[]
-    // const locale = await getStackLocal(token_payload, stacks);
+    await ProjectModelLowdb?.read?.();
+    const testStacks = ProjectModelLowdb?.chain?.get?.("projects")?.flatMap?.("test_stacks")?.value?.();
+    if (testStacks?.length > 0) {
+      const filterStacks = [];
+      for (const stack of stacks ?? []) {
+        const isPresent = testStacks?.find?.((testStack: any) => testStack?.stackUid === stack?.api_key);
+        if (isPresent === undefined) {
+          filterStacks?.push(stack);
+        }
+      }
+      stacks = filterStacks;
+    }
     return {
       data: {
-        // stacks: locale,
         stacks,
       },
       status: res.status,