From 1059a6073e3f3f8df5bd33242da19999dbc8ce99 Mon Sep 17 00:00:00 2001 From: Aniket Kumar Pandey Date: Mon, 23 May 2022 15:19:50 +0530 Subject: [PATCH 001/206] Improved: code to revert 'getEComStores' action and fetch all eComStores in 'getProfile' action instead of calling another action from it (#257v6ck). --- src/store/modules/user/actions.ts | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts index f8929acb..3f6c990f 100644 --- a/src/store/modules/user/actions.ts +++ b/src/store/modules/user/actions.ts @@ -63,7 +63,10 @@ const actions: ActionTree = { "noConditionFind": "Y" } - await dispatch('getEComStores', payload).then((stores: any) => { + let stores = await UserService.getEComStores(payload); + if(stores.status === 200 && stores.data.docs?.length > 0 && !hasError(stores)) { + stores = stores.data.docs; + resp.data.stores = [ ...(stores ? stores : []), { @@ -71,8 +74,7 @@ const actions: ActionTree = { storeName: "None" } ] - }) - + } this.dispatch('util/getServiceStatusDesc') commit(types.USER_CURRENT_ECOM_STORE_UPDATED, resp.data?.stores[0]); @@ -118,21 +120,6 @@ const actions: ActionTree = { } }, - async getEComStores(_context, payload) { - let resp; - - try{ - resp = await UserService.getEComStores(payload); - if (resp.status === 200 && resp.data.docs?.length > 0 && !hasError(resp)) { - const stores = resp.data.docs - - return stores - } - } catch(err) { - console.error(err) - } - }, - async setEComStore({ commit }, payload) { commit(types.USER_CURRENT_ECOM_STORE_UPDATED, payload.store); }, From 9a1a64a67f57e9be4f304169aa1c31ea59f0f728 Mon Sep 17 00:00:00 2001 From: prashant singh rathore Date: Wed, 25 May 2022 12:35:26 +0530 Subject: [PATCH 002/206] Fixed: Indentation issues --- src/views/Pipeline.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Pipeline.vue b/src/views/Pipeline.vue index 7ae4cf46..7a8c3d9c 100644 --- a/src/views/Pipeline.vue +++ b/src/views/Pipeline.vue @@ -502,7 +502,7 @@ export default defineComponent({ event: ev, componentProps: { job } }); - return popover.present() + return popover.present() }, async cancelJob(job: any){ const alert = await alertController From 569e768ba134098c2bf7523ea18b88981a1c8bd6 Mon Sep 17 00:00:00 2001 From: shashwatbangar Date: Thu, 26 May 2022 12:28:35 +0530 Subject: [PATCH 003/206] Fixed: After refreshing and then clicking the back button the user is redirected to the pipeline page(job-manager(#2deygnv) --- src/views/JobDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/JobDetails.vue b/src/views/JobDetails.vue index 646aab85..45f8364a 100644 --- a/src/views/JobDetails.vue +++ b/src/views/JobDetails.vue @@ -2,7 +2,7 @@ - + {{ $t("Job details") }} From 656a6078ce7f08d19f4101882b54954dc66b2f78 Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Thu, 26 May 2022 12:36:39 +0530 Subject: [PATCH 004/206] Fixed: issue of temp expr not being set when scheduling a new job(#2dmgzqb) --- src/store/modules/job/actions.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/store/modules/job/actions.ts b/src/store/modules/job/actions.ts index 7d938f86..c557e5f3 100644 --- a/src/store/modules/job/actions.ts +++ b/src/store/modules/job/actions.ts @@ -405,10 +405,11 @@ const actions: ActionTree = { 'JOB_NAME': job.jobName, 'SERVICE_NAME': job.serviceName, 'SERVICE_COUNT': '0', + 'SERVICE_TEMP_EXPR': job.jobStatus, 'jobFields': { 'productStoreId': this.state.user.currentEComStore.productStoreId, 'systemJobEnumId': job.systemJobEnumId, - 'tempExprId': job.jobStatus, + 'tempExprId': job.jobStatus, // Need to remove this as we are passing frequency in SERVICE_TEMP_EXPR, currently kept it for backward compatibility 'maxRecurrenceCount': '-1', 'parentJobId': job.parentJobId, 'runAsUser': 'system', // default system, but empty in run now @@ -520,10 +521,11 @@ const actions: ActionTree = { 'JOB_NAME': job.jobName, 'SERVICE_NAME': job.serviceName, 'SERVICE_COUNT': '0', + 'SERVICE_TEMP_EXPR': job.jobStatus, 'jobFields': { 'productStoreId': this.state.user.currentEComStore.productStoreId, 'systemJobEnumId': job.systemJobEnumId, - 'tempExprId': job.jobStatus, + 'tempExprId': job.jobStatus, // Need to remove this as we are passing frequency in SERVICE_TEMP_EXPR, currently kept it for backward compatibility 'parentJobId': job.parentJobId, 'recurrenceTimeZone': this.state.user.current.userTimeZone }, From 43543b83977789ca2810828f3f3442ded89e4edc Mon Sep 17 00:00:00 2001 From: Ravindra Purohit Date: Thu, 26 May 2022 12:54:13 +0530 Subject: [PATCH 005/206] Implemented | Web hooks card on Product View Page --- src/views/Product.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/views/Product.vue b/src/views/Product.vue index d180c554..91a449a1 100644 --- a/src/views/Product.vue +++ b/src/views/Product.vue @@ -26,6 +26,20 @@

{{ $t("Sync products and category structures from Shopify into HotWax Commerce and keep them up to date.") }}

 + + + + Web Hooks + + + New Products + + + + Delete Products + + +