From 2bfdbe6bbf093713516853bb058037e1a215734b Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 24 Apr 2024 10:33:55 +0530
Subject: [PATCH 1/2] Improved: permission management in case of adding and
 updating permission association with group (#227)

---
 src/authorization/Actions.ts       | 1 +
 src/authorization/Rules.ts         | 3 ++-
 src/components/PermissionItems.vue | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/authorization/Actions.ts b/src/authorization/Actions.ts
index 267add0..c3337fe 100644
--- a/src/authorization/Actions.ts
+++ b/src/authorization/Actions.ts
@@ -6,6 +6,7 @@ export default {
   'APP_UPDT_PRODUCT_STORE_CONFG': 'APP_UPDT_PRODUCT_STORE_CONFG',
   'APP_SUPER_USER': 'APP_SUPER_USER',
   'APP_SECURITY_GROUP_CREATE': 'APP_SECURITY_GROUP_CREATE',
+  'APP_PERMISSION_ADD': 'APP_PERMISSION_ADD',
   'APP_PERMISSION_UPDATE': 'APP_PERMISSION_UPDATE',
   'APP_PERMISSION_VIEW': 'APP_PERMISSION_VIEW',
   'APP_USER_CREATE': 'APP_USER_CREATE'
diff --git a/src/authorization/Rules.ts b/src/authorization/Rules.ts
index f49187e..b3adb98 100644
--- a/src/authorization/Rules.ts
+++ b/src/authorization/Rules.ts
@@ -6,7 +6,8 @@ export default {
   'APP_UPDT_PASSWORD': 'SECURITY_CREATE OR SECURITY_ADMIN',
   'APP_UPDT_PRODUCT_STORE_CONFG': 'SECURITY_CREATE OR SECURITY_ADMIN',
   'APP_SECURITY_GROUP_CREATE': 'SECURITY_CREATE OR SECURITY_ADMIN',
-  'APP_PERMISSION_UPDATE': 'SECURITY_CREATE OR SECURITY_ADMIN',
+  'APP_PERMISSION_ADD': 'SECURITY_CREATE OR SECURITY_ADMIN',
+  'APP_PERMISSION_UPDATE': 'SECURITY_UPDATE OR SECURITY_ADMIN',
   'APP_PERMISSION_VIEW': 'SECURITY_VIEW OR SECURITY_ADMIN',
   'APP_SUPER_USER': 'WEBTOOLS_VIEW',
   'USERS_APP_VIEW': 'USERS_APP_VIEW'
diff --git a/src/components/PermissionItems.vue b/src/components/PermissionItems.vue
index 9a01ff0..0ef6a85 100644
--- a/src/components/PermissionItems.vue
+++ b/src/components/PermissionItems.vue
@@ -35,7 +35,7 @@
               <ion-card-title>{{ permission.permissionId }}</ion-card-title>
               <ion-card-subtitle>{{ permission.description }}</ion-card-subtitle>
             </div>
-            <ion-checkbox :disabled="!hasPermission(Actions.APP_PERMISSION_UPDATE)" :checked="permission.isChecked" @click="updatePermissionAssociation($event, permission)" />
+            <ion-checkbox :disabled="permission.isChecked ? !hasPermission(Actions.APP_PERMISSION_UPDATE) : !hasPermission(Actions.APP_PERMISSION_ADD)" :checked="permission.isChecked" @click="updatePermissionAssociation($event, permission)" />
           </ion-card-header>
         </ion-card>
       </section>

From a56031e1ba8d95499313065a0fe3fabef9985881 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 24 Apr 2024 14:43:59 +0530
Subject: [PATCH 2/2] Improved: app level permission name for security
 permission create (#227)

---
 src/authorization/Actions.ts       | 2 +-
 src/authorization/Rules.ts         | 2 +-
 src/components/PermissionItems.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/authorization/Actions.ts b/src/authorization/Actions.ts
index c3337fe..b7c25d3 100644
--- a/src/authorization/Actions.ts
+++ b/src/authorization/Actions.ts
@@ -6,7 +6,7 @@ export default {
   'APP_UPDT_PRODUCT_STORE_CONFG': 'APP_UPDT_PRODUCT_STORE_CONFG',
   'APP_SUPER_USER': 'APP_SUPER_USER',
   'APP_SECURITY_GROUP_CREATE': 'APP_SECURITY_GROUP_CREATE',
-  'APP_PERMISSION_ADD': 'APP_PERMISSION_ADD',
+  'APP_PERMISSION_CREATE': 'APP_PERMISSION_CREATE',
   'APP_PERMISSION_UPDATE': 'APP_PERMISSION_UPDATE',
   'APP_PERMISSION_VIEW': 'APP_PERMISSION_VIEW',
   'APP_USER_CREATE': 'APP_USER_CREATE'
diff --git a/src/authorization/Rules.ts b/src/authorization/Rules.ts
index b3adb98..47d073c 100644
--- a/src/authorization/Rules.ts
+++ b/src/authorization/Rules.ts
@@ -6,7 +6,7 @@ export default {
   'APP_UPDT_PASSWORD': 'SECURITY_CREATE OR SECURITY_ADMIN',
   'APP_UPDT_PRODUCT_STORE_CONFG': 'SECURITY_CREATE OR SECURITY_ADMIN',
   'APP_SECURITY_GROUP_CREATE': 'SECURITY_CREATE OR SECURITY_ADMIN',
-  'APP_PERMISSION_ADD': 'SECURITY_CREATE OR SECURITY_ADMIN',
+  'APP_PERMISSION_CREATE': 'SECURITY_CREATE OR SECURITY_ADMIN',
   'APP_PERMISSION_UPDATE': 'SECURITY_UPDATE OR SECURITY_ADMIN',
   'APP_PERMISSION_VIEW': 'SECURITY_VIEW OR SECURITY_ADMIN',
   'APP_SUPER_USER': 'WEBTOOLS_VIEW',
diff --git a/src/components/PermissionItems.vue b/src/components/PermissionItems.vue
index 0ef6a85..afded98 100644
--- a/src/components/PermissionItems.vue
+++ b/src/components/PermissionItems.vue
@@ -35,7 +35,7 @@
               <ion-card-title>{{ permission.permissionId }}</ion-card-title>
               <ion-card-subtitle>{{ permission.description }}</ion-card-subtitle>
             </div>
-            <ion-checkbox :disabled="permission.isChecked ? !hasPermission(Actions.APP_PERMISSION_UPDATE) : !hasPermission(Actions.APP_PERMISSION_ADD)" :checked="permission.isChecked" @click="updatePermissionAssociation($event, permission)" />
+            <ion-checkbox :disabled="permission.isChecked ? !hasPermission(Actions.APP_PERMISSION_UPDATE) : !hasPermission(Actions.APP_PERMISSION_CREATE)" :checked="permission.isChecked" @click="updatePermissionAssociation($event, permission)" />
           </ion-card-header>
         </ion-card>
       </section>