fix: correct constant name from GET_AUIDT_DATA to GET_AUDIT_DATA and enhance response handling in migration controller for improved status management

Author: samarp-jain

api/src/constants/index.ts

@@ -273,7 +273,7 @@ export const MIGRATION_DATA_CONFIG = {
   EXPORT_INFO_FILE: "export-info.json",
 };
 
-export const GET_AUIDT_DATA = {
+export const GET_AUDIT_DATA = {
   MIGRATION: "migration-v2",
   API_DIR: "api",
   MIGRATION_DATA_DIR: "migration-data",

api/src/controllers/migration.controller.ts

@@ -51,11 +51,11 @@ const deleteTestStack = async (req: Request, res: Response): Promise<void> => {
 };
 const getAuditData = async (req: Request, res: Response): Promise<void> => {
   const resp = await migrationService.getAuditData(req);
-  res.status(200).json(resp);
+  res.status(resp?.status).json(resp);
 };
 const getLogs = async (req: Request, res: Response): Promise<void> => {
   const resp = await migrationService.getLogs(req);
-  res.status(200).json(resp);
+  res.status(resp?.status).json(resp);
 };
 
 const saveLocales = async (req: Request, res: Response): Promise<void> => {

api/src/services/migration.service.ts

@@ -7,7 +7,7 @@ import https from "../utils/https.utils.js";
 import { LoginServiceType } from "../models/types.js";
 import getAuthtoken from "../utils/auth.utils.js";
 import logger from "../utils/logger.js";
-import { GET_AUIDT_DATA } from "../constants/index.js";
+import { GET_AUDIT_DATA } from "../constants/index.js";
 import {
   HTTP_TEXTS,
   HTTP_CODES,
@@ -157,8 +157,8 @@ const getAuditData = async (req: Request): Promise<any> => {
   }
 
   try {
-    const mainPath = process?.cwd()?.split?.(GET_AUIDT_DATA?.MIGRATION)?.[0];
-    const logsDir = path.join(mainPath, GET_AUIDT_DATA?.MIGRATION, GET_AUIDT_DATA?.API_DIR, GET_AUIDT_DATA?.MIGRATION_DATA_DIR);
+    const mainPath = process?.cwd()?.split?.(GET_AUDIT_DATA?.MIGRATION)?.[0];
+    const logsDir = path.join(mainPath, GET_AUDIT_DATA?.MIGRATION, GET_AUDIT_DATA?.API_DIR, GET_AUDIT_DATA?.MIGRATION_DATA_DIR);
 
     const stackFolders = fs.readdirSync(logsDir);
 
@@ -167,7 +167,7 @@ const getAuditData = async (req: Request): Promise<any> => {
       throw new BadRequestError("Migration data not found for this stack");
     }
 
-    const auditLogPath = path?.resolve(logsDir, stackFolder, GET_AUIDT_DATA?.LOGS_DIR, GET_AUIDT_DATA?.AUDIT_DIR, GET_AUIDT_DATA?.AUDIT_REPORT);
+    const auditLogPath = path?.resolve(logsDir, stackFolder, GET_AUDIT_DATA?.LOGS_DIR, GET_AUDIT_DATA?.AUDIT_DIR, GET_AUDIT_DATA?.AUDIT_REPORT);
     if (!fs.existsSync(auditLogPath)) {
       throw new BadRequestError("Audit log path not found");
     }
@@ -192,7 +192,7 @@ const getAuditData = async (req: Request): Promise<any> => {
       throw new BadRequestError(`No audit data found for module: ${moduleName}`);
     }
     let transformedData = transformAndFlattenData(fileData);
-    if (filter != GET_AUIDT_DATA?.FILTERALL) {
+    if (filter != GET_AUDIT_DATA?.FILTERALL) {
       const filters = filter?.split("-");
       moduleName === 'Entries_Select_feild' ? transformedData = transformedData?.filter((log) => {
         return filters?.some((filter) => {
@@ -222,7 +222,8 @@ const getAuditData = async (req: Request): Promise<any> => {
 
     return {
       data: paginatedData,
-      totalCount: transformedData?.length
+      totalCount: transformedData?.length,
+      status: HTTP_CODES?.OK
     };
 
   } catch (error: any) {
@@ -250,24 +251,24 @@ const transformAndFlattenData = (data: any): Array<{ [key: string]: any, id: num
     // Handle the data based on its structure
     if (Array.isArray(data)) {
       // If data is already an array, use it directly
-      data.forEach((item, index) => {
-        flattenedItems.push({
+      data?.forEach((item, index) => {
+        flattenedItems?.push({
           ...item ?? {},
-          uid: item.uid || `item-${index}`
+          uid: item?.uid || `item-${index}`
         });
       });
     } else if (typeof data === 'object' && data !== null) {
       Object?.entries?.(data)?.forEach(([key, value]) => {
         if (Array.isArray(value)) {
-          value.forEach((item, index) => {
+          value?.forEach((item, index) => {
             flattenedItems?.push({
               ...item ?? {},
               parentKey: key,
               uid: item?.uid || `${key}-${index}`
             });
           });
         } else if (typeof value === 'object' && value !== null) {
-          flattenedItems.push({
+          flattenedItems?.push({
             ...value,
             key,
             uid: (value as any)?.uid || key
@@ -972,9 +973,9 @@ const getLogs = async (req: Request): Promise<any> => {
       if (!logEntries?.length) {
         return { logs: [], total: 0 };
       }
-      const filterOptions = Array.from(new Set(logEntries.map((log) => log.level)));
-      const auditStartIndex = logEntries.findIndex(log => log.message.includes("Starting audit process"));
-      const auditEndIndex = logEntries.findIndex(log => log.message.includes("Audit process completed"));
+      const filterOptions = Array?.from(new Set(logEntries?.map((log) => log?.level)));
+      const auditStartIndex = logEntries?.findIndex?.(log => log?.message?.includes("Starting audit process"));
+      const auditEndIndex = logEntries?.findIndex?.(log => log?.message?.includes("Audit process completed"));
       logEntries = [
         ...logEntries.slice(0, auditStartIndex),
         ...logEntries.slice(auditEndIndex + 1)
@@ -1000,6 +1001,7 @@ const getLogs = async (req: Request): Promise<any> => {
         logs: paginatedLogs,
         total: logEntries?.length ?? 0,
         filterOptions: filterOptions,
+        status: HTTP_CODES?.OK
       };
     } else {
       logger.error(getLogMessage(srcFunc, HTTP_TEXTS.LOGS_NOT_FOUND));

ui/src/cmsData/setting.json

@@ -28,6 +28,9 @@
   "execution_logs": {
     "title": "Execution Logs"
   },
+  "audit_logs": {
+    "title": "Audit Logs"
+  },
   "tags": [],
   "locale": "en-us",
   "uid": "blt96cda740c3157d20",
@@ -37,4 +40,4 @@
   "updated_at": "2024-03-11T06:03:23.420Z",
   "_version": 3,
   "_in_progress": false
-}
+}

ui/src/components/AuditFilterModal/index.scss

@@ -4,9 +4,9 @@
     position: absolute;
     z-index: 1000;
     width: 350px;
-    background-color: #ffffff;
+    background-color: $color-brand-white-base;
     border-radius: 12px;
-    box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
+    box-shadow: 0 8px 24px $color-base-black-31;
     display: flex;
     flex-direction: column;
     max-height: 350px;
@@ -65,10 +65,10 @@
 }
 
 .close-btn:hover {
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+    box-shadow: 0 4px 12px $color-base-black-31;
     transform: scale(1.05);
     border-radius: 8px;
-    background-color: #f0f1f3;
+    background-color: $color-base-black-31 ;
     cursor: pointer;
     transition:
         box-shadow 0.2s ease,

ui/src/components/Common/Settings/index.tsx

@@ -264,7 +264,7 @@ const Settings = () => {
         {active === cmsData?.execution_logs?.title && (
           <ExecutionLog projectId={projectId} />
         )}
-        {active === "AuditLogs" &&
+        {active === cmsData?.audit_logs?.title &&
           <AuditLogs />
 
         }
@@ -322,12 +322,12 @@ const Settings = () => {
         />
         <ListRow
           rightArrow={true}
-          active={active === "AuditLogs"}
-          content={"AuditLogs"}
+          active={active === cmsData?.audit_logs?.title}
+          content={cmsData?.audit_logs?.title}
           leftIcon={<Icon icon="Stacks" version="v2" />}
           onClick={() => {
-            setActive("AuditLogs");
-            setCurrentHeader("AuditLogs");
+            setActive(cmsData?.audit_logs?.title);
+            setCurrentHeader(cmsData?.audit_logs?.title);
           }}
           version="v2"
         />

ui/src/components/Common/Settings/setting.interface.ts

@@ -21,7 +21,7 @@ interface CTA {
   title: string;
   url: string;
   with_icon: boolean;
-  icon: string 
+  icon: string
 }
 interface IExecutionLogs {
   title: string;
@@ -33,5 +33,6 @@ interface IExecutionLogs {
 export interface Setting {
   project?: IProject;
   execution_logs?: IExecutionLogs;
+  audit_logs?: IExecutionLogs;
   title?: string;
 }

ui/src/components/ExecutionLogs/index.tsx

@@ -300,7 +300,7 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
         isRowSelect={false}
         columnSelector={false}
         canSearch={true}
-        searchPlaceholder={EXECUTION_LOGS_UI_TEXT.SEARCH_PLACEHOLDER}
+        searchPlaceholder={EXECUTION_LOGS_UI_TEXT?.SEARCH_PLACEHOLDER}
         searchValue={searchText ?? ''}
         onSearchChangeEvent={(value: string) => setSearchText(value)}
         withExportCta={{
@@ -311,7 +311,7 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
               version="v2"
               value={testStacks?.length ? selectedStack : ''}
               options={stackIds ?? []}
-              placeholder={EXECUTION_LOGS_UI_TEXT.SELECT_PLACEHOLDER}
+              placeholder={EXECUTION_LOGS_UI_TEXT?.SELECT_PLACEHOLDER}
               onChange={(s: DropdownOption) => {
                 setSelectedStack({
                   label: s?.label ?? '',
@@ -326,13 +326,13 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
         customEmptyState={
           <EmptyState
             forPage="list"
-            heading={searchText === '' ? EXECUTION_LOGS_UI_TEXT.EMPTY_STATE_HEADING.NO_LOGS : EXECUTION_LOGS_UI_TEXT.EMPTY_STATE_HEADING.NO_MATCH}
+            heading={searchText === '' ? EXECUTION_LOGS_UI_TEXT?.EMPTY_STATE_HEADING?.NO_LOGS : EXECUTION_LOGS_UI_TEXT?.EMPTY_STATE_HEADING?.NO_MATCH}
             description={
               searchText === ''
-                ? EXECUTION_LOGS_UI_TEXT.EMPTY_STATE_DESCRIPTION.NO_LOGS
-                : EXECUTION_LOGS_UI_TEXT.EMPTY_STATE_DESCRIPTION.NO_RESULT
+                ? EXECUTION_LOGS_UI_TEXT?.EMPTY_STATE_DESCRIPTION?.NO_LOGS
+                : EXECUTION_LOGS_UI_TEXT?.EMPTY_STATE_DESCRIPTION?.NO_RESULT
             }
-            moduleIcon={searchText === '' ? EXECUTION_LOGS_UI_TEXT.EMPTY_STATE_ICON.NO_LOGS : EXECUTION_LOGS_UI_TEXT.EMPTY_STATE_ICON.NO_MATCH}
+            moduleIcon={searchText === '' ? EXECUTION_LOGS_UI_TEXT?.EMPTY_STATE_ICON?.NO_LOGS : EXECUTION_LOGS_UI_TEXT?.EMPTY_STATE_ICON?.NO_MATCH}
             type="secondary"
             className="custom-empty-state"
           />

ui/src/services/api/project.service.ts

@@ -25,7 +25,7 @@ export const getAuditData = async (orgId: string, projectId: string, stackId: st
     return await getCall(`${API_VERSION}/migration/get_audit_data/${orgId}/${projectId}/${stackId}/${moduleName}/${skip}/${limit}/${startIndex}/${stopIndex}/${searchText}/${filter}`, options());
   } catch (error) {
     if (error instanceof Error) {
-      throw new Error(`Error in userSession: ${error.message}`);
+      throw new Error(`Error in userSession: ${error?.message}`);
     } else {
       throw new Error('Unknown error in userSession');
     }

upload-api/src/config/index.ts

@@ -2,7 +2,7 @@ export default {
   plan: {
     dropdown: { optionLimit: 100 }
   },
-  cmsType: 'sitecore',
+  cmsType: 'contentful',
   isLocalPath: true,
   awsData: {
     awsRegion: 'us-east-2',
@@ -12,6 +12,5 @@ export default {
     bucketName: '',
     bucketKey: ''
   },
-  // localPath: '/Users/sayali.joshi/Downloads/contentfulDummyEmbedData.json' //package 45.zip'
-  localPath: '/Users/samarp.jain/Desktop/package 45.zip',
+  localPath: 'your-local-legacy-cms-path',
 };