updated core and libraries

Author: Swathi-eGov

react/libraries/README.md

@@ -1,13 +1,38 @@
-# digit-ui-libraries
 
-> Made with @egovernments/create-ui-library
+
+# digit-ui-svg-components
 
 ## Install
 
 ```bash
 npm install --save @egovernments/digit-ui-libraries
 ```
 
+## Limitation
+
+```bash
+This Package is more specific to DIGIT-UI's can be used across mission's
+```
+
+## Usage
+
+After adding the dependency make sure you have this dependency in
+
+```bash
+frontend/micro-ui/web/package.json
+```
+
+```json
+"@egovernments/digit-ui-libraries":"1.8.0",
+```
+
+then navigate to App.js
+
+```bash
+ frontend/micro-ui/web/src/App.js
+```
+
+
 ## Usage
 
 ```jsx
@@ -27,6 +52,23 @@ const App = ({ deltaConfig, stateCode, cityCode, moduleCode }) => {
 export default App;
 ```
 
+### Changelog
+
+```bash
+1.8.1-beta.1 Republished after merging with Master due to version issues.
+1.8.0 Released as part of workbench v1.0
+```
+
+### Published from DIGIT Frontend 
+DIGIT Frontend Repo (https://github.com/egovernments/Digit-Frontend/tree/develop)
+
+### Contributors
+
+[jagankumar-egov] [nipunarora-eGov] [Tulika-eGov] [Ramkrishna-egov] [nabeelmd-eGov] [anil-egov] [vamshikrishnakole-wtt-egov] 
+
 ## License
 
-MIT © [](https://github.com/)
+MIT © [jagankumar-egov](https://github.com/jagankumar-egov)
+
+
+![Logo](https://s3.ap-south-1.amazonaws.com/works-dev-asset/mseva-white-logo.png)

react/libraries/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-libraries",
-  "version": "1.7.10",
+  "version": "1.8.1-beta.1",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
   "source": "src/index.js",

react/libraries/src/index.js

@@ -3,6 +3,7 @@ import Enums from "./enums/index";
 import mergeConfig from "./config/mergeConfig";
 import { useStore } from "./services/index";
 import { initI18n } from "./translations/index";
+import { Request } from "./services/atoms/Utils/Request";
 
 import { Storage, PersistantStorage } from "./services/atoms/Utils/Storage";
 import { UploadServices } from "./services/atoms/UploadServices";
@@ -87,4 +88,4 @@ const initLibraries = () => {
   });
 };
 
-export { initLibraries, Enums, Hooks, subFormRegistry };
+export { initLibraries, Enums, Hooks, subFormRegistry ,Request};

react/libraries/src/services/molecules/Works/Search.js

@@ -1,6 +1,7 @@
 import cloneDeep from "lodash/cloneDeep";
 import _ from "lodash";
 import { WorksService } from "../../elements/Works";
+import HrmsService from "../../elements/HRMS";
 import { convertEpochToDate } from "../../../utils/pt";
 
 const createProjectsArray = (t, project, searchParams, headerLocale) => {
@@ -129,7 +130,6 @@ const createProjectsArray = (t, project, searchParams, headerLocale) => {
     return totalProjects;
 }
 
-
 export const WorksSearch = {
     searchEstimate: async (tenantId="pb.jalandhar", filters = {} ) => {
 
@@ -147,51 +147,45 @@ export const WorksSearch = {
         const response = await WorksService?.loiSearch({tenantId,filters})
         return response?.letterOfIndents
     },
-    viewProjectDetailsScreen: async (
-        t,
-        tenantId,
-        searchParams,
-        filters = { limit: 10, offset: 0, includeAncestors: true, includeDescendants: true },
-        headerLocale
-      ) => {
+    viewProjectDetailsScreen: async(t,tenantId, searchParams, filters = {limit : 10, offset : 0, includeAncestors : true, includeDescendants : true}, headerLocale)=> {
         const response = await WorksService?.searchProject(tenantId, searchParams, filters);
 
-    
+        //Categoring the response into an object of searched project and its sub-projects ( if any )
+        //searched projects will have basic details, project details and financial details
+        //subprojects will be shown in a table similar to what create project has
         let projectDetails = {
-          searchedProject: {
-            basicDetails: {},
-            details: {
-              projectDetails: [],
+            searchedProject : {
+                basicDetails : {},
+                details : {
+                    projectDetails : [],
+                    financialDetails : []
+                }
             },
-          },
-        };
-    
-        if (response?.Project) {
-          let projects = createProjectsArray(t, response?.Project, searchParams, headerLocale);
-    
-          //searched Project details
-          projectDetails.searchedProject["basicDetails"] = projects?.searchedProject?.basicDetails;
-          projectDetails.searchedProject["details"]["projectDetails"] = {
-            applicationDetails: [
-              projects?.searchedProject?.headerDetails,
-              projects?.searchedProject?.projectDetails,
-              projects?.searchedProject?.locationDetails,
-              projects?.searchedProject?.documentDetails,
-            ],
-          }; //rest categories will come here
+            subProjects : []
         }
-    
-        return {
-          projectDetails: response?.Project ? projectDetails : [],
-          response: response?.Project,
-          processInstancesDetails: [],
-          applicationData: {},
-          workflowDetails: [],
-          applicationData: {},
-          isNoDataFound: response?.Project?.length === 0,
-        };
-      },
 
+        //Upon Search, we will get a response of one Project which will be our Searched Projects
+        //That project will have descendants, which will be the part of Sub-Projects.
+
+        let projects = createProjectsArray(t, response?.Projects, searchParams, headerLocale);
+        //searched Project details
+        projectDetails.searchedProject['basicDetails'] = projects?.searchedProject?.basicDetails;
+        projectDetails.searchedProject['details']['projectDetails'] = {applicationDetails : [projects?.searchedProject?.departmentDetails, projects?.searchedProject?.workTypeDetails, projects?.searchedProject?.locationDetails, projects?.searchedProject?.documentDetails]}; //rest categories will come here
+        projectDetails.searchedProject['details']['financialDetails'] = {applicationDetails :  [projects?.searchedProject?.financialDetails]}; //rest categories will come here
+
+        if(response?.Projects?.[0]?.descendants) {
+            projects = createProjectsArray(t, response?.Projects?.[0]?.descendants, searchParams, headerLocale);
+            //all details of searched project will come here
+            projectDetails.subProjects?.push(projects?.subProjects);
+        }
+        return {
+            projectDetails : projectDetails,
+            processInstancesDetails: [],
+            applicationData: {},
+            workflowDetails: [],
+            applicationData:{}
+        }
+    }, 
     viewEstimateScreen: async (t, tenantId, estimateNumber) => {
 
 

react/libraries/src/utils/date.js

@@ -17,4 +17,40 @@ function getDate(timestamp) {
 
 const monthNames = ["Jan", "Feb", "March", "Apr", "May", "June", "July", "Aug", "Sep", "Oct", "Nov", "Dec"];
 
-export { getDate, monthNames };
+/*
+Digit.Utils.date.convertDateToEpoch()
+* @params dateString date as string
+dayStartOrEnd defaults to dayend
+
+  //example input format : "2018-10-02"
+
+*/
+const convertDateToEpoch = (dateString, dayStartOrEnd = "dayend") => {
+  try {
+    const parts = dateString.match(/(\d{4})-(\d{1,2})-(\d{1,2})/);
+    const DateObj = new Date(Date.UTC(parts[1], parts[2] - 1, parts[3]));
+    DateObj.setMinutes(DateObj.getMinutes() + DateObj.getTimezoneOffset());
+    if (dayStartOrEnd === "dayend") {
+      DateObj.setHours(DateObj.getHours() + 24);
+      DateObj.setSeconds(DateObj.getSeconds() - 1);
+    }
+    return DateObj.getTime();
+  } catch (e) {
+    return dateString;
+  }
+};
+
+ const convertEpochToDate = (dateEpoch) => {
+  if (dateEpoch == null || dateEpoch == undefined || dateEpoch == "") {
+      return "NA";
+  }
+  const dateFromApi = new Date(dateEpoch);
+  let month = dateFromApi.getMonth() + 1;
+  let day = dateFromApi.getDate();
+  let year = dateFromApi.getFullYear();
+  month = (month > 9 ? "" : "0") + month;
+  day = (day > 9 ? "" : "0") + day;
+  return `${day}/${month}/${year}`;
+};
+
+export { getDate, monthNames ,convertDateToEpoch , convertEpochToDate };

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":{

react/modules/core/README.md

@@ -1,4 +1,4 @@
-<!-- TODO: update this -->
+
 
 # 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 (<https://github.com/egovernments/Digit-Core/tree/digit-ui-core>)
+### Published from DIGIT Frontend 
+DIGIT Frontend Repo (https://github.com/egovernments/Digit-Frontend/tree/develop)
 
-## License
 
-MIT © [jagankumar-egov](https://github.com/jagankumar-egov)
+![Logo](https://s3.ap-south-1.amazonaws.com/works-dev-asset/mseva-white-logo.png)

react/modules/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-core",
-  "version": "1.7.10",
+  "version": "1.8.1-beta.6",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-components-core": "^0.0.1",
-    "@egovernments/digit-ui-react-components": "1.7.10",
+    "@egovernments/digit-ui-react-components": "1.8.1-beta.4",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-i18next": "11.16.2",

react/modules/core/src/Module.js

@@ -7,7 +7,8 @@ import { Provider } from "react-redux";
 import { BrowserRouter as Router } from "react-router-dom";
 import { DigitApp } from "./App";
 import SelectOtp from "./pages/citizen/Login/SelectOtp";
-
+import ChangeCity from "./components/ChangeCity";
+import ChangeLanguage from "./components/ChangeLanguage";
 import { useState } from "react";
 import ErrorBoundary from "./components/ErrorBoundaries";
 import getStore from "./redux/store";
@@ -110,6 +111,8 @@ export const DigitUI = ({ stateCode, registry, enabledModules, moduleReducers, d
 
 const componentsToRegister = {
   SelectOtp,
+  ChangeCity,
+  ChangeLanguage
 };
 
 export const initCoreComponents = () => {

react/modules/core/src/components/AppModules.js

@@ -9,7 +9,7 @@ const getTenants = (codes, tenants) => {
   return tenants.filter((tenant) => codes?.map?.((item) => item.code).includes(tenant.code));
 };
 
-export const AppModules = ({ stateCode, userType, modules, appTenants }) => {
+export const AppModules = ({ stateCode, userType, modules, appTenants, additionalComponent }) => {
   const ComponentProvider = Digit.Contexts.ComponentProvider;
   const { path } = useRouteMatch();
   const location = useLocation();
@@ -49,7 +49,7 @@ export const AppModules = ({ stateCode, userType, modules, appTenants }) => {
           <ChangePassword />
         </Route>
         <Route>
-          <AppHome userType={userType} modules={modules} />
+          <AppHome userType={userType} modules={modules} additionalComponent={additionalComponent} />
         </Route>
         {/* <Route path={`${path}/user-profile`}> <UserProfile /></Route> */}
       </Switch>