From e3d9df5d7f91fb8920f32c3b9ae59de73ab045ae Mon Sep 17 00:00:00 2001
From: Shradha Nahar <shrdhanhr28@gmail.com>
Date: Wed, 26 Aug 2026 12:41:44 +0530
Subject: [PATCH 1/7] fix: stop excluding AEM structure entry from migration
 (CMG-1112)

---
 upload-api/src/config/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upload-api/src/config/index.ts b/upload-api/src/config/index.ts
index 4bde1a7e6..a44e8f9aa 100644
--- a/upload-api/src/config/index.ts
+++ b/upload-api/src/config/index.ts
@@ -23,5 +23,5 @@ export default {
     base_url: process.env.DRUPAL_ASSETS_BASE_URL || 'drupal_assets_base_url',
     public_path: process.env.DRUPAL_ASSETS_PUBLIC_PATH || 'drupal_assets_public_path'
   },
-  localPath: process.env.CMS_LOCAL_PATH || process.env.CONTAINER_PATH || 'your_local_cms_data_path',
+  localPath: '/Users/shradha.nahar/Desktop/migration-v2/Archive/generated-aem-iteration-1',
 };

From cc632b45a57006c22e3abb3c02d9d7bce65b86f1 Mon Sep 17 00:00:00 2001
From: Shradha Nahar <shrdhanhr28@gmail.com>
Date: Wed, 26 Aug 2026 13:06:22 +0530
Subject: [PATCH 2/7] fix: stop excluding AEM structure entry from migration
 (CMG-1112)

---
 api/src/services/aem.service.ts  | 24 +++++-------------------
 upload-api/src/config/index.json |  4 ++--
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/api/src/services/aem.service.ts b/api/src/services/aem.service.ts
index 2996e6088..a5fe24d63 100644
--- a/api/src/services/aem.service.ts
+++ b/api/src/services/aem.service.ts
@@ -1363,8 +1363,11 @@ const createEntry = async ({
   const entryMapping: Record<string, string[]> = {};
   const usedEntryUids = new Set<string>();
 
-  // Process each entry file
-  for await (const fileName of read(entriesDir)) {
+  // Process each entry file. Sorted (not raw fs-readdir-recursive order) so that when two
+  // files legitimately collide on the same modelId+locale (see CMG-1112), which one "wins"
+  // and gets migrated is deterministic and reproducible across machines/runs, rather than
+  // depending on filesystem directory order.
+  for await (const fileName of [...read(entriesDir)].sort()) {
     const filePath = path.join(entriesDir, fileName);
     if (filePath?.startsWith?.(damPath)) {
       continue;
@@ -1373,23 +1376,6 @@ const createEntry = async ({
     if (typeof content === 'string') {
       const parseData = JSON.parse(content);
 
-      // AEM can export a page TEMPLATE's own structure/schema definition (e.g.
-      // /conf/.../settings/wcm/templates/<template>/structure[.html]) as a separate file
-      // alongside real pages that use that template — it isn't content, just the
-      // template's own component-allow-list. Exclude it outright rather than letting it
-      // compete with a real page for the same derived id (see CMG-1112): this removes the
-      // ambiguity entirely instead of leaving the outcome dependent on directory-walk order.
-      const repoPath: string | undefined = parseData?.dataLayer?.[parseData?.id]?.['repo:path'];
-      if (repoPath && /\/settings\/wcm\/templates\/[^/]+\/structure(\.html)?$/.test(repoPath)) {
-        await customLogger(
-          projectId,
-          destinationStackId,
-          'warn',
-          getLogMessage(srcFunc, `Skipped entry from "${fileName}": AEM template structure/schema definition, not real content (repo:path "${repoPath}").`, {})
-        );
-        continue;
-      }
-
       // Use the page model's stable "id" as the entry uid so uid-mapper keys
       // stay consistent across delta iterations; random uuid only as fallback.
       let modelId = typeof parseData?.id === 'string' && parseData.id.trim() !== ''
diff --git a/upload-api/src/config/index.json b/upload-api/src/config/index.json
index ac59f9155..30e03e5c6 100644
--- a/upload-api/src/config/index.json
+++ b/upload-api/src/config/index.json
@@ -4,7 +4,7 @@
       "optionLimit": 100
     }
   },
-  "cmsType": "contentful",
+  "cmsType": "aem",
   "isLocalPath": true,
   "awsData": {
     "awsRegion": "us-east-2",
@@ -25,5 +25,5 @@
     "base_url": "drupal_assets_base_url",
     "public_path": "drupal_assets_public_path"
   },
-  "localPath": "/Users/chetan.narkhede/Desktop/migration-v2/asic-v1.json"
+  "localPath": "/Users/shradha.nahar/Desktop/migration-v2/Archive/templates-copy"
 }
\ No newline at end of file

From cf6f1c348b530cb0f015866fc752b225bfd66ea8 Mon Sep 17 00:00:00 2001
From: Shradha Nahar <shrdhanhr28@gmail.com>
Date: Wed, 26 Aug 2026 13:07:29 +0530
Subject: [PATCH 3/7] added back correct file parth

---
 upload-api/src/config/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upload-api/src/config/index.ts b/upload-api/src/config/index.ts
index a44e8f9aa..ae373cf9b 100644
--- a/upload-api/src/config/index.ts
+++ b/upload-api/src/config/index.ts
@@ -23,5 +23,5 @@ export default {
     base_url: process.env.DRUPAL_ASSETS_BASE_URL || 'drupal_assets_base_url',
     public_path: process.env.DRUPAL_ASSETS_PUBLIC_PATH || 'drupal_assets_public_path'
   },
-  localPath: '/Users/shradha.nahar/Desktop/migration-v2/Archive/generated-aem-iteration-1',
+  localPath: process.env.CMS_LOCAL_PATH || process.env.CONTAINER_PATH || 'your_local_cms_data_path'
 };

From 0d8faf47f905dd5884d4e246f52471c1a7a0b75f Mon Sep 17 00:00:00 2001
From: Shradha Nahar <shrdhanhr28@gmail.com>
Date: Wed, 26 Aug 2026 13:08:48 +0530
Subject: [PATCH 4/7] config fixes

---
 upload-api/src/config/index.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/upload-api/src/config/index.json b/upload-api/src/config/index.json
index 30e03e5c6..3fb29d2bb 100644
--- a/upload-api/src/config/index.json
+++ b/upload-api/src/config/index.json
@@ -4,7 +4,7 @@
       "optionLimit": 100
     }
   },
-  "cmsType": "aem",
+  "cmsType": "contentful",
   "isLocalPath": true,
   "awsData": {
     "awsRegion": "us-east-2",
@@ -25,5 +25,5 @@
     "base_url": "drupal_assets_base_url",
     "public_path": "drupal_assets_public_path"
   },
-  "localPath": "/Users/shradha.nahar/Desktop/migration-v2/Archive/templates-copy"
-}
\ No newline at end of file
+  "localPath": "/Users/chetan.narkhede/Desktop/migration-v2/asic-v1.json"
+}

