Dev

api/src/services/contentMapper.service.ts

@@ -442,19 +442,21 @@ const getExistingContentTypes = async (req: Request) => {
     let selectedContentType = null;
 
     if (contentTypeUID) {
-      const [res] = await safePromise(
+      const [err, res] = await safePromise(
         https({
           method: 'GET',
           url: `${baseUrl}/${contentTypeUID}`,
           headers,
         }),
       );
 
-      selectedContentType = {
-        title: res?.data?.content_type?.title,
-        uid: res?.data?.content_type?.uid,
-        schema: res?.data?.content_type?.schema,
-      };
+      if (!err) {
+        selectedContentType = {
+          title: res?.data?.content_type?.title,
+          uid: res?.data?.content_type?.uid,
+          schema: res?.data?.content_type?.schema,
+        };
+      }
     }
     return {
       contentTypes: processedContentTypes,
@@ -549,27 +551,21 @@ const getExistingGlobalFields = async (req: Request) => {
     let selectedGlobalField = null;
 
     if (globalFieldUID) {
-      const [res] = await safePromise(
+      const [err, res] = await safePromise(
         https({
           method: 'GET',
           url: `${baseUrl}/${globalFieldUID}`,
           headers,
         }),
       );
 
-      // if (err) {
-      //   throw new Error(
-      //     `Error fetching selected global field: ${
-      //       err.response?.data || err.message
-      //     }`
-      //   );
-      // }
-
-      selectedGlobalField = {
-        title: res?.data?.global_field?.title,
-        uid: res?.data?.global_field?.uid,
-        schema: res?.data?.global_field?.schema,
-      };
+      if (!err) {
+        selectedGlobalField = {
+          title: res?.data?.global_field?.title,
+          uid: res?.data?.global_field?.uid,
+          schema: res?.data?.global_field?.schema,
+        };
+      }
     }
 
     return { globalFields: processedGlobalFields, selectedGlobalField };

api/src/utils/content-type-creator.utils.ts

@@ -160,29 +160,24 @@ function buildFieldSchema(item: any, marketPlacePath: string, parentUid = ''): a
         }
       }
 
-      if (blockSchema.length > 0) {
-        blocks.push({
-          title: blockRawUid,  // Keep original for title
-          uid: blockUid,       // Snake case for uid
-          schema: removeDuplicateFields(blockSchema)
-        });
-      }
+      blocks.push({
+        title: blockRawUid,  // Keep original for title
+        uid: blockUid,       // Snake case for uid
+        schema: removeDuplicateFields(blockSchema)
+      });
     }
 
-    if (blocks.length > 0) {
-      return {
-        data_type: "blocks",
-        display_name: item?.display_name || rawUid,  // Keep original for display
-        field_metadata: {},
-        uid: itemUid,  // Snake case uid
-        multiple: true,
-        mandatory: false,
-        unique: false,
-        non_localizable: false,
-        blocks: removeDuplicateFields(blocks)
-      };
-    }
-    return null;
+    return {
+      data_type: "blocks",
+      display_name: item?.display_name || rawUid,  // Keep original for display
+      field_metadata: {},
+      uid: itemUid,  // Snake case uid
+      multiple: true,
+      mandatory: false,
+      unique: false,
+      non_localizable: false,
+      blocks: removeDuplicateFields(blocks)
+    };
   }
 
   if (fieldType === 'group') {
@@ -316,14 +311,25 @@ export function buildSchemaTree(fields: any[], parentUid = '', parentType = '',
 
     if (hasChildren) {
       if (fieldType === 'modular_blocks') {
-        // Get modular block children
+        // Get modular block children (check both current and backup UIDs)
         const mbChildren = fields.filter(f => {
           if (!f) return false;
           const fUid = f?.contentstackFieldUid || '';
           if (!fUid || !fieldUid) return false;
-          return f?.contentstackFieldType === 'modular_blocks_child' &&
-            fUid.startsWith(fieldUid + '.') &&
-            !fUid.substring(fieldUid.length + 1).includes('.');
+          if (f?.contentstackFieldType !== 'modular_blocks_child') return false;
+
+          if (fUid.startsWith(fieldUid + '.') &&
+            !fUid.substring(fieldUid.length + 1).includes('.')) {
+            return true;
+          }
+
+          if (oldFieldUid && oldFieldUid !== fieldUid &&
+            fUid.startsWith(oldFieldUid + '.') &&
+            !fUid.substring(oldFieldUid.length + 1).includes('.')) {
+            return true;
+          }
+
+          return false;
         });
 
         result.schema = mbChildren.map(child => {

docker-compose.yml

@@ -55,8 +55,8 @@ services:
     restart: unless-stopped
     environment:
       - NODE_ENV=${NODE_ENV:-production}
-      - REACT_APP_API_URL=${REACT_APP_API_URL:-http://localhost:5001}
-      - REACT_APP_UPLOAD_API_URL=${REACT_APP_UPLOAD_API_URL:-http://localhost:4002}
+      - VITE_BASE_API_URL=${VITE_BASE_API_URL:-http://localhost:5001/}
+      - VITE_UPLOAD_SERVER=${VITE_UPLOAD_SERVER:-http://localhost:4002/}
     networks:
       - migration-network
     security_opt:

index.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 
 const apiEnvContent = `APP_TOKEN_KEY=MIGRATION_V2\nPORT=5001\n`;
-const uiEnvContent = `REACT_APP_WEBSITE_BASE_URL="http://localhost:3000/"\nREACT_APP_BASE_API_URL="http://localhost:5001/"\nREACT_APP_API_VERSION=v2\nREACT_APP_HOST="http://localhost:3000"\nREACT_APP_UPLOAD_SERVER="http://localhost:4002/"\nREACT_APP_OFFLINE_CMS=true\n`;
+const uiEnvContent = `VITE_WEBSITE_BASE_URL="http://localhost:3000/"\nVITE_BASE_API_URL="http://localhost:5001/"\nVITE_API_VERSION=v2\nVITE_HOST="http://localhost:3000"\nVITE_UPLOAD_SERVER="http://localhost:4002/"\nVITE_OFFLINE_CMS=true\n`;
 const uploadAPIEnvContent = `PORT=4002\nNODE_BACKEND_API=http://localhost:5001\n`;
 
 const envFilePaths = {

ui/.env.local

@@ -1,6 +1,6 @@
-REACT_APP_WEBSITE_BASE_URL="http://localhost:3000/"
-REACT_APP_BASE_API_URL="http://localhost:5001/"
-REACT_APP_API_VERSION=v2
-REACT_APP_HOST="http://localhost:3000"
-REACT_APP_UPLOAD_SERVER="http://localhost:4002/"
-REACT_APP_OFFLINE_CMS=true
+VITE_WEBSITE_BASE_URL="http://localhost:3000/"
+VITE_BASE_API_URL="http://localhost:5001/"
+VITE_API_VERSION=v2
+VITE_HOST="http://localhost:3000"
+VITE_UPLOAD_SERVER="http://localhost:4002/"
+VITE_OFFLINE_CMS=true

ui/.gitignore

@@ -24,6 +24,4 @@ yarn-error.log*
 
 
 # .npmrc
-.npmrc
-
-!.env.local
+.npmrc

ui/Dockerfile

@@ -20,4 +20,5 @@ USER nodeapp
 
 EXPOSE 3000
 
-CMD [ "npm", "run", "start" ]
+# Build at container startup so VITE_* env vars from docker-compose
+CMD [ "sh", "-c", "npm run build && npx vite preview --port 3000 --host" ]

ui/public/index.html → ui/index.html

@@ -9,9 +9,9 @@
       name="description"
       content="Contentstack Migrations tool for easily migrate content between stacks or from other CMS platforms to Contentstack."
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
 
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="manifest" href="/manifest.json" />
 
     <title>Contentstack Migration Tool</title>
 
@@ -24,9 +24,8 @@
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link
-      rel="preload"
-      as="style"
       href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap"
+      rel="stylesheet"
     />
     <link
       href="https://fonts.googleapis.com/css2?family=Montserrat:wght@100..900&display=swap"
@@ -71,5 +70,6 @@
     <a href="#root" class="skip-to-main-content-link">Skip to main content</a>
 
     <div id="root"></div>
+    <script type="module" src="/src/index.tsx"></script>
   </body>
 </html>