Merge pull request #1021 from upyog/digit2.9-merge

Digit2.9 merge

.github/workflows/publishAllPackages.yml

@@ -2,7 +2,7 @@ name: Node.js Publish UI Packages
 
 on:
   push:
-    branches: [ 'digit2.9' ]
+    branches: [ 'digit2.9-merge' ]
     paths:
       - 'frontend/micro-ui/web/micro-ui-internals/**'
 

frontend/micro-ui/web/docker/Dockerfile

@@ -6,17 +6,17 @@ RUN yarn add @egovernments/digit-ui-libraries
 RUN yarn add @upyog/digit-ui-module-pt
 RUN yarn add @upyog/digit-ui-module-fsm
 RUN yarn add @upyog/digit-ui-module-tl
-RUN yarn add @egovernments/digit-ui-module-dss
-RUN yarn add @egovernments/digit-ui-module-mcollect
-RUN yarn add @egovernments/digit-ui-module-pgr
-RUN yarn add @egovernments/digit-ui-module-noc
-RUN yarn add @egovernments/digit-ui-module-engagement
-RUN yarn add @egovernments/digit-ui-module-hrms
+RUN yarn add @upyog/digit-ui-module-dss
+RUN yarn add @upyog/digit-ui-module-mcollect
+RUN yarn add @upyog/digit-ui-module-pgr
+RUN yarn add @upyog/digit-ui-module-noc
+RUN yarn add @upyog/digit-ui-module-engagement
+RUN yarn add @upyog/digit-ui-module-hrms
 RUN yarn add @egovernments/digit-ui-module-core
 RUN yarn add @upyog/digit-ui-module-obps
 RUN yarn add @egovernments/digit-ui-module-common
 RUN yarn add @upyog/digit-ui-module-ws
-RUN yarn add @egovernments/digit-ui-module-commonpt
+RUN yarn add @upyog/digit-ui-module-commonpt
 ARG WORK_DIR
 WORKDIR /app
 ENV NODE_OPTIONS "--max-old-space-size=4096"

frontend/micro-ui/web/micro-ui-internals/.prettierrc.json

@@ -1,3 +1,4 @@
 {
+
   "printWidth": 150
 }

frontend/micro-ui/web/micro-ui-internals/example/package.json

