diff --git a/.env.example b/.env.example index 1ffcfc3a..8c97ae55 100644 --- a/.env.example +++ b/.env.example @@ -24,3 +24,7 @@ VUE_APP_ORDERS_MAARG_JOB_NAMES={"GEN_BRKD_ORDITM_FEED":"GEN_BRKR_ORD_ITM_FD","GE VUE_APP_MISC_MAARG_JOB_NAMES={"BLK_SYS_MESS_SHPFY": "SND_BLK_SYS_M_SHPFY","BLK_RSLT_SHPFY":"POL_BLK_RSLT_SHPFY"} VUE_APP_PREORD_MAARG_JOB_NAMES={"PO_RCPT_FEED": "GEN_PO_RCPT_FD"} VUE_APP_CRON_EXPRESSIONS={"Every 5 minutes":"0 */5 * ? * *","Every 15 minutes":"0 */15 * ? * *","Every 30 minutes":"0 */30 * ? * *","Hourly":"0 0 * ? * *","Every six hours":"0 0 */6 ? * *","Every day at midnight":"0 0 0 * * ?"} +VUE_APP_GITBOOK_API_KEY="" +VUE_APP_SPACE_ID="" +VUE_APP_GITBOOK_BASE_URL="https://api.gitbook.com/v1" +VUE_APP_GITBOOK_JOBS_DOCS_URL="https://docs.hotwax.co/documents/retail-operations/workflow/job-workflows" diff --git a/package-lock.json b/package-lock.json index 23d4d873..96e8f838 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@hotwax/app-version-info": "^1.0.0", "@hotwax/apps-theme": "^1.2.6", "@hotwax/dxp-components": "1.15.4", - "@hotwax/oms-api": "1.14.0", + "@hotwax/oms-api": "1.15.0", "@ionic/core": "^7.6.0", "@ionic/vue": "^7.6.0", "@ionic/vue-router": "^7.6.0", @@ -2682,8 +2682,9 @@ } }, "node_modules/@hotwax/oms-api": { - "version": "1.14.0", - "license": "Apache-2.0", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.15.0.tgz", + "integrity": "sha512-6WXJ5z5JaAxgKith6dblLchP471xUYcFaeggN5onWZBkgGx5NqkLT0rgLWTW/UcVQMokxKtzSc+mcJ4eI1mGww==", "dependencies": { "@types/node-json-transform": "^1.0.0", "axios": "^0.21.1", diff --git a/package.json b/package.json index 169e7958..fffbdf29 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@hotwax/app-version-info": "^1.0.0", "@hotwax/apps-theme": "^1.2.6", "@hotwax/dxp-components": "1.15.4", - "@hotwax/oms-api": "1.14.0", + "@hotwax/oms-api": "1.15.0", "@ionic/core": "^7.6.0", "@ionic/vue": "^7.6.0", "@ionic/vue-router": "^7.6.0", diff --git a/src/adapter/index.ts b/src/adapter/index.ts index a31b0067..60edcc82 100644 --- a/src/adapter/index.ts +++ b/src/adapter/index.ts @@ -1,7 +1,8 @@ -import { api, client, getConfig, initialise, logout, resetConfig, updateInstanceUrl, updateToken, setUserTimeZone, getAvailableTimeZones} from '@hotwax/oms-api' +import { api, askQuery, client, getConfig, initialise, logout, resetConfig, searchQuery, updateInstanceUrl, updateToken, setUserTimeZone, getAvailableTimeZones} from '@hotwax/oms-api' export { api, + askQuery, client, getConfig, initialise, @@ -9,6 +10,7 @@ export { resetConfig, updateInstanceUrl, updateToken, + searchQuery, setUserTimeZone, getAvailableTimeZones } \ No newline at end of file diff --git a/src/components/JobConfiguration.vue b/src/components/JobConfiguration.vue index a786e546..177e57f1 100644 --- a/src/components/JobConfiguration.vue +++ b/src/components/JobConfiguration.vue @@ -14,7 +14,9 @@ -

{{ currentJob.description }}

+

{{ currentJob.description }} + {{ translate("Learn more") }} +

@@ -170,6 +172,7 @@ import { IonRow, IonSelect, IonSelectOption, + IonText, alertController, modalController, } from "@ionic/vue"; @@ -200,6 +203,7 @@ import emitter from '@/event-bus'; import { Actions, hasPermission } from '@/authorization' import CustomFrequencyModal from '@/components/CustomFrequencyModal.vue'; import JobParameterModal from '@/components/JobParameterModal.vue' +import LearnMoreModal from "@/components/LearnMoreModal.vue"; export default defineComponent({ name: "JobConfiguration", @@ -218,7 +222,8 @@ export default defineComponent({ IonRow, IonSelect, IonSelectOption, - IonCheckbox + IonCheckbox, + IonText }, data() { return { @@ -279,6 +284,13 @@ export default defineComponent({ const jobId = this.currentJob.jobId this.router.push({ name: 'DataManagerLogDetails', params: { jobId } }) }, + async openLearnMoreModal() { + const learnMoreModal = await modalController.create({ + component: LearnMoreModal, + componentProps: {currentJob: this.currentJob} + }) + return learnMoreModal.present() + }, getDateTime(time: any) { return DateTime.fromMillis(time).toISO() }, @@ -604,6 +616,10 @@ export default defineComponent({