From dafb585c45a4384e56b3bbb4ba2034510eccc9a1 Mon Sep 17 00:00:00 2001 From: palak-egov Date: Thu, 15 Jun 2023 12:13:56 +0530 Subject: [PATCH 1/6] [UM-6216] --- data/pg/DataSecurity/DecryptionABAC.json | 32 ++++++++++----------- data/pg/DataSecurity/SecurityPolicy.json | 36 ++++++++++++------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/data/pg/DataSecurity/DecryptionABAC.json b/data/pg/DataSecurity/DecryptionABAC.json index 0ff9cd355..5c2ecda68 100644 --- a/data/pg/DataSecurity/DecryptionABAC.json +++ b/data/pg/DataSecurity/DecryptionABAC.json @@ -325,22 +325,6 @@ } ] }, - { - "key": "MiscReceiptCB", - "roleAttributeAccessList": [ - { - "roleCode": "EMPLOYEE", - "attributeAccessList": [ - { - "attribute": { - "jsonPath": "*/name" - }, - "accessType": "PLAIN" - } - ] - } - ] - }, { "key": "LMEPerformanceReport", "roleAttributeAccessList": [ @@ -440,6 +424,22 @@ } ] }, + { + "key": "MiscReceiptCB", + "roleAttributeAccessList": [ + { + "roleCode": "EMPLOYEE", + "attributeAccessList": [ + { + "attribute": { + "jsonPath": "*/name" + }, + "accessType": "PLAIN" + } + ] + } + ] + }, { "key": "StateLevelTradeLicenseRegistryReport", "roleAttributeAccessList": [ diff --git a/data/pg/DataSecurity/SecurityPolicy.json b/data/pg/DataSecurity/SecurityPolicy.json index bc165829b..65f2e2c0b 100644 --- a/data/pg/DataSecurity/SecurityPolicy.json +++ b/data/pg/DataSecurity/SecurityPolicy.json @@ -285,24 +285,6 @@ ] }, - { - "model": "MiscReceiptCB", - "uniqueIdentifier": { - "name": "uuid", - "jsonPath": "/uuid" - }, - "attributes": [ - { - "name": "name", - "jsonPath": "name", - "patternId": "002", - "defaultVisibility": "PLAIN" - } - ], - "roleBasedDecryptionPolicy": [ - - ] - }, { "model": "waterOpenSearch", "uniqueIdentifier": { @@ -762,6 +744,24 @@ ] }, + { + "model": "MiscReceiptCB", + "uniqueIdentifier": { + "name": "uuid", + "jsonPath": "/uuid" + }, + "attributes": [ + { + "name": "name", + "jsonPath": "name", + "patternId": "002", + "defaultVisibility": "PLAIN" + } + ], + "roleBasedDecryptionPolicy": [ + + ] + }, { "model": "StateTradeLicenseCancelledRegistryReport", "uniqueIdentifier": { From 6f11705159ada984649a6415de9fc002b687153b Mon Sep 17 00:00:00 2001 From: palak-egov Date: Thu, 15 Jun 2023 13:12:34 +0530 Subject: [PATCH 2/6] adding decryption for mcollect report --- data/pg/DataSecurity/DecryptionABAC.json | 32 ++++++++++++------------ data/pg/DataSecurity/SecurityPolicy.json | 18 +++++++++++++ 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/data/pg/DataSecurity/DecryptionABAC.json b/data/pg/DataSecurity/DecryptionABAC.json index 5c2ecda68..df378bb63 100644 --- a/data/pg/DataSecurity/DecryptionABAC.json +++ b/data/pg/DataSecurity/DecryptionABAC.json @@ -440,6 +440,22 @@ } ] }, + { + "key": "MCollectReceiptRegister", + "roleAttributeAccessList": [ + { + "roleCode": "EMPLOYEE", + "attributeAccessList": [ + { + "attribute": { + "jsonPath": "*/name" + }, + "accessType": "PLAIN" + } + ] + } + ] + }, { "key": "StateLevelTradeLicenseRegistryReport", "roleAttributeAccessList": [ @@ -1434,22 +1450,6 @@ } ] }, - { - "key": "MCollectReceiptRegister", - "roleAttributeAccessList": [ - { - "roleCode": "EMPLOYEE", - "attributeAccessList": [ - { - "attribute": { - "jsonPath": "*/name" - }, - "accessType": "PLAIN" - } - ] - } - ] - }, { "key": "TradeLicenseDailyCollectionReport", "roleAttributeAccessList": [ diff --git a/data/pg/DataSecurity/SecurityPolicy.json b/data/pg/DataSecurity/SecurityPolicy.json index 65f2e2c0b..008519980 100644 --- a/data/pg/DataSecurity/SecurityPolicy.json +++ b/data/pg/DataSecurity/SecurityPolicy.json @@ -762,6 +762,24 @@ ] }, + { + "model": "MCollectReceiptRegister", + "uniqueIdentifier": { + "name": "uuid", + "jsonPath": "/uuid" + }, + "attributes": [ + { + "name": "name", + "jsonPath": "name", + "patternId": "002", + "defaultVisibility": "PLAIN" + } + ], + "roleBasedDecryptionPolicy": [ + + ] + }, { "model": "StateTradeLicenseCancelledRegistryReport", "uniqueIdentifier": { From 0e929774c69fbc1a0a4b593fcab7a385b0339012 Mon Sep 17 00:00:00 2001 From: palak-egov Date: Thu, 15 Jun 2023 14:12:51 +0530 Subject: [PATCH 3/6] adding decrypt path for uc report --- data/pg/DataSecurity/SecurityPolicy.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/pg/DataSecurity/SecurityPolicy.json b/data/pg/DataSecurity/SecurityPolicy.json index 008519980..dfdfa1163 100644 --- a/data/pg/DataSecurity/SecurityPolicy.json +++ b/data/pg/DataSecurity/SecurityPolicy.json @@ -774,6 +774,12 @@ "jsonPath": "name", "patternId": "002", "defaultVisibility": "PLAIN" + }, + { + "name": "consumername", + "jsonPath": "consumername", + "patternId": "002", + "defaultVisibility": "PLAIN" } ], "roleBasedDecryptionPolicy": [ From f8be5bf07c06d1bee1ecec01769bd474d7547640 Mon Sep 17 00:00:00 2001 From: vamshikrishnakole-wtt-egov Date: Thu, 15 Jun 2023 14:32:42 +0530 Subject: [PATCH 4/6] UM-6280 Fire NOC and BnD redirection issue from citizen in Sandbox --- .../actions-test.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json b/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json index 9491325e4..568396f12 100644 --- a/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json +++ b/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json @@ -13451,7 +13451,7 @@ }, { "id": 2425, - "name": "FirenocCitizen", + "name": "Firenoc Citizen Home", "url": "digit-ui-card", "displayName": "FireNoc Search", "orderNumber": 1, @@ -13460,16 +13460,16 @@ "serviceCode": "", "code": "", "path": "", - "navigationURL": "/citizen/fire-noc/home", + "navigationURL": "fire-noc/home", "leftIcon": "FirenocIcon", "rightIcon": "", "queryParams": "", "sidebar": "digit-ui-links", - "sidebarURL": "/citizen/fire-noc/home" + "sidebarURL": "fire-noc/home" }, { "id": 2426, - "name": "BirthCitizen", + "name": "Birth Certificate Home", "url": "digit-ui-card", "displayName": "Birth Search", "orderNumber": 1, @@ -13478,16 +13478,16 @@ "serviceCode": "", "code": "", "path": "", - "navigationURL": "/citizen/birth-citizen/home", + "navigationURL": "birth-citizen/home", "leftIcon": "BirthIcon", "rightIcon": "", "queryParams": "", "sidebar": "digit-ui-links", - "sidebarURL": "/citizen/birth-citizen/home" + "sidebarURL": "birth-citizen/home" }, { "id": 2427, - "name": "DeathCitizen", + "name": "Death Certificate Home", "url": "digit-ui-card", "displayName": "Death Search", "orderNumber": 1, @@ -13496,12 +13496,12 @@ "serviceCode": "", "code": "", "path": "", - "navigationURL": "/citizen/death-citizen/home", + "navigationURL": "death-citizen/home", "leftIcon": "DeathIcon", "rightIcon": "", "queryParams": "", "sidebar": "digit-ui-links", - "sidebarURL": "/citizen/death-citizen/home" + "sidebarURL": "death-citizen/home" }, { "id": 2428, From 7f18e1b43a618365d8d7b295d46a925a612d1e28 Mon Sep 17 00:00:00 2001 From: vamshikrishnakole-wtt-egov Date: Thu, 15 Jun 2023 14:54:31 +0530 Subject: [PATCH 5/6] UM-6280 Fire NOC and BnD redirection issue from citizen in Sandbox --- data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json b/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json index 568396f12..55e0b683f 100644 --- a/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json +++ b/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json @@ -13460,12 +13460,12 @@ "serviceCode": "", "code": "", "path": "", - "navigationURL": "fire-noc/home", + "navigationURL": "/citizen/fire-noc/home", "leftIcon": "FirenocIcon", "rightIcon": "", "queryParams": "", "sidebar": "digit-ui-links", - "sidebarURL": "fire-noc/home" + "sidebarURL": "/citizen/fire-noc/home" }, { "id": 2426, @@ -13478,12 +13478,12 @@ "serviceCode": "", "code": "", "path": "", - "navigationURL": "birth-citizen/home", + "navigationURL": "/citizen/birth-citizen/home", "leftIcon": "BirthIcon", "rightIcon": "", "queryParams": "", "sidebar": "digit-ui-links", - "sidebarURL": "birth-citizen/home" + "sidebarURL": "/citizen/birth-citizen/home" }, { "id": 2427, @@ -13496,12 +13496,12 @@ "serviceCode": "", "code": "", "path": "", - "navigationURL": "death-citizen/home", + "navigationURL": "/citizen/death-citizen/home", "leftIcon": "DeathIcon", "rightIcon": "", "queryParams": "", "sidebar": "digit-ui-links", - "sidebarURL": "death-citizen/home" + "sidebarURL": "/citizen/death-citizen/home" }, { "id": 2428, From 39e63ba47fa77f474f2e37b49ee6ccc7928975b4 Mon Sep 17 00:00:00 2001 From: vinothrallapalli-eGov Date: Fri, 16 Jun 2023 22:37:58 +0530 Subject: [PATCH 6/6] Update FinancialYear.json for FIRE NOC --- data/pg/egf-master/FinancialYear.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/pg/egf-master/FinancialYear.json b/data/pg/egf-master/FinancialYear.json index 19cdf706d..a2e6760d7 100644 --- a/data/pg/egf-master/FinancialYear.json +++ b/data/pg/egf-master/FinancialYear.json @@ -64,8 +64,8 @@ "finYearRange": "2023-24", "name": "2023-24", "code": "2023-24", - "startingDate": 1680307199000, - "endingDate": 1711929599000, + "startingDate": 1680287400000, + "endingDate": 1711909799000, "active": true, "isActiveForPosting": false, "isClosed": false,