@@ -11,22 +11,18 @@
   "devDependencies": {
     "@egovernments/digit-ui-module-bills": "1.7.2",
     "@egovernments/digit-ui-module-common": "1.7.2",
-    "@egovernments/digit-ui-module-core": "1.7.2",
-    "@egovernments/digit-ui-module-engagement": "1.7.0-beta.2",
-    "@egovernments/digit-ui-module-dss": "1.7.2",
-    "@egovernments/digit-ui-module-hrms": "1.7.2",
-    "@egovernments/digit-ui-module-commonpt":"1.7.2",
-    "@egovernments/digit-ui-react-components": "1.7.2",
-    "@egovernments/digit-ui-libraries": "1.7.2",
-    "@upyog/digit-ui-module-fsm": "1.7.2",
-    "@egovernments/digit-ui-module-mcollect": "1.7.2",
-    "@egovernments/digit-ui-module-noc": "1.7.2",
+    "@upyog/digit-ui-module-engagement": "1.7.2",
+    "@upyog/digit-ui-module-fsm": "1.7.3",
+    "@upyog/digit-ui-module-mcollect": "1.7.3",
+    "@upyog/digit-ui-module-noc": "1.7.3",
     "@upyog/digit-ui-module-obps": "1.7.2",
-    "@egovernments/digit-ui-module-pgr": "1.7.2",
-    "@upyog/digit-ui-module-pt": "1.7.2",
-    "@egovernments/digit-ui-module-receipts": "1.7.2",
+    "@upyog/digit-ui-module-pgr": "1.7.5",
+    "@upyog/digit-ui-module-pt": "1.7.4",
+    "@upyog/digit-ui-module-receipts": "1.7.3",
     "@upyog/digit-ui-module-tl": "1.7.2",
-    "@upyog/digit-ui-module-ws": "1.7.2",
+    "@upyog/digit-ui-module-ws": "1.7.3",
+    "@upyog/digit-ui-module-bills": "1.7.2",
+    "@upyog/digit-ui-module-commonpt": "1.7.2",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",

frontend/micro-ui/web/micro-ui-internals/example/src/index.js

@@ -2,31 +2,31 @@ import React from "react";
 import ReactDOM from "react-dom";
 
 import { initLibraries } from "@egovernments/digit-ui-libraries";
-import { PGRReducers } from "@egovernments/digit-ui-module-pgr";
+import { PGRReducers } from "@upyog/digit-ui-module-pgr";
 import { PTModule, PTLinks, PTComponents } from "@upyog/digit-ui-module-pt";
-import { MCollectModule, MCollectLinks } from "@egovernments/digit-ui-module-mcollect";
+import { MCollectModule, MCollectLinks } from "@upyog/digit-ui-module-mcollect";
 // import { TLModule, TLLinks } from "@upyog/digit-ui-module-tl";
 import { initFSMComponents } from "@upyog/digit-ui-module-fsm";
-import { initPGRComponents } from "@egovernments/digit-ui-module-pgr";
-import { initDSSComponents } from "@egovernments/digit-ui-module-dss";
-import { initHRMSComponents } from "@egovernments/digit-ui-module-hrms";
-import { initReceiptsComponents, ReceiptsModule } from "@egovernments/digit-ui-module-receipts";
+import { initPGRComponents } from "@upyog/digit-ui-module-pgr";
+import { initDSSComponents } from "@upyog/digit-ui-module-dss";
+import { initHRMSComponents } from "@upyog/digit-ui-module-hrms";
+import { initReceiptsComponents, ReceiptsModule } from "@upyog/digit-ui-module-receipts";
 // import { initReportsComponents } from "@egovernments/digit-ui-module-reports";
-import { initMCollectComponents } from "@egovernments/digit-ui-module-mcollect";
+import { initMCollectComponents } from "@upyog/digit-ui-module-mcollect";
 import { initTLComponents } from "@upyog/digit-ui-module-tl";
 import { PaymentModule, PaymentLinks, paymentConfigs } from "@egovernments/digit-ui-module-common";
-import { HRMSModule } from "@egovernments/digit-ui-module-hrms";
+import { HRMSModule } from "@upyog/digit-ui-module-hrms";
 import { initOBPSComponents } from "@upyog/digit-ui-module-obps";
-import { initEngagementComponents } from "@egovernments/digit-ui-module-engagement";
-import { initNOCComponents } from "@egovernments/digit-ui-module-noc";
+import { initEngagementComponents } from "@upyog/digit-ui-module-engagement";
+import { initNOCComponents } from "@upyog/digit-ui-module-noc";
 import { initWSComponents } from "@upyog/digit-ui-module-ws";
 import { DigitUI } from "@egovernments/digit-ui-module-core";
-import { initCommonPTComponents } from "@egovernments/digit-ui-module-commonpt";
-import { initBillsComponents, BillsModule } from "@egovernments/digit-ui-module-bills";
+import { initCommonPTComponents } from "@upyog/digit-ui-module-commonpt";
+import { initBillsComponents, BillsModule } from "@upyog/digit-ui-module-bills";
 
 // import {initCustomisationComponents} from "./customisations";
 
-// import { PGRModule, PGRLinks } from "@egovernments/digit-ui-module-pgr";
+// import { PGRModule, PGRLinks } from "@upyog/digit-ui-module-pgr";
 // import { Body, TopBar } from "@egovernments/digit-ui-react-components";
 import "@upyog-niua/upyog-css/example/index.css";
 // import * as comps from "@egovernments/digit-ui-react-components";

frontend/micro-ui/web/micro-ui-internals/package.json

@@ -2,11 +2,12 @@
   "name": "egovernments",
   "version": "1.5.4",
   "main": "index.js",
-  "workspaces": [
+  "workspaces":  [
     "packages/libraries",
     "packages/css",
     "example",
-    "packages/react-components"
+    "packages/react-components",
+    "packages/modules/*"   
   ],
   "license": "MIT",
   "private": true,

frontend/micro-ui/web/micro-ui-internals/packages/css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyog-niua/upyog-css",
-  "version": "1.0.11",
+  "version": "1.8.0",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",
@@ -12,7 +12,7 @@
   },
   "scripts": {
     "start": "gulp build",
-    "build:prod": "NODE_ENV=production gulp build",
+    "build:prod": "gulp build",
     "prepublish": "yarn build:prod",
     "deploy": "gulp && cp -R svg example && cp -R img example && gh-pages -d example"
   },

frontend/micro-ui/web/micro-ui-internals/packages/css/postcss.config.js

@@ -52,4 +52,4 @@ module.exports = {
 //       },
 //     },
 //   };
-// };
+// };

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/fsm/useMDMS.js

@@ -24,6 +24,10 @@ const useMDMS = (tenantId, moduleCode, type, config = {}, payload = []) => {
     return useQuery("FSM_APPLICATION_EDIT_APPLICATION_CHANNEL", () => onlyEmployeeChannels(), queryConfig);
   };
 
+  const useUrcConfig = () => {
+    return useQuery("FSM_APPLICATION_NEW_URC_CONFIG", () => MdmsService.getUrcConfig(tenantId, moduleCode, type), queryConfig);
+  };
+
   const usePropertyType = () => {
     return useQuery("FSM_PROPERTY_TYPE", () => MdmsService.getPropertyType(tenantId, moduleCode, type), queryConfig);
   };
@@ -146,7 +150,9 @@ const useMDMS = (tenantId, moduleCode, type, config = {}, payload = []) => {
     case "ReceivedPaymentType":
       return useReceivedPaymentType();
     case "WSTaxHeadMaster":
-      return useWSTaxHeadMaster()
+      return useWSTaxHeadMaster();
+    case "UrcConfig":
+      return useUrcConfig();
     default:
       return null;
   }

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js

@@ -195,6 +195,12 @@ import useSurveySearch from "./surveys/useSearch";
 import useSurveyShowResults from "./surveys/useShowResults";
 import useSurveySubmitResponse from "./surveys/useSubmitResponse";
 import useSurveyInbox from "./surveys/useSurveyInbox";
+import useServeyCreateDef from "./surveys/useCreateSurvey";
+import useCfdefinitionsearch from "./surveys/useCfdefinitionsearch";
+import useSubmitSurveyResponse from "./surveys/useSubmitSurveyResponse";
+import useSelectedSurveySearch from "./surveys/useSelectedSurveySearch";
+import useCfdefinitionsearchresult from "./surveys/useCfdefinitionsearchresult";
+import useUpdateSurvey from "./surveys/useSurveyUpdate";
 
 import useNOCDetails from "./noc/useNOCDetails";
 import useNOCInbox from "./noc/useInbox";
@@ -440,6 +446,12 @@ const survey = {
   useSubmitResponse: useSurveySubmitResponse,
   useShowResults: useSurveyShowResults,
   useSurveyInbox,
+  useServeyCreateDef:useServeyCreateDef,
+  useCfdefinitionsearch:useCfdefinitionsearch,
+  useSubmitSurveyResponse:useSubmitSurveyResponse,
+  useSelectedSurveySearch:useSelectedSurveySearch,
+  useCfdefinitionsearchresult:useCfdefinitionsearchresult,
+  useUpdateSurvey:useUpdateSurvey,
 };
 
 const noc = {

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/surveys/useCfdefinitionsearch.js

@@ -0,0 +1,8 @@
+import { Surveys } from "../../services/elements/Surveys";
+import { useQuery } from "react-query";
+
+const useCfdefinitionsearch = (filters, config) => {
+  return useQuery([`search_surveys`,filters.Pagination,filters.ServiceDefinitionCriteria], () => Surveys.cfdefinitionsearch(filters), { ...config });
+};
+
+export default useCfdefinitionsearch;

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/surveys/useCfdefinitionsearchresult.js

@@ -0,0 +1,9 @@
+import { Surveys } from "../../services/elements/Surveys";
+import { useQuery } from "react-query";
+
+const useCfdefinitionsearchresult = (filters, config) => {
+    console.log(config,"useCfdefinitionsearchresult")
+  return useQuery(`useCfdefinitionsearchresult_search_surveys_${new Date()}`, () => Surveys.cfdefinitionsearch(filters), { ...config });
+};
+
+export default useCfdefinitionsearchresult;

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/surveys/useCreateSurvey.js

@@ -0,0 +1,10 @@
+import { Surveys } from "../../services/elements/Surveys";
+import { useMutation } from "react-query";
+
+const useCreateSurveysDef = (filters, config) => {
+  console.log("useCreateSurveysDef");
+
+  return useMutation((filters) => Surveys.createSurvey(filters));
+};
+
+export default useCreateSurveysDef;

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/surveys/useSelectedSurveySearch.js

@@ -0,0 +1,9 @@
+import { Surveys } from "../../services/elements/Surveys";
+import { useQuery } from "react-query";
+
+const useSelectedSurveySearch = (filters, config) => {
+    console.log(config,"useSelectedSurveySearch")
+  return useQuery(`search_selected_survey_${new Date()}`, () => Surveys.selectedSurveySearch(filters), { ...config });
+};
+
+export default useSelectedSurveySearch;

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/surveys/useSubmitSurveyResponse.js

@@ -0,0 +1,8 @@
+import { Surveys } from "../../services/elements/Surveys";
+import { useMutation } from "react-query";
+
+const useSubmitSurveyResponse = (filters, config) => {
+    return useMutation((filters) => Surveys.submitSurveyResponse(filters));
+};
+
+export default useSubmitSurveyResponse;

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/surveys/useSurveyUpdate.js

@@ -0,0 +1,9 @@
+import { Surveys } from "../../services/elements/Surveys";
+import { useMutation } from "react-query";
+
+const useUpdateSurvey = (filters, config) => {
+  console.log("updateSurvey")
+  return useMutation((filters) => Surveys.updateSurvey(filters));
+};
+
+export default useUpdateSurvey;

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js

@@ -198,6 +198,11 @@ const Urls = {
       delete: "/egov-survey-services/egov-ss/survey/_delete",
       submitResponse: "/egov-survey-services/egov-ss/survey/response/_submit",
       showResults: "/egov-survey-services/egov-ss/survey/response/_results",
+      createSurvey: "/service-request/service/definition/v1/_create",
+      cfdefinitionsearch: "/service-request/service/definition/v1/_search",
+      submitSurveyResponse: "/service-request/service/v1/_create",
+      selectedSurveySearch: "/service-request/service/v1/_search",
+      updateSurvey:"/service-request/service/definition/v1/_update",
     },
   },
 

frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/MDMS.js

@@ -1004,6 +1004,8 @@ const GetApplicationChannel = (MdmsRes) =>
     i18nKey: `ES_APPLICATION_DETAILS_APPLICATION_CHANNEL_${channel.code}`,
   }));
 
