From b1a629ead0d0f201f4051f3fcf038a4757d78646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Mon, 20 Dec 2021 15:30:07 +0100 Subject: [PATCH 1/6] :zap: Add missing webhook key --- packages/editor-ui/src/plugins/i18n/locales/en.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json index 3a1cf4575f984..d9253da7356bf 100644 --- a/packages/editor-ui/src/plugins/i18n/locales/en.json +++ b/packages/editor-ui/src/plugins/i18n/locales/en.json @@ -193,7 +193,8 @@ "error": "error", "manual": "manual", "retry": "retry", - "trigger": "trigger" + "trigger": "trigger", + "webhook": "webhook" }, "name": "@:reusableBaseText.name", "openPastExecution": "Open Past Execution", From f0bc2eb86e5b232dcf2146aafdf26afb8010d415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Mon, 20 Dec 2021 15:30:27 +0100 Subject: [PATCH 2/6] :zap: Add missing method call --- packages/editor-ui/src/components/ExecutionsList.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue index 591eb4ce59c77..af547d51f2230 100644 --- a/packages/editor-ui/src/components/ExecutionsList.vue +++ b/packages/editor-ui/src/components/ExecutionsList.vue @@ -77,6 +77,9 @@
+ + {{ $locale.baseText('executionsList.waiting') }} + {{ $locale.baseText('executionsList.running') }} From 23e4a9f62513ff0935cd19bfdedfcde1e1b943e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Mon, 20 Dec 2021 15:32:22 +0100 Subject: [PATCH 3/6] :zap: Deprecate number formatting This was a minor convenience feature but out of scope for MVP. Needs refactoring for future usage in plugin. --- packages/editor-ui/src/components/mixins/genericHelpers.ts | 7 ++++--- packages/editor-ui/src/plugins/i18n/docs/README.md | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/editor-ui/src/components/mixins/genericHelpers.ts b/packages/editor-ui/src/components/mixins/genericHelpers.ts index 4e0b92f49292b..15502f9ff9f06 100644 --- a/packages/editor-ui/src/components/mixins/genericHelpers.ts +++ b/packages/editor-ui/src/components/mixins/genericHelpers.ts @@ -22,16 +22,17 @@ export const genericHelpers = mixins(showMessage).extend({ displayTimer (msPassed: number, showMs = false): string { if (msPassed < 60000) { if (showMs === false) { - return `${this.$locale.number(Math.floor(msPassed / 1000), 'decimal')} ${this.$locale.baseText('genericHelpers.sec')}`; + return `${Math.floor(msPassed / 1000)} ${this.$locale.baseText('genericHelpers.sec')}`; } - return `${this.$locale.number(msPassed / 1000, 'decimal')} ${this.$locale.baseText('genericHelpers.sec')}`; + return `${msPassed / 1000} ${this.$locale.baseText('genericHelpers.sec')}`; } const secondsPassed = Math.floor(msPassed / 1000); const minutesPassed = Math.floor(secondsPassed / 60); + const secondsLeft = (secondsPassed - (minutesPassed * 60)).toString().padStart(2, '0'); - return `${this.$locale.number(minutesPassed, 'decimal')}:${this.$locale.number(secondsPassed, 'decimal')} ${this.$locale.baseText('genericHelpers.min')}`; + return `${minutesPassed}:${secondsLeft} ${this.$locale.baseText('genericHelpers.min')}`; }, editAllowedCheck (): boolean { if (this.isReadOnly) { diff --git a/packages/editor-ui/src/plugins/i18n/docs/README.md b/packages/editor-ui/src/plugins/i18n/docs/README.md index f0645b9205de6..1645352f7e30d 100644 --- a/packages/editor-ui/src/plugins/i18n/docs/README.md +++ b/packages/editor-ui/src/plugins/i18n/docs/README.md @@ -77,6 +77,7 @@ As a convenience, the base text file may contain the special key `reusableBaseTe }, ``` + #### Interpolation From fdcfead9cf0b87f2bbb7b26ea1084c6653eb411e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Mon, 20 Dec 2021 15:46:30 +0100 Subject: [PATCH 4/6] :zap: Add missing integrated key --- packages/editor-ui/src/plugins/i18n/locales/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json index d9253da7356bf..dd979ce8e9339 100644 --- a/packages/editor-ui/src/plugins/i18n/locales/en.json +++ b/packages/editor-ui/src/plugins/i18n/locales/en.json @@ -191,6 +191,7 @@ "mode": "Mode", "modes": { "error": "error", + "integrated": "integrated", "manual": "manual", "retry": "retry", "trigger": "trigger", From d454ae2b12477031fba3d4e0f4305d78ee3b0756 Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Mon, 20 Dec 2021 17:18:28 +0100 Subject: [PATCH 5/6] :bug: Fix syntax that it displays correctly --- packages/editor-ui/src/components/ExecutionsList.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue index af547d51f2230..357cd96c48b96 100644 --- a/packages/editor-ui/src/components/ExecutionsList.vue +++ b/packages/editor-ui/src/components/ExecutionsList.vue @@ -74,13 +74,12 @@