From b47f4bb9b74080b067cebf62cadc944b199eb69c Mon Sep 17 00:00:00 2001 From: aaradhya-egov <137176709+aaradhya-egov@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:57:15 +0530 Subject: [PATCH] fix on tetnant of pgr (#1594) * fix * fix * fix --- .../core/src/pages/employee/QuickStart/Config.js | 13 ++++++++++++- .../src/pages/employee/QuickStart/QuickSetup.js | 8 ++++++-- .../pages/employee/RoleLanding/RoleLandingConfig.js | 2 +- .../pgr/src/pages/citizen/Rating/SelectRating.js | 2 +- .../pgr/src/pages/citizen/ReopenComplaint/index.js | 2 +- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/QuickStart/Config.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/QuickStart/Config.js index d0328b88e49..e76c34be65b 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/QuickStart/Config.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/QuickStart/Config.js @@ -79,6 +79,17 @@ const QuickSetupConfigComponent = ({ onSelect, formData, control, formState, ... id: 1, type: "faqs", actions: [ + { + question: "SANDBOX_FAQ_QUES_14", + isLabelLink: true, + answer: [ + { + label: "SANDBOX_FAQ_ANS_14_LABEL_1", + fulllink:true, + link:"https://egov-digit.gitbook.io/digit-sandbox/specifications/user-manual/walkthrough-videos", + } + ] + }, { question: "SANDBOX_FAQ_QUES_1", content: "SANDBOX_FAQ_CONTENT_1", @@ -86,7 +97,7 @@ const QuickSetupConfigComponent = ({ onSelect, formData, control, formState, ... answer: [ { label: "SANDBOX_FAQ_ANS_1_LABEL_1", - link:"citizen/all-services", + link:"citizen/login", description: "SANDBOX_FAQ_ANS_1_DESCRIPTION_1", }, { diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/QuickStart/QuickSetup.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/QuickStart/QuickSetup.js index 613065b5627..0fd00a734b1 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/QuickStart/QuickSetup.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/QuickStart/QuickSetup.js @@ -34,8 +34,12 @@ const FaqComponent = (props) => { type="button" size={"medium"} onClick={() => { - const baseURL = `https://${window.location.hostname}/${window?.globalPath}/${tenantId}`; - window.open(`${baseURL}/${action?.link}`, "_blank"); + if (action?.fulllink) { + window.open(action?.link, "_blank"); + } else { + const baseURL = `https://${window.location.hostname}/${window?.globalPath}/${tenantId}`; + window.open(`${baseURL}/${action?.link}`, "_blank"); + } }} style={{ padding: "0px" }} /> diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/RoleLanding/RoleLandingConfig.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/RoleLanding/RoleLandingConfig.js index 66f449baf75..be3cc157084 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/RoleLanding/RoleLandingConfig.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/RoleLanding/RoleLandingConfig.js @@ -49,7 +49,7 @@ export const externalConfig = [ heading: "ROLE_LANDING_CITIZEN", // localization key for "Citizen" description: "ROLE_LANDING_CITIZEN_DESCRIPTION", // localization key for the description buttonName: "ROLE_LANDING_CITIZEN_BUTTON", // localization key for the button label - action: "/citizen" + action: "/citizen/login" }, { type: "card", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Rating/SelectRating.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Rating/SelectRating.js index c24bce32f20..d0a6fe20d7b 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Rating/SelectRating.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Rating/SelectRating.js @@ -11,7 +11,7 @@ const SelectRating = ({ parentRoute }) => { const dispatch = useDispatch(); const history = useHistory(); - let tenantId = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")?.code || Digit.ULBService.getCurrentTenantId(); + let tenantId = Digit.Utils.getMultiRootTenant()? Digit.ULBService.getStateId() : Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")?.code || Digit.ULBService.getCurrentTenantId(); const complaintDetails = Digit.Hooks.pgr.useComplaintDetails({ tenantId: tenantId, id: id }).complaintDetails; const updateComplaint = useCallback((complaintDetails) => dispatch(updateComplaints(complaintDetails)), [dispatch]); const [submitError, setError] = useState(false) diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/ReopenComplaint/index.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/ReopenComplaint/index.js index ddd9dab9acd..cbfdb825857 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/ReopenComplaint/index.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/ReopenComplaint/index.js @@ -12,7 +12,7 @@ const ReopenComplaint = ({ match, history, parentRoute }) => { const allParams = window.location.pathname.split("/") const id = allParams[allParams.length - 1] - const tenantId = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")?.code || Digit.ULBService.getCurrentTenantId(); + const tenantId = Digit.Utils.getMultiRootTenant()? Digit.ULBService.getStateId() :Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")?.code || Digit.ULBService.getCurrentTenantId(); const complaintDetails = Digit.Hooks.pgr.useComplaintDetails({ tenantId: tenantId, id: id }).complaintDetails; return (