Skip to content
This repository was archived by the owner on Nov 26, 2024. It is now read-only.

Fixed all the version related issue #59

Open
wants to merge 2 commits into
base: 1.2.1-fsm-develop
Choose a base branch
from
Open

Fixed all the version related issue #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c82fe87
UI Build issue resolved
jagankumar-egov Dec 8, 2022
77d6222
updated all versions
jagankumar-egov Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/micro-ui-internals/packages/libraries/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-libraries",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"main": "dist/index.js",
"module": "dist/index.modern.js",
"source": "src/index.js",
Expand Down
27 changes: 14 additions & 13 deletions web/micro-ui-internals/packages/libraries/src/services/molecules/FSM/Search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ export const Search = {
child:
response?.address?.geoLocation?.latitude && response?.address?.geoLocation?.longitude
? {
element: "img",
src: Digit.Utils.getStaticMapUrl(response?.address?.geoLocation?.latitude, response?.address?.geoLocation?.longitude),
}
element: "img",
src: Digit.Utils.getStaticMapUrl(response?.address?.geoLocation?.latitude, response?.address?.geoLocation?.longitude),
}
: null,
},
],
Expand Down Expand Up @@ -171,8 +171,8 @@ export const Search = {
title: "ES_APPLICATION_DETAILS_AMOUNT_PER_TRIP",
value: amountPerTrip,
},
totalAmount === "N/A"
? { title: "ES_PAYMENT_DETAILS_TOTAL_AMOUNT", value: response?.noOfTrips * amountPerTrip }
totalAmount === "N/A"
? { title: "ES_PAYMENT_DETAILS_TOTAL_AMOUNT", value: amountPerTrip === "N/A" ? "N/A" : response?.noOfTrips * amountPerTrip }
: { title: "ES_PAYMENT_DETAILS_TOTAL_AMOUNT", value: totalAmount },
],
},
Expand All @@ -192,9 +192,9 @@ export const Search = {
if (userType !== "CITIZEN" && userType !== "DSO") {
employeeResponse.map((data) => {
if (data.title === "ES_TITLE_APPLICANT_DETAILS" || data.title === "Applicant Details") {
data.values.push({ title: "COMMON_APPLICANT_GENDER", value: response?.citizen?.gender })
data.values.push({ title: "COMMON_APPLICANT_GENDER", value: response?.citizen?.gender });
}
})
});
}

if (userType !== "CITIZEN")
Expand Down Expand Up @@ -244,12 +244,13 @@ export const Search = {
},

combineResponse: (vehicleTrip, vendorOwnerKey) => {
return vehicleTrip.map((trip) => {
if (vendorOwnerKey[trip.tripOwnerId]) {
return { ...trip, dsoName: vendorOwnerKey[trip.tripOwnerId].name };
} else return {}
}).filter(e => e.tripOwnerId);

return vehicleTrip
.map((trip) => {
if (vendorOwnerKey[trip.tripOwnerId]) {
return { ...trip, dsoName: vendorOwnerKey[trip.tripOwnerId].name };
} else return {};
})
.filter((e) => e.tripOwnerId);
},

