-
+
{
reset({
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/SearchWaterConnection/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/SearchWaterConnection/index.js
index c8ead0f7569..647422e5afe 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/SearchWaterConnection/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/SearchWaterConnection/index.js
@@ -1,5 +1,5 @@
import React, { Fragment, useState,useEffect, useCallback, useMemo } from "react";
-import { SearchForm, Table, Card, Loader, Header,Toast } from "@egovernments/digit-ui-react-components";
+import { SearchForm, Table, Card, Loader, Header,Toast } from "@upyog/digit-ui-react-components";
import { useForm, Controller } from "react-hook-form";
import SearchFields from "./SearchFields";
import { useTranslation } from "react-i18next";
@@ -120,7 +120,7 @@ const SearchWaterConnection = ({ tenantId, onSubmit, data, count, resultOk, busi
Header: t("WS_COMMON_TABLE_COL_OWN_NAME_LABEL"),
disableSortBy: true,
Cell: ({ row }) => {
- return GetCell(row?.original?.connectionHolders?.map((owner) => owner?.name).join(",") ? row?.original?.connectionHolders?.map((owner) => owner?.name).join(",") : `${row.original?.["owner"] || "NA"}`);
+ return GetCell(row?.original?.connectionHolders?.map((owner) => owner?.name).join(",") ? row?.original?.connectionHolders?.map((owner) => owner?.name).join(",") : `${row.original?.["ownerNames"] || "NA"}`);
},
},
{
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/Timeline.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/Timeline.js
index 9820a3ec16a..790d440587e 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/Timeline.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/Timeline.js
@@ -1,6 +1,6 @@
import React from "react";
import { useTranslation } from "react-i18next";
-import { TickMark } from "@egovernments/digit-ui-react-components";
+import { TickMark } from "@upyog/digit-ui-react-components";
let actions = [];
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSCard.js
index 97fc0271b57..4a740b2216a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSCard.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSCard.js
@@ -1,4 +1,4 @@
-import { EmployeeModuleCard, WSICon } from "@egovernments/digit-ui-react-components";
+import { EmployeeModuleCard, WSICon } from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { checkForEmployee } from "../utils";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/FilterFormFieldsComponent.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/FilterFormFieldsComponent.js
index ba358f2c84d..cc28e687dda 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/FilterFormFieldsComponent.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/FilterFormFieldsComponent.js
@@ -1,5 +1,5 @@
import React, { Fragment, useMemo } from "react";
-import { FilterFormField, Loader, RadioButtons, RemoveableTag, CheckBox, MultiSelectDropdown } from "@egovernments/digit-ui-react-components";
+import { FilterFormField, Loader, RadioButtons, RemoveableTag, CheckBox, MultiSelectDropdown } from "@upyog/digit-ui-react-components";
import { Controller, useWatch } from "react-hook-form";
import { useTranslation } from "react-i18next";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/SearchFormFieldsComponent.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/SearchFormFieldsComponent.js
index a6cf1164e98..70931852d7b 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/SearchFormFieldsComponent.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/SearchFormFieldsComponent.js
@@ -1,5 +1,5 @@
import React, { Fragment } from "react";
-import { CardLabelError, SearchField, TextInput, MobileNumber } from "@egovernments/digit-ui-react-components";
+import { CardLabelError, SearchField, TextInput, MobileNumber } from "@upyog/digit-ui-react-components";
import { useTranslation } from "react-i18next";
const SearchFormFieldsComponents = ({ registerRef, searchFormState }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/index.js
index 9da0e3c0546..dcd71f76fa6 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/index.js
@@ -1,5 +1,5 @@
import React, { Fragment, useCallback, useMemo, useReducer, useEffect } from "react";
-import { InboxComposer, ComplaintIcon, Header, DropIcon } from "@egovernments/digit-ui-react-components";
+import { InboxComposer, ComplaintIcon, Header, DropIcon } from "@upyog/digit-ui-react-components";
import { useTranslation } from "react-i18next";
import SearchFormFieldsComponents from "./SearchFormFieldsComponent";
import FilterFormFieldsComponent from "./FilterFormFieldsComponent";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/useInboxMobileCardsData.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/useInboxMobileCardsData.js
index 26980e1f613..d92789316ea 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/useInboxMobileCardsData.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSInbox/useInboxMobileCardsData.js
@@ -1,6 +1,6 @@
import React from "react";
import { useTranslation } from "react-i18next";
-import { SearchField, RadioButtons } from "@egovernments/digit-ui-react-components";
+import { SearchField, RadioButtons } from "@upyog/digit-ui-react-components";
import { Controller, useFormContext } from "react-hook-form";
import { Link } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationCommentsDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationCommentsDetails.js
index 5a94c808b3e..c8e7b047884 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationCommentsDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationCommentsDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, LabelFieldPair, TextInput } from "@egovernments/digit-ui-react-components";
+import { CardLabel, LabelFieldPair, TextInput } from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
const WSActivationCommentsDetails = ({ t, config, userType, formData, onSelect }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationConnectionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationConnectionDetails.js
index 2e7d0ff0755..c4af63cd8b8 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationConnectionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationConnectionDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, Dropdown, LabelFieldPair, Loader, TextInput, CardLabelError } from "@egovernments/digit-ui-react-components";
+import { CardLabel, Dropdown, LabelFieldPair, Loader, TextInput, CardLabelError } from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { stringReplaceAll, getPattern } from "../utils";
import cloneDeep from "lodash/cloneDeep";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationDetails.js
index f69d6a5cfc2..3a221e9e855 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, DatePicker, LabelFieldPair, TextInput } from "@egovernments/digit-ui-react-components";
+import { CardLabel, DatePicker, LabelFieldPair, TextInput } from "@upyog/digit-ui-react-components";
import React from "react";
const WSActivationDetails = ({ t, config, userType, formData, onSelect }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationPageDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationPageDetails.js
index bdfa33b75f9..9fc86efaaaa 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationPageDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationPageDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, LabelFieldPair, TextInput, CardLabelError, DatePicker } from "@egovernments/digit-ui-react-components";
+import { CardLabel, LabelFieldPair, TextInput, CardLabelError, DatePicker } from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { getPattern } from "../utils";
import * as func from "../utils";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationPlumberDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationPlumberDetails.js
index ca403e707e0..d928fcc3199 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationPlumberDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationPlumberDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, Dropdown, LabelFieldPair, TextInput, CardLabelError,WrapUnMaskComponent } from "@egovernments/digit-ui-react-components";
+import { CardLabel, Dropdown, LabelFieldPair, TextInput, CardLabelError,WrapUnMaskComponent } from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import * as func from "../utils";
import { useForm, Controller } from "react-hook-form";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationSupportingDocuments.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationSupportingDocuments.js
index 750ea0ecbfd..0ff123a7294 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationSupportingDocuments.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSActivationSupportingDocuments.js
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
-import { CardLabel, LabelFieldPair, Dropdown, UploadFile, Toast, Loader } from "@egovernments/digit-ui-react-components";
+import { CardLabel, LabelFieldPair, Dropdown, UploadFile, Toast, Loader } from "@upyog/digit-ui-react-components";
import { useLocation } from "react-router-dom";
const WSActivationSupportingDocuments = ({ t, config, userType, formData, onSelect }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSConnectionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSConnectionDetails.js
index 6180ec792f2..e3ed7b93995 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSConnectionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSConnectionDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, Dropdown, LabelFieldPair, Loader, TextInput, CardLabelError, CheckBox } from "@egovernments/digit-ui-react-components";
+import { CardLabel, Dropdown, LabelFieldPair, Loader, TextInput, CardLabelError, CheckBox } from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { getPattern } from "../utils";
import { useForm, Controller } from "react-hook-form";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSConnectionHolder.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSConnectionHolder.js
index 8882ededc89..bbc53afb62c 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSConnectionHolder.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSConnectionHolder.js
@@ -1,4 +1,5 @@
-import { CardLabel, CheckBox, Dropdown, FormStep, Loader, MobileNumber, RadioButtons, TextInput, UploadFile } from "@egovernments/digit-ui-react-components";
+
+import { CardLabel, CheckBox, Dropdown, FormStep, Loader, MobileNumber, RadioButtons, TextInput, UploadFile } from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import Timeline from "../components/Timeline";
import { stringReplaceAll } from "../utils";
@@ -19,7 +20,7 @@ const WSConnectionHolder = ({ t, config, onSelect, userType, formData, ownerInde
const [dropdownValue, setDropdownValue] = useState(formData?.ConnectionHolderDetails?.documentType || "");
const [ownerType, setOwnerType] = useState( formData?.ConnectionHolderDetails?.specialCategoryType || {});
let isMobile = window.Digit.Utils.browser.isMobile();
-
+ const [emailId, setEmail] = useState(formData?.ConnectionHolderDetails?.emailId || formData?.formData?.ConnectionHolderDetails?.emailId || "");
const tenantId = Digit.ULBService.getCurrentTenantId();
const stateId = Digit.ULBService.getStateId();
let dropdownData = [];
@@ -108,10 +109,14 @@ const WSConnectionHolder = ({ t, config, onSelect, userType, formData, ownerInde
function setTypeOfOwner(value) {
setOwnerType(value);
}
+ function setOwnerEmail(e) {
+ setEmail(e.target.value);
+ }
function selectfile(e) {
setFile(e.target.files[0]);
}
-
+
+const reversedOwners= Array.isArray(formData?.cpt?.details?.owners) ? formData?.cpt?.details?.owners.slice().reverse():[];
const goNext = () => {
@@ -120,12 +125,13 @@ const WSConnectionHolder = ({ t, config, onSelect, userType, formData, ownerInde
//need to add property data here from previous screen
let ConnectionDet = {
isOwnerSame:isOwnerSame,
- name: formData?.cpt?.details?.owners?.[0]?.name,
- mobileNumber: formData?.cpt?.details?.owners?.[0]?.mobileNumber,
- gender: formData?.cpt?.details?.owners?.[0]?.gender ? {code:formData?.cpt?.details?.owners?.[0]?.gender, i18nKey:`COMMON_GENDER_${formData?.cpt?.details?.owners?.[0]?.gender}`} : null,
- guardian: formData?.cpt?.details?.owners?.[0]?.fatherOrHusbandName,
- address: formData?.cpt?.details?.owners?.[0]?.permanentAddress,
- relationship:formData?.cpt?.details?.owners?.[0]?.relationship ? {code : formData?.cpt?.details?.owners?.[0]?.relationship, i18nKey:`COMMON_MASTERS_OWNERTYPE_${formData?.cpt?.details?.owners?.[0]?.relationship}`} : null,
+ name: reversedOwners?.[0]?.name,
+ mobileNumber: reversedOwners?.[0]?.mobileNumber,
+ gender: reversedOwners?.[0]?.gender ? {code:reversedOwners?.[0]?.gender, i18nKey:`COMMON_GENDER_${reversedOwners?.[0]?.gender}`} : null,
+ guardian: reversedOwners?.[0]?.fatherOrHusbandName,
+ address: reversedOwners?.[0]?.permanentAddress,
+ emailId: reversedOwners?.[0]?.emailId,
+ relationship:reversedOwners?.[0]?.relationship ? {code : reversedOwners?.[0]?.relationship, i18nKey:`COMMON_MASTERS_OWNERTYPE_${reversedOwners?.[0]?.relationship}`} : null,
specialCategoryType:ownerType,
documentId:documentId,
fileStoreId:uploadedFile,
@@ -135,7 +141,7 @@ const WSConnectionHolder = ({ t, config, onSelect, userType, formData, ownerInde
}
else
{
- let ConnectionDet = { isOwnerSame:isOwnerSame, name: name, mobileNumber: mobileNumber, gender: gender, guardian: guardian, address: address, relationship:relationship,specialCategoryType:ownerType, documentId:documentId, fileStoreId:uploadedFile, documentType:dropdownValue }
+ let ConnectionDet = { isOwnerSame:isOwnerSame, name: name, mobileNumber: mobileNumber, gender: gender, guardian: guardian, address: address, relationship:relationship,specialCategoryType:ownerType, emailId:emailId, documentId:documentId, fileStoreId:uploadedFile, documentType:dropdownValue }
onSelect(config.key, ConnectionDet);
}
};
@@ -261,6 +267,20 @@ const WSConnectionHolder = ({ t, config, onSelect, userType, formData, ownerInde
optionKey="i18nKey"
t={t}
/>
+ {`${t("WS_EMAIL_ID")}`}
+
{/* {ownerType && Object.entries(ownerType).length>0 && ownerType?.code !== "NONE" &&
{`${t("WS_DOCUMENT_ID_LABEL")}`}
({
documentId: "",
documentType: "",
file: "",
+ emailId:""
});
const WSConnectionHolderDetails = ({ config, onSelect, userType, formData, setError, formState, clearErrors }) => {
@@ -221,7 +222,8 @@ const ConnectionDetails = (_props) => {
const [ownerType, setOwnerType] = useState(connectionHolderDetail?.ownerType);
const [sameAsOwnerDetails, setSameAsOwnerDetails] = useState(connectionHolderDetail?.sameAsOwnerDetails);
const [uuid, setuuid] = useState(connectionHolderDetail?.uuid);
- const formValue = { name, gender, mobileNumber, guardian, relationship, ownerType, sameAsOwnerDetails, address, uuid };
+ const [emailId, setEmailId] = useState(connectionHolderDetail?.emailId);
+ const formValue = { name, gender, mobileNumber, guardian, relationship, ownerType, sameAsOwnerDetails, address, uuid, emailId };
const { errors } = localFormState;
const isMobile = window.Digit.Utils.browser.isMobile();
const isEmployee = window.location.href.includes("/employee")
@@ -821,6 +823,72 @@ const ConnectionDetails = (_props) => {
{localFormState.touched.ownerType ? errors?.ownerType?.message : ""}
+
+ {`${t("WS_EMAIL_ID")}`}
+
+
((e && getPattern("Email").test(e)) || !e ? true : t("ERR_DEFAULT_INPUT_FIELD_MSG")),
+ }}
+ isMandatory={false}
+ render={(props) => (
+
+
{
+ setEmailId(e.target.value);
+ props.onChange(e.target.value);
+ setFocusIndex({ index: connectionHolderDetail?.key, type: "emailId" });
+ }}
+ labelStyle={{ marginTop: "unset" }}
+ onBlur={props.onBlur}
+ style={
+ checkifPrivacyValid() && !getValues("emailId")?.includes("*")
+ ? !Digit.Utils.checkPrivacy(privacyData, { uuid: connectionHolderDetail?.uuid, fieldName: "name", model: "User" }) &&
+ !Digit.Utils.checkPrivacy(privacyData, { uuid: connectionHolderDetail?.uuid, fieldName: "mobileNumber", model: "User" })
+ ? ((isMobile && isEmployee) ? {} :{ width: "96%" })
+ : ((isMobile && isEmployee) ? {} :{ width: "96%" })
+ : {}
+ }
+ />
+ {checkifPrivacyValid() && (
+
+ {
+ setEmailId(e);
+ props.onChange(e);
+ }}
+ iseyevisible={getValues("emailId")?.includes("*") ? true : false}
+ privacy={{
+ uuid: connectionHolderDetail?.uuid,
+ fieldName: "emailId",
+ model: "WnSConnectionOwner",
+ loadData: {
+ serviceName: formData?.ConnectionDetails?.[0]?.water ? "/ws-services/wc/_search" : "/sw-services/swc/_search",
+ requestBody: {},
+ requestParam: {
+ tenantId: formData?.cpt?.details?.tenantId,
+ applicationNumber: formData?.ConnectionDetails?.[0]?.applicationNo,
+ },
+ jsonPath: formData?.ConnectionDetails?.[0]?.water
+ ? "WaterConnection[0].connectionHolders[0].emailId"
+ : "SewerageConnections[0].connectionHolders[0].emailId",
+ isArray: false,
+ },
+ }}
+ >
+
+ )}
+
+ )}
+ />
+
+
) : null}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectAcknowledgement.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectAcknowledgement.js
index 1bc03e306c5..4d16c7fcb49 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectAcknowledgement.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectAcknowledgement.js
@@ -1,5 +1,5 @@
import React, { useEffect } from "react";
-import { Banner, Card, CardSectionHeader, CardText, LinkButton, SubmitBar, successSvg } from "@egovernments/digit-ui-react-components";
+import { Banner, Card, CardSectionHeader, CardText, LinkButton, SubmitBar, successSvg } from "@upyog/digit-ui-react-components";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import { pdfDocumentName, pdfDownloadLink } from "../utils";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionAppDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionAppDetails.js
index 21bfa943bd0..e9e4a2bd85b 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionAppDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionAppDetails.js
@@ -7,7 +7,7 @@ import {
RadioButtons,
TextArea,
TextInput
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { stringReplaceAll } from "../utils";
import { useForm, Controller } from "react-hook-form";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionDocsRequired.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionDocsRequired.js
index a0686fd2b1d..feca3a77dcb 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionDocsRequired.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionDocsRequired.js
@@ -1,5 +1,5 @@
import React, { Fragment } from "react";
-import { Card, CardHeader, SubmitBar, CitizenInfoLabel, CardText, Loader, CardSubHeader, BackButton, BreadCrumb, Header, CardLabel, CardSectionHeader, CardCaption, ActionBar } from "@egovernments/digit-ui-react-components";
+import { Card, CardHeader, SubmitBar, CitizenInfoLabel, CardText, Loader, CardSubHeader, BackButton, BreadCrumb, Header, CardLabel, CardSectionHeader, CardCaption, ActionBar } from "@upyog/digit-ui-react-components";
import { useTranslation } from "react-i18next";
import { useHistory, useRouteMatch } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionDocumentsForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionDocumentsForm.js
index 7052a125d13..5ed6ffd4f6a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionDocumentsForm.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionDocumentsForm.js
@@ -10,7 +10,7 @@ import {
FormStep,
CardHeader,
SubmitBar
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import { useHistory, useRouteMatch } from "react-router-dom";
function WSDisconnectionDocumentsForm({ t, config, onSelect, userType, formData }) {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionForm.js
index 94d0cb5d05b..efde3db9ab9 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionForm.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDisconnectionForm.js
@@ -20,7 +20,7 @@ import {
ActionBar,
Dropdown,
InfoIcon
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { useHistory, useRouteMatch } from "react-router-dom";
import DisconnectTimeline from "../components/DisconnectTimeline";
@@ -47,10 +47,12 @@ const WSDisconnectionForm = ({ t, config, onSelect, userType }) => {
const [documents, setDocuments] = useState(applicationData.WSDisconnectionForm ? applicationData.WSDisconnectionForm.documents : []);
const [error, setError] = useState(null);
const [disconnectionTypeList, setDisconnectionTypeList] = useState([]);
+ const [disconnectionReasonList, setDisconnectionReasonList]=useState([]);
const [checkRequiredFields, setCheckRequiredFields] = useState(false);
const [isEnableLoader, setIsEnableLoader] = useState(false);
const { isMdmsLoading, data: mdmsData } = Digit.Hooks.ws.useMDMS(stateCode, "ws-services-masters", ["disconnectionType"]);
+ const {loading, data: disconnectionReason} = Digit.Hooks.ws.useMDMS(stateCode,"ws-services-masters", ["DisconnectionReason"]);
const { isLoading: wsDocsLoading, data: wsDocs } = Digit.Hooks.ws.WSSearchMdmsTypes.useWSServicesMasters(stateCode, "DisconnectionDocuments");
const {isLoading: slaLoading, data: slaData } = Digit.Hooks.ws.useDisconnectionWorkflow({tenantId});
const isReSubmit = window.location.href.includes("resubmit");
@@ -103,6 +105,11 @@ const WSDisconnectionForm = ({ t, config, onSelect, userType }) => {
setDisconnectionTypeList(disconnectionTypes);
}, [mdmsData]);
+ useEffect(() => {
+ const disconnectionReasons = disconnectionReason?.["ws-services-masters"]?.DisconnectionReason || [];
+ disconnectionReasons?.forEach(data => data.i18nKey = `WS_DISCONNECTIONTYPE_${stringReplaceAll(data?.code?.toUpperCase(), " ", "_")}`);
+ setDisconnectionReasonList(disconnectionReasons);
+ }, [disconnectionReason]);
useEffect(() => {
Digit.SessionStorage.set("WS_DISCONNECTION", {...applicationData, WSDisconnectionForm: disconnectionData});
@@ -208,7 +215,7 @@ const WSDisconnectionForm = ({ t, config, onSelect, userType }) => {
} ;
- if (isMdmsLoading || wsDocsLoading || isEnableLoader || slaLoading) return
+ if (isMdmsLoading || wsDocsLoading || isEnableLoader || slaLoading || loading) return
if(userType === 'citizen') {
@@ -288,13 +295,16 @@ if(userType === 'citizen') {
:""}
{t("WS_DISCONNECTION_REASON")+ "*"}
-
{t("WS_DISCONNECTION_REASON") + "*"}
-
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocsRequired.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocsRequired.js
index 94ebdec858d..9bdcabecaf1 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocsRequired.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocsRequired.js
@@ -1,5 +1,5 @@
import React, { Fragment } from "react";
-import { Card, CardHeader, SubmitBar, CitizenInfoLabel, CardText, Loader, CardSubHeader, BackButton, BreadCrumb, Header, CardLabel, CardSectionHeader, CardCaption, ActionBar, PrintBtnCommon } from "@egovernments/digit-ui-react-components";
+import { Card, CardHeader, SubmitBar, CitizenInfoLabel, CardText, Loader, CardSubHeader, BackButton, BreadCrumb, Header, CardLabel, CardSectionHeader, CardCaption, ActionBar, PrintBtnCommon } from "@upyog/digit-ui-react-components";
import { useTranslation } from "react-i18next";
import { useHistory, useRouteMatch } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocument.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocument.js
index bf74834df4f..12c3ffcb231 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocument.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocument.js
@@ -1,4 +1,4 @@
-import { Loader, PDFSvg } from "@egovernments/digit-ui-react-components";
+import { Loader, PDFSvg } from "@upyog/digit-ui-react-components";
import React from "react";
import { useTranslation } from "react-i18next";
import { pdfDocumentName, pdfDownloadLink } from "../utils";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocumentDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocumentDetails.js
index 9a05141d8b4..51dfe33c873 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocumentDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocumentDetails.js
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
-import { CardLabel, Dropdown, UploadFile, Toast, Loader, FormStep } from "@egovernments/digit-ui-react-components";
+import { CardLabel, Dropdown, UploadFile, Toast, Loader, FormStep } from "@upyog/digit-ui-react-components";
import Timeline from "../components/Timeline";
const WSDocumentDetails = ({ t, config, onSelect, userType, formData, setError: setFormError, clearErrors: clearFormErrors, formState }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocumentsEmployee.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocumentsEmployee.js
index cc93eef55c5..afa2411c5f8 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocumentsEmployee.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSDocumentsEmployee.js
@@ -8,7 +8,7 @@ import {
Loader,
CardHeader,
CardSectionHeader,
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import { useLocation } from "react-router-dom";
const WSDocumentsEmployee = ({ t, config, onSelect, userType, formData, setError: setFormError, clearErrors: clearFormErrors, formState }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSEditConnectionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSEditConnectionDetails.js
index ca89bac5f09..3939f8f4546 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSEditConnectionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSEditConnectionDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, Dropdown, LabelFieldPair, Loader, TextInput, CardLabelError, CheckBox, StatusTable, Row, CardSubHeader } from "@egovernments/digit-ui-react-components";
+import { CardLabel, Dropdown, LabelFieldPair, Loader, TextInput, CardLabelError, CheckBox, StatusTable, Row, CardSubHeader } from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { getPattern } from "../utils";
import { useForm, Controller } from "react-hook-form";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSInfoLabel.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSInfoLabel.js
index 4ae3da189fe..fb8e6b8950d 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSInfoLabel.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSInfoLabel.js
@@ -1,6 +1,6 @@
import React, { useState } from "react";
-import { TypeSelectCard } from "@egovernments/digit-ui-react-components";
-import { FormStep, RadioOrSelect, RadioButtons, CitizenInfoLabel, InfoBannerIcon } from "@egovernments/digit-ui-react-components";
+import { TypeSelectCard } from "@upyog/digit-ui-react-components";
+import { FormStep, RadioOrSelect, RadioButtons, CitizenInfoLabel, InfoBannerIcon } from "@upyog/digit-ui-react-components";
const EyeSvgINdex = ({ style }) => {
return
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPlumberDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPlumberDetails.js
index be81c007615..a69f9fc5e5d 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPlumberDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPlumberDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, Dropdown, LabelFieldPair, TextInput } from "@egovernments/digit-ui-react-components";
+import { CardLabel, Dropdown, LabelFieldPair, TextInput } from "@upyog/digit-ui-react-components";
import React from "react";
const WSPlumberDetails = ({ t, config, userType, formData }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPlumberPreference.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPlumberPreference.js
index 66369fbec8d..7c08615f722 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPlumberPreference.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPlumberPreference.js
@@ -5,7 +5,7 @@ import {
CardLabel,
TextInput,
MobileNumber,
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import Timeline from "../components/Timeline";
const WSPlumberPreference = ({ t, config, onSelect, userType, formData }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPropertyDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPropertyDetails.js
index c52a0ba1950..a99b5207b60 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPropertyDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSPropertyDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, LabelFieldPair, LinkButton, Loader, TextInput } from "@egovernments/digit-ui-react-components";
+import { CardLabel, LabelFieldPair, LinkButton, Loader, TextInput } from "@upyog/digit-ui-react-components";
import React from "react";
import { Link } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRestorationAcknowledgement.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRestorationAcknowledgement.js
index a2a730752a9..1331b81c443 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRestorationAcknowledgement.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRestorationAcknowledgement.js
@@ -1,5 +1,5 @@
import React, { useEffect } from "react";
-import { Banner, Card, CardSectionHeader, CardText, LinkButton, SubmitBar, successSvg } from "@egovernments/digit-ui-react-components";
+import { Banner, Card, CardSectionHeader, CardText, LinkButton, SubmitBar, successSvg } from "@upyog/digit-ui-react-components";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import { pdfDocumentName, pdfDownloadLink } from "../utils";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRestorationForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRestorationForm.js
index e295616d7e2..d3debb5b564 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRestorationForm.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRestorationForm.js
@@ -20,7 +20,7 @@ import {
ActionBar,
Dropdown,
InfoIcon
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { useHistory, useRouteMatch } from "react-router-dom";
import DisconnectTimeline from "../components/DisconnectTimeline";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRoadCuttingDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRoadCuttingDetails.js
index 467ab598959..15a4d39d0f2 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRoadCuttingDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRoadCuttingDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, Dropdown, LabelFieldPair, LinkButton, TextInput, CardLabelError, DeleteIcon } from "@egovernments/digit-ui-react-components";
+import { CardLabel, Dropdown, LabelFieldPair, LinkButton, TextInput, CardLabelError, DeleteIcon } from "@upyog/digit-ui-react-components";
import _ from "lodash";
import React, { useState, useEffect, useMemo } from "react";
import { useForm, Controller } from "react-hook-form";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSServiceName.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSServiceName.js
index 4df6f695b72..8d58f8190bc 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSServiceName.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSServiceName.js
@@ -3,7 +3,7 @@ import {
FormStep,
RadioOrSelect,
CardLabel
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import Timeline from "../components/Timeline";
const WSServiceName = ({ t, config, onSelect, userType, formData }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSSewerageConnectionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSSewerageConnectionDetails.js
index 852216e499b..72d8b2d3fe6 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSSewerageConnectionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSSewerageConnectionDetails.js
@@ -4,7 +4,7 @@ import {
TextInput,
CardLabel,
Toast
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import Timeline from "../components/Timeline";
const WSSewerageConnectionDetails = ({ t, config, userType, onSelect, formData }) => {
@@ -60,6 +60,7 @@ const WSSewerageConnectionDetails = ({ t, config, userType, onSelect, formData }
gender: formData?.ConnectionHolderDetails?.gender?.code,
mobileNumber: formData?.ConnectionHolderDetails?.mobileNumber,
name: formData?.ConnectionHolderDetails?.name,
+ emailId:formData?.ConnectionHolderDetails?.emailId,
ownerType: formData?.ConnectionHolderDetails?.specialCategoryType?.code || "NONE",
relationship: formData?.ConnectionHolderDetails?.relationship?.code,
sameAsPropertyAddress: false,
@@ -130,6 +131,7 @@ const WSSewerageConnectionDetails = ({ t, config, userType, onSelect, formData }
gender: formData?.ConnectionHolderDetails?.gender?.code,
mobileNumber: formData?.ConnectionHolderDetails?.mobileNumber,
name: formData?.ConnectionHolderDetails?.name,
+ emailId: formData?.ConnectionHolderDetails?.emailId,
ownerType: formData?.ConnectionHolderDetails?.specialCategoryType?.code || "NONE",
relationship: formData?.ConnectionHolderDetails?.relationship?.code,
sameAsPropertyAddress: false,
@@ -184,6 +186,7 @@ const WSSewerageConnectionDetails = ({ t, config, userType, onSelect, formData }
gender: formData?.ConnectionHolderDetails?.gender?.code,
mobileNumber: formData?.ConnectionHolderDetails?.mobileNumber,
name: formData?.ConnectionHolderDetails?.name,
+ emailId:formData?.ConnectionHolderDetails?.emailId,
ownerType: formData?.ConnectionHolderDetails?.specialCategoryType?.code || "NONE",
relationship: formData?.ConnectionHolderDetails?.relationship?.code,
sameAsPropertyAddress: false,
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWFApplicationTimeline.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWFApplicationTimeline.js
index ce6190d9feb..f1e8c8729a4 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWFApplicationTimeline.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWFApplicationTimeline.js
@@ -1,4 +1,4 @@
-import { ActionLinks, CardSectionHeader, CheckPoint, ConnectingCheckPoints, Loader, SubmitBar } from "@egovernments/digit-ui-react-components";
+import { ActionLinks, CardSectionHeader, CheckPoint, ConnectingCheckPoints, Loader, SubmitBar } from "@upyog/digit-ui-react-components";
import React, { Fragment } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWFCaption.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWFCaption.js
index bab97409ed1..ddb2f146a35 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWFCaption.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWFCaption.js
@@ -1,6 +1,6 @@
import React from "react";
import { useTranslation } from "react-i18next";
-import { TelePhone,DisplayPhotos } from "@egovernments/digit-ui-react-components";
+import { TelePhone,DisplayPhotos } from "@upyog/digit-ui-react-components";
import WSWFReason from "./WSWFReason";
const WSWFCaption = ({ data,OpenImage }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWaterConnectionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWaterConnectionDetails.js
index 3c9ecda57bf..d5920f8ab60 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWaterConnectionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSWaterConnectionDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, Dropdown, FormStep, Loader, RadioOrSelect, TextInput, Toast } from "@egovernments/digit-ui-react-components";
+import { CardLabel, Dropdown, FormStep, Loader, RadioOrSelect, TextInput, Toast } from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import Timeline from "../components/Timeline";
@@ -73,6 +73,7 @@ const WSWaterConnectionDetails = ({ t, config, userType, onSelect, formData }) =
gender: formData?.ConnectionHolderDetails?.gender?.code,
mobileNumber: formData?.ConnectionHolderDetails?.mobileNumber,
name: formData?.ConnectionHolderDetails?.name,
+ emailId: formData?.ConnectionHolderDetails?.emailId,
ownerType: formData?.ConnectionHolderDetails?.specialCategoryType?.code || "NONE",
relationship: formData?.ConnectionHolderDetails?.relationship?.code,
sameAsPropertyAddress: false,
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/EditApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/EditApplication/index.js
index 326314e5f93..67f5fc7c0d9 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/EditApplication/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/EditApplication/index.js
@@ -1,4 +1,4 @@
-import { Loader } from "@egovernments/digit-ui-react-components";
+import { Loader } from "@upyog/digit-ui-react-components";
import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useQueryClient } from "react-query";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/ConnectionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/ConnectionDetails.js
index f86db1076a4..479cc68e1ac 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/ConnectionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/ConnectionDetails.js
@@ -15,7 +15,7 @@ import {
Menu,
Modal,
Toast,
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import { useHistory } from "react-router-dom";
import _ from "lodash";
import React, { useState, useRef } from "react";
@@ -97,8 +97,8 @@ const ConnectionDetails = () => {
}
const handleDownloadPdf = async () => {
- const tenantInfo = data?.WaterConnection?.[0]?.tenantId;
- let res = data?.WaterConnection?.[0];
+ const tenantInfo = data?.WaterConnection?.[0]?.tenantId || data?.SewerageConnections?.[0]?.tenantId;
+ let res = data?.WaterConnection?.[0] || data?.SewerageConnections?.[0];
const PDFdata = getConnectionDetailsPDF({ ...res }, { ...PTData?.Properties?.[0] }, tenantInfo, t);
PDFdata.then((ress) => Digit.Utils.pdf.generatev1(ress));
setShowOptions(false);
@@ -547,6 +547,25 @@ let serviceType = state?.applicationType?.includes("WATER") ? "WATER":"SEWERAGE"
},
}}
/>
+
) : (
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/ConsumptionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/ConsumptionDetails.js
index 91b65bde90a..ff5c9418156 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/ConsumptionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/ConsumptionDetails.js
@@ -1,4 +1,4 @@
-import { Card, Header, KeyNote, Loader, StatusTable, SubmitBar, Row } from "@egovernments/digit-ui-react-components";
+import { Card, Header, KeyNote, Loader, StatusTable, SubmitBar, Row } from "@upyog/digit-ui-react-components";
import React from "react";
import { useTranslation } from "react-i18next";
import { Link, useParams } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/WSConnection.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/WSConnection.js
index b5e7259675e..90b73438bcf 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/WSConnection.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyConnection/WSConnection.js
@@ -1,4 +1,4 @@
-import { Card, KeyNote, SubmitBar } from "@egovernments/digit-ui-react-components";
+import { Card, KeyNote, SubmitBar } from "@upyog/digit-ui-react-components";
import React from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
@@ -15,7 +15,7 @@ const WSConnection = ({ application }) => {
owner.name).join(",") || application?.property?.owners?.map((owner) => owner.name).join(",")
+ application?.connectionHolders?.map((owner) => owner.name).join(",") || application?.property?.owners.sort((a,b)=>a?.additionalDetails?.ownerSequence-b?.additionalDetails?.ownerSequence)?.map((owner) => owner.name).join(",")
}
/>
{
DownloadReceipt(application?.paymentDetails?.[0]?.bill?.consumerCode, application?.tenantId, application?.paymentDetails?.[0]?.bill?.consumerCode?.includes("SW")?"SW":"WS")}
+ onSubmit={(e) => DownloadReceipt(application, application?.paymentDetails?.[0]?.bill?.consumerCode, application?.tenantId, application?.paymentDetails?.[0]?.bill?.consumerCode?.includes("SW")?"SW":"WS")}
/>
);
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyPayment/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyPayment/index.js
index 18bfe183b0d..f48e92463ee 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyPayment/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/MyPayment/index.js
@@ -1,4 +1,4 @@
-import { Header, Loader } from "@egovernments/digit-ui-react-components";
+import { Header, Loader } from "@upyog/digit-ui-react-components";
import React from "react";
import { useTranslation } from "react-i18next";
import WSPayment from "./WSPayments";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/ReSubmitDisconnection/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/ReSubmitDisconnection/CheckPage.js
index f1423eb2e50..07c795386bd 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/ReSubmitDisconnection/CheckPage.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/ReSubmitDisconnection/CheckPage.js
@@ -1,7 +1,7 @@
import {
Card, CardHeader, CardSubHeader, CardText,
CitizenInfoLabel, LinkButton, Row, StatusTable, SubmitBar, EditIcon, Header, CardSectionHeader, Loader
- } from "@egovernments/digit-ui-react-components";
+ } from "@upyog/digit-ui-react-components";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { useHistory, useRouteMatch, Link } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/SearchConnection/searchConnection.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/SearchConnection/searchConnection.js
index 0501a3251b5..8c844bfb13c 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/SearchConnection/searchConnection.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/SearchConnection/searchConnection.js
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from "react";
-import { FormComposer, CardLabelDesc, Loader, Menu, CardText } from "@egovernments/digit-ui-react-components";
-import { FormStep, CardLabel, RadioButtons, RadioOrSelect, Localities, InfoBannerIcon } from "@egovernments/digit-ui-react-components";
-import { TextInput, LabelFieldPair, Dropdown, Toast } from "@egovernments/digit-ui-react-components";
+import { FormComposer, CardLabelDesc, Loader, Menu, CardText } from "@upyog/digit-ui-react-components";
+import { FormStep, CardLabel, RadioButtons, RadioOrSelect, Localities, InfoBannerIcon } from "@upyog/digit-ui-react-components";
+import { TextInput, LabelFieldPair, Dropdown, Toast } from "@upyog/digit-ui-react-components";
import PropTypes from "prop-types";
import { useHistory } from "react-router-dom";
import { useTranslation } from "react-i18next";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/SearchResults/searchResults.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/SearchResults/searchResults.js
index 94a0552b547..15c517a33ba 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/SearchResults/searchResults.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/SearchResults/searchResults.js
@@ -1,5 +1,5 @@
import React from "react";
-import { Header, ResponseComposer, Loader } from "@egovernments/digit-ui-react-components";
+import { Header, ResponseComposer, Loader } from "@upyog/digit-ui-react-components";
import PropTypes from "prop-types";
import Axios from "axios";
import { useHistory, Link } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSApplicationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSApplicationDetails.js
index c6ddc17842c..0764daed659 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSApplicationDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSApplicationDetails.js
@@ -11,7 +11,7 @@ import {
CardText,
CardHeader,
SubmitBar,
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import React, { useState, useRef } from "react";
import { useTranslation } from "react-i18next";
import { Link, useLocation } from "react-router-dom";
@@ -152,7 +152,7 @@ const WSApplicationDetails = () => {
const receiptApplicationFeeDownloadObject = {
order: 4,
- label: t("WS_RECEIPT_APPLICATION_FEE"),
+ label: t("DOWNLOAD_RECEIPT_HEADER"),
onClick: printApplicationReceipts,
};
@@ -353,7 +353,7 @@ let serviceType = data && data?.WaterConnection?.[0] ? "WATER" : "SEWERAGE";
a?.additionalDetails?.ownerSequence-b?.additionalDetails?.ownerSequence)?.[0]?.name}
textStyle={{ whiteSpace: "pre" }}
/>
+
) : (
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSCreate/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSCreate/CheckPage.js
index 7843aa1608a..8268b3e3a51 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSCreate/CheckPage.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSCreate/CheckPage.js
@@ -1,7 +1,7 @@
import {
Card, CardHeader, CardSubHeader, CardText,
CitizenInfoLabel, LinkButton, Row, StatusTable, SubmitBar, EditIcon, Header, CardSectionHeader
- } from "@egovernments/digit-ui-react-components";
+ } from "@upyog/digit-ui-react-components";
import React from "react";
import { useTranslation } from "react-i18next";
import { useHistory, useRouteMatch, Link } from "react-router-dom";
@@ -43,6 +43,7 @@ import {
propAddArr.push(cpt?.details?.address?.pincode);
}
}
+ const reversedOwners= Array.isArray(cpt?.details?.owners) ? cpt?.details?.owners.slice().reverse() :[];
return(
@@ -52,7 +53,7 @@ import {
{t(`WS_BASIC_DETAILS_HEADER`)}
-
+
@@ -81,6 +82,7 @@ import {
+
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSCreate/WSAcknowledgement.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSCreate/WSAcknowledgement.js
index 1f74d976cd6..ab82c948f36 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSCreate/WSAcknowledgement.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSCreate/WSAcknowledgement.js
@@ -1,4 +1,4 @@
-import { Banner, Card, CardText, LinkButton, Loader, SubmitBar } from "@egovernments/digit-ui-react-components";
+import { Banner, Card, CardText, LinkButton, Loader, SubmitBar } from "@upyog/digit-ui-react-components";
import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSDisconnection/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSDisconnection/CheckPage.js
index 352300e2045..7f2504dd70c 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSDisconnection/CheckPage.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSDisconnection/CheckPage.js
@@ -1,7 +1,7 @@
import {
Card, CardHeader, CardSubHeader, CardText,
CitizenInfoLabel, LinkButton, Row, StatusTable, SubmitBar, EditIcon, Header, CardSectionHeader, Loader
- } from "@egovernments/digit-ui-react-components";
+ } from "@upyog/digit-ui-react-components";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { useHistory, useRouteMatch, Link } from "react-router-dom";
@@ -144,7 +144,7 @@ import { convertDateToEpoch, convertEpochToDate, createPayloadOfWSDisconnection,
{value.WSDisconnectionForm.type.value.code == "Temporary"? :""}
-
+
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/additionalDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/additionalDetails.js
index ed0baeeb695..0b649f72f45 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/additionalDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/additionalDetails.js
@@ -1,4 +1,4 @@
-import { Card, CardSubHeader, Header, LinkButton, Loader, Row, StatusTable, CardSectionHeader } from "@egovernments/digit-ui-react-components";
+import { Card, CardSubHeader, Header, LinkButton, Loader, Row, StatusTable, CardSectionHeader } from "@upyog/digit-ui-react-components";
import React from "react";
import { useTranslation } from "react-i18next";
import { Link, useLocation } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/index.js
index 7713421843f..80c9711b249 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/index.js
@@ -1,4 +1,4 @@
-import { Header, Loader } from "@egovernments/digit-ui-react-components";
+import { Header, Loader } from "@upyog/digit-ui-react-components";
import React from "react";
import { Link } from "react-router-dom";
import { useTranslation } from "react-i18next";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/ws-application.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/ws-application.js
index e6bf5b8d281..a040dc50483 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/ws-application.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSMyApplications/ws-application.js
@@ -1,27 +1,43 @@
-import { Card, KeyNote, SubmitBar } from "@egovernments/digit-ui-react-components";
+import { Card, KeyNote, SubmitBar, Loader } from "@upyog/digit-ui-react-components";
import React from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import { getAddress } from "../../../utils/index";
import _ from "lodash";
+import { stringReplaceAll, convertEpochToDate } from "../../../utils";
const WSApplication = ({ application }) => {
const { t } = useTranslation();
let encodeApplicationNo = encodeURI(application.applicationNo)
// let workflowDetails = Digit.Hooks.useWorkflowDetails({
- // tenantId: application?.tenantId,
- // id: application?.applicationNo,
- // moduleCode: "WS",
- // config: {
- // enabled: !!application?.applicationNo
- // }
- // });
+ // tenantId: application?.tenantId,
+ // id: application?.applicationNo,
+ // moduleCode: "WS",
+ // config: {
+ // enabled: !!application?.applicationNo
+ // }
+ // });
+
+ let filter1 = { tenantId: application.tenantId, applicationNumber: application.applicationNo };
+ const { isLoading, isError, error, data } = Digit.Hooks.ws.useMyApplicationSearch(
+ { filters: filter1, BusinessService: application.applicationNo?.includes("SW") ? "SW" : "WS" },
+ { filters: filter1, privacy: Digit.Utils.getPrivacyObject() }
+ );
+ const { isLoading: isPTLoading, isError: isPTError, error: PTerror, data: PTData } = Digit.Hooks.pt.usePropertySearch(
+ { filters: { propertyIds: application?.propertyId } },
+ { filters: { propertyIds: application?.propertyId }, privacy: Digit.Utils.getPrivacyObject() }
+ );
+ const businessService = application?.applicationNo?.includes("SW") ? (application?.applicationNo?.includes("DC") ? "SW" : "SW.ONE_TIME_FEE") : (application?.applicationNo?.includes("DC")? "WS" :"WS.ONE_TIME_FEE")
+ const fetchBillParams = { consumerCode: application?.applicationNo?.includes("DC") ? application?.connectionNo : application?.connectionNo };
+ if (isLoading) {
+ return ;
+ }
return (
- owner.name).join(",") || application?.property?.owners?.map((owner) => owner.name).join(",") || t("CS_NA")} />
+ owner.name).join(",") || application?.property?.owners?.sort((a,b)=> a?.additionalDetails?.ownerSequence- b?.additionalDetails?.ownerSequence).map((owner) => owner.name).join(",") || t("CS_NA")} />
@@ -48,6 +64,23 @@ const WSApplication = ({ application }) => {
+ {application?.applicationStatus === "PENDING_FOR_PAYMENT" ? (
+ owner.name).join(",") || application?.connectionHolders?.map((owner) => owner.name).join(",") || PTData?.Properties?.[0]?.owners?.map((owner) => owner.name).join(",")}&isDisoconnectFlow=${application?.applicationNo?.includes("DC")?true : false}`,
+ state: {},
+ }}
+ >
+
+
+
+
+ ) : null}
);
};
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSRestoration/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSRestoration/CheckPage.js
index 2b5117e30a6..dfefb0b7430 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSRestoration/CheckPage.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSRestoration/CheckPage.js
@@ -1,7 +1,7 @@
import {
Card, CardHeader, CardSubHeader, CardText,Toast,
CitizenInfoLabel, LinkButton, Row, StatusTable, SubmitBar, EditIcon, Header, CardSectionHeader, Loader
- } from "@egovernments/digit-ui-react-components";
+ } from "@upyog/digit-ui-react-components";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { useHistory, useRouteMatch, Link } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WnSMyBills/wnsMyBills.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WnSMyBills/wnsMyBills.js
index 855b46d5ff1..b4e98494ef0 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WnSMyBills/wnsMyBills.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WnSMyBills/wnsMyBills.js
@@ -1,5 +1,5 @@
import React from "react";
-import { Header, ResponseComposer, Loader } from "@egovernments/digit-ui-react-components";
+import { Header, ResponseComposer, Loader } from "@upyog/digit-ui-react-components";
import PropTypes from "prop-types";
import Axios from "axios";
import { useHistory, Link, useLocation } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/index.js
index 2d0c172b6d4..64aeb9c6cc5 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/index.js
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { Switch, useLocation, Route } from "react-router-dom";
-import { PrivateRoute, BackButton } from "@egovernments/digit-ui-react-components";
+import { PrivateRoute, BackButton } from "@upyog/digit-ui-react-components";
import TestAcknowledgment from "./TestAcknowledgment";
import { WSMyApplications } from "./WSMyApplications";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ActivateConnection/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ActivateConnection/index.js
index 8beeda44faa..cfd06cb85ea 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ActivateConnection/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ActivateConnection/index.js
@@ -1,4 +1,4 @@
-import { FormComposer, Header, Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { FormComposer, Header, Loader, Toast } from "@upyog/digit-ui-react-components";
import cloneDeep from "lodash/cloneDeep";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationBillAmendment.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationBillAmendment.js
index 131729d35c4..3e01d0ebf75 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationBillAmendment.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationBillAmendment.js
@@ -19,7 +19,7 @@ import {
InfoBannerIcon,
Toast,
Table
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import React, { Fragment, useEffect, useMemo, useReducer, useState } from "react";
import { Controller, useFieldArray, useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationDetails.js
index a9080b0b8ef..15a31752aaa 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationDetails.js
@@ -12,7 +12,7 @@ import {
SubmitBar,
MultiLink,
Toast
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import { useParams, useHistory } from "react-router-dom";
import { useTranslation } from "react-i18next";
import ApplicationDetailsTemplate from "../../../../templates/ApplicationDetails";
@@ -357,9 +357,17 @@ const ApplicationDetails = () => {
};
async function getRecieptSearch(tenantId, payments, consumerCodes, receiptKey) {
- let response = await Digit.PaymentService.generatePdf(tenantId, { Payments: [{...payments}] }, receiptKey);
+ let response=null;
+ if(payments?.fileStoreId){
+ response = { filestoreIds: [payments?.fileStoreId] }
+ const fileStore = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: response.filestoreIds[0] });
+ window.open(fileStore[response.filestoreIds[0]], "_blank");
+ }
+ else{
+ response = await Digit.PaymentService.generatePdf(tenantId, { Payments: [{...payments}] }, receiptKey);
const fileStore = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: response.filestoreIds[0] });
window.open(fileStore[response?.filestoreIds[0]], "_blank");
+ }
}
const handleEstimateDownload = async () => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationDetailsBillAmendment.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationDetailsBillAmendment.js
index 19406a9cec2..afb8a591f68 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationDetailsBillAmendment.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationDetailsBillAmendment.js
@@ -1,4 +1,4 @@
-import { Header, MultiLink, Toast } from "@egovernments/digit-ui-react-components";
+import { Header, MultiLink, Toast } from "@upyog/digit-ui-react-components";
import React, { Fragment, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import ApplicationDetailsTemplate from "../../../../templates/ApplicationDetails";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/BulkBillGeneration.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/BulkBillGeneration.js
new file mode 100644
index 00000000000..0ea764f7f2b
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/BulkBillGeneration.js
@@ -0,0 +1,77 @@
+import { Loader, Toast } from "@upyog/digit-ui-react-components";
+import React, { useState, Fragment, useCallback, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+
+const BulkBillGeneration = ({ path }) => {
+ const [isBothCallsFinished, setIsBothCallFinished] = useState(true);
+ const { t } = useTranslation();
+ const [payload, setPayload] = useState({});
+ const [setLoading, setLoadingState] = useState(false);
+ const WSBulkBillSearch = Digit.ComponentRegistryService.getComponent("WSBulkBillSearch");
+ const tenantId = Digit.ULBService.getCurrentTenantId();
+ const getUrlPathName = window.location.pathname;
+ const checkPathName = getUrlPathName.includes("water/search-connection");
+ const businessServ = checkPathName ? "WS" : "SW";
+ const [showToast, setShowToast] = useState(null);
+
+ const onSubmit = ((data) => {
+ setPayload({"locality":data?.locality?.code});
+ });
+
+ const config = {
+ enabled: !!(payload && Object.keys(payload).length > 0),
+ };
+
+ let result = Digit.Hooks.ws.useBulkSearchWS({ tenantId,filters: payload, config});
+
+ const isMobile = window.Digit.Utils.browser.isMobile();
+
+ if (result?.isLoading && isMobile) {
+ return
+ }
+
+ const getData = () => {
+ console.log("result",result)
+ if (result?.meterReadings.length == 0 ) {
+ return { display: "ES_COMMON_NO_DATA" }
+ } else if (result?.meterReadings.length > 0) {
+ let meterReadings=result?.meterReadings.map((data)=>{
+ return {"billingPeriod":data.billingPeriod,"connectionNo":data.connectionNo,"lastReading":data.lastReading,"lastReadingDate":data.lastReadingDate,"meterStatus":data.meterStatus,"currentReadingDate":"","currentReading":""}})
+ return meterReadings
+ } else {
+ return [];
+ }
+ }
+
+ const isResultsOk = () => {
+ return result?.meterReadings?.length > 0 ? true : false;
+ }
+
+ return (
+
+
+
+ {showToast && (
+ {
+ setShowToast(null);
+ }}
+ />
+ )}
+
+ );
+};
+
+export default BulkBillGeneration;
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionApplication/WSDisconnectionResponse.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionApplication/WSDisconnectionResponse.js
index 8daf0fa33eb..3deea07a299 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionApplication/WSDisconnectionResponse.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionApplication/WSDisconnectionResponse.js
@@ -1,4 +1,4 @@
-import { Banner, Card, CardText, SubmitBar, ActionBar } from "@egovernments/digit-ui-react-components";
+import { Banner, Card, CardText, SubmitBar, ActionBar } from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { useHistory } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionApplication/index.js
index 3768a1a12a6..f765d176f02 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionApplication/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionApplication/index.js
@@ -1,4 +1,4 @@
-import { Loader } from "@egovernments/digit-ui-react-components";
+import { Loader } from "@upyog/digit-ui-react-components";
import React from "react";
import { useTranslation } from "react-i18next";
import { useRouteMatch, Switch, Route, Redirect } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionDetails.js
index 6f509735888..5b2d9a58b8e 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/DisconnectionDetails.js
@@ -1,6 +1,6 @@
import React, { useEffect, useState, Fragment, useRef } from "react";
import { useTranslation } from "react-i18next";
-import { Header, MultiLink } from "@egovernments/digit-ui-react-components";
+import { Header, MultiLink } from "@upyog/digit-ui-react-components";
import ApplicationDetailsTemplate from "../../../../templates/ApplicationDetails";
import * as func from "../../utils";
import cloneDeep from "lodash/cloneDeep";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditApplication/WSEditApplicationByConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditApplication/WSEditApplicationByConfig.js
index 41ef1af1142..bc66616052c 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditApplication/WSEditApplicationByConfig.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditApplication/WSEditApplicationByConfig.js
@@ -1,4 +1,4 @@
-import { FormComposer, Header, Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { FormComposer, Header, Loader, Toast } from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useLocation, useHistory } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditApplication/index.js
index 2473f4e582e..fb85ae97193 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditApplication/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditApplication/index.js
@@ -1,4 +1,4 @@
-import { FormComposer, Header, Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { FormComposer, Header, Loader, Toast } from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useLocation, useHistory } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/EditDisconnectionByConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/EditDisconnectionByConfig.js
index f315914b316..282a6e7eb4f 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/EditDisconnectionByConfig.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/EditDisconnectionByConfig.js
@@ -1,4 +1,4 @@
-import { FormComposer, Header, Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { FormComposer, Header, Loader, Toast } from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useLocation } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/ResubmitDisconnection.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/ResubmitDisconnection.js
index 99b169ced38..3e9b3ed8b15 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/ResubmitDisconnection.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/ResubmitDisconnection.js
@@ -1,4 +1,4 @@
-import { FormComposer, Header, Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { FormComposer, Header, Loader, Toast } from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useLocation } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/index.js
index f933bb5f3fb..1abf3c8459d 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditDisconnectionApplication/index.js
@@ -1,4 +1,4 @@
-import { FormComposer, Header, Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { FormComposer, Header, Loader, Toast } from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useLocation } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditModifyApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditModifyApplication/index.js
index 7f244cd9a89..aa4b7125cb7 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditModifyApplication/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/EditModifyApplication/index.js
@@ -1,4 +1,4 @@
-import { FormComposer, Header, Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { FormComposer, Header, Loader, Toast } from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useLocation, useHistory } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ModifyApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ModifyApplication/index.js
index d2565ae0b8e..747a1775654 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ModifyApplication/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ModifyApplication/index.js
@@ -1,4 +1,4 @@
-import { FormComposer, Header, Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { FormComposer, Header, Loader, Toast } from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useLocation, useHistory } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ModifyApplicationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ModifyApplicationDetails.js
index e0b8b101e43..1319f440d3e 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ModifyApplicationDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ModifyApplicationDetails.js
@@ -1,5 +1,5 @@
import React, { useState, Fragment, useRef } from "react";
-import { Header, MultiLink } from "@egovernments/digit-ui-react-components";
+import { Header, MultiLink } from "@upyog/digit-ui-react-components";
import { useTranslation } from "react-i18next";
import ApplicationDetailsTemplate from "../../../../templates/ApplicationDetails";
import * as func from "../../utils";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/NewApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/NewApplication/index.js
index 9d59ff0ce5d..b858e4e7fe2 100755
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/NewApplication/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/NewApplication/index.js
@@ -1,4 +1,4 @@
-import { FormComposer, Header, Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { FormComposer, Header, Loader, Toast } from "@upyog/digit-ui-react-components";
import cloneDeep from "lodash/cloneDeep";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RequiredDocuments.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RequiredDocuments.js
index 20b7d1cc2c7..520a0fd6efa 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RequiredDocuments.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RequiredDocuments.js
@@ -1,4 +1,4 @@
-import { ActionBar, Card, CardHeader, CardLabel, CardLabelDesc, CardText, DownloadIcon, Header, Loader, MultiLink, ShareIcon, SubmitBar } from "@egovernments/digit-ui-react-components"
+import { ActionBar, Card, CardHeader, CardLabel, CardLabelDesc, CardText, DownloadIcon, Header, Loader, MultiLink, ShareIcon, SubmitBar } from "@upyog/digit-ui-react-components"
import React, {Fragment, useRef} from "react"
import { useTranslation } from "react-i18next"
import { useHistory, useLocation, useParams } from "react-router-dom"
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/Response.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/Response.js
index 84a5d44373e..a19c56cacf8 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/Response.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/Response.js
@@ -1,4 +1,4 @@
-import { ActionBar, Banner, Card, CardText, Loader, SubmitBar } from "@egovernments/digit-ui-react-components"
+import { ActionBar, Banner, Card, CardText, Loader, SubmitBar } from "@upyog/digit-ui-react-components"
import React, { useEffect } from "react"
import { useTranslation } from "react-i18next"
import { Link, useLocation } from "react-router-dom"
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ResponseBillAmend.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ResponseBillAmend.js
index c31b1b38a41..93a998dfdcd 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ResponseBillAmend.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ResponseBillAmend.js
@@ -1,4 +1,4 @@
-import { ActionBar, Banner, Card, CardText, Loader, SubmitBar } from "@egovernments/digit-ui-react-components"
+import { ActionBar, Banner, Card, CardText, Loader, SubmitBar } from "@upyog/digit-ui-react-components"
import React, { useEffect } from "react"
import { useTranslation } from "react-i18next"
import { Link, useLocation } from "react-router-dom"
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RestorationApplication/WSRestorationResponse.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RestorationApplication/WSRestorationResponse.js
index e0a622b1977..f24bea6b33a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RestorationApplication/WSRestorationResponse.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RestorationApplication/WSRestorationResponse.js
@@ -1,4 +1,4 @@
-import { Banner, Card, CardText, SubmitBar, ActionBar } from "@egovernments/digit-ui-react-components";
+import { Banner, Card, CardText, SubmitBar, ActionBar } from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { useHistory } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RestorationApplication/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RestorationApplication/index.js
index 8e4df6127a6..253dc9414e6 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RestorationApplication/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/RestorationApplication/index.js
@@ -1,4 +1,4 @@
-import { Loader } from "@egovernments/digit-ui-react-components";
+import { Loader } from "@upyog/digit-ui-react-components";
import React from "react";
import { useTranslation } from "react-i18next";
import { useRouteMatch, Switch, Route, Redirect } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchIntegrated.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchIntegrated.js
index 6e6881c3505..5d598caf60e 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchIntegrated.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchIntegrated.js
@@ -1,4 +1,4 @@
-import { Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { Loader, Toast } from "@upyog/digit-ui-react-components";
import React, { useState, Fragment, useCallback, useEffect } from "react";
import { useTranslation } from "react-i18next";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchWater.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchWater.js
index 9532b009c50..7fdfb940ffd 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchWater.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchWater.js
@@ -1,4 +1,4 @@
-import { Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { Loader, Toast } from "@upyog/digit-ui-react-components";
import React, { useState, Fragment, useCallback } from "react";
import { useTranslation } from "react-i18next";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchWaterConnectionIntegrated.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchWaterConnectionIntegrated.js
index f8658894bbd..f3699514459 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchWaterConnectionIntegrated.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/SearchWaterConnectionIntegrated.js
@@ -1,5 +1,5 @@
import React, { Fragment, useEffect, useCallback, useMemo } from "react";
-import { SearchForm, Table, Card, Loader, Header } from "@egovernments/digit-ui-react-components";
+import { SearchForm, Table, Card, Loader, Header } from "@upyog/digit-ui-react-components";
import { useForm, Controller } from "react-hook-form";
import SearchFields from "../../components/SearchWaterConnection/SearchFields2";
import { useTranslation } from "react-i18next";
@@ -140,7 +140,7 @@ console.log("errorrrrrr",e)
Header: t("WS_COMMON_TABLE_COL_SERVICE_LABEL"),
disableSortBy: true,
Cell: ({ row }) => {
- return GetCell(t(`WS_${row.original?.["service"]}`));
+ return GetCell(row?.original?.applicationNo.includes("WS")?`Water Service`:'Sewerage Service');
},
},
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/WSResponse.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/WSResponse.js
index 5fdd2ee2d29..0cd714dac3f 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/WSResponse.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/WSResponse.js
@@ -1,4 +1,4 @@
-import { Banner, Card, CardText, SubmitBar, ActionBar } from "@egovernments/digit-ui-react-components";
+import { Banner, Card, CardText, SubmitBar, ActionBar } from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import getPDFData from "../../utils/getWSAcknowledgementData";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/ConnectionDetailsModal.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/ConnectionDetailsModal.js
index a7b6339715b..24d6884e0b9 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/ConnectionDetailsModal.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/ConnectionDetailsModal.js
@@ -1,4 +1,4 @@
-import { Loader, Modal, FormComposer } from "@egovernments/digit-ui-react-components";
+import { Loader, Modal, FormComposer } from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
const Heading = (props) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/ConsumptionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/ConsumptionDetails.js
index 660c921424f..50e1d374f1d 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/ConsumptionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/ConsumptionDetails.js
@@ -1,7 +1,7 @@
import {
ActionBar, Card, DatePicker, Dropdown, FormComposer, Header, Loader, Modal, Row, StatusTable, SubmitBar,
Toast
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import * as func from "../../../utils";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/connectionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/connectionDetails.js
index a4415699300..04d0f6e132c 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/connectionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/connectionDetails/connectionDetails.js
@@ -2,7 +2,7 @@ import React, { useEffect, useState, Fragment, useRef } from "react";
import { useTranslation } from "react-i18next";
import ApplicationDetailsTemplate from "../../../../../templates/ApplicationDetails";
import { useHistory } from "react-router-dom";
-import { Header, ActionBar, MultiLink, SubmitBar, Menu, Modal, ButtonSelector, Toast } from "@egovernments/digit-ui-react-components";
+import { Header, ActionBar, MultiLink, SubmitBar, Menu, Modal, ButtonSelector, Toast } from "@upyog/digit-ui-react-components";
import * as func from "../../../utils";
import { ifUserRoleExists, downloadPdf, downloadAndOpenPdf } from "../../../utils";
import WSInfoLabel from "../../../pageComponents/WSInfoLabel";
@@ -250,7 +250,7 @@ const showActionRestoration = ["RESTORATION_BUTTON"]
const connectionDetailsReceipt = {
order: 2,
- label: t("WS_CONNECTION_DETAILS_RECEIPT"),
+ label: t("WS_CONNECTION_DETAILS"),
onClick: () => downloadConnectionDetails(),
};
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/index.js
index 4123d561f08..ec40c11796e 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/index.js
@@ -1,7 +1,7 @@
import React from "react";
import { useTranslation } from "react-i18next";
import { Switch, useLocation } from "react-router-dom";
-import { PrivateRoute, BreadCrumb } from "@egovernments/digit-ui-react-components";
+import { PrivateRoute, BreadCrumb } from "@upyog/digit-ui-react-components";
import WSResponse from "./WSResponse";
@@ -257,6 +257,7 @@ const App = ({ path }) => {
const WSEditDisconnectionByConfig = Digit?.ComponentRegistryService?.getComponent("WSEditDisconnectionByConfig");
const WSResubmitDisconnection = Digit?.ComponentRegistryService?.getComponent("WSResubmitDisconnection");
const WSSearchIntegrated = Digit?.ComponentRegistryService?.getComponent("WSSearchIntegrated");
+ const WSBulkBillGeneration = Digit?.ComponentRegistryService?.getComponent("WSBulkBillGeneration");
const locationCheck =
window.location.href.includes("/employee/ws/new-application") ||
@@ -325,6 +326,7 @@ const App = ({ path }) => {
} />
} />
} />
+ } />
{/*
*/}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/search.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/search.js
index f49f4b3ad2b..8801841370b 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/search.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/search.js
@@ -1,6 +1,6 @@
import React, { useState, Fragment } from "react";
import { useTranslation } from "react-i18next";
-import { Loader, Toast } from "@egovernments/digit-ui-react-components";
+import { Loader, Toast } from "@upyog/digit-ui-react-components";
const Search = ({ path }) => {
const [isBothCallsFinished, setIsBothCallFinished] = useState(true);
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getConnectionDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getConnectionDetails.js
index b2a784c865c..3a74e4dba5a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getConnectionDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getConnectionDetails.js
@@ -21,7 +21,7 @@ import {
const getPropertyDetails = (application, t) => {
const owners = application?.owners?.filter((owner) => owner.active == true) || [];
- const names = owners?.map(owner => owner.name)?.join(",");
+ const names = owners.sort((a,b)=>a?.additionalDetails?.ownerSequence- b?.additionalDetails?.ownerSequence)?.map(owner => owner.name)?.join(",");
return {
title: t("WS_COMMON_PROPERTY_DETAILS"),
values: [
@@ -76,6 +76,7 @@ import {
//{ title: t("WS_CONN_HOLDER_OWN_DETAIL_RELATION_LABEL"), value: t(owner?.connectionHolders?.[0]?.relationship) || t("CS_NA") },
//{ title: t("WS_OWNER_SPECIAL_CATEGORY"), value: owner?.connectionHolders?.[0]?.ownerType ? t(`COMMON_MASTERS_OWNERTYPE_${owner?.ownerType}`) : t("CS_NA") },
{ title: t("WS_CORRESPONDANCE_ADDRESS_LABEL"), value: owner?.connectionHolders?.[0]?.correspondenceAddress || t("CS_NA") },
+ { title: t("CORE_COMMON_EMAIL_ID"), value: owner?.connectionHolders?.[0]?.emailId || t("CS_NA") },
] : [
{ title: t("WS_CONN_HOLDER_SAME_AS_OWNER_DETAILS"), value: t("SCORE_YES") || t("CS_NA") }
],
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSAcknowledgementData.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSAcknowledgementData.js
index 3f049cef186..fb5374a5c2c 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSAcknowledgementData.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSAcknowledgementData.js
@@ -54,7 +54,7 @@ const getPropertyAddress = (property) => {
const getPropertyDetails = (application, t) => {
const owners = application?.owners?.filter((owner) => owner.active == true) || [];
- const names = owners?.map(owner => owner.name)?.join(",");
+ const names = owners.sort((a,b)=>a?.additionalDetails?.ownerSequence-b?.additionalDetails?.ownerSequence)?.map(owner => owner.name)?.join(",");
return {
title: t("WS_COMMON_PROPERTY_DETAILS"),
values: [
@@ -107,6 +107,7 @@ const getConnectionHolderDetails = (owner, t) => {
//{ title: t("WS_CONN_HOLDER_OWN_DETAIL_RELATION_LABEL"), value: t(owner?.connectionHolders?.[0]?.relationship) || t("CS_NA") },
//{ title: t("WS_OWNER_SPECIAL_CATEGORY"), value: owner?.connectionHolders?.[0]?.ownerType ? t(`COMMON_MASTERS_OWNERTYPE_${owner?.ownerType}`) : t("CS_NA") },
{ title: t("WS_CORRESPONDANCE_ADDRESS_LABEL"), value: owner?.connectionHolders?.[0]?.correspondenceAddress || t("CS_NA") },
+ { title: t("WS_EMAIL_ID"), value: owner?.connectionHolders?.[0]?.emailId || t("CS_NA") },
] : [
{ title: t("WS_CONN_HOLDER_SAME_AS_OWNER_DETAILS"), value: t("SCORE_YES") || t("CS_NA") }
],
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSDisconnectionAcknowledgementData.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSDisconnectionAcknowledgementData.js
index 7edb6224f52..c4e3c87cc3d 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSDisconnectionAcknowledgementData.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSDisconnectionAcknowledgementData.js
@@ -21,7 +21,7 @@ import {
const getPropertyDetails = (application, t) => {
const owners = application?.owners?.filter((owner) => owner.active == true) || [];
- const names = owners?.map(owner => owner.name)?.join(",");
+ const names = owners.sort((a,b)=>a?.additionalDetails?.ownerSequence-b?.additionalDetails?.ownerSequence)?.map(owner => owner.name)?.join(",");
return {
title: t("WS_COMMON_PROPERTY_DETAILS"),
values: [
@@ -44,6 +44,7 @@ import {
//{ title: t("WS_CONN_HOLDER_OWN_DETAIL_RELATION_LABEL"), value: t(owner?.connectionHolders?.[0]?.relationship) || t("CS_NA") },
//{ title: t("WS_OWNER_SPECIAL_CATEGORY"), value: owner?.connectionHolders?.[0]?.ownerType ? t(`COMMON_MASTERS_OWNERTYPE_${owner?.ownerType}`) : t("CS_NA") },
{ title: t("WS_CORRESPONDANCE_ADDRESS_LABEL"), value: owner?.connectionHolders?.[0]?.correspondenceAddress || t("CS_NA") },
+ { title: t("CORE_COMMON_EMAIL_ID"), value: owner?.connectionHolders?.[0]?.emailId || t("CS_NA") },
] : [
{ title: t("WS_CONN_HOLDER_SAME_AS_OWNER_DETAILS"), value: t("SCORE_YES") || t("CS_NA") }
],
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSDisconnectionApplicationForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSDisconnectionApplicationForm.js
index e1d9422fe14..af6efdeeb36 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSDisconnectionApplicationForm.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSDisconnectionApplicationForm.js
@@ -21,7 +21,7 @@ import {
const getPropertyDetails = (application, t) => {
const owners = application?.owners?.filter((owner) => owner.active == true) || [];
- const names = owners?.map(owner => owner.name)?.join(",");
+ const names = owners.sort((a,b)=>a?.additionalDetails?.ownerSequence-b?.additionalDetails?.ownerSequence)?.map(owner => owner.name)?.join(",");
return {
title: t("WS_COMMON_PROPERTY_DETAILS"),
values: [
@@ -55,6 +55,7 @@ import {
//{ title: t("WS_CONN_HOLDER_OWN_DETAIL_RELATION_LABEL"), value: t(owner?.connectionHolders?.[0]?.relationship) || t("CS_NA") },
//{ title: t("WS_OWNER_SPECIAL_CATEGORY"), value: owner?.connectionHolders?.[0]?.ownerType ? t(`COMMON_MASTERS_OWNERTYPE_${owner?.ownerType}`) : t("CS_NA") },
{ title: t("WS_CORRESPONDANCE_ADDRESS_LABEL"), value: owner?.connectionHolders?.[0]?.correspondenceAddress || t("CS_NA") },
+ { title: t("CORE_COMMON_EMAIL_ID"), value: owner?.connectionHolders?.[0]?.emailId || t("CS_NA") },
] : [
{ title: t("WS_CONN_HOLDER_SAME_AS_OWNER_DETAILS"), value: t("SCORE_YES") || t("CS_NA") }
],
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSRestorationAcknowledgementData.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSRestorationAcknowledgementData.js
index 2731e6d5bd3..b11fa4acf94 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSRestorationAcknowledgementData.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSRestorationAcknowledgementData.js
@@ -21,7 +21,7 @@ import {
const getPropertyDetails = (application, t) => {
const owners = application?.owners?.filter((owner) => owner.active == true) || [];
- const names = owners?.map(owner => owner.name)?.join(",");
+ const names = owners.sort((a,b)=>a?.additionalDetails?.ownerSequence-b?.additionalDetails?.ownerSequence)?.map(owner => owner.name)?.join(",");
return {
title: t("WS_COMMON_PROPERTY_DETAILS"),
values: [
@@ -44,6 +44,7 @@ import {
//{ title: t("WS_CONN_HOLDER_OWN_DETAIL_RELATION_LABEL"), value: t(owner?.connectionHolders?.[0]?.relationship) || t("CS_NA") },
//{ title: t("WS_OWNER_SPECIAL_CATEGORY"), value: owner?.connectionHolders?.[0]?.ownerType ? t(`COMMON_MASTERS_OWNERTYPE_${owner?.ownerType}`) : t("CS_NA") },
{ title: t("WS_CORRESPONDANCE_ADDRESS_LABEL"), value: owner?.connectionHolders?.[0]?.correspondenceAddress || t("CS_NA") },
+ { title: t("CORE_COMMON_EMAIL_ID"), value: owner?.connectionHolders?.[0]?.emailId || t("CS_NA") },
] : [
{ title: t("WS_CONN_HOLDER_SAME_AS_OWNER_DETAILS"), value: t("SCORE_YES") || t("CS_NA") }
],
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWsAckDataForModifyPdfs.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWsAckDataForModifyPdfs.js
index 06641aadfc7..8b513863d0a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWsAckDataForModifyPdfs.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWsAckDataForModifyPdfs.js
@@ -68,6 +68,7 @@ const getConnectionHolderDetails = (application, oldApplication, t) => {
values: [
{ val1: t("WS_OWN_DETAIL_NAME"), val2: application?.connectionHolders?.[0]?.name || t("CS_NA"), val3: compare(application?.connectionHolders?.[0]?.name, oldApplication?.connectionHolders?.[0]?.name, t) },
{ val1: t("CORE_COMMON_MOBILE_NUMBER"), val2: application?.connectionHolders?.[0]?.mobileNumber || t("CS_NA"), val3: compare(application?.connectionHolders?.[0]?.mobileNumber, oldApplication?.connectionHolders?.[0]?.mobileNumber, t) },
+ { val1: t("CORE_COMMON_EMAIL_ID"), val2: application?.connectionHolders?.[0]?.emailId || t("CS_NA"), val3: compare(application?.connectionHolders?.[0]?.emailId, oldApplication?.connectionHolders?.[0]?.emailId, t) },
{ val1: t("WS_CONN_HOLDER_COMMON_FATHER_OR_HUSBAND_NAME"), val2: application?.connectionHolders?.[0]?.fatherOrHusbandName || t("CS_NA"), val3: compare(application?.connectionHolders?.[0]?.fatherOrHusbandName, oldApplication?.connectionHolders?.[0]?.fatherOrHusbandName, t) },
{ val1: t("WS_CORRESPONDANCE_ADDRESS_LABEL"), val2: application?.connectionHolders?.[0]?.correspondenceAddress || t("CS_NA"), val3: compare(application?.connectionHolders?.[0]?.correspondenceAddress, oldApplication?.connectionHolders?.[0]?.correspondenceAddress, t) },
]
@@ -79,6 +80,7 @@ const getConnectionHolderDetails = (application, oldApplication, t) => {
values: [
{ val1: t("WS_OWN_DETAIL_NAME"), val2: application?.connectionHolders?.[0]?.name || t("CS_NA"), val3: t("WS_SAME_AS_PROPERTY_OWNERS") },
{ val1: t("CORE_COMMON_MOBILE_NUMBER"), val2: application?.connectionHolders?.[0]?.mobileNumber || t("CS_NA"), val3: t("WS_SAME_AS_PROPERTY_OWNERS") },
+ { val1: t("CORE_COMMON_EMAIL_ID"), val2: application?.connectionHolders?.[0]?.emailId || t("CS_NA"), val3: t("WS_SAME_AS_PROPERTY_OWNERS") },
{ val1: t("WS_CONN_HOLDER_COMMON_FATHER_OR_HUSBAND_NAME"), val2: application?.connectionHolders?.[0]?.fatherOrHusbandName || t("CS_NA"), val3: t("WS_SAME_AS_PROPERTY_OWNERS") },
{ val1: t("WS_CORRESPONDANCE_ADDRESS_LABEL"), val2: application?.connectionHolders?.[0]?.correspondenceAddress || t("CS_NA"), val3: t("WS_SAME_AS_PROPERTY_OWNERS") },
]
@@ -90,6 +92,7 @@ const getConnectionHolderDetails = (application, oldApplication, t) => {
values: [
{ val1: t("WS_OWN_DETAIL_NAME"), val3: oldApplication?.connectionHolders?.[0]?.name || t("CS_NA"), val2: t("WS_SAME_AS_PROPERTY_OWNERS") },
{ val1: t("CORE_COMMON_MOBILE_NUMBER"), val3: oldApplication?.connectionHolders?.[0]?.mobileNumber || t("CS_NA"), val2: t("WS_SAME_AS_PROPERTY_OWNERS") },
+ { val1: t("CORE_COMMON_EMAIL_ID"), val3: oldApplication?.connectionHolders?.[0]?.emailId || t("CS_NA"), val2: t("WS_SAME_AS_PROPERTY_OWNERS") },
{ val1: t("WS_CONN_HOLDER_COMMON_FATHER_OR_HUSBAND_NAME"), val3: oldApplication?.connectionHolders?.[0]?.fatherOrHusbandName || t("CS_NA"), val2: t("WS_SAME_AS_PROPERTY_OWNERS") },
{ val1: t("WS_CORRESPONDANCE_ADDRESS_LABEL"), val3: oldApplication?.connectionHolders?.[0]?.correspondenceAddress || t("CS_NA"), val2: t("WS_SAME_AS_PROPERTY_OWNERS") },
]
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/index.js
index 5eaa12d749c..335b49e8b35 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/index.js
@@ -65,9 +65,21 @@ export const pdfDownloadLink = (documents = {}, fileStoreId = "", format = "") =
};
/* method to get filename from fielstore url*/
-export const DownloadReceipt = async (consumerCode, tenantId, businessService, pdfKey = "consolidatedreceipt") => {
- tenantId = tenantId ? tenantId : Digit.ULBService.getCurrentTenantId();
- await Digit.Utils.downloadReceipt(consumerCode, businessService, "consolidatedreceipt", tenantId);
+// export const DownloadReceipt = async (payments,consumerCode, tenantId, businessService, pdfKey = "consolidatedreceipt") => {
+// tenantId = tenantId ? tenantId : Digit.ULBService.getCurrentTenantId();
+// await Digit.Utils.downloadReceipt(consumerCode, businessService, "consolidatedreceipt", tenantId);
+// };
+
+export const DownloadReceipt = async (payments,consumerCode, tenantId, businessService) => {
+ let response=null;
+ if(payments?.fileStoreId){
+ response = { filestoreIds: [payments?.fileStoreId] };
+ }
+ else{
+ response = await Digit.PaymentService.generatePdf(tenantId, { Payments: [{...payments}] }, "ws-onetime-receipt");
+ }
+ const fileStore = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: response.filestoreIds[0] });
+ window.open(fileStore[response?.filestoreIds[0]], "_blank");
};
export const pdfDocumentName = (documentLink = "", index = 0) => {
let documentName = decodeURIComponent(documentLink.split("?")[0].split("/").pop().slice(13)) || `Document - ${index + 1}`;
@@ -162,7 +174,8 @@ export const getPattern = (type) => {
return /^\d{0,8}(\.\d{1,2})?$/i;
//return /(([0-9]+)((\.\d{1,2})?))$/i;
case "Email":
- return /^(?=^.{1,64}$)((([^<>()\[\]\\.,;:\s$*@'"]+(\.[^<>()\[\]\\.,;:\s@'"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,})))$/i;
+ return /[A-Za-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$/i;
+ //return /^(?=^.{1,64}$)((([^<>()\[\]\\.,;:\s$*@'"]+(\.[^<>()\[\]\\.,;:\s@'"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,})))$/i;
case "Address":
return /^[^\$\"<>?\\\\~`!@$%^()+={}\[\]*:;“”‘’]{1,500}$/i;
case "PAN":
@@ -244,6 +257,7 @@ export const createPayloadOfWS = async (data) => {
ownerType: data?.ConnectionHolderDetails?.[0]?.ownerType?.code || "",
relationship: data?.ConnectionHolderDetails?.[0]?.relationship?.code || "",
sameAsPropertyAddress: data?.ConnectionHolderDetails?.[0]?.sameAsOwnerDetails,
+ emailId: data?.ConnectionHolderDetails?.[0].emailId || "",
},
]
: null,
@@ -353,6 +367,7 @@ export const convertToEditWSUpdate = (data) => {
gender: data?.ConnectionHolderDetails?.gender?.code || "",
mobileNumber: data?.ConnectionHolderDetails?.mobileNumber || "",
name: data?.ConnectionHolderDetails?.name || "",
+ emailId:data?.ConnectionHolderDetails?.emailId || "",
ownerType: data?.ConnectionHolderDetails?.specialCategoryType?.code || "",
relationship: data?.ConnectionHolderDetails?.relationship?.code || "",
sameAsPropertyAddress: data?.ConnectionHolderDetails?.sameAsOwnerDetails,
@@ -469,6 +484,7 @@ export const convertToEditSWUpdate = (data) => {
gender: data?.ConnectionHolderDetails?.gender?.code || "",
mobileNumber: data?.ConnectionHolderDetails?.mobileNumber || "",
name: data?.ConnectionHolderDetails?.name || "",
+ emailId:data?.ConnectionHolderDetails?.emailId || "",
ownerType: data?.ConnectionHolderDetails?.specialCategoryType?.code || "",
relationship: data?.ConnectionHolderDetails?.relationship?.code || "",
sameAsPropertyAddress: data?.ConnectionHolderDetails?.sameAsOwnerDetails,
@@ -588,7 +604,7 @@ export const createPayloadOfWSDisconnection = async (data, storeData, service) =
dateEffectiveFrom: convertDateToEpoch(data?.date),
isdisconnection: true,
isDisconnectionTemporary: data?.type?.value?.code === "Temporary" || data?.type?.value?.code === "TEMPORARY" ? true : false,
- disconnectionReason: data?.reason.value,
+ disconnectionReason: data?.reason.value?.code,
documents: data?.documents,
water: true,
sewerage: false,
@@ -635,7 +651,7 @@ export const createPayloadOfWSDisconnection = async (data, storeData, service) =
dateEffectiveFrom: convertDateToEpoch(data?.date),
isdisconnection: true,
isDisconnectionTemporary: data?.type?.value?.code === "Temporary" ? true : false,
- disconnectionReason: data?.reason.value,
+ disconnectionReason: data?.reason.value?.code,
documents: data?.documents,
water: false,
sewerage: true,
@@ -709,7 +725,7 @@ export const createPayloadOfWSReconnection = async (data, storeData, service) =>
dateEffectiveFrom: convertDateToEpoch(data?.date),
isdisconnection: true,
isDisconnectionTemporary: data?.type?.value?.code === "Temporary" || data?.type?.value?.code === "TEMPORARY" ? true : false,
- disconnectionReason: data?.reason.value,
+ disconnectionReason: data?.reason.value?.code,
documents: data?.documents,
water: true,
sewerage: false,
@@ -757,7 +773,7 @@ export const createPayloadOfWSReconnection = async (data, storeData, service) =>
dateEffectiveFrom: convertDateToEpoch(data?.date),
isdisconnection: true,
isDisconnectionTemporary: data?.type?.value?.code === "Temporary" ? true : false,
- disconnectionReason: data?.reason.value,
+ disconnectionReason: data?.reason.value?.code,
documents: data?.documents,
water: false,
sewerage: true,
@@ -809,7 +825,7 @@ export const createPayloadOfWSReSubmitDisconnection = async (data, storeData, se
...storeData?.applicationData,
dateEffectiveFrom: convertDateToEpoch(data?.date),
isDisconnectionTemporary: data?.type?.value?.code === "Temporary" ? true : false,
- disconnectionReason: data?.reason.value,
+ disconnectionReason: data?.reason.value?.code,
documents: data?.documents,
water: true,
sewerage: false,
@@ -835,7 +851,7 @@ export const createPayloadOfWSReSubmitDisconnection = async (data, storeData, se
dateEffectiveFrom: convertDateToEpoch(data?.date),
isdisconnection: true,
isDisconnectionTemporary: data?.type?.value?.code === "Temporary" ? true : false,
- disconnectionReason: data?.reason.value,
+ disconnectionReason: data?.reason.value?.code,
documents: data?.documents,
water: false,
sewerage: true,
@@ -1153,6 +1169,7 @@ export const convertApplicationData = (data, serviceType, modify = false, editBy
uuid: data?.applicationData?.connectionHolders?.[0]?.uuid,
name: data?.applicationData?.connectionHolders?.[0]?.name || "",
mobileNumber: data?.applicationData?.connectionHolders?.[0]?.mobileNumber || "",
+ emailId: data?.applicationData?.connectionHolders?.[0]?.emailId || "",
guardian: data?.applicationData?.connectionHolders?.[0]?.fatherOrHusbandName || "",
address: data?.applicationData?.connectionHolders?.[0]?.correspondenceAddress || "",
gender: data?.applicationData?.connectionHolders?.[0]?.gender
@@ -1429,6 +1446,7 @@ export const convertEditApplicationDetails = async (data, appData, actionData) =
gender: data?.ConnectionHolderDetails?.[0]?.gender?.code || "",
mobileNumber: data?.ConnectionHolderDetails?.[0]?.mobileNumber || "",
name: data?.ConnectionHolderDetails?.[0]?.name || "",
+ emailId:data?.ConnectionHolderDetails?.[0]?.emailId || "",
ownerType: data?.ConnectionHolderDetails?.[0]?.ownerType?.code || "",
relationship: data?.ConnectionHolderDetails?.[0]?.relationship?.code || "",
sameAsPropertyAddress: data?.ConnectionHolderDetails?.[0]?.sameAsOwnerDetails,
@@ -1607,6 +1625,7 @@ export const convertModifyApplicationDetails = async (data, appData, actionData
gender: data?.ConnectionHolderDetails?.[0]?.gender?.code || "",
mobileNumber: data?.ConnectionHolderDetails?.[0]?.mobileNumber || "",
name: data?.ConnectionHolderDetails?.[0]?.name || "",
+ emailId:data?.ConnectionHolderDetails?.[0]?.emailId || "",
ownerType: data?.ConnectionHolderDetails?.[0]?.ownerType?.code || "",
relationship: data?.ConnectionHolderDetails?.[0]?.relationship?.code || "",
sameAsPropertyAddress: data?.ConnectionHolderDetails?.[0]?.sameAsOwnerDetails,
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/.storybook/preview.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/.storybook/preview.js
index 5a292d831b8..ceb39003dd4 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/.storybook/preview.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/.storybook/preview.js
@@ -1,5 +1,5 @@
import "@upyog-niua/upyog-css/example/index.css";
-import { initLibraries } from "@egovernments/digit-ui-libraries";
+import { initLibraries } from "@upyog/digit-ui-libraries";
// TODO: It should be removed bcz we should not use any library in components
initLibraries();
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json
index 228b51fc2cd..6dd7425c668 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json
@@ -1,6 +1,6 @@
{
- "name": "@egovernments/digit-ui-react-components",
- "version": "1.7.0-beta.2",
+ "name": "@upyog/digit-ui-react-components",
+ "version": "1.7.0-beta.4",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/index.modern.js",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/DateRange.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/DateRange.js
index 5f68635ae08..d88dcafdff2 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/DateRange.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/DateRange.js
@@ -1,5 +1,5 @@
import React, { Fragment, useEffect, useMemo, useRef, useState } from "react";
-// import { ArrowDown, Modal, ButtonSelector, Calender } from "@egovernments/digit-ui-react-components";
+// import { ArrowDown, Modal, ButtonSelector, Calender } from "@upyog/digit-ui-react-components";
import ButtonSelector from "../atoms/ButtonSelector";
import { ArrowDown, Calender } from "../atoms/svgindex";
import Modal from "../hoc/Modal";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/FormStep.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/FormStep.js
index 851b9ea4c70..7236d37249b 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/FormStep.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/FormStep.js
@@ -6,7 +6,7 @@ import CardLabel from "../atoms/CardLabel";
import CardLabelError from "../atoms/CardLabelError";
import TextInput from "../atoms/TextInput";
import InputCard from "./InputCard";
-import { DatePicker } from "@egovernments/digit-ui-react-components";
+import { DatePicker } from "@upyog/digit-ui-react-components";
const FormStep = ({
t,
children,
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/PropertyType.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/PropertyType.js
index 33ce6557ac4..cbe15198dbb 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/PropertyType.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/PropertyType.js
@@ -1,6 +1,6 @@
import React from "react";
import { Loader } from "../atoms/Loader";
-import {Dropdown} from "@egovernments/digit-ui-react-components";;
+import {Dropdown} from "@upyog/digit-ui-react-components";;
import { useTranslation } from "react-i18next";
const PropertyType = ({ selectLocality, keepNull, selected, optionCardStyles, style, disable, disableLoader }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/publish.sh b/frontend/micro-ui/web/micro-ui-internals/publish.sh
index c4463d8b236..e5a7795db02 100644
--- a/frontend/micro-ui/web/micro-ui-internals/publish.sh
+++ b/frontend/micro-ui/web/micro-ui-internals/publish.sh
@@ -7,17 +7,15 @@ msg() {
}
# msg "Pre-building all packages"
-# yarn build
+# yarn install && yarn build
# sleep 5
-msg "Building and publishing css"
-cd "$BASEDIR/packages/css" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
msg "Building and publishing libraries"
-cd "$BASEDIR/packages/libraries" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/libraries" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing react-components"
-cd "$BASEDIR/packages/react-components" && rm -rf node_modules && rm -rf dist&& yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/react-components" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
# sleep 10
# msg "Updating dependencies"
@@ -25,50 +23,54 @@ cd "$BASEDIR/packages/react-components" && rm -rf node_modules && rm -rf dist&
# sleep 5
msg "Building and publishing PGR module"
-cd "$BASEDIR/packages/modules/pgr" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/pgr" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing FSM module"
-cd "$BASEDIR/packages/modules/fsm" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/fsm" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing PT module"
-cd "$BASEDIR/packages/modules/pt" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/pt" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing DSS module"
-cd "$BASEDIR/packages/modules/dss" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/dss" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing Common module"
-cd "$BASEDIR/packages/modules/common" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/common" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing Core module"
-cd "$BASEDIR/packages/modules/core" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/core" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing OBPS module"
-cd "$BASEDIR/packages/modules/obps" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/obps" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing tl module"
-cd "$BASEDIR/packages/modules/tl" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/tl" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing bills module"
-cd "$BASEDIR/packages/modules/bills" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/bills" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing noc module"
-cd "$BASEDIR/packages/modules/noc" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/noc" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing commonPt module"
-cd "$BASEDIR/packages/modules/commonPt" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/commonPt" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing engagement module"
-cd "$BASEDIR/packages/modules/engagement" && rm -rf node_modules && rm -rf dis && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/engagement" && rm -rf node_modules && rm -rf dis && yarn install && yarn build && npm publish --access public
msg "Building and publishing receipts module"
-cd "$BASEDIR/packages/modules/receipts" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/receipts" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
msg "Building and publishing hrms module"
-cd "$BASEDIR/packages/modules/hrms" && rm -rf node_modules && rm -rf dist && yarn build&& npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/hrms" && rm -rf node_modules && rm -rf dist && yarn install && yarn build&& npm publish --access public
msg "Building and publishing ws module"
-cd "$BASEDIR/packages/modules/ws" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
+cd "$BASEDIR/packages/modules/ws" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
+
+msg "Building and publishing mCollect module"
+cd "$BASEDIR/packages/modules/mCollect" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
+
+msg "Building and publishing PTR module"
+cd "$BASEDIR/packages/modules/ptr" && rm -rf node_modules && rm -rf dist && yarn install && yarn build && npm publish --access public
-msg "Building and publishing ws module"
-cd "$BASEDIR/packages/modules/mCollect" && rm -rf node_modules && rm -rf dist && yarn build && npm publish --tag upyog-2.8
diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
index 7faf8e127b0..e73e40554e0 100644
--- a/frontend/micro-ui/web/package.json
+++ b/frontend/micro-ui/web/package.json
@@ -8,11 +8,9 @@
"micro-ui-internals/packages/react-components",
"micro-ui-internals/packages/modules/common",
"micro-ui-internals/packages/modules/core",
+ "micro-ui-internals/packages/modules/commonPt",
"micro-ui-internals/packages/modules/dss",
- "micro-ui-internals/packages/modules/pgr",
"micro-ui-internals/packages/modules/pt",
- "micro-ui-internals/packages/modules/commonPt",
- "micro-ui-internals/packages/modules/mCollect",
"micro-ui-internals/packages/modules/obps"
@@ -22,24 +20,25 @@
},
"dependencies": {
"@upyog-niua/upyog-css": "1.0.10",
- "@egovernments/digit-ui-libraries": "1.7.0-beta.2",
- "@egovernments/digit-ui-module-bills": "1.7.0-beta.2",
- "@egovernments/digit-ui-module-common": "1.7.0-beta.2",
- "@egovernments/digit-ui-module-core": "1.7.0-beta.2",
- "@egovernments/digit-ui-module-engagement": "1.7.0-beta.2",
- "@egovernments/digit-ui-module-dss": "1.7.0-beta.2",
- "@upyog/digit-ui-module-fsm": "1.7.0-beta.9",
- "@egovernments/digit-ui-module-hrms": "1.7.0-beta.2",
- "@egovernments/digit-ui-module-mcollect": "1.7.0-beta.2",
- "@egovernments/digit-ui-module-commonpt":"1.7.0-beta.3",
- "@upyog/digit-ui-module-obps": "1.7.0-beta.2",
- "@egovernments/digit-ui-module-noc": "1.7.0-beta.2",
- "@egovernments/digit-ui-module-pgr": "1.7.0-beta.2",
- "@upyog/digit-ui-module-pt": "1.7.0-beta.2",
- "@egovernments/digit-ui-module-receipts": "1.7.0-beta.2",
- "@upyog/digit-ui-module-tl": "1.7.0-beta.2",
- "@upyog/digit-ui-module-ws": "1.7.0-beta.2",
- "@egovernments/digit-ui-react-components": "1.7.0-beta.2",
+ "@upyog/digit-ui-libraries": "1.7.0-beta.5",
+ "@upyog/digit-ui-module-bills": "1.7.0-beta.3",
+ "@upyog/digit-ui-module-common": "1.7.0-beta.5",
+ "@upyog/digit-ui-module-core": "1.7.0-beta.3",
+ "@upyog/digit-ui-module-engagement": "1.7.0-beta.4",
+ "@upyog/digit-ui-module-dss": "1.7.0-beta.4",
+ "@upyog/digit-ui-module-fsm": "1.7.0-beta.17",
+ "@upyog/digit-ui-module-hrms": "1.7.0-beta.3",
+ "@upyog/digit-ui-module-mcollect": "1.7.0-beta.4",
+ "@upyog/digit-ui-module-commonpt":"1.7.0-beta.4",
+ "@upyog/digit-ui-module-obps": "1.7.0-beta.7",
+ "@upyog/digit-ui-module-noc": "1.7.0-beta.3",
+ "@upyog/digit-ui-module-pgr": "1.7.0-beta.5",
+ "@upyog/digit-ui-module-pt": "1.7.0-beta.4",
+ "@upyog/digit-ui-module-receipts": "1.7.0-beta.3",
+ "@upyog/digit-ui-module-tl": "1.7.0-beta.7",
+ "@upyog/digit-ui-module-ws": "1.7.0-beta.10",
+ "@upyog/digit-ui-react-components": "1.7.0-beta.4",
+ "@upyog-niua/upyog-ui-module-ptr": "1.0.6",
"babel-loader": "8.1.0",
"react": "17.0.2",
"react-dom": "17.0.2",
diff --git a/frontend/micro-ui/web/src/App.js b/frontend/micro-ui/web/src/App.js
index 1452f146071..0f65f1aa2e8 100644
--- a/frontend/micro-ui/web/src/App.js
+++ b/frontend/micro-ui/web/src/App.js
@@ -3,39 +3,44 @@ import React from "react";
import {
initPGRComponents,
PGRReducers,
-} from "@egovernments/digit-ui-module-pgr";
+} from "@upyog/digit-ui-module-pgr";
import { initFSMComponents } from "@upyog/digit-ui-module-fsm";
import {
PTModule,
PTLinks,
PTComponents,
} from "@upyog/digit-ui-module-pt";
-import { MCollectModule, MCollectLinks, initMCollectComponents } from "@egovernments/digit-ui-module-mcollect";
-import { initDSSComponents } from "@egovernments/digit-ui-module-dss";
+import { MCollectModule, MCollectLinks, initMCollectComponents } from "@upyog/digit-ui-module-mcollect";
+import { initDSSComponents } from "@upyog/digit-ui-module-dss";
import {
PaymentModule,
PaymentLinks,
paymentConfigs,
-} from "@egovernments/digit-ui-module-common";
-import { DigitUI } from "@egovernments/digit-ui-module-core";
-import { initLibraries } from "@egovernments/digit-ui-libraries";
+} from "@upyog/digit-ui-module-common";
+import { DigitUI } from "@upyog/digit-ui-module-core";
+import { initLibraries } from "@upyog/digit-ui-libraries";
import {
HRMSModule,
initHRMSComponents,
-} from "@egovernments/digit-ui-module-hrms";
+} from "@upyog/digit-ui-module-hrms";
import {
TLModule,
TLLinks,
initTLComponents,
} from "@upyog/digit-ui-module-tl";
-import { initReceiptsComponents, ReceiptsModule } from "@egovernments/digit-ui-module-receipts";
+import {
+ PTRModule,
+ PTRLinks,
+ PTRComponents,
+} from "@upyog-niua/upyog-ui-module-ptr";
+import { initReceiptsComponents, ReceiptsModule } from "@upyog/digit-ui-module-receipts";
import { initOBPSComponents } from "@upyog/digit-ui-module-obps";
-import { initNOCComponents } from "@egovernments/digit-ui-module-noc";
-import { initEngagementComponents } from "@egovernments/digit-ui-module-engagement";
+import { initNOCComponents } from "@upyog/digit-ui-module-noc";
+import { initEngagementComponents } from "@upyog/digit-ui-module-engagement";
import { initWSComponents } from "@upyog/digit-ui-module-ws";
import { initCustomisationComponents } from "./Customisations";
-import { initCommonPTComponents } from "@egovernments/digit-ui-module-commonpt";
-import { initBillsComponents } from "@egovernments/digit-ui-module-bills";
+import { initCommonPTComponents } from "@upyog/digit-ui-module-commonpt";
+import { initBillsComponents } from "@upyog/digit-ui-module-bills";
// import { initReportsComponents } from "@egovernments/digit-ui-module-reports";
initLibraries();
@@ -64,6 +69,7 @@ const enabledModules = [
"FireNoc",
"Birth",
"Death",
+ "PTR"
];
window.Digit.ComponentRegistryService.setupRegistry({
...paymentConfigs,
@@ -78,6 +84,9 @@ window.Digit.ComponentRegistryService.setupRegistry({
TLModule,
TLLinks,
ReceiptsModule,
+ PTRModule,
+ PTRLinks,
+ ...PTRComponents,
});
initPGRComponents();
diff --git a/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTAllotmentDetails.js b/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTAllotmentDetails.js
index 569aa45e409..f5438837fe7 100644
--- a/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTAllotmentDetails.js
+++ b/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTAllotmentDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, CitizenInfoLabel, FormStep, LabelFieldPair, TextInput,CardLabelError } from "@egovernments/digit-ui-react-components";
+import { CardLabel, CitizenInfoLabel, FormStep, LabelFieldPair, TextInput,CardLabelError } from "@upyog/digit-ui-react-components";
import React, { useState } from "react";
var validation ={};
const PTAllotmentDetails = ({ t, config, onSelect, value, userType, formData }) => {
diff --git a/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTBusinessDetails.js b/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTBusinessDetails.js
index 3d28785e7e5..41bc0ea4c67 100644
--- a/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTBusinessDetails.js
+++ b/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTBusinessDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, CitizenInfoLabel, FormStep, LabelFieldPair, TextInput,CardLabelError } from "@egovernments/digit-ui-react-components";
+import { CardLabel, CitizenInfoLabel, FormStep, LabelFieldPair, TextInput,CardLabelError } from "@upyog/digit-ui-react-components";
import React, { useState } from "react";
var validation ={};
const PTBusinessDetails = ({ t, config, onSelect, value, userType, formData }) => {
diff --git a/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTVasikaDetails.js b/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTVasikaDetails.js
index 0e4b6895745..d7806bb5c8f 100644
--- a/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTVasikaDetails.js
+++ b/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PTVasikaDetails.js
@@ -1,4 +1,4 @@
-import { CardLabel, CitizenInfoLabel, FormStep, LabelFieldPair, TextInput,CardLabelError } from "@egovernments/digit-ui-react-components";
+import { CardLabel, CitizenInfoLabel, FormStep, LabelFieldPair, TextInput,CardLabelError } from "@upyog/digit-ui-react-components";
import React, { useState } from "react";
var validation ={};
const PTVasikaDetails = ({ t, config, onSelect, value, userType, formData }) => {
diff --git a/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PropertyUsageType.js b/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PropertyUsageType.js
index deade4fc2ad..1f680aa6351 100644
--- a/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PropertyUsageType.js
+++ b/frontend/micro-ui/web/src/Customisations/pt/pageComponents/PropertyUsageType.js
@@ -1,6 +1,6 @@
import {
CardLabel, CardLabelError, CitizenInfoLabel, Dropdown, FormStep, LabelFieldPair, RadioButtons
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { useLocation } from "react-router-dom";
diff --git a/frontend/micro-ui/web/src/Customisations/tl/pageComponents/PropertyUsageType.js b/frontend/micro-ui/web/src/Customisations/tl/pageComponents/PropertyUsageType.js
index 5520a66fc5a..f5925f80827 100644
--- a/frontend/micro-ui/web/src/Customisations/tl/pageComponents/PropertyUsageType.js
+++ b/frontend/micro-ui/web/src/Customisations/tl/pageComponents/PropertyUsageType.js
@@ -1,6 +1,6 @@
import {
CardLabel, CardLabelError, CitizenInfoLabel, Dropdown, FormStep, LabelFieldPair, RadioButtons
-} from "@egovernments/digit-ui-react-components";
+} from "@upyog/digit-ui-react-components";
import React, { useEffect, useState } from "react";
import { useLocation } from "react-router-dom";
diff --git a/frontend/micro-ui/web/src/index.js b/frontend/micro-ui/web/src/index.js
index 8a4e2662169..928392e63f7 100644
--- a/frontend/micro-ui/web/src/index.js
+++ b/frontend/micro-ui/web/src/index.js
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
-import { initLibraries } from "@egovernments/digit-ui-libraries";
+import { initLibraries } from "@upyog/digit-ui-libraries";
// import "@egovernments/digit-ui-css/dist/index.css";
import "./index.css";
import App from './App';