Merge pull request #835 from contentstack/dev

Dev To Stage Push

Author: sayalijoshi27

api/src/services/aem.service.ts

@@ -71,7 +71,7 @@ export interface FieldMapType {
 }
 
 export interface Advanced {
-  validationRegex: string;
+  validationRegex?: string;
   mandatory?: boolean;
   multiple?: boolean;
   unique?: boolean;
@@ -89,6 +89,7 @@ export interface Advanced {
   referenedItems?: string[];
   title?: string;
   url?: string;
+  initial?: Omit<Advanced, 'initial'>;
 }
 
 export interface ItemStatus {

ui/src/components/ContentMapper/contentMapper.interface.ts

@@ -2027,7 +2027,9 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
         contentstackFieldType: row?.backupFieldType,
         contentstackField: row?.otherCmsField,
         contentstackFieldUid: row?.backupFieldUid,
-
+        advanced: {
+          ...row?.advanced?.initial,
+        },
       };
     });
     setTableData(updatedRows);
@@ -2107,8 +2109,6 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
           setContentTypes(resetContentTypes);
           setCount(filteredCT?.length);
 
-          await fetchFields(selectedContentType?.id ?? '', searchText || '');
-          
           Notification({
             notificationContent: { text: data?.message },
             notificationProps: {

ui/src/components/ContentMapper/index.tsx

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import read from 'fs-readdir-recursive';
 import { IReadFiles } from "./types/index.interface";
 import { MergeStrategy } from "./types/index.interface";
 import { v4 as uuidv4 } from "uuid";
@@ -242,10 +243,9 @@ export function countComponentTypes(component: any, result: Record<string, numbe
   if (!component || typeof component !== "object") return result;
 
   // Check for ':type' at current level
-  const typeField = component[":type"]?.value;
-  if (typeField) {
-    result[typeField] = (result[typeField] || 0) + 1;
-  }
+  const t = component[":type"];
+  const typeField = typeof t === "string" ? t : t?.value;
+  if (typeField) result[typeField] = (result[typeField] || 0) + 1;
 
   // Recursively check nested properties
   for (const key in component) {
@@ -333,4 +333,78 @@ export function ensureField(
   if (!found) {
     mainSchema.unshift(fieldConfig);
   }
+}
+
+/**
+ * Helper function that recursively searches for carousel components and extracts item types
+ */
+function findCarouselsRecursive(obj: any, itemTypes: Set<string>): void {
+  if (!obj || typeof obj !== 'object') return;
+  
+  const typeValue = obj[':type'] || obj['type'];
+  const isCarousel = typeof typeValue === 'string' && typeValue.includes('carousel');
+  
+  if (isCarousel && obj[':items']) { 
+    // Get the items object
+    const items = obj[':items'];
+    
+    if (items && typeof items === 'object') {
+      // Iterate through each item in the carousel
+      for (const [key, value] of Object.entries(items)) {
+        if (value && typeof value === 'object') {
+          const itemType = (value as any)[':type'];
+          
+          if (itemType && typeof itemType === 'string') {
+            // Extract component name from path
+            const componentName = itemType.split('/').pop();
+            if (componentName) {
+              itemTypes.add(componentName);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  // Recursively search nested objects
+  if (Array.isArray(obj)) {
+    obj.forEach(item => findCarouselsRecursive(item, itemTypes));
+  } else {
+    Object.values(obj).forEach(value => findCarouselsRecursive(value, itemTypes));
+  }
+}
+
+/**
+ * Scans all JSON files to find all unique component types used in carousel items
+ * @param packagePath - Path to the AEM package
+ * @returns Set of all component types found in any carousel
+ */
+export async function scanAllCarouselItemTypes(packagePath: string): Promise<Set<string>> {
+  const carouselItemTypes = new Set<string>();
+  const filesDir = path.resolve(packagePath);
+  
+  try {
+    const allFiles = read(filesDir);
+    const jsonFiles = allFiles.filter(f => f.endsWith('.json'));
+    
+    for (const fileName of jsonFiles) {
+      const filePath = path.join(filesDir, fileName);
+      
+      try {
+        const content = await fs.promises.readFile(filePath, 'utf-8');
+        const data = JSON.parse(content);
+        
+        // Recursively search for carousel components
+        findCarouselsRecursive(data, carouselItemTypes);
+        
+      } catch (err) {
+        // Skip invalid JSON files
+        continue;
+      }
+    }
+    return carouselItemTypes;
+  } catch (err) {
+    console.error('❌ Error scanning carousel items:', err);
+    return carouselItemTypes;
+  }
 }