Merge pull request #713 from contentstack/bugfix/cmg-616

Bugfix/cmg 616

Author: sayalijoshi27

.talismanrc

@@ -50,3 +50,9 @@ fileignoreconfig:
   - filename: upload-api/src/helper/index.ts
     checksum: beef34c30cc18c55d66df0124e8bfb69899be9aaef074252afe291c93d4c0f77
 
+  - filename: api/src/services/migration.service.ts
+    checksum: f37809ddd67b8ad143d7d9fbb2c305f7c9150a8eec1f3325724fca576c736656
+
+  - filename: ui/src/components/AuditLogs/index.tsx
+    checksum: 51ce05f66ac49023452f200e587389e55c88357102a61e77eb468d0e02b52846
+

api/src/services/migration.service.ts

@@ -448,7 +448,7 @@ const startMigration = async (req: Request): Promise<any> => {
     .findIndex({ id: projectId })
     .value();
   if (index > -1) {
-    ProjectModelLowdb.update((data: any) => {
+    await ProjectModelLowdb.update((data: any) => {
       data.projects[index].isMigrationStarted = true;
     });
   }
@@ -464,6 +464,17 @@ const startMigration = async (req: Request): Promise<any> => {
       projectId,
       `${project?.destination_stack_id}.log`
     );
+    const message = getLogMessage(
+      'start Migration',
+      'Starting Migration...',
+      {}
+    );
+    await customLogger(
+      projectId,
+      project?.destination_stack_id,
+      'info',
+      message
+    );
     await setLogFilePath(loggerPath);
 
     const copyLogsToStack = async (

api/src/services/wordpress.service.ts

@@ -2330,6 +2330,15 @@ async function extractPosts( packagePath: string, destinationStackId: string, pr
       // Process the current chunk
       const chunkPostData = await processChunkData(chunkData, filename, isLastChunk, contenttype);
       postdataCombined = { ...postdataCombined, ...chunkPostData };
+      const seenTitles = new Map();
+      Object?.entries(postdataCombined)?.forEach(([uid, item]:any) => {
+        const originalTitle = item?.title;
+      
+        if (seenTitles.has(originalTitle)) {
+          item.title = `${originalTitle} - ${item?.uid}`;
+        }
+        seenTitles.set(item?.title, true);
+      });
       const message = getLogMessage(
         srcFunc,
         `${filename.split(".").slice(0, -1).join(".")} has been successfully transformed.`,

ui/src/components/AdvancePropertise/advanceProperties.interface.ts

@@ -24,8 +24,9 @@ export interface SchemaProps {
    * @param rowId - The ID of the row.
    * @param value - The advanced settings.
    * @param checkBoxChanged - Indicates whether the checkbox has changed.
+   * @param rowContentstackFieldUid - Indicates the contentstack uid of that row data
    */
-  updateFieldSettings: (rowId: string, value: Advanced, checkBoxChanged: boolean) => void;
+  updateFieldSettings: (rowId: string, value: Advanced, checkBoxChanged: boolean, rowContentstackFieldUid: string) => void;
 
   /**
    * Indicates whether the field is localized.

ui/src/components/AdvancePropertise/index.tsx

@@ -147,7 +147,8 @@ const AdvancePropertise = (props: SchemaProps) => {
         title: currentToggleStates?.title,
         url: currentToggleStates?.url
       },
-      checkBoxChanged
+      checkBoxChanged,
+      props?.data?.contentstackFieldUid
     );
   };
 
@@ -189,7 +190,8 @@ const AdvancePropertise = (props: SchemaProps) => {
         title: currentToggleStates?.title,
         url: currentToggleStates?.url
       },
-      checkBoxChanged
+      checkBoxChanged,
+      props?.data?.contentstackFieldUid
     );
   };
 
@@ -215,7 +217,8 @@ const AdvancePropertise = (props: SchemaProps) => {
         embedObject: currentToggleStates?.embedObject,
         embedObjects: embedObjectsLabels
       },
-      true
+      true,
+      props?.data?.contentstackFieldUid
     );
   };
 
@@ -251,7 +254,8 @@ const AdvancePropertise = (props: SchemaProps) => {
         embedObjects: embedObjectsLabels,
         options: options
       },
-      true
+      true,
+      props?.data?.contentstackFieldUid
     );
   };
   const handleRemoveDefalutValue = (index: number) => {
@@ -280,7 +284,8 @@ const AdvancePropertise = (props: SchemaProps) => {
         embedObjects: embedObjectsLabels,
         options: options
       },
-      true
+      true,
+      props?.data?.contentstackFieldUid
     );
   };
 
@@ -583,7 +588,8 @@ const AdvancePropertise = (props: SchemaProps) => {
                             validationRegex: toggleStates?.validationRegex ?? '',
                             embedObjects: embedObject
                           },
-                          true
+                          true,
+                          props?.data?.contentstackFieldUid
                         );
                       }}
                       options={option}

ui/src/components/AuditLogs/index.tsx

@@ -26,7 +26,7 @@ const AuditLogs: React.FC = () => {
     const [searchText, setSearchText] = useState<string>('');
     const [tableData, setTableData] = useState<TableDataItem[]>([]);
     const [totalCounts, setTotalCounts] = useState<number>(0);
-    const [tableKey, setTableKey] = useState<number>(0);
+    const [tableUid, setTableUid] = useState<number>(0);
     const [filterOption, setFilterOption] = useState<string>('all');
     const [filterValue, setFilterValue] = useState<FilterOption[]>([]);
     const [isCursorInside, setIsCursorInside] = useState(true);
@@ -143,12 +143,12 @@ const AuditLogs: React.FC = () => {
         setFilterOption('all');
         setIsFilterApplied(false);
         if (selectedOption) {
-            setTableKey((prevKey) => prevKey + 1);
+            setTableUid((prevUid) => prevUid + 1);
         }
     };
     const handleSearchChange = (value: string) => {
         setSearchText(value);
-        setTableKey((prevKey) => prevKey + 1);
+        setTableUid((prevUid) => prevUid + 1);
     };
     const ColumnFilter = () => {
         const closeModal = () => {
@@ -404,7 +404,7 @@ const AuditLogs: React.FC = () => {
     return (
         <div className='table-height'>
             <InfiniteScrollTable
-                key={tableKey}
+                key={tableUid}
                 itemSize={80}
                 data={tableData}
                 columns={dropDownOptions == 'content-types' || dropDownOptions == 'global-fields' ? contentTypeHeader : entryHeader}

ui/src/components/ContentMapper/index.scss

@@ -311,3 +311,7 @@ div .table-row {
   font-size: $size-font-large;
   font-weight: $font-weight-semi-bold;
 }
+.filterButton-color{
+  color: $color-brand-primary-base;
+  font-weight: $font-weight-bold;
+}