Skip to content

Improved: flow to honor the oms and maarg urls separately(dxp/407) #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Improved: flow to honor the oms and maarg urls separately(dxp/407) #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
457 changes: 82 additions & 375 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.23.0",
"@hotwax/oms-api": "^1.25.0",
"@hotwax/dxp-components": "file:../dxp-components",
"@hotwax/oms-api": "file:../packages/oms-api",
"@ionic/core": "^7.6.0",
"@ionic/vue": "^7.6.0",
"@ionic/vue-router": "^7.6.0",
Expand Down
6 changes: 4 additions & 2 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@ export default defineComponent({
userToken: 'user/getUserToken',
instanceUrl: 'user/getInstanceUrl',
currentEComStore: 'user/getCurrentEComStore',
allNotificationPrefs: 'user/getAllNotificationPrefs'
allNotificationPrefs: 'user/getAllNotificationPrefs',
maarg: "user/getMaarg"
})
},
created() {
initialise({
token: this.userToken,
instanceUrl: this.instanceUrl,
oms: this.instanceUrl,
maarg: this.maarg,
cacheMaxAge: this.maxAge,
events: {
unauthorised: this.unauthorised,
Expand Down
4 changes: 2 additions & 2 deletions src/adapter/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
storeClientRegistrationToken,
subscribeTopic,
unsubscribeTopic,
updateInstanceUrl,
updateUrls,
updateToken,
getAvailableTimeZones,
setUserTimeZone,
Expand Down Expand Up @@ -47,7 +47,7 @@ export {
storeClientRegistrationToken,
subscribeTopic,
unsubscribeTopic,
updateInstanceUrl,
updateUrls,
updateToken,
getAvailableTimeZones,
setUserTimeZone,
Expand Down
Loading
Loading