+const getUrcConfig = (MdmsRes) => MdmsRes["FSM"].UrcConfig;
+
 const GetPropertyType = (MdmsRes) =>
   MdmsRes["FSM"].PropertyType.filter((property) => property.active && !property.propertyType).map((item) => ({
     ...item,
@@ -1407,6 +1409,8 @@ const transformResponse = (type, MdmsRes, moduleCode, tenantId) => {
       return GetTripNumber(MdmsRes);
     case "ReceivedPaymentType":
       return GetReceivedPaymentType(MdmsRes);
+    case "UrcConfig":
+      return getUrcConfig(MdmsRes);
     default:
       return MdmsRes;
   }
@@ -1522,6 +1526,9 @@ export const MdmsService = {
   getApplicationChannel: (tenantId, moduleCode) => {
     return MdmsService.getDataByCriteria(tenantId, getApplicationChannelCriteria(tenantId, moduleCode), moduleCode);
   },
+  getUrcConfig: (tenantId, moduleCode, type) => {
+    return MdmsService.getDataByCriteria(tenantId, getUrcConfigCriteria(tenantId, moduleCode, type), moduleCode);
+  },
   getPropertyType: (tenantId, moduleCode, type) => {
     return MdmsService.getDataByCriteria(tenantId, getPropertyTypeCriteria(tenantId, moduleCode, type), moduleCode);
   },