-
-
Notifications
You must be signed in to change notification settings - Fork 239
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Thing page: Support invoking Thing actions & Viewing their output (#2818
) Refs openhab/openhab-core#4392. Closes #2817. This adds a new section "Actions" to the Thing tab of the Thing page, which provides a button for each UI-supported Thing action. Clicking on that button will open a popup, where action input can be configured and action output can be viewed. All keys of the action output response object from REST are rendered as list Items, the labels are taken from the action output definitions and fallback to the key. If the key is `qrCode` or its output type is defined as `qrCode`, its value is rendered as QR code. For actions without inputs or without outputs, messages are shown indicating that there is no such. --------- Signed-off-by: Florian Hotze <[email protected]>
- Loading branch information
1 parent
4100b56
commit 5febf02
Showing
2 changed files
with
177 additions
and
4 deletions.
There are no files selected for viewing
120 changes: 120 additions & 0 deletions
120
bundles/org.openhab.ui/web/src/pages/settings/things/thing-action-popup.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| <template> | ||
| <f7-popup ref="modulePopup" class="moduleconfig-popup"> | ||
| <f7-page> | ||
| <f7-navbar> | ||
| <f7-nav-left> | ||
| <f7-link icon-ios="f7:arrow_left" icon-md="material:arrow_back" icon-aurora="f7:arrow_left" popup-close /> | ||
| </f7-nav-left> | ||
| <f7-nav-title> | ||
| {{ action.label }} | ||
| </f7-nav-title> | ||
| <f7-nav-right> | ||
| <f7-link @click="close"> | ||
| Close | ||
| </f7-link> | ||
| </f7-nav-right> | ||
| </f7-navbar> | ||
| <f7-block class="no-margin no-padding"> | ||
| <!-- Action Inputs --> | ||
| <f7-col> | ||
| <f7-block-title class="parameter-group-title"> | ||
| Action Input | ||
| </f7-block-title> | ||
| <config-sheet v-if="action.inputConfigDescriptions.length > 0" ref="configSheet" | ||
| :parameter-groups="[]" :parameters="action.inputConfigDescriptions" | ||
| :configuration="actionInput" :read-only="executing" /> | ||
| <div class="margin" v-else> | ||
| There is no input to be configured for this action. | ||
| </div> | ||
| </f7-col> | ||
| <!-- Executing Spinner --> | ||
| <f7-block v-if="executing" class="text-align-center padding-top margin-top"> | ||
| <f7-block-title> | ||
| <f7-preloader :size="30" /> | ||
| <div>Executing...</div> | ||
| </f7-block-title> | ||
| </f7-block> | ||
| <!-- Execute Button --> | ||
| <f7-col v-if="!executing"> | ||
| <f7-list> | ||
| <f7-list-button color="blue" title="Execute Action" @click="execute" /> | ||
| </f7-list> | ||
| </f7-col> | ||
| <!-- Action Outputs --> | ||
| <f7-col v-if="!executing && actionOutput"> | ||
| <f7-block-title class="parameter-group-title"> | ||
| Action Output | ||
| </f7-block-title> | ||
| <div v-if="Object.keys(actionOutput).length === 0" class="margin"> | ||
| There is either no output for this action or something went wrong - please check the logs. | ||
| </div> | ||
| <div v-else> | ||
| <f7-list> | ||
| <template v-for="key of Object.keys(actionOutput)"> | ||
| <!-- Render result as a list item, works without action output definition from REST --> | ||
| <f7-list-item v-if="key === 'result'" :key="key" :floating-label="$theme.md" title="Result"> | ||
| {{ actionOutput[key] }} | ||
| </f7-list-item> | ||
| <!-- Render QR code if the key is qrCode --> | ||
| <f7-list-item v-else-if="key === 'qrCode'" :key="key" :floating-label="$theme.md" :title="action.outputs.find(o => o.name === key)?.label || 'QR Code'"> | ||
| <vue-qrcode :value="actionOutput[key]" /> | ||
| </f7-list-item> | ||
| <!-- Render QR code if the action output type is qrCode in the action output definition from REST --> | ||
| <f7-list-item v-else-if="action.outputs.find(o => o.name === key)?.type === 'qrCode'" :key="key" :floating-label="$theme.md" :title="action.outputs.find(o => o.name === key).label"> | ||
| <vue-qrcode :value="actionOutput[key]" /> | ||
| </f7-list-item> | ||
| <!-- Render other keys as list items with the label defined by the action output definition from REST or the key as label --> | ||
| <f7-list-item v-else :key="key" :floating-label="$theme.md" :title="action.outputs.find(o => o.name === key)?.label || key"> | ||
| {{ actionOutput[key] }} | ||
| </f7-list-item> | ||
| </template> | ||
| <f7-list-item accordion-item title="Raw Output Value"> | ||
| <f7-accordion-content class="thing-type-description"> | ||
| <div class="margin"> | ||
| <code> {{ actionOutput }} </code> | ||
| </div> | ||
| </f7-accordion-content> | ||
| </f7-list-item> | ||
| </f7-list> | ||
| </div> | ||
| </f7-col> | ||
| </f7-block> | ||
| </f7-page> | ||
| </f7-popup> | ||
| </template> | ||
| <script> | ||
| import ConfigSheet from '@/components/config/config-sheet.vue' | ||
| export default { | ||
| components: { | ||
| ConfigSheet, | ||
| 'vue-qrcode': () => import(/* webpackChunkName: "vue-qrcode" */ 'vue-qrcode') | ||
| }, | ||
| props: ['thingUID', 'action'], | ||
| data () { | ||
| return { | ||
| executing: false, | ||
| actionInput: {}, | ||
| actionOutput: null | ||
| } | ||
| }, | ||
| methods: { | ||
| execute () { | ||
| if (this.$refs.configSheet?.isValid() === false) { | ||
| this.$f7.dialog.alert('Please review the input and correct validation errors') | ||
| return | ||
| } | ||
| this.executing = true | ||
| this.$oh.api.post(`/rest/actions/${this.thingUID}/${this.action.actionUid}`, this.actionInput) | ||
| .then((data) => { | ||
| this.actionOutput = data | ||
| this.executing = false | ||
| }) | ||
| }, | ||
| close () { | ||
| this.$refs.modulePopup.close() | ||
| } | ||
| } | ||
| } | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters