Merge remote-tracking branch 'upstream/main' into #196-block-login

hotwax · Apr 24, 2024 · 6dc83e2 · 6dc83e2
2 parents 953ec74 + 1e3236a
commit 6dc83e2
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "users",
-  "version": "1.8.0",
+  "version": "1.9.1",
   "private": true,
   "description": "Users",
   "scripts": {

diff --git a/src/authorization/Actions.ts b/src/authorization/Actions.ts
@@ -7,5 +7,6 @@ export default {
   'APP_SUPER_USER': 'APP_SUPER_USER',
   'APP_SECURITY_GROUP_CREATE': 'APP_SECURITY_GROUP_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
@@ -7,6 +7,7 @@ export default {
   '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_VIEW': 'SECURITY_VIEW OR SECURITY_ADMIN',
   'APP_SUPER_USER': 'WEBTOOLS_VIEW',
   'USERS_APP_VIEW': 'USERS_APP_VIEW'
 } as any
diff --git a/src/components/PermissionItems.vue b/src/components/PermissionItems.vue
@@ -1,19 +1,20 @@
 <template>
   <div class="search-permissions">
     <ion-searchbar :placeholder="translate('Search permissions')" v-model="query.queryString" @ionInput="updateQuery()" />
-    <ion-item lines="none">
+    <ion-item lines="full">
       <ion-icon :icon="shieldCheckmarkOutline" slot="start" />
       <ion-toggle v-model="query.showSelected" @ionChange="updateQuery()">
         {{ translate("Only selected permissions") }}
       </ion-toggle>
     </ion-item>
-    <ion-item lines="none">
+    <ion-item lines="full">
       <ion-icon :icon="optionsOutline" slot="start" />
       <ion-select :label="translate('Filters')" interface="popover" v-model="query.classificationSecurityGroupId" @ionChange="updateQuery()">
         <ion-select-option value="">{{ translate("All") }}</ion-select-option>
         <ion-select-option :value="classificationSecurityGroup.groupId" :key="classificationSecurityGroup.groupId" v-for="classificationSecurityGroup in classificationSecurityGroups">
           {{ classificationSecurityGroup.groupName }}
         </ion-select-option>
+        <ion-select-option value="OTHERS">{{ translate("Others") }}</ion-select-option>
       </ion-select>
     </ion-item>
   </div>
@@ -24,6 +25,7 @@
         <ion-label>
           {{ group.groupName || group.groupId }}
         </ion-label>
+        <ion-note slot="end">{{ group.permissions.length }}</ion-note>
       </ion-item-divider>
 
       <section v-if="group.groupId !== 'SGC_HIDDEN'">
@@ -57,6 +59,7 @@ import {
   IonItem,
   IonItemDivider,
   IonLabel,
+  IonNote,
   IonSearchbar,
   IonSelect,
   IonSelectOption,
@@ -85,6 +88,7 @@ export default defineComponent({
     IonItem,
     IonItemDivider,
     IonLabel,
+    IonNote,
     IonSearchbar,
     IonSelect,
     IonSelectOption,

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -134,6 +134,7 @@
   "OMS": "OMS",
   "OMS instance": "OMS instance",
   "Only selected permissions": "Only selected permissions",
+  "Others": "Others",
   "Password": "Password",
   "Password reset successful.": "Password reset successful.",
   "Password reset email sent successfully.": "Password reset email sent successfully.",

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -63,7 +63,10 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@/views/Settings.vue')
       },{
         path: 'permissions',
-        component: () => import('@/views/Permissions.vue')
+        component: () => import('@/views/Permissions.vue'),
+        meta: {
+          permissionId: "APP_PERMISSION_VIEW"
+        }
       },
     ],
     beforeEnter: authGuard,

diff --git a/src/views/UserConfirmation.vue b/src/views/UserConfirmation.vue
@@ -69,6 +69,7 @@
     mailOutline
   } from 'ionicons/icons';
   import { translate } from "@hotwax/dxp-components";
+  import emitter from "@/event-bus";
   
   export default defineComponent({
     name: "UserConfirmation",
@@ -95,7 +96,9 @@
     },
     props: ['partyId'],
     async ionViewWillEnter() {
+      emitter.emit('presentLoader')
       await this.store.dispatch("user/getSelectedUserDetails", { partyId: this.partyId });
+      emitter.emit('dismissLoader')
     },
     methods: {
       async quickSetup() {

diff --git a/src/views/UserDetails.vue b/src/views/UserDetails.vue
@@ -122,8 +122,8 @@
                   <ion-label>{{ translate('Username') }}</ion-label>
                   <ion-label slot="end">{{ selectedUser.userLoginId }}</ion-label>
                 </ion-item>
-                <ion-item>
-                  <ion-toggle :disabled="!hasPermission(Actions.APP_UPDT_BLOCK_LOGIN)" @click.prevent="updateUserLoginStatus($event)" :checked="selectedUser.enabled == 'N'">
+                <ion-item :disabled="!hasPermission(Actions.APP_UPDT_BLOCK_LOGIN)" >
+                  <ion-toggle @click.prevent="updateUserLoginStatus($event)" :checked="selectedUser.enabled == 'N'">
                     {{ translate("Block login") }}
                   </ion-toggle>
                 </ion-item>
@@ -317,8 +317,8 @@
               </ion-card-title>
             </ion-card-header>
             <ion-list>
-              <ion-item>
-                <ion-toggle :disabled="!hasPermission(Actions.APP_UPDT_PICKER_CONFG)" @click.prevent="updatePickerRoleStatus($event)" :checked="selectedUser.isWarehousePicker === true">
+              <ion-item :disabled="!hasPermission(Actions.APP_UPDT_PICKER_CONFG)">
+                <ion-toggle @click.prevent="updatePickerRoleStatus($event)" :checked="selectedUser.isWarehousePicker === true">
                   {{ translate("Show as picker") }}
                 </ion-toggle>
               </ion-item>

diff --git a/src/views/Users.vue b/src/views/Users.vue
@@ -110,7 +110,7 @@
       </div>
 
       <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-        <ion-fab-button :disabled="!hasPermission(Actions.APP_USER_CREATE)" @click="router.push('/create-user')">
+        <ion-fab-button :disabled="!hasPermission(Actions.APP_USER_CREATE)" @click="createUser()">
           <ion-icon :icon="addOutline" />
         </ion-fab-button>
       </ion-fab>
@@ -236,6 +236,10 @@ export default defineComponent({
     await this.store.dispatch('util/getSecurityGroups')
   },
   methods: {
+    createUser(){
+      this.store.dispatch('user/clearSelectedUser');  
+      this.router.push('/create-user');
+    },
     enableScrolling() {
       const parentElement = (this as any).$refs.contentRef.$el
       const scrollEl = parentElement.shadowRoot.querySelector("main[part='scroll']")