From 26b912fae4c59bc02ddb7b4a5f5d099f24a18948 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Wed, 18 Oct 2023 02:58:28 +0200 Subject: [PATCH] [Execute UI] - If an action is passed over the URL, then initialize the UI with it. - Added link from the actions back to their plugins. --- .../components/panels/Execute/ActionDoc.vue | 36 ++++++++++++++++++- .../src/components/panels/Execute/Index.vue | 26 ++++++++++++-- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/platypush/backend/http/webapp/src/components/panels/Execute/ActionDoc.vue b/platypush/backend/http/webapp/src/components/panels/Execute/ActionDoc.vue index 502863d91a..aab26ce987 100644 --- a/platypush/backend/http/webapp/src/components/panels/Execute/ActionDoc.vue +++ b/platypush/backend/http/webapp/src/components/panels/Execute/ActionDoc.vue @@ -5,7 +5,12 @@   Action documentation +
+ + @@ -31,10 +36,39 @@ export default { doc: String, curlSnippet: String, loading: Boolean, - } + }, + + computed: { + pluginName() { + const tokens = (this.action?.name || '').split('.') + return tokens.length > 1 ? tokens.slice(0, -1).join('.') : null + }, + }, + + methods: { + onExtClick() { + window.location.href = `/#extensions?extension=${this.pluginName}` + }, + }, } diff --git a/platypush/backend/http/webapp/src/components/panels/Execute/Index.vue b/platypush/backend/http/webapp/src/components/panels/Execute/Index.vue index 2cac0fe176..1692493b13 100644 --- a/platypush/backend/http/webapp/src/components/panels/Execute/Index.vue +++ b/platypush/backend/http/webapp/src/components/panels/Execute/Index.vue @@ -193,7 +193,7 @@ export default { return args }, {}), - ...this.action.extraArgs.reduce((args, arg) => { + ...(this.action.extraArgs || []).reduce((args, arg) => { let value = arg.value try { value = JSON.parse(value) @@ -288,9 +288,19 @@ export default { this.actions[action.name] = action } } + + // If an action has been passed on the URL, set it + const args = this.getUrlArgs() + const actionName = args?.action + if (actionName?.length && actionName in this.actions && actionName !== this.action.name) { + this.updateAction(actionName) + } }, async updateAction(actionName) { + if (actionName === this.action.name) + return + this.action.name = actionName if (!(this.action.name in this.actions)) { this.selectedDoc = undefined @@ -324,9 +334,19 @@ export default { if (!this.actionDocsCache[this.action.name]) this.actionDocsCache[this.action.name] = {} - this.actionDocsCache[this.action.name].html = this.selectedDoc - this.$el.querySelector('.action-arg-value')?.focus() + this.actionDocsCache[this.action.name].html = this.selectedDoc + this.setUrlArgs({action: this.action.name}) + + const firstArg = this.$el.querySelector('.action-arg-value') + if (firstArg) { + firstArg.focus() + } else { + this.$nextTick(() => { + this.actionInput.focus() + }) + } + this.response = undefined this.error = undefined },