Merge remote-tracking branch 'upstream/main' into hotwax#214-delay-user

R-Sourabh · Apr 19, 2024 · 28fc9b1 · 28fc9b1
2 parents 5b29e92 + d652ec8
commit 28fc9b1
Show file tree

Hide file tree

Showing 31 changed files with 221 additions and 138 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "HotWax Commerce Import",
-    "short_name": "User Management",
+    "short_name": "Users",
     "theme_color": "#FFFFFF",
     "icons": [{
             "src": "public/img/icons/favicon-16x16.png",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "users",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "private": true,
-  "description": "User Management App",
+  "description": "Users",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -17,8 +17,8 @@
     "@casl/ability": "^6.0.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
-    "@hotwax/dxp-components": "^1.12.2",
-    "@hotwax/oms-api": "^1.13.0",
+    "@hotwax/dxp-components": "1.13.0",
+    "@hotwax/oms-api": "1.14.0",
     "@ionic/core": "^7.6.0",
     "@ionic/vue": "^7.6.0",
     "@ionic/vue-router": "^7.6.0",

diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>User Management - HotWax Commerce</title>
+    <title>Users - HotWax Commerce</title>
 
     <base href="/" />
 

diff --git a/src/adapter/index.ts b/src/adapter/index.ts
@@ -8,7 +8,9 @@ import {
   resetConfig,
   setUserLocale,
   updateToken,
-  updateInstanceUrl
+  updateInstanceUrl,
+  setUserTimeZone,
+  getAvailableTimeZones
 } from '@hotwax/oms-api'
 
 export {
@@ -21,5 +23,7 @@ export {
   resetConfig,
   setUserLocale,
   updateToken,
-  updateInstanceUrl
+  updateInstanceUrl,
+  setUserTimeZone,
+  getAvailableTimeZones
 }
diff --git a/src/components/FilterMenu.vue b/src/components/FilterMenu.vue
@@ -12,7 +12,7 @@
           <ion-icon :icon="idCardOutline" slot="start" />
           <ion-select :label="translate('Clearance')" interface="popover" v-model="query.securityGroup" @ionChange="closeMenu">
             <ion-select-option value="">{{ translate("All") }}</ion-select-option>
-            <ion-select-option :value="securityGroup.groupId" :key="index" v-for="(securityGroup, index) in securityGroups">{{ securityGroup.groupName }}</ion-select-option>
+            <ion-select-option :value="securityGroup.groupId" :key="index" v-for="(securityGroup, index) in securityGroups">{{ securityGroup.groupName || securityGroup.groupId }}</ion-select-option>
           </ion-select>
         </ion-item>
         <ion-item lines="none">

diff --git a/src/components/PermissionItems.vue b/src/components/PermissionItems.vue
@@ -7,17 +7,26 @@
         {{ translate("Only selected permissions") }}
       </ion-toggle>
     </ion-item>
+    <ion-item lines="none">
+      <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>
+    </ion-item>
   </div>
 
   <template v-if="arePermissionsAvailable()">
     <div v-for="(group, groupId) in filteredPermissions" :key="groupId">
-      <ion-item-divider v-if="group.permissions.length" class="ion-margin-vertical" color="light">
+      <ion-item-divider v-if="group.groupId !== 'SGC_HIDDEN' && group.permissions.length" class="ion-margin-vertical" color="light">
         <ion-label>
-          {{ group.groupName }}
+          {{ group.groupName || group.groupId }}
         </ion-label>
       </ion-item-divider>
 
-      <section>
+      <section v-if="group.groupId !== 'SGC_HIDDEN'">
         <ion-card v-for="permission in group.permissions" :key="permission.permissionId">
           <ion-card-header>
             <div>
@@ -49,11 +58,13 @@ import {
   IonItemDivider,
   IonLabel,
   IonSearchbar,
+  IonSelect,
+  IonSelectOption,
   IonToggle
 } from '@ionic/vue';
 import { defineComponent } from 'vue';
 import { translate } from '@hotwax/dxp-components';
-import { shieldCheckmarkOutline } from 'ionicons/icons';
+import { optionsOutline, shieldCheckmarkOutline } from 'ionicons/icons';
 import { mapGetters, useStore } from 'vuex';
 import { PermissionService } from '@/services/PermissionService';
 import { showToast } from '@/utils';
@@ -75,14 +86,17 @@ export default defineComponent({
     IonItemDivider,
     IonLabel,
     IonSearchbar,
+    IonSelect,
+    IonSelectOption,
     IonToggle,
   },
   computed: {
     ...mapGetters({
       query: 'permission/getQuery',
       currentGroupPermissions: 'permission/getCurrentGroupPermissions',
       currentGroup: "permission/getCurrentGroup",
-      filteredPermissions: "permission/getFilteredPermissions"
+      filteredPermissions: "permission/getFilteredPermissions",
+      classificationSecurityGroups: 'util/getClassificationSecurityGroups'
     })
   },
   methods: {
@@ -154,6 +168,7 @@ export default defineComponent({
     return {
       Actions,
       hasPermission,
+      optionsOutline,
       shieldCheckmarkOutline,
       store,
       translate

diff --git a/src/components/ProductStoreActionsPopover.vue b/src/components/ProductStoreActionsPopover.vue
@@ -1,7 +1,7 @@
 <template>
   <ion-content>
     <ion-list>
-      <ion-list-header>{{ productStore.storeName }}</ion-list-header>
+      <ion-list-header>{{ productStore.storeName || productStore.productStoreId }}</ion-list-header>
       <ion-item button @click="selectProductStoreRole()">
         {{ translate("Edit") }}
       </ion-item>

diff --git a/src/components/ResetPasswordModal.vue b/src/components/ResetPasswordModal.vue
@@ -28,7 +28,8 @@
           v-model="newPassword" 
           id="newPassword" 
           :type="showNewPassword ? 'text' : 'password'"
-          :error-text="translate('Password requirements not fulfilled.')"/>
+          :error-text="translate('Password requirements not fulfilled.')"
+          autocomplete="new-password"/>
         <!-- <ion-button fill="clear" @click="showNewPassword = !showNewPassword">
           <ion-icon :icon="showNewPassword ? eyeOutline : eyeOffOutline"/>
         </ion-button> -->

diff --git a/src/components/SelectFacilityModal.vue b/src/components/SelectFacilityModal.vue
@@ -15,7 +15,7 @@
       <ion-item v-for="facility in facilities" :key="facility.facilityId">
         <ion-checkbox :checked="isSelected(facility.facilityId)" @ionChange="toggleFacilitySelection(facility)">
           <ion-label>
-            {{ facility.facilityName }}
+            {{ facility.facilityName || facility.facilityId }}
             <p>{{ facility.facilityId }}</p>
           </ion-label>
         </ion-checkbox>
@@ -27,7 +27,7 @@
         <ion-item v-for="facility in facilities" :key="facility.facilityId">
           <ion-radio :value="facility.facilityId">
             <ion-label>
-              {{ facility.facilityName }}
+              {{ facility.facilityName || facility.facilityId }}
               <p>{{ facility.facilityId }}</p>
             </ion-label>
           </ion-radio>

diff --git a/src/components/SelectProductStoreModal.vue b/src/components/SelectProductStoreModal.vue
@@ -15,7 +15,7 @@
       <ion-item v-for="productStore in productStores" :key="productStore.productStoreId">
         <ion-checkbox :checked="isSelected(productStore.productStoreId)" @ionChange="toggleProductStoreSelection(productStore)">
           <ion-label>
-            {{ productStore.storeName }}
+            {{ productStore.storeName || productStore.productStoreId }}
             <p>{{ productStore.productStoreId }}</p>
           </ion-label>
         </ion-checkbox>

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -23,6 +23,8 @@
   "Block login": "Block login",
   "Block user login": "Block user login",
   "Block this user from logging into HotWax Commerce. Login can be re-enabled by disabling this setting": "Block this user from logging into HotWax Commerce. Login can be re-enabled by disabling this setting",
+  "Browser TimeZone": "Browser TimeZone",
+  "Browser time zone": "Browser time zone",
   "Cancel": "Cancel",
   "Change": "Change",
   "Clearance": "Clearance",
@@ -181,7 +183,9 @@
   "Select template": "Select template",
   "Select your favorites to preselect them across all applications": "Select your favorites to preselect them across all applications",
   "Select your preferred language.": "Select your preferred language.",
+  "Selected TimeZone": "Selected TimeZone",
   "Select time zone": "Select time zone",
+  "Select a different time zone": "Select a different time zone",
   "selected": "{storeCount} selected",
   "Send reset password email instead": "Send reset password email instead",
   "Settings": "Settings",
@@ -207,6 +211,7 @@
   "Update user facilities": "Update user facilities",
   "Update Security Group": "Update Security Group",
   "Upload": "Upload",
+  "User created successfully": "User created successfully",
   "User details": "User details",
   "User disabled": "User disabled",
   "User login status updated successfully.": "User login status updated successfully.",

diff --git a/src/main.ts b/src/main.ts
@@ -34,7 +34,7 @@ import permissionActions from '@/authorization/Actions';
 import { dxpComponents } from '@hotwax/dxp-components'
 import { login, logout, loader } from '@/utils/user';
 import localeMessages from '@/locales';
-import { getConfig, initialise, setUserLocale } from '@/adapter';
+import { getConfig, initialise, setUserLocale, setUserTimeZone, getAvailableTimeZones } from '@/adapter';
 
 
 const app = createApp(App)
@@ -60,6 +60,8 @@ const app = createApp(App)
     logout,
     localeMessages,
     setUserLocale,
+    setUserTimeZone,
+    getAvailableTimeZones
   });
 
 router.isReady().then(() => {

diff --git a/src/store/modules/permission/PermissionState.ts b/src/store/modules/permission/PermissionState.ts
@@ -2,7 +2,8 @@ export default interface PermissionState {
   permissionsByClassificationGroups: any;
   query: {
     queryString: string,
-    showSelected: boolean
+    showSelected: boolean,
+    classificationSecurityGroupId: string
   };
   currentGroup: any;
   permissionsByGroup: any;