From e0026724b51009019c596ce15f7548a4c81e9dbf Mon Sep 17 00:00:00 2001
From: Shradha Nahar <shrdhanhr28@gmail.com>
Date: Wed, 26 Aug 2026 13:17:24 +0530
Subject: [PATCH 5/7] fix: bump react-router and postcss to close SLA-breached
 CVEs

---
 package.json         |  2 +-
 ui/package-lock.json | 33 +++++++++++++++++----------------
 ui/package.json      |  7 ++++---
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index c58180d2d..4d8d9afcd 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
   "overrides": {
     "axios": ">=1.16.0",
     "nth-check": ">=2.0.1",
-    "postcss": ">=8.5.10",
+    "postcss": ">=8.5.23",
     "serialize-javascript": ">=6.0.2",
     "@babel/runtime": ">=7.26.10",
     "lodash": "^4.18.1",
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 0a9948f77..4dca08edc 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -24,8 +24,8 @@
         "react-dom": "^18.2.0",
         "react-final-form": "^6.5.9",
         "react-redux": "^9.1.2",
-        "react-router": "^7.15.0",
-        "react-router-dom": "^7.15.0",
+        "react-router": "^7.18.2",
+        "react-router-dom": "^7.18.2",
         "react-toastify": "npm:@contentstack/react-toastify@6.1.5",
         "redux-persist": "^6.0.0",
         "sass": "^1.68.0",
@@ -7533,15 +7533,16 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/nanoid": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "version": "3.3.18",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz",
+      "integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -7993,9 +7994,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.12",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.12.tgz",
-      "integrity": "sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==",
+      "version": "8.5.26",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz",
+      "integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -8012,7 +8013,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.11",
+        "nanoid": "^3.3.17",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -8507,9 +8508,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.16.0.tgz",
-      "integrity": "sha512-wArC8lVyJb3+jM9OpDyW6hLCizACWkvQR/sSGqSs+o5uEXEtGlqdZ4v8hENR3Jad6i+LRkK93q/+bQAcvl6V1A==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.18.2.tgz",
+      "integrity": "sha512-aUVMjFm3GAPTTZL7oYr5E7ETiqfQCHRLH+B+5afnICvf0r7kkK4eR6SMuwbSTJw/7t+12khT/Kahij49fqOCIg==",
       "license": "MIT",
       "dependencies": {
         "cookie": "^1.0.1",
@@ -8529,12 +8530,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.16.0.tgz",
-      "integrity": "sha512-kMUAbimWB5FVbF4Bce4bJsiKJWLIUHq/mEG8+CFDnCSgltptBiG5nguducmsJeGKytlCvQud9Qhzpn49iduTlA==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.18.2.tgz",
+      "integrity": "sha512-AIKJ/jgGlFb3EbfCXk5Gzshiwt+l3mqbCrNjmEWMMjqQxNJ3svBa6bgzFyCC2Sw3RA0VWF1kg3uQf2OFhxb8hw==",
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.16.0"
+        "react-router": "7.18.2"
       },
       "engines": {
         "node": ">=20.0.0"
diff --git a/ui/package.json b/ui/package.json
index 270486dfe..7675801fa 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -19,8 +19,8 @@
     "react-dom": "^18.2.0",
     "react-final-form": "^6.5.9",
     "react-redux": "^9.1.2",
-    "react-router": "^7.15.0",
-    "react-router-dom": "^7.15.0",
+    "react-router": "^7.18.2",
+    "react-router-dom": "^7.18.2",
     "react-toastify": "npm:@contentstack/react-toastify@6.1.5",
     "redux-persist": "^6.0.0",
     "sass": "^1.68.0",
@@ -71,7 +71,8 @@
     "ws": ">=8.21.0",
     "esbuild": "^0.28.1",
     "fast-uri": ">=4.1.1",
-    "brace-expansion": ">=5.0.9"
+    "brace-expansion": ">=5.0.9",
+    "postcss": ">=8.5.23"
   },
   "eslintConfig": {
     "extends": [

From 9708bdbf338f7634a87c931947176fcb5848daff Mon Sep 17 00:00:00 2001
From: Shradha Nahar <shrdhanhr28@gmail.com>
Date: Wed, 26 Aug 2026 17:57:26 +0530
Subject: [PATCH 6/7] fix: reserve AEM entry collision key only once an entry
 is emitted
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

usedEntryUids was reserving modelId::locale unconditionally right after
computing uid, before the later contentType/mappedLocale check decided
whether an entry would actually be produced. A file that fell into the
"no content type matched" branch (e.g. a template structure export with
no mapped content type) still consumed the key — permanently blocking a
sibling file sharing that key from producing the real entry, leaving
zero entries instead of one. That's the same "structure entry missing"
symptom QA reopened CMG-1112 for, now made deterministic by the added
sort instead of order-dependent.

Move the reservation into the success branch so a non-producing file
never blocks its sibling, while still guaranteeing at most one entry
per modelId::locale.
---
 api/src/services/aem.service.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/api/src/services/aem.service.ts b/api/src/services/aem.service.ts
index a5fe24d63..d217a408e 100644
--- a/api/src/services/aem.service.ts
+++ b/api/src/services/aem.service.ts
@@ -1416,9 +1416,6 @@ const createEntry = async ({
         continue;
       }
       const uid = modelId || uuidv4?.()?.replace?.(/-/g, '');
-      if (collisionKey) {
-        usedEntryUids.add(collisionKey);
-      }
       const title = getTitle(parseData);
       const isEFragment = isExperienceFragment(parseData);
       const templateUid = isEFragment?.isXF ? parseData?.title : parseData?.templateName ?? parseData?.templateType;
@@ -1432,6 +1429,14 @@ const createEntry = async ({
       data.publish_details = [];
 
       if (contentType?.contentstackUid && data && mappedLocale) {
+        // Reserve the collision key only now that an entry is actually being emitted — a
+        // file that reaches the "no content type matched" / "no mapped locale" branch below
+        // must NOT consume the key, or it would permanently block a sibling file (sharing
+        // the same modelId::locale) that could otherwise have produced the real entry,
+        // leaving zero entries instead of one.
+        if (collisionKey) {
+          usedEntryUids.add(collisionKey);
+        }
         const mappedValue = (keyMapper as Record<string, string> | undefined)?.[contentType.contentstackUid];
         const resolvedCtUid: string = 
           mappedValue && mappedValue !== '' 

From 014cfa972052234569d749561e800964f8febbd7 Mon Sep 17 00:00:00 2001
From: Shradha Nahar <shrdhanhr28@gmail.com>
Date: Wed, 26 Aug 2026 18:01:12 +0530
Subject: [PATCH 7/7] chore: drop incidental upload-api/src/config
 formatting-only changes

Reverts upload-api/src/config/index.ts and index.json to match dev
exactly. These were unrelated trailing-comma/trailing-newline diffs
that had ridden along in this branch's history, not part of the
CMG-1112 fix (flagged in PR review).
---
 upload-api/src/config/index.json | 2 +-
 upload-api/src/config/index.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/upload-api/src/config/index.json b/upload-api/src/config/index.json
index 3fb29d2bb..ac59f9155 100644
--- a/upload-api/src/config/index.json
+++ b/upload-api/src/config/index.json
@@ -26,4 +26,4 @@
     "public_path": "drupal_assets_public_path"
   },
   "localPath": "/Users/chetan.narkhede/Desktop/migration-v2/asic-v1.json"
-}
+}
\ No newline at end of file
diff --git a/upload-api/src/config/index.ts b/upload-api/src/config/index.ts
index ae373cf9b..4bde1a7e6 100644
--- a/upload-api/src/config/index.ts
+++ b/upload-api/src/config/index.ts
@@ -23,5 +23,5 @@ export default {
     base_url: process.env.DRUPAL_ASSETS_BASE_URL || 'drupal_assets_base_url',
     public_path: process.env.DRUPAL_ASSETS_PUBLIC_PATH || 'drupal_assets_public_path'
   },
-  localPath: process.env.CMS_LOCAL_PATH || process.env.CONTAINER_PATH || 'your_local_cms_data_path'
+  localPath: process.env.CMS_LOCAL_PATH || process.env.CONTAINER_PATH || 'your_local_cms_data_path',
 };