comment-2: constants added, search func added in search utility

Author: yashin4112

api/src/services/migration.service.ts

@@ -0,0 +1,13 @@
+import { LogEntry } from "winston/index.js";
+
+export const matchesSearchText = (log: LogEntry, searchText: string): boolean => {
+  if (!searchText || searchText === "null") return true;
+
+  const loweredSearch = searchText.toLowerCase();
+
+  const fieldsToSearch = ["level", "message", "methodName", "timestamp"];
+
+  return fieldsToSearch.some((field) =>
+    log?.[field]?.toString()?.toLowerCase()?.includes(loweredSearch)
+  );
+};

api/src/utils/search.util.ts

@@ -12,15 +12,18 @@
       "theme": "secondary",
       "title": "Delete Project",
       "url": "",
-      "with_icon": true
+      "with_icon": true,
+      "icon": "Delete"
     },
     "save_project": {
       "open_in_new_tab": false,
       "theme": "primary",
       "title": "Save",
       "url": "",
-      "with_icon": true
-    }
+      "with_icon": true,
+      "icon": "v2-Save"
+    },
+    "back_button": "LeftArrow"
   },
   "execution_logs": {
     "title": "Execution Logs"

ui/src/cmsData/setting.json

@@ -11,8 +11,7 @@ import {
   Textarea,
   PageLayout,
   Notification,
-  cbModal,
-  ClipBoard
+  cbModal
 } from '@contentstack/venus-components';
 
 // Redux
@@ -24,7 +23,7 @@ import { ModalObj } from '../../../components/Modal/modal.interface';
 
 // Service
 import { deleteProject, getProject, updateProject } from '../../../services/api/project.service';
-import { CS_ENTRIES } from '../../../utilities/constants';
+import { CS_ENTRIES, HTTP_CODES } from '../../../utilities/constants';
 import { getCMSDataFromFile } from '../../../cmsData/cmsSelector';
 
 // Component
@@ -81,7 +80,7 @@ const Settings = () => {
         params?.projectId ?? ''
       );
 
-      if (status === 200) {
+      if (status === HTTP_CODES.OK) {
         setProjectName(data?.name);
         setProjectDescription(data?.description);
         setProjectId(params?.projectId ?? '');
@@ -111,7 +110,7 @@ const Settings = () => {
       projectData
     );
 
-    if (status === 200) {
+    if (status === HTTP_CODES.OK) {
       Notification({
         notificationContent: { text: 'Project Updated Successfully' },
         notificationProps: {
@@ -136,7 +135,7 @@ const Settings = () => {
     //setIsLoading(true);
     const response = await deleteProject(selectedOrganisation?.value, params?.projectId ?? '');
 
-    if (response?.status === 200) {
+    if (response?.status === HTTP_CODES.OK) {
       //setIsLoading(false);
       closeModal();
       dispatch(updateNewMigrationData(DEFAULT_NEW_MIGRATION));
@@ -194,7 +193,7 @@ const Settings = () => {
           <div className="flex-center">
             <div className="flex-v-center Button__mt-regular Button__visible">
               <Icon
-                icon="Delete"
+                icon={cmsData?.project?.delete_project?.icon ?? ''}
                 version="v2"
                 data={cmsData?.project?.delete_project?.title}></Icon>
             </div>
@@ -250,7 +249,7 @@ const Settings = () => {
                     buttonType="primary"
                     aria-label="save for saving update"
                     version="v2"
-                    icon={'v2-Save'}
+                    icon={cmsData?.project?.save_project?.icon}
                     autoClose={5000}
                     label={'Success'}
                     onClick={handleUpdateProject}>
@@ -262,9 +261,7 @@ const Settings = () => {
           </div>
         )}
         {active === cmsData?.execution_logs?.title && (
-          <div>
             <ExecutionLog projectId={projectId} />
-          </div>
         )}
       </div>
     )
@@ -281,7 +278,7 @@ const Settings = () => {
           <div>
             <Icon
               version="v2"
-              icon={'LeftArrow'}
+              icon={cmsData?.project?.back_button ?? ''}
               size="medium"
               onClick={() => {
                 handleBack();

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

@@ -10,6 +10,7 @@ interface IProject {
   save_project: CTA;
   email: string;
   description_placeholder: string;
+  back_button: string;
 }
 /**
  * Represents a Call to Action (CTA) object.
@@ -20,6 +21,7 @@ interface CTA {
   title: string;
   url: string;
   with_icon: boolean;
+  icon: string 
 }
 interface IExecutionLogs {
   title: string;

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

@@ -12,6 +12,7 @@ import './index.scss';
 
 import FilterModal from '../FilterModale';
 import { getMigrationLogs } from '../../services/api/migration.service';
+import { EXECUTION_LOGS_UI_TEXT } from '../../utilities/constants';
 
 const ExecutionLogs = ({ projectId }: { projectId: string }) => {
   const [data, setData] = useState<LogEntry[]>([]);
@@ -40,7 +41,7 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
       state?.migration?.newMigrationData?.migration_execution?.migrationCompleted
   );
 
-  const stackIds = testStacks?.map((stack: StackIds) => ({
+  const stackIds = testStacks?.map?.((stack: StackIds) => ({
     label: stack?.stackName,
     value: stack?.stackUid
   }));
@@ -54,8 +55,8 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
 
   const [selectedStack, setSelectedStack] = useState<DropdownOption>(
     {
-      label: stackIds[stackIds?.length - 1]?.label ?? '' ,
-      value: stackIds[stackIds?.length - 1]?.value ?? '' 
+      label: stackIds?.[stackIds?.length - 1]?.label ?? '' ,
+      value: stackIds?.[stackIds?.length - 1]?.value ?? '' 
     }
   );
 
@@ -114,10 +115,8 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
           return;
         }
 
-        const usersQueryArray = filterOption.map((item) => item.value);
-        const newFilter =
-          usersQueryArray?.length > 1 ? usersQueryArray?.join('-') : usersQueryArray[0];
-
+        const usersQueryArray = filterOption?.map((item) => item?.value);
+        const newFilter = usersQueryArray?.length > 1 ? usersQueryArray?.join('-') : usersQueryArray?.[0];
         setFilterValue(newFilter);
         fetchData({ filter: newFilter });
         setIsFilterApplied(true);
@@ -136,8 +135,8 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
 
     const iconProps = {
       className: isFilterApplied
-        ? 'filterWithAppliedIcon Icon--v2 Icon--medium'
-        : 'defaultFilterIcon Icon--v2 Icon--medium',
+        ? EXECUTION_LOGS_UI_TEXT.FILTER_ICON.FILTER_ON
+        : EXECUTION_LOGS_UI_TEXT.FILTER_ICON.FILTER_OFF,
       withTooltip: true,
       tooltipContent: 'Filter',
       tooltipPosition: 'left'
@@ -187,7 +186,7 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
             minute: '2-digit',
             hour12: true
           };
-          const formatted = new Intl.DateTimeFormat('en-US', options).format(date);
+          const formatted = new Intl.DateTimeFormat('en-US', options)?.format(date);
           return <div>{formatted}</div>;
         }
         return <div>No Data Available</div>;
@@ -264,8 +263,8 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
         setData([]);
         setTotalCounts(0);
       } else {
-        setData(response?.data.logs);
-        setTotalCounts(response?.data.total);
+        setData(response?.data?.logs);
+        setTotalCounts(response?.data?.total);
       }
     } catch (error) {
       console.error('Unexpected error while fetching logs:', error);
@@ -297,7 +296,7 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
       isRowSelect={false}
       columnSelector={false}
       canSearch={true}
-      searchPlaceholder={'Search Execution Logs'}
+      searchPlaceholder={EXECUTION_LOGS_UI_TEXT.SEARCH_PLACEHOLDER}
       searchValue={searchText ?? ''}
       onSearchChangeEvent={(value: string) => setSearchText(value)}
       withExportCta={{
@@ -308,7 +307,7 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
           version="v2"
           value={testStacks?.length ? selectedStack : ''}
           options={stackIds ?? []}
-          placeholder='Select a stack'
+          placeholder={EXECUTION_LOGS_UI_TEXT.SELECT_PLACEHOLDER}
           onChange={(s: DropdownOption) => {
           setSelectedStack({
             label: s?.label ?? '',
@@ -323,13 +322,13 @@ const ExecutionLogs = ({ projectId }: { projectId: string }) => {
       customEmptyState={
         <EmptyState
         forPage="list"
-        heading={searchText === '' ? 'No Logs' : 'No matching results found!'}
+        heading={searchText === '' ? EXECUTION_LOGS_UI_TEXT.EMPTY_STATE_HEADING.NO_LOGS : EXECUTION_LOGS_UI_TEXT.EMPTY_STATE_HEADING.NO_MATCH} 
         description={
           searchText === ''
-          ? 'Try Executing the Migration.'
-          : 'Try changing the search query to find what you are looking for.'
+          ?  EXECUTION_LOGS_UI_TEXT.EMPTY_STATE_DESCRIPTION.NO_LOGS
+          : EXECUTION_LOGS_UI_TEXT.EMPTY_STATE_DESCRIPTION.NO_RESULT
         }
-        moduleIcon={searchText === '' ? 'NoDataEmptyState' : 'NoSearchResult'}
+        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/components/ExecutionLogs/index.tsx

@@ -1,5 +1,5 @@
 import { ObjectType } from '../../utilities/constants.interface';
-import { API_VERSION } from '../../utilities/constants';
+import { API_VERSION, EXECUTION_LOGS_ERROR_TEXT } from '../../utilities/constants';
 import { getDataFromLocalStorage } from '../../utilities/functions';
 import { getCall, postCall, putCall, patchCall } from './service';
 
@@ -349,9 +349,10 @@ export const getMigrationLogs = async (orgId: string, projectId: string, stackId
       );
   } catch (error) {
     if (error instanceof Error) {
-      throw new Error(`Error in userSession: ${error.message}`);
+      throw new Error(`${EXECUTION_LOGS_ERROR_TEXT.ERROR}: ${error.message}`);
     } else {
-      throw new Error('Unknown error in userSession');
+      throw new Error('Unknown ${EXECUTION_LOGS_ERROR_TEXT.ERROR}');
     }
   }
-}
+}
+

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

@@ -118,3 +118,42 @@ export const VALIDATION_DOCUMENTATION_URL: { [key: string]: string } = {
   wordpress: '',
   drupal: ''
 };
+
+export const HTTP_CODES = {
+  OK: 200,
+  FORBIDDEN: 403,
+  BAD_REQUEST: 400,
+  NOT_FOUND: 404,
+  UNAUTHORIZED: 401,
+  TOO_MANY_REQS: 429,
+  SOMETHING_WRONG: 501,
+  MOVED_PERMANENTLY: 301,
+  SUPPORT_DOC: 294,
+  SERVER_ERROR: 500,
+  UNPROCESSABLE_CONTENT: 422,
+};
+
+export const EXECUTION_LOGS_UI_TEXT = {
+  SEARCH_PLACEHOLDER: 'Search Execution Logs',
+  SELECT_PLACEHOLDER: 'Select a stack',
+  EMPTY_STATE_DESCRIPTION: {
+    NO_RESULT: 'Try Changing the Search Query to find what you are looking for',
+    NO_LOGS: 'Try executing Test Migration'
+  },
+  EMPTY_STATE_HEADING: {
+    NO_LOGS: 'No Logs Found',
+    NO_MATCH: 'No Matching Result Found'
+  },
+  EMPTY_STATE_ICON: {
+    NO_LOGS:'NoDataEmptyState',
+    NO_MATCH: 'NoSearchResult'
+  },
+  FILTER_ICON: {
+    FILTER_ON: 'filterWithAppliedIcon Icon--v2 Icon--medium',
+    FILTER_OFF: 'defaultFilterIcon Icon--v2 Icon--medium'
+  }
+}
+
+export const EXECUTION_LOGS_ERROR_TEXT = {
+  ERROR: 'Error in Getting Migration Logs'
+}

ui/src/utilities/constants.ts

@@ -2,7 +2,7 @@ export default {
   plan: {
     dropdown: { optionLimit: 100 }
   },
-  cmsType: 'sitecore',
+  cmsType: 'contentful',
   isLocalPath: true,
   awsData: {
     awsRegion: 'us-east-2',
@@ -13,5 +13,5 @@ export default {
     bucketKey: ''
   },
   // localPath: '/Users/sayali.joshi/Downloads/contentfulDummyEmbedData.json' //package 45.zip'
-  localPath: '/Users/yash.shinde/Documents/Migration/update-script/package 45.zip'
-};
+  localPath: '/Users/shobhit.upadhyay/Downloads/asic.json'
+};