applicationWithBillSlab: async (t, tenantId, applicationNos) => {
Expand Down
8 changes: 4 additions & 4 deletions web/micro-ui-internals/packages/modules/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-common",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"license": "MIT",
"description": "Digit Common Payment Module",
"main": "dist/index.js",
Expand All @@ -10,13 +10,13 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"prepublish": "yarn build"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
3 changes: 1 addition & 2 deletions ...micro-ui-internals/packages/modules/common/src/payments/employee/payment-collect/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ export const CollectPayment = (props) => {
const [formState, setFormState] = useState({});
const [toast, setToast] = useState(null);

const isFsm = location?.pathname?.includes("fsm") || location?.pathname?.includes("FSM");

const isFsm = window?.location?.pathname?.includes("fsm") || window?.location?.pathname?.includes("FSM");
const defaultPaymentModes = [
{ code: "CASH", label: t("COMMON_MASTERS_PAYMENTMODE_CASH") },
{ code: "CHEQUE", label: t("COMMON_MASTERS_PAYMENTMODE_CHEQUE") },
Expand Down
8 changes: 4 additions & 4 deletions web/micro-ui-internals/packages/modules/commonPt/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-commonpt",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"license": "MIT",
"description": "Digit PT Light weight Module",
"main": "dist/index.js",
Expand All @@ -10,7 +10,7 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"prepublish": "yarn build"
},
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"lodash.merge": "^4.6.2",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
8 changes: 4 additions & 4 deletions web/micro-ui-internals/packages/modules/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-core",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"license": "MIT",
"description": "Digit App Core Module contains all core components",
"main": "dist/index.js",
Expand All @@ -10,13 +10,13 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"prepublish": "yarn build"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
8 changes: 4 additions & 4 deletions web/micro-ui-internals/packages/modules/dss/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-dss",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"license": "MIT",
"description": "Digit Dashboard Module",
"main": "dist/index.js",
Expand All @@ -10,7 +10,7 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"prepublish": "yarn build"
},
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"react": "17.0.2",
"react-date-range": "1.3.0",
"react-dom": "17.0.2",
Expand Down
8 changes: 4 additions & 4 deletions web/micro-ui-internals/packages/modules/engagement/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-engagement",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"license": "MIT",
"description": "Digit App Core Enagagement Module contains Notification survey documents",
"main": "dist/index.js",
Expand All @@ -10,7 +10,7 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"prepublish": "yarn build"
},
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
10 changes: 5 additions & 5 deletions web/micro-ui-internals/packages/modules/fsm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-fsm",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"license": "MIT",
"main": "dist/index.js",
"description": "Digit FSM Module",
Expand All @@ -10,17 +10,17 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --compress --no-sourcemap --format cjs",
"prepublish": "yarn build"
},
"peerDependencies": {
"react": "17.0.2",
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"microbundle-crl": "0.13.11",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
6 changes: 5 additions & 1 deletion web/micro-ui-internals/packages/modules/fsm/src/pages/employee/FstpOperations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { useTranslation } from "react-i18next";
import { useHistory } from "react-router-dom";

const FstpOperations = () => {
console.log("testing");
const { t } = useTranslation();
const state = Digit.ULBService.getStateId();
const tenantId = Digit.ULBService.getCurrentTenantId();
Expand All @@ -17,6 +16,11 @@ const FstpOperations = () => {
link: "/digit-ui/employee/fsm/fstp-add-vehicle",
icon: <AddNewIcon />
},
{
name: "ES_FSM_VIEW_REPORTS_BUTTON",
locate: "/employee/report/fsm/FSMFSTPPlantWithVehicleLogReport",
icon: <ViewReportIcon />
},
{
name: "ES_COMMON_INBOX",
link: "/digit-ui/employee/fsm/fstp-inbox",
Expand Down
8 changes: 4 additions & 4 deletions web/micro-ui-internals/packages/modules/hrms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-hrms",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"description": "Digit HRMS Module",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -10,13 +10,13 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"prepublish": "yarn build"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
8 changes: 4 additions & 4 deletions web/micro-ui-internals/packages/modules/mCollect/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-mcollect",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"license": "MIT",
"description": "Digit Misc Collections Module",
"main": "dist/index.js",
Expand All @@ -10,7 +10,7 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"prepublish": "yarn build"
},
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"lodash.merge": "^4.6.2",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
8 changes: 4 additions & 4 deletions web/micro-ui-internals/packages/modules/noc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-noc",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"description": "Digit NOC Module",
"main": "dist/index.js",
"module": "dist/index.modern.js",
Expand All @@ -9,7 +9,7 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"prepublish": "yarn build"
},
Expand All @@ -18,8 +18,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
8 changes: 4 additions & 4 deletions web/micro-ui-internals/packages/modules/obps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-obps",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"description": "Digit OBPS Module",
"main": "dist/index.js",
"module": "dist/index.modern.js",
Expand All @@ -9,7 +9,7 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"prepublish": "yarn build"
},
Expand All @@ -18,8 +18,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hook-form": "6.15.8",
Expand Down
8 changes: 4 additions & 4 deletions web/micro-ui-internals/packages/modules/pgr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-pgr",
"version": "1.5.5-fsm.1.2.1",
"version": "1.5.10-fsm.1.2.1",
"license": "MIT",
"description": "Digit Complaints Module",
"main": "dist/index.js",
Expand All @@ -10,7 +10,7 @@
"dist"
],
"scripts": {
"start": "microbundle-crl watch --no-compress --format modern,cjs",
"start": "microbundle-crl --compress --no-sourcemap --format cjs",
"build": "microbundle-crl --no-compress --format modern,cjs",
"prepublish": "yarn build"
},
Expand All @@ -19,8 +19,8 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-libraries": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.5-fsm.1.2.1",
"@egovernments/digit-ui-libraries": "1.5.10-fsm.1.2.1",
"@egovernments/digit-ui-react-components": "1.5.10-fsm.1.2.1",
"lodash.merge": "^4.6.2",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
Loading