From b8bfb442f219be71efc084e4b17a6379f4ae8718 Mon Sep 17 00:00:00 2001 From: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Date: Tue, 16 Jan 2024 16:23:33 +0530 Subject: [PATCH 1/3] Sm 3833 (#417) * SM-3883 resolving dso search * SM-3883 WF timeline fixes for comments * SM-3883 WF timeline fixes for comments --------- Co-authored-by: nabeelmd-eGov --- .../packages/fsm-libraries/src/services/molecules/FSM/Search.js | 2 +- .../modules/fsm/src/pages/employee/ApplicationDetails/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/fsm-libraries/src/services/molecules/FSM/Search.js b/frontend/micro-ui/web/micro-ui-internals/packages/fsm-libraries/src/services/molecules/FSM/Search.js index 07e5cac6f0f..a523bdda939 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/fsm-libraries/src/services/molecules/FSM/Search.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/fsm-libraries/src/services/molecules/FSM/Search.js @@ -71,7 +71,7 @@ export const Search = { ids: response.dsoId, vehicleIds: response?.vehicleId, }; - [dsoDetails] = await DsoDetails(tenantId, dsoFilters); + [dsoDetails] = await DsoDetails(tenantId, dsoFilters, t); if (response?.vehicleId) { vehicle = dsoDetails.vehicles.find( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js index 6ed9aaf8e42..ceb835d567b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/index.js @@ -172,7 +172,7 @@ const ApplicationDetails = (props) => { } const getTimelineCaptions = (checkpoint) => { - const __comment = checkpoint?.comment?.split("~"); + const __comment = checkpoint?.comment?.split("~") || checkpoint?.wfComment?.[0]?.split("~"); const reason = __comment ? __comment[0] : null; const reason_comment = __comment ? __comment[1] : null; if (checkpoint.status === "CREATED") { From ee87be902c2b689d47db52173157737ee0e92e8c Mon Sep 17 00:00:00 2001 From: nabeelmd-eGov Date: Tue, 16 Jan 2024 16:40:39 +0530 Subject: [PATCH 2/3] SM-3883 dso issue fix --- .../fsm/src/pages/employee/ApplicationDetails/Modal/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js index d3c69c77be8..037b64bbd33 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/ApplicationDetails/Modal/index.js @@ -42,7 +42,7 @@ const popupActionBarStyles = { const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, actionData, module,applicationDetails }) => { const mobileView = Digit.Utils.browser.isMobile() ? true : false; - const { data: dsoData, isLoading: isDsoLoading, isSuccess: isDsoSuccess, error: dsoError } = Digit.Hooks.fsm.useDsoSearch(tenantId, { limit: '-1', status: 'ACTIVE' }); + const { data: dsoData, isLoading: isDsoLoading, isSuccess: isDsoSuccess, error: dsoError } = Digit.Hooks.fsm.useDsoSearch(tenantId, { limit: '-1', status: 'ACTIVE' }, {}, t); const { isLoading, isSuccess, isError, data: applicationData, error } = Digit.Hooks.fsm.useSearch( tenantId, { applicationNos: id }, From 62eaabe9a27203752ce76c48db4be7bdad6a7ba2 Mon Sep 17 00:00:00 2001 From: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Date: Tue, 16 Jan 2024 16:43:52 +0530 Subject: [PATCH 3/3] Merge pull request #418 from egovernments/SM-3883 SM-3883 dso issue fix