{languages.map((language, index) => (
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Dialog/LogoutDialog.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Dialog/LogoutDialog.js
index c36ca264588..cb55d19e392 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Dialog/LogoutDialog.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Dialog/LogoutDialog.js
@@ -1,4 +1,4 @@
-import { CardText, CloseSvg, Modal } from "@egovernments/digit-ui-react-components";
+import {CardText, SVG, Modal} from "@egovernments/digit-ui-components";
import React from "react";
import { useTranslation } from "react-i18next";
@@ -15,11 +15,10 @@ const CloseBtn = (props) => {
return (
- handleChangeLanguage(language)}
- >
+
))}
{props?.isMobileView ? (
-
@@ -69,7 +68,7 @@ const LogoutDialog = ({ onSelect, onCancel, onDismiss }) => {
position: "absolute",
left: 0,
bottom: 0,
- padding: "18px",
+ padding: "5px",
}}
style={{
flex: 1,
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Header.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Header.js
index a07bdb9d04c..541e9f68f93 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Header.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Header.js
@@ -1,6 +1,6 @@
+import { Loader } from "@egovernments/digit-ui-components";
import React from "react";
import { useTranslation } from "react-i18next";
-import { Loader } from "@egovernments/digit-ui-react-components"
const Header = () => {
const { data: storeData, isLoading } = Digit.Hooks.useStore.getInitData();
@@ -12,7 +12,7 @@ const Header = () => {
return (
- {" "}
-
)}
{t(`TENANT_TENANTS_${stateInfo?.code.toUpperCase()}`)}
+{t(`TENANT_TENANTS_${stateInfo?.code?.toUpperCase()}`)}
- {location.pathname.includes("sanitation-ui/citizen/all-services") ? null :
{moduleArray
.filter((mod) => mod)
.map(({ code }, index) => {
let mdmsDataObj;
- if (fetchedCitizen) mdmsDataObj = fetchedCitizen ? processLinkData(getCitizenMenu, code, t) : undefined;
+ if (fetchedCitizen)
+ mdmsDataObj = fetchedCitizen
+ ? processLinkData(getCitizenMenu, code, t)
+ : undefined;
if (mdmsDataObj?.links?.length > 0) {
return (
ele?.link)?.sort((x, y) => x?.orderNumber - y?.orderNumber)}
+ links={mdmsDataObj?.links
+ ?.filter((ele) => ele?.link)
+ ?.sort((x, y) => x?.orderNumber - y?.orderNumber)}
Icon={() => iconSelector(code)}
Info={
code === "OBPS"
@@ -110,7 +120,9 @@ const CitizenHome = ({ modules, getCitizenMenu, fetchedCitizen, isLoading }) =>
{modules.map(({ code }, index) => {
- const Card = Digit.ComponentRegistryService.getComponent(`${code}Card`) || (() =>
@@ -141,7 +155,10 @@ const EmployeeHome = ({ modules, additionalComponent }) => {
{additionalComponent &&
additionalComponent?.length > 0 &&
additionalComponent.map((i) => {
- const Component = typeof i === "string" ? Digit.ComponentRegistryService.getComponent(i) : null;
+ const Component =
+ typeof i === "string"
+ ? Digit.ComponentRegistryService.getComponent(i)
+ : null;
return Component ? (
+
{t("PRIVACY_AUDIT_REPORT")}:
{t(`ES_COMMON_CLEAR_ALL`)}
@@ -106,8 +160,18 @@ const MobileSearchApplication = ({ Controller, register, control, t, reset, prev } }; const CurrentMobileModalComponent = useCallback( - ({ currentlyActiveMobileModal, searchFormFieldsComponentProps, tenantId, ...props }) => - MobileComponentDirectory({ currentlyActiveMobileModal, searchFormFieldsComponentProps, tenantId, ...props }), + ({ + currentlyActiveMobileModal, + searchFormFieldsComponentProps, + tenantId, + ...props + }) => + MobileComponentDirectory({ + currentlyActiveMobileModal, + searchFormFieldsComponentProps, + tenantId, + ...props, + }), [currentlyActiveMobileModal] ); let roles = []; @@ -136,14 +200,25 @@ const MobileSearchApplication = ({ Controller, register, control, t, reset, prev return (
- handleExcelDownload(tabledata)} />
+ {t("PRIVACY_AUDIT_REPORT")}:
-
-
+
-
+ handleExcelDownload(tabledata)}
+ />
+
setActiveMobileModal({ type: "set", payload: "SearchFormComponent" })}
+ handleActionClick={() =>
+ setActiveMobileModal({
+ type: "set",
+ payload: "SearchFormComponent",
+ })
+ }
{...{ tenantId, t }}
/>
@@ -157,7 +232,12 @@ const MobileSearchApplication = ({ Controller, register, control, t, reset, prev
handleSubmit={handleSubmit}
id="search-form"
className="rm-mb form-field-flex-one inboxPopupMobileWrapper"
- {...{ searchFormFieldsComponentProps, currentlyActiveMobileModal, closeMobilePopupModal, tenantId }}
+ {...{
+ searchFormFieldsComponentProps,
+ currentlyActiveMobileModal,
+ closeMobilePopupModal,
+ tenantId,
+ }}
/>
) : null}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Search/SearchFields.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Search/SearchFields.js
index c3a37bd296e..6c31b13da0d 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Search/SearchFields.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Search/SearchFields.js
@@ -1,6 +1,4 @@
-import {
- DatePicker, SearchField, SubmitBar
-} from "@egovernments/digit-ui-react-components";
+import { DatePicker, SearchField, Button } from "@egovernments/digit-ui-components";
import React from "react";
import { Controller } from "react-hook-form";
const SearchFields = ({ register, control, reset, tenantId, t, previousPage, formState, isLoading }) => {
@@ -17,7 +15,7 @@ const SearchFields = ({ register, control, reset, tenantId, t, previousPage, for
- {
- const initialValues = Digit.SessionStorage.get("AUDIT_APPLICATION_DETAIL") || {
+ const initialValues = Digit.SessionStorage.get(
+ "AUDIT_APPLICATION_DETAIL"
+ ) || {
offset: 0,
limit: 5,
sortOrder: "DESC",
};
- const { register, control, handleSubmit, setValue, getValues, reset } = useForm({
+ const {
+ register,
+ control,
+ handleSubmit,
+ setValue,
+ getValues,
+ reset,
+ } = useForm({
defaultValues: initialValues,
});
const convertEpochToDate = (dateEpoch) => {
@@ -61,11 +79,18 @@ const SearchApplication = ({ tenantId, t, onSubmit, data, count }) => {
settabledata([
data?.map((obj) => {
let returnObject = {};
- returnObject[t("AUDIT_DATE_LABEL")] = convertEpochToDate(obj?.timestamp);
- returnObject[t("AUDIT_TIME_LABEL")] = convertEpochToTimeInHours(obj?.timestamp);
- returnObject[t("AUDIT_DATAVIEWED_LABEL")] = obj?.dataView[0] + "," + obj?.dataView[1];
+ returnObject[t("AUDIT_DATE_LABEL")] = convertEpochToDate(
+ obj?.timestamp
+ );
+ returnObject[t("AUDIT_TIME_LABEL")] = convertEpochToTimeInHours(
+ obj?.timestamp
+ );
+ returnObject[t("AUDIT_DATAVIEWED_LABEL")] =
+ obj?.dataView[0] + "," + obj?.dataView[1];
returnObject[t("AUDIT_DATAVIEWED_BY_LABEL")] = obj?.dataViewedBy;
- returnObject[t("AUDIT_ROLE_LABEL")] = obj?.roles.map((obj) => obj.name).join(",");
+ returnObject[t("AUDIT_ROLE_LABEL")] = obj?.roles
+ .map((obj) => obj.name)
+ .join(",");
return {
...returnObject,
};
@@ -95,7 +120,22 @@ const SearchApplication = ({ tenantId, t, onSubmit, data, count }) => {
const isMobile = window.Digit.Utils.browser.isMobile();
if (isMobile) {
- return {t("PRIVACY_AUDIT_REPORT")} {" "}
-
+
{data?.display ? (
-
+
{t(data.display)
.split("\\n")
.map((text, index) => (
@@ -168,9 +239,21 @@ const SearchApplication = ({ tenantId, t, onSubmit, data, count }) => {
))}
) : data !== "" ? (
-
-
- handleExcelDownload(tabledata)} />
+
+ {
getCellProps={(cellInfo) => {
return {
style: {
- minWidth: cellInfo.column.Header === t("ES_INBOX_APPLICATION_NO") ? "240px" : "",
+ minWidth:
+ cellInfo.column.Header === t("ES_INBOX_APPLICATION_NO")
+ ? "240px"
+ : "",
padding: "20px 18px",
fontSize: "16px",
},
@@ -194,7 +280,12 @@ const SearchApplication = ({ tenantId, t, onSubmit, data, count }) => {
pageSizeLimit={getValues("limit")}
onSort={onSort}
disableSort={false}
- sortParams={[{ id: getValues("sortBy"), desc: getValues("sortOrder") === "DESC" ? true : false }]}
+ sortParams={[
+ {
+ id: getValues("sortBy"),
+ desc: getValues("sortOrder") === "DESC" ? true : false,
+ },
+ ]}
/>
) : (
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSideBar.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSideBar.js
index a8139463aec..f5e4e4bbfb8 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSideBar.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSideBar.js
@@ -1,6 +1,5 @@
-import {
- Loader, NavBar
-} from "@egovernments/digit-ui-react-components";
+import { NavBar } from "@egovernments/digit-ui-react-components";
+import { Loader } from "@egovernments/digit-ui-components";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { useHistory } from "react-router-dom";
@@ -9,14 +8,17 @@ import ChangeCity from "../../ChangeCity";
import { defaultImage } from "../../utils";
import StaticCitizenSideBar from "./StaticCitizenSideBar";
-
const Profile = ({ info, stateName, t }) => {
const [profilePic, setProfilePic] = React.useState(null);
React.useEffect(async () => {
const tenant = Digit.ULBService.getCurrentTenantId();
const uuid = info?.uuid;
if (uuid) {
- const usersResponse = await Digit.UserService.userSearch(tenant, { uuid: [uuid] }, {});
+ const usersResponse = await Digit.UserService.userSearch(
+ tenant,
+ { uuid: [uuid] },
+ {}
+ );
if (usersResponse && usersResponse.user && usersResponse.user.length) {
const userDetails = usersResponse.user[0];
@@ -26,7 +28,9 @@ const Profile = ({ info, stateName, t }) => {
}
}, [profilePic !== null]);
- const CustomEmployeeTopBar = Digit.ComponentRegistryService?.getComponent("CustomEmployeeTopBar")
+ const CustomEmployeeTopBar = Digit.ComponentRegistryService?.getComponent(
+ "CustomEmployeeTopBar"
+ );
return (
+ handleExcelDownload(tabledata)}
+ />