- ?\\\\~`!@$%^()+={}\[\]*:;“”‘’]{1,50}$/i, minLength: 2}) : register({required : false})}/>
- {renderErrorIfAny(row, "projectName")}
-
-
-
-
- (
- getDropDownDataFromMDMS(t, row, "typeOfProject" , props, register, "name", {
- mdmsConfig: {
- masterName: "ProjectType",
- moduleName: "works",
- localePrefix: "COMMON_MASTERS",
- }})
- )}
- />
- {renderErrorIfAny(row, "typeOfProject", true)}
-
-
- (
- getDropDownDataFromMDMS(t, row, "subTypeOfProject", props, register, "name", subProjectSubTypeOfWorkOptions)
- )}
- />
- {renderErrorIfAny(row, "subTypeOfProject", true)}
-
-
- (
- getDropDownDataFromMDMS(t, row, "natureOfWork", props, register, "name", {
- mdmsConfig: {
- masterName: "NatureOfWork",
- moduleName: "works",
- localePrefix: "COMMON_MASTERS",
- }})
- )}
- />
- {renderErrorIfAny(row, "natureOfWork", true)}
-
-
-
-
-
-
- (
- getDropDownDataFromMDMS(t, row, "recommendedModeOfEntrustment", props, register, "name", {
- mdmsConfig: {
- masterName: "EntrustmentMode",
- moduleName: "works",
- localePrefix: "COMMON_MASTERS",
- }})
- )}
- />
- {renderErrorIfAny(row, "recommendedModeOfEntrustment", true)}
-
-
- (
- getDropDownDataFromMDMS(t, row, "ward", props, register, "i18nKey", wardsAndLocalities?.wards)
- )}
- />
- {renderErrorIfAny(row, "ward", true)}
-
-
- (
- getDropDownDataFromMDMS(t, row, "locality", props, register, "i18nKey", subProjectDetailsLocalities)
- )}
- />
- {renderErrorIfAny(row, "locality", true)}
-
-
- (
- getDropDownDataFromMDMS(t, row, "ulb", props, register, "i18nKey", getCities())
- )}
- />
- {renderErrorIfAny(row, "ulb", true)}
-
-
-
-
- {
- function getFileStoreData(filesData) {
- const numberOfFiles = filesData.length;
- let finalDocumentData = [];
- if (numberOfFiles > 0) {
- filesData.forEach((value) => {
- finalDocumentData.push({
- fileName: value?.[0],
- fileStoreId: value?.[1]?.fileStoreId?.fileStoreId,
- documentType: value?.[1]?.file?.type,
- });
- });
- }
- //here we need to update the form the same way as the state of the reducer in multiupload, since Upload component within the multiupload wrapper uses that same format of state so we need to set the form data as well in the same way. Previously we were altering it and updating the formData
- onChange(numberOfFiles>0?filesData:[]);
- }
- return (
-
-
+ ?\\\\~`!@$%^()+={}\[\]*:;“”‘’]{1,50}$/i,
+ minLength: 2,
+ })
+ : register({ required: false })
+ }
+ />
+ {renderErrorIfAny(row, "projectName")}
+
+
+
+
+
+ getDropDownDataFromMDMS(
+ t,
+ row,
+ "typeOfProject",
+ props,
+ register,
+ "name",
+ {
+ mdmsConfig: {
+ masterName: "ProjectType",
+ moduleName: "works",
+ localePrefix: "COMMON_MASTERS",
+ },
+ }
+ )
+ }
+ />
+ {renderErrorIfAny(row, "typeOfProject", true)}
+
+
+
+ getDropDownDataFromMDMS(
+ t,
+ row,
+ "subTypeOfProject",
+ props,
+ register,
+ "name",
+ subProjectSubTypeOfWorkOptions
+ )
+ }
+ />
+ {renderErrorIfAny(row, "subTypeOfProject", true)}
+
+
+
+ getDropDownDataFromMDMS(
+ t,
+ row,
+ "natureOfWork",
+ props,
+ register,
+ "name",
+ {
+ mdmsConfig: {
+ masterName: "NatureOfWork",
+ moduleName: "works",
+ localePrefix: "COMMON_MASTERS",
+ },
+ }
+ )
+ }
+ />
+ {renderErrorIfAny(row, "natureOfWork", true)}
+
+
+
+
+
+
+
+ getDropDownDataFromMDMS(
+ t,
+ row,
+ "recommendedModeOfEntrustment",
+ props,
+ register,
+ "name",
+ {
+ mdmsConfig: {
+ masterName: "EntrustmentMode",
+ moduleName: "works",
+ localePrefix: "COMMON_MASTERS",
+ },
+ }
+ )
+ }
+ />
+ {renderErrorIfAny(row, "recommendedModeOfEntrustment", true)}
+
+
+
+ getDropDownDataFromMDMS(
+ t,
+ row,
+ "ward",
+ props,
+ register,
+ "i18nKey",
+ wardsAndLocalities?.wards
+ )
+ }
+ />
+ {renderErrorIfAny(row, "ward", true)}
+
+
+
+ getDropDownDataFromMDMS(
+ t,
+ row,
+ "locality",
+ props,
+ register,
+ "i18nKey",
+ subProjectDetailsLocalities
+ )
+ }
+ />
+ {renderErrorIfAny(row, "locality", true)}
+
+
+
+ getDropDownDataFromMDMS(
+ t,
+ row,
+ "ulb",
+ props,
+ register,
+ "i18nKey",
+ getCities()
+ )
+ }
+ />
+ {renderErrorIfAny(row, "ulb", true)}
+
+
+
+
+ {
+ function getFileStoreData(filesData) {
+ const numberOfFiles = filesData.length;
+ let finalDocumentData = [];
+ if (numberOfFiles > 0) {
+ filesData.forEach((value) => {
+ finalDocumentData.push({
+ fileName: value?.[0],
+ fileStoreId: value?.[1]?.fileStoreId?.fileStoreId,
+ documentType: value?.[1]?.file?.type,
+ });
+ });
+ }
+ //here we need to update the form the same way as the state of the reducer in multiupload, since Upload component within the multiupload wrapper uses that same format of state so we need to set the form data as well in the same way. Previously we were altering it and updating the formData
+ onChange(numberOfFiles > 0 ? filesData : []);
+ }
+ return (
+
+
-
-
-
-
- )
-}
-export default SubProjectDetailsTable;
\ No newline at end of file
+ return (
+ | - | - | - |
+
+
+
+
+ );
+};
+export default SubProjectDetailsTable;
diff --git a/react/modules/Project/src/configs/createProjectConfigMUKTA.js b/react/modules/Project/src/configs/createProjectConfigMUKTA.js
index ffc1f649713..343449148fd 100644
--- a/react/modules/Project/src/configs/createProjectConfigMUKTA.js
+++ b/react/modules/Project/src/configs/createProjectConfigMUKTA.js
@@ -38,9 +38,6 @@ export const createProjectConfigMUKTA = {
"key": "basicDetails_dateOfProposal",
"type": "date",
"disable": false,
- "preProcess" : {
- "updateDependent" : ["populators.validation.max"]
- },
"populators": {
"name": "basicDetails_dateOfProposal",
"validation":{
diff --git a/react/modules/Project/src/pageComponents/ViewFinancialDetails.js b/react/modules/Project/src/pageComponents/ViewFinancialDetails.js
index 090b8d7c8d4..eb5838830f9 100644
--- a/react/modules/Project/src/pageComponents/ViewFinancialDetails.js
+++ b/react/modules/Project/src/pageComponents/ViewFinancialDetails.js
@@ -1,4 +1,4 @@
-import { Loader, Card } from '@egovernments/digit-ui-react-components';
+import { Loader, Card } from '@egovernments/digit-ui-components-core';
import React, { Fragment, useState, useEffect } from 'react'
import { useTranslation } from 'react-i18next';
import ApplicationDetails from '../../../templates/ApplicationDetails';
diff --git a/react/modules/Project/src/pageComponents/ViewProject.js b/react/modules/Project/src/pageComponents/ViewProject.js
index ed0203b3d9d..a8f8a36912c 100644
--- a/react/modules/Project/src/pageComponents/ViewProject.js
+++ b/react/modules/Project/src/pageComponents/ViewProject.js
@@ -1,4 +1,4 @@
-import { Loader, Card, Toast } from "@egovernments/digit-ui-react-components";
+import { Loader, Card,Toast } from "@egovernments/digit-ui-components-core";
import React, { Fragment, useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import ApplicationDetails from "../../../templates/ApplicationDetails";
diff --git a/react/modules/Project/src/pages/employee/CreateProject/CreateProjectForm.js b/react/modules/Project/src/pages/employee/CreateProject/CreateProjectForm.js
index 3ae42bd6747..b1e795c78e1 100644
--- a/react/modules/Project/src/pages/employee/CreateProject/CreateProjectForm.js
+++ b/react/modules/Project/src/pages/employee/CreateProject/CreateProjectForm.js
@@ -1,5 +1,5 @@
-import { FormComposer, Header, Toast } from "@egovernments/digit-ui-react-components";
-import { FormComposerV2 } from "@egovernments/digit-ui-components-core";
+import { FormComposerV2} from "@egovernments/digit-ui-components-core";
+import { Header } from "@egovernments/digit-ui-react-components";
import React, { Fragment, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import _ from "lodash";
diff --git a/react/modules/Project/src/pages/employee/CreateProject/CreateProjectResponse.js b/react/modules/Project/src/pages/employee/CreateProject/CreateProjectResponse.js
index 3c057074066..2bf138496c8 100644
--- a/react/modules/Project/src/pages/employee/CreateProject/CreateProjectResponse.js
+++ b/react/modules/Project/src/pages/employee/CreateProject/CreateProjectResponse.js
@@ -1,63 +1,94 @@
import React, { useEffect, useState } from "react";
import { Link, useHistory, useLocation } from "react-router-dom";
import { useTranslation } from "react-i18next";
-import { Banner, Card, LinkLabel, AddFileFilled, ArrowLeftWhite, ActionBar, SubmitBar} from "@egovernments/digit-ui-react-components";
+import { Banner } from "@egovernments/digit-ui-react-components";
+import {
+ LinkLabel,
+ Card,
+ SubmitBar,
+ ActionBar,
+ ArrowLeftWhite,
+ AddFileFilled,
+} from "@egovernments/digit-ui-components-core";
const CreateProjectResponse = () => {
- const {t} = useTranslation();
- const history = useHistory();
- const queryStrings = Digit.Hooks.useQueryParams();
- const [ projectIDsList, setProjectIDsList ] = useState(queryStrings?.projectIDs.split(','));
- const loggedInUserRoles = Digit.Utils.getLoggedInUserDetails("roles");
- const [isEstimateCreator, setIsEstimateCreator] = useState(false);
- const [ isResponseSuccess, setIsResponseSuccess ] = useState(queryStrings?.isSuccess === "true" ? true : queryStrings?.isSuccess === "false" ? false : true);
- const {state} = useLocation();
+ const { t } = useTranslation();
+ const history = useHistory();
+ const queryStrings = Digit.Hooks.useQueryParams();
+ const [projectIDsList, setProjectIDsList] = useState(
+ queryStrings?.projectIDs.split(",")
+ );
+ const loggedInUserRoles = Digit.Utils.getLoggedInUserDetails("roles");
+ const [isEstimateCreator, setIsEstimateCreator] = useState(false);
+ const [isResponseSuccess, setIsResponseSuccess] = useState(
+ queryStrings?.isSuccess === "true"
+ ? true
+ : queryStrings?.isSuccess === "false"
+ ? false
+ : true
+ );
+ const { state } = useLocation();
- useEffect(()=>{
- setIsEstimateCreator(loggedInUserRoles?.includes("ESTIMATE_CREATOR"));
- },[]);
+ useEffect(() => {
+ setIsEstimateCreator(loggedInUserRoles?.includes("ESTIMATE_CREATOR"));
+ }, []);
- const navigate = (page) =>{
- switch(page){
- case "search-project" : {
- history.push(`/${window.contextPath}/employee/project/search-project`);
- break;
- }
- case "create-estimate" : {
- history.push(`/${window.contextPath}/employee/estimate/create-detailed-estimate?tenantId=${queryStrings?.tenantId}&projectNumber=${projectIDsList?.[0]}`);
- break;
- }
- case "home-screen" : {
- history.push(`/${window.contextPath}/employee`);
- break;
- }
- }
+ const navigate = (page) => {
+ switch (page) {
+ case "search-project": {
+ history.push(`/${window.contextPath}/employee/project/search-project`);
+ break;
+ }
+ case "create-estimate": {
+ history.push(
+ `/${window.contextPath}/employee/estimate/create-detailed-estimate?tenantId=${queryStrings?.tenantId}&projectNumber=${projectIDsList?.[0]}`
+ );
+ break;
+ }
+ case "home-screen": {
+ history.push(`/${window.contextPath}/employee`);
+ break;
+ }
}
+ };
- return (
- | + |
+
+ |
+ + | + |
- navigate('search-project')}>
-
- {isResponseSuccess && isEstimateCreator && navigate('create-estimate')}>
- }
-
-
+ navigate("search-project")}
+ >
+
+ {isResponseSuccess && isEstimateCreator && (
+ navigate("create-estimate")}
+ >
+
+ )}
+
+
- setShowActions(!showActions)}
+ />
+
+ )}
+ {toast?.show && (
+
+ );
+};
+
+export default ProjectDetails;
diff --git a/react/modules/Project/src/pages/employee/ProjectSearch/index.js b/react/modules/Project/src/pages/employee/ProjectSearch/index.js
index 0587b407884..37b9075c59a 100644
--- a/react/modules/Project/src/pages/employee/ProjectSearch/index.js
+++ b/react/modules/Project/src/pages/employee/ProjectSearch/index.js
@@ -1,6 +1,7 @@
import React, { useEffect, useMemo } from "react";
import { useTranslation } from "react-i18next";
-import { Header, InboxSearchComposer, Loader, Button, AddFilled } from "@egovernments/digit-ui-react-components";
+import {InboxSearchComposer, Loader, Button ,AddFilled} from "@egovernments/digit-ui-components-core";
+import { Header } from "@egovernments/digit-ui-react-components";
import { useHistory, useLocation } from "react-router-dom";
import searchConfigMUKTA from "../../../configs/searchConfigMUKTA";
diff --git a/react/modules/Project/src/pages/employee/ProjectSearchAndInbox/index.js b/react/modules/Project/src/pages/employee/ProjectSearchAndInbox/index.js
index dc109e9bbb3..e9fe187f44f 100644
--- a/react/modules/Project/src/pages/employee/ProjectSearchAndInbox/index.js
+++ b/react/modules/Project/src/pages/employee/ProjectSearchAndInbox/index.js
@@ -1,7 +1,6 @@
import React from "react";
import { useTranslation } from "react-i18next";
import { Header, Loader,InboxSearchComposer} from "@egovernments/digit-ui-components-core";
-// import { InboxSearchComposer } from "@egovernments/digit-ui-react-components";
import inboxConfig from "../../../configs/InboxConfig";
const ProjectSearchAndInboxComponent = () => {
diff --git a/react/modules/Project/src/pages/employee/ProjectWMSSearch/index.js b/react/modules/Project/src/pages/employee/ProjectWMSSearch/index.js
index a09308fc209..7702853584a 100644
--- a/react/modules/Project/src/pages/employee/ProjectWMSSearch/index.js
+++ b/react/modules/Project/src/pages/employee/ProjectWMSSearch/index.js
@@ -1,11 +1,9 @@
import React, { useEffect, useMemo } from "react";
import { useTranslation } from "react-i18next";
-import { Header, Loader } from "@egovernments/digit-ui-react-components";
-import { InboxSearchComposer } from "@egovernments/digit-ui-components-core";
-import {Button} from "@egovernments/digit-ui-components-core";
+import { Button, Loader ,InboxSearchComposer } from "@egovernments/digit-ui-components-core";
+import { Header } from "@egovernments/digit-ui-react-components";
import { useHistory, useLocation } from "react-router-dom";
import searchWMSProjectConfig from "../../../configs/searchWMSProjectConfig";
-// import { InboxSearchComposer } from "@egovernments/digit-ui-react-components";
const ProjectWMSSearch = () => {
const { t } = useTranslation();
diff --git a/react/modules/Project/src/pages/employee/index.js b/react/modules/Project/src/pages/employee/index.js
index 9c084ef9784..175d8f141b3 100644
--- a/react/modules/Project/src/pages/employee/index.js
+++ b/react/modules/Project/src/pages/employee/index.js
@@ -1,7 +1,7 @@
import React, { useEffect } from "react";
import { Switch, useLocation } from "react-router-dom";
import { useTranslation } from "react-i18next";
-import { PrivateRoute, AppContainer, BreadCrumb } from "@egovernments/digit-ui-react-components";
+import { PrivateRoute, AppContainer,BreadCrumb } from "@egovernments/digit-ui-components-core";
import WorkflowCompTest from "./WorkflowCompTest";
// import SampleComp from "./SampleComp";
const ProjectBreadCrumb = ({ location }) => {
diff --git a/react/modules/core/README.md b/react/modules/core/README.md
index 6388cb7f4f1..9e5caf45793 100644
--- a/react/modules/core/README.md
+++ b/react/modules/core/README.md
@@ -1,4 +1,4 @@
-
+
# digit-ui-module-core
@@ -61,10 +61,40 @@ with
.filter((opt) => (opt?.hasOwnProperty("active") ? opt.active : true))
```
+ * Digit.Hooks.Utils.getDefaultLanguage()
+
+```
+from 1.8.0 beta version add the following utility method in micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js
-# Changelog
+const getDefaultLanguage = () => {
+ return `${getLocaleDefault()}_${getLocaleRegion()}`;
+};
+
+and add its related functions
+
+```
+
+
+### Changelog
```bash
+1.8.1-beta.6 Resolved duplicacy issue in the Sidebar
+1.8.1-beta.5 Fixed Sidebar Path issue
+1.8.1-beta.4 Added a null check for homescreen landing issue
+1.8.1-beta.3 User profile back button fixes for mobile view
+1.8.1-beta.2 User profile Save and change password button fixes for mobile view
+1.8.1-beta.1 Republished after merging with Master due to version issues.
+1.8.0-beta.16 fixed the hardcoded logout message
+1.8.0-beta.15 fixed the sidebar sort order issue
+1.8.0-beta.14
+1.8.0-beta.13
+1.8.0-beta.12
+1.8.0-beta.11 republished due to some version issues
+1.8.0-beta.10 Constants updated for mgramsewa
+1.8.0-beta.9 Updated How It works screen to take header from mdms config and show pdf card only when required
+1.8.0-beta.8 redefine addtional component to render only under employee home page
+1.8.0-beta.6 added addtional component render for tqm modules
+1.8.0 workbench v1.0
1.8.0-beta.5 fix for login screen alignments
1.8.0-beta.4 made the default localisation in globalconfig
1.8.0-beta workbench base version beta release
@@ -91,14 +121,21 @@ with
1.5.28 fixed the route issue for profile screen
```
-# Contributors
+### Contributors
[jagankumar-egov] [nipunarora-eGov] [Tulika-eGov] [Ramkrishna-egov] [nabeelmd-eGov] [anil-egov] [vamshikrishnakole-wtt-egov]
-## Published from DIGIT Core
+## Documentation
+
+Documentation Site (https://core.digit.org/guides/developer-guide/ui-developer-guide/digit-ui)
+
+## Maintainer
+
+- [jagankumar-egov](https://www.github.com/jagankumar-egov)
+
-Digit Dev Repo (
- {t("WORKS_PROJECT_DETAILS")}
- HandleDownloadPdf()}
- downloadBtnClassName={"employee-download-btn-className"}
- label={t("CS_COMMON_DOWNLOAD")}
+ } else if (isProjectModifier || isEstimateViewerAndCreator) {
+ //we have given search estimate access to project creator
+ setHideActionBar(false);
+ estimates &&
+ estimates?.length !== 0 &&
+ setUniqueActions({
+ name: "VIEW_ESTIMATE",
+ });
+ }
+ if (isProjectModifier) {
+ setHideActionBar(false);
+ setUniqueActions({
+ name: "MODIFY_PROJECT",
+ });
+ }
+ }
+ }, [estimates, isEstimateSearchError, estimateLoading]);
+
+ //remove Toast after 3s
+ useEffect(() => {
+ if (toast?.show) {
+ setTimeout(() => {
+ handleToastClose();
+ }, 3000);
+ }
+ }, [toast?.show]);
+
+ //update config for Nav once we get the data
+ useEffect(() => {
+ if (data?.projectDetails?.subProjects?.length > 0) {
+ navConfigs[2].active = true;
+ setSubProjects(data?.projectDetails?.subProjects);
+ } else {
+ navConfigs[2].active = false;
+ }
+ let filterdNavConfig = navConfigs.filter(
+ (config) => config.active === true
+ );
+ setNavTypeConfig(filterdNavConfig);
+ }, [data]);
+
+ //remove session form data if user navigates away from the project create screen
+ useEffect(() => {
+ if (
+ !window.location.href.includes("create-project") &&
+ sessionFormData &&
+ Object.keys(sessionFormData) != 0
+ ) {
+ clearSessionFormData();
+ }
+ }, [location]);
+
+ return (
+
-
- {
- !hideActionBar &&
-
- {showActions ?
- : null
- }
- setShowActions(!showActions)}/>
-
- }
- {toast?.show &&
- )
-}
-
-export default ProjectDetails;
\ No newline at end of file
+ ) : null}
+
+
+
+ {!hideActionBar && (
+
+ {showActions ? (
+
-
-
-
-
+
+ {t("WORKS_PROJECT_DETAILS")}
+
+ HandleDownloadPdf()}
+ downloadBtnClassName={"employee-download-btn-className"}
+ label={t("CS_COMMON_DOWNLOAD")}
+ />
+
+
+
- {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"
@@ -98,7 +120,9 @@ const CitizenHome = ({ modules, getCitizenMenu, fetchedCitizen, isLoading }) =>
-
- {modules.map(({ code }, index) => {
- const Card = Digit.ComponentRegistryService.getComponent(`${code}Card`) || (() =>
+
+ {additionalComponent &&
+ additionalComponent?.length > 0 &&
+ additionalComponent.map((i) => {
+ const Component =
+ typeof i === "string"
+ ? Digit.ComponentRegistryService.getComponent(i)
+ : null;
+ return Component ? (
+
+
-
+ {modules.map(({ code }, index) => {
+ const Card =
+ Digit.ComponentRegistryService.getComponent(`${code}Card`) ||
+ (() =>
+
+ ) : null;
+ })}
+
);
};
-export const AppHome = ({ userType, modules, getCitizenMenu, fetchedCitizen, isLoading }) => {
+export const AppHome = ({
+ userType,
+ modules,
+ getCitizenMenu,
+ fetchedCitizen,
+ isLoading,
+ additionalComponent,
+}) => {
if (userType === "citizen") {
- return
+
-
+
-
{t("PRIVACY_AUDIT_REPORT")}:
{t(`ES_COMMON_CLEAR_ALL`)}
@@ -105,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 = []; @@ -135,14 +200,25 @@ const MobileSearchApplication = ({ Controller, register, control, t, reset, prev return (
- handleExcelDownload(tabledata)} />
+ {t("PRIVACY_AUDIT_REPORT")}:
setActiveMobileModal({ type: "set", payload: "SearchFormComponent" })}
+ handleActionClick={() =>
+ setActiveMobileModal({
+ type: "set",
+ payload: "SearchFormComponent",
+ })
+ }
{...{ tenantId, t }}
/>
@@ -156,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/react/modules/core/src/components/Search/SearchFields.js b/react/modules/core/src/components/Search/SearchFields.js
index b35d5b5ae6a..07ca41bacb1 100644
--- a/react/modules/core/src/components/Search/SearchFields.js
+++ b/react/modules/core/src/components/Search/SearchFields.js
@@ -1,7 +1,6 @@
-import { DatePicker, SubmitBar, SearchField, Button } from "@egovernments/digit-ui-components-core";
+import { DatePicker, SearchField, Button } from "@egovernments/digit-ui-components-core";
import React from "react";
import { Controller } from "react-hook-form";
-
const SearchFields = ({ register, control, reset, tenantId, t, previousPage, formState, isLoading }) => {
const isMobile = window.Digit.Utils.browser.isMobile();
diff --git a/react/modules/core/src/components/Search/index.js b/react/modules/core/src/components/Search/index.js
index 1c3a51bfaf7..3776742febd 100644
--- a/react/modules/core/src/components/Search/index.js
+++ b/react/modules/core/src/components/Search/index.js
@@ -1,17 +1,34 @@
+import {
+ DownloadBtnCommon,
+ Table,
+} from "@egovernments/digit-ui-react-components";
+import {
+ BackButton,
+ Loader,
+ SearchForm,
+ Header
+} from "@egovernments/digit-ui-components-core";
import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { BackButton, Loader, Header, SearchForm, SVG } from "@egovernments/digit-ui-components-core";
import { Controller, useForm } from "react-hook-form";
import MobileSearchApplication from "./MobileSearchApplication";
import SearchFields from "./SearchFields";
-import { Table } from "@egovernments/digit-ui-react-components";
const SearchApplication = ({ tenantId, t, onSubmit, data, count }) => {
- 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) => {
@@ -43,7 +60,7 @@ const SearchApplication = ({ tenantId, t, onSubmit, data, count }) => {
const DownloadBtn = (props) => {
return (
{t("PRIVACY_AUDIT_REPORT")} {" "}
-
+ handleExcelDownload(tabledata)}
+ />
-
);
};
@@ -62,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,
};
@@ -96,7 +120,22 @@ const SearchApplication = ({ tenantId, t, onSubmit, data, count }) => {
const isMobile = window.Digit.Utils.browser.isMobile();
if (isMobile) {
- return
+
{data?.display ? (
-
+
{t(data.display)
.split("\\n")
.map((text, index) => (
@@ -169,9 +239,21 @@ const SearchApplication = ({ tenantId, t, onSubmit, data, count }) => {
))}
) : data !== "" ? (
-
-
- handleExcelDownload(tabledata)} />
+
+
+ handleExcelDownload(tabledata)}
+ />