@@ -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,6 +86,8 @@ export default defineComponent({
IonItemDivider,
IonLabel,
IonSearchbar,
+ IonSelect,
+ IonSelectOption,
IonToggle,
},
computed: {
@@ -82,7 +95,8 @@ export default defineComponent({
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
index bf6b5cc..e9d6bfc 100644
--- a/src/components/ProductStoreActionsPopover.vue
+++ b/src/components/ProductStoreActionsPopover.vue
@@ -1,7 +1,7 @@
- {{ productStore.storeName }}
+ {{ productStore.storeName || productStore.productStoreId }}
{{ translate("Edit") }}
diff --git a/src/components/ResetPasswordModal.vue b/src/components/ResetPasswordModal.vue
index f80158e..04e890f 100644
--- 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"/>
diff --git a/src/components/SelectFacilityModal.vue b/src/components/SelectFacilityModal.vue
index fa5774d..b12391c 100644
--- a/src/components/SelectFacilityModal.vue
+++ b/src/components/SelectFacilityModal.vue
@@ -15,7 +15,7 @@
- {{ facility.facilityName }}
+ {{ facility.facilityName || facility.facilityId }}
{{ facility.facilityId }}
@@ -27,7 +27,7 @@
- {{ facility.facilityName }}
+ {{ facility.facilityName || facility.facilityId }}
{{ facility.facilityId }}
diff --git a/src/components/SelectProductStoreModal.vue b/src/components/SelectProductStoreModal.vue
index 14388ca..a79cd07 100644
--- a/src/components/SelectProductStoreModal.vue
+++ b/src/components/SelectProductStoreModal.vue
@@ -15,7 +15,7 @@
- {{ productStore.storeName }}
+ {{ productStore.storeName || productStore.productStoreId }}
{{ productStore.productStoreId }}
diff --git a/src/locales/en.json b/src/locales/en.json
index e5396f6..e638388 100644
--- 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
index c76bc76..df65852 100644
--- 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
index e37d09d..55f06cc 100644
--- 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;
diff --git a/src/store/modules/permission/actions.ts b/src/store/modules/permission/actions.ts
index 8f1e849..1cea095 100644
--- a/src/store/modules/permission/actions.ts
+++ b/src/store/modules/permission/actions.ts
@@ -53,9 +53,7 @@ const actions: ActionTree = {
viewSize: 250,
viewIndex: viewIndex,
inputFields: {
- groupTypeEnumId: "PRM_CLASS_TYPE",
- groupId: "SGC_HIDDEN",
- groupId_op: "notEqual"
+ groupTypeEnumId: "PRM_CLASS_TYPE"
}
})
@@ -93,6 +91,20 @@ const actions: ActionTree = {
})
})
+ const otherPermissions = JSON.parse(JSON.stringify(state.allPermissions))
+ Object.values(groupTypes).map((group: any) => {
+ group.permissions.map((permission: any) => {
+ delete otherPermissions[permission.permissionId]
+ })
+ })
+
+ // Others category for permissions not in any internal group.
+ groupTypes['OTHERS'] = {
+ groupId: 'OTHERS',
+ groupName: 'Others',
+ permissions: Object.values(otherPermissions)
+ }
+
commit(types.PERMISSION_BY_CLASSIFICATION_GROUPS_UPDATED, groupTypes)
},
diff --git a/src/store/modules/permission/getters.ts b/src/store/modules/permission/getters.ts
index fec5df7..b1e9c38 100644
--- a/src/store/modules/permission/getters.ts
+++ b/src/store/modules/permission/getters.ts
@@ -7,9 +7,17 @@ const getters: GetterTree = {
return state.permissionsByClassificationGroups
},
getFilteredPermissions(state) {
- const groupType = JSON.parse(JSON.stringify(state.permissionsByClassificationGroups))
+ let groupType = JSON.parse(JSON.stringify(state.permissionsByClassificationGroups))
const query = state.query
+ if (query.classificationSecurityGroupId) {
+ const filteredGroupType = {} as any;
+ if (groupType[query.classificationSecurityGroupId]) {
+ filteredGroupType[query.classificationSecurityGroupId] = groupType[query.classificationSecurityGroupId];
+ }
+ groupType = filteredGroupType;
+ }
+
if(query.showSelected) {
Object.values(groupType).map((group: any) => {
groupType[group.groupId] = {
diff --git a/src/store/modules/permission/index.ts b/src/store/modules/permission/index.ts
index 830fee1..4eefa8e 100644
--- a/src/store/modules/permission/index.ts
+++ b/src/store/modules/permission/index.ts
@@ -11,7 +11,8 @@ const permissionModule: Module = {
permissionsByClassificationGroups: {},
query: {
queryString: '',
- showSelected: false
+ showSelected: false,
+ classificationSecurityGroupId: ''
},
currentGroup: {},
permissionsByGroup: {},
diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
index 45ebd24..2e441ff 100644
--- a/src/store/modules/user/actions.ts
+++ b/src/store/modules/user/actions.ts
@@ -149,15 +149,11 @@ const actions: ActionTree = {
/**
* Update user timeZone
*/
- async setUserTimeZone({ state, commit }, payload) {
- const resp = await UserService.setUserTimeZone(payload)
- if (resp.status === 200 && !hasError(resp)) {
- const current: any = state.current;
- current.userTimeZone = payload.timeZoneId;
- commit(types.USER_INFO_UPDATED, current);
- Settings.defaultZone = current.userTimeZone;
- showToast(translate("Time zone updated successfully"));
- }
+ async setUserTimeZone ( { state, commit }, timeZoneId) {
+ const current: any = state.current;
+ current.userTimeZone = timeZoneId;
+ commit(types.USER_INFO_UPDATED, current);
+ Settings.defaultZone = current.userTimeZone;
},
async getSelectedUserDetails({ commit, state }, payload) {
@@ -349,20 +345,23 @@ const actions: ActionTree = {
"viewSize": payload.viewSize
}
- let users = [], total = 0;
+ let users = JSON.parse(JSON.stringify(state.users.list)), total = 0;
try {
- const resp = await UserService.fetchUsers(params)
+ const resp = await UserService.fetchUsers(params);
- if(!hasError(resp) && resp.data.count) {
- users = resp.data.docs
- if(payload.viewIndex && payload.viewIndex > 0) users = JSON.parse(JSON.stringify(state.users.list)).concat(resp.data.docs)
- total = resp.data.count
+ if (!hasError(resp) && resp.data.count) {
+ if (payload.viewIndex && payload.viewIndex > 0) {
+ users = users.concat(resp.data.docs);
+ } else {
+ users = resp.data.docs;
+ }
+ total = resp.data.count;
} else {
- throw resp.data
+ throw resp.data;
}
} catch(error) {
- logger.error(error)
+ logger.error(error);
}
emitter.emit("dismissLoader");
diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index 71234bd..f585f05 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -2,6 +2,7 @@ export default interface UtilState {
roles: any[];
productStores: any[];
securityGroups: any[];
+ classificationSecurityGroups: any[];
facilities: any[];
shopifyShops: any[];
}
\ No newline at end of file
diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index b3489d2..4962c3a 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -116,6 +116,35 @@ const actions: ActionTree = {
}
commit(types.UTIL_SECURITY_GROUPS_UPDATED, securityGroups);
},
+ async getClassificationSecurityGroups({ commit }) {
+ const payload = {
+ entityName: "SecurityGroup",
+ viewSize: 250,
+ distinct: "Y",
+ noConditionFind: "Y",
+ fieldList: ["description", "groupId", "groupName"],
+ orderBy: 'groupName ASC',
+ inputFields: {
+ groupTypeEnumId: "PRM_CLASS_TYPE",
+ groupId: "SGC_HIDDEN",
+ groupId_op: "notEqual"
+ }
+ }
+ let securityGroups = []
+
+ try {
+ const resp = await UtilService.getSecurityGroups(payload)
+
+ if(!hasError(resp)) {
+ securityGroups = resp.data.docs
+ } else {
+ throw resp.data
+ }
+ } catch(error) {
+ logger.error(error);
+ }
+ commit(types.UTIL_CLASSIFICATION_SECURITY_GROUPS_UPDATED, securityGroups);
+ },
async fetchFacilities({ commit }) {
let facilities = [];
diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
index 71c9327..4add2dc 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -15,6 +15,9 @@ const getters: GetterTree = {
getSecurityGroups(state) {
return state.securityGroups
},
+ getClassificationSecurityGroups(state) {
+ return state.classificationSecurityGroups
+ },
getFacilities(state) {
return state.facilities
},
diff --git a/src/store/modules/util/index.ts b/src/store/modules/util/index.ts
index 5f281a4..f3b7445 100644
--- a/src/store/modules/util/index.ts
+++ b/src/store/modules/util/index.ts
@@ -11,6 +11,7 @@ const utilModule: Module = {
roles: [],
productStores: [],
securityGroups: [],
+ classificationSecurityGroups: [],
facilities: [],
shopifyShops: []
},
diff --git a/src/store/modules/util/mutation-types.ts b/src/store/modules/util/mutation-types.ts
index cf0399a..176b370 100644
--- a/src/store/modules/util/mutation-types.ts
+++ b/src/store/modules/util/mutation-types.ts
@@ -4,3 +4,4 @@ export const UTIL_PRODUCT_STORES_UPDATED = SN_UTIL + '/PRODUCT_STORES_UPDATED'
export const UTIL_SECURITY_GROUPS_UPDATED = SN_UTIL + '/SECURITY_GROUPS_UPDATED'
export const UTIL_FACILITIES_UPDATED = SN_UTIL + '/FACILITIES_UPDATED'
export const UTIL_SHOPIFY_SHOPS_UPDATED = SN_UTIL + '/SHOPIFY_SHOPS_UPDATED'
+export const UTIL_CLASSIFICATION_SECURITY_GROUPS_UPDATED = SN_UTIL + '/CLASSIFICATION_SECURITY_GROUPS_UPDATED'
diff --git a/src/store/modules/util/mutations.ts b/src/store/modules/util/mutations.ts
index 723b05d..5d2c04e 100644
--- a/src/store/modules/util/mutations.ts
+++ b/src/store/modules/util/mutations.ts
@@ -17,6 +17,8 @@ const mutations: MutationTree = {
},
[types.UTIL_SHOPIFY_SHOPS_UPDATED](state, payload) {
state.shopifyShops = payload
+ },[types.UTIL_CLASSIFICATION_SECURITY_GROUPS_UPDATED](state, payload) {
+ state.classificationSecurityGroups = payload
}
}
export default mutations;
\ No newline at end of file
diff --git a/src/theme/variables.css b/src/theme/variables.css
index 66c1d64..996b3c7 100644
--- a/src/theme/variables.css
+++ b/src/theme/variables.css
@@ -276,7 +276,7 @@ http://ionicframework.com/docs/theming/ */
.search-permissions {
display: grid;
- grid-template-columns: repeat(auto-fit, minmax(343px, 1fr));
+ grid-template-columns: repeat(auto-fit, minmax(228px, 1fr));
gap: var(--spacer-xs);
align-items: start;
margin-bottom: var(--spacer-lg);
diff --git a/src/views/CreateUser.vue b/src/views/CreateUser.vue
index dbf7745..c3f85cb 100644
--- a/src/views/CreateUser.vue
+++ b/src/views/CreateUser.vue
@@ -18,7 +18,7 @@
{{ translate("Select facility") }} *
- {{ facility.facilityName }}
+ {{ facility.facilityName || facility.facilityId }}
@@ -206,6 +206,7 @@ export default defineComponent({
if (partyTypeId === "PARTY_GROUP" ) {
await UserService.addPartyToFacility({"partyId": partyId, "facilityId": payload.facilityId, "roleTypeId": "WAREHOUSE_MANAGER"});
}
+ showToast(translate("User created successfully"));
this.$router.replace({ path: `/user-confirmation/${partyId}` })
} else {
throw resp.data;
diff --git a/src/views/Permissions.vue b/src/views/Permissions.vue
index 21f6faa..4408f2d 100644
--- a/src/views/Permissions.vue
+++ b/src/views/Permissions.vue
@@ -20,8 +20,8 @@
{{ group.groupId }}
- {{ group?.groupName }}
-
+ {{ group?.groupName || group?.groupId }}
+
@@ -36,7 +36,7 @@
{{ currentGroup.groupId }}
- {{ currentGroup.groupName }}
+ {{ currentGroup.groupName || currentGroup.groupId }}
{{ currentGroup.description }}
{{ translate("Edit") }}
@@ -122,6 +122,7 @@ export default defineComponent({
},
async mounted() {
await this.store.dispatch('util/getSecurityGroups')
+ await this.store.dispatch('util/getClassificationSecurityGroups')
if(!this.allPermissions.length) await this.store.dispatch('permission/getAllPermissions')
if(!Object.keys(this.permissionsByClassificationGroups).length) await this.store.dispatch('permission/getPermissionsByClassificationGroups')
if(this.currentGroup.groupId) await this.store.dispatch('permission/getPermissionsByGroup', this.currentGroup.groupId)
@@ -136,7 +137,7 @@ export default defineComponent({
await this.store.dispatch('permission/getPermissionsByGroup', this.currentGroup.groupId)
await this.store.dispatch('permission/checkAssociated')
await this.getUsersCount()
- await this.store.dispatch('permission/updateQuery', {queryString: '', showAllSelected: false})
+ await this.store.dispatch('permission/updateQuery', {queryString: '', showAllSelected: false, classificationSecurityGroupId: ''})
emitter.emit('dismissLoader')
},
async editSecurityGroup() {
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index d93c727..f2cb57d 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -47,21 +47,7 @@