From d8243dbfdaa79e08ceeb5a944dc886e459091bf9 Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Thu, 22 Dec 2022 18:32:22 +0100
Subject: [PATCH 1/7] [MainUI] Extend script settings for tags & language

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../settings/rules/script/script-edit.vue     | 42 ++++++++++++-------
 .../rules/script/script-general-settings.vue  | 21 +++++++++-
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
index 416a1e4455..7a3386013d 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
@@ -85,7 +85,7 @@
           </div>
         </f7-toolbar>
         <f7-block class="block-narrow">
-          <script-general-settings :createMode="newScript" :rule="rule" />
+          <script-general-settings :createMode="newScript" :rule="rule" :mode="mode" :languages="languages" @newLanguage="changeLanguage" />
           <f7-col v-if="isEditable">
             <f7-list>
               <f7-list-button color="red" @click="deleteRule">
@@ -189,20 +189,8 @@ export default {
         tags: ['Script']
       }
       this.mode = 'application/javascript+blockly'
-      this.$oh.api.get('/rest/module-types/script.ScriptAction').then((data) => {
-        this.$set(this, 'scriptModuleType', data)
-        this.$set(this, 'languages',
-          this.scriptModuleType.configDescriptions
-            .find((c) => c.name === 'type').options
-            .map((l) => {
-              return {
-                contentType: l.value,
-                name: l.label.split(' (')[0],
-                version: l.label.split(' (')[1].replace(')', '')
-              }
-            }))
-        this.ready = true
-      })
+      this.loadScriptModules()
+      this.ready = true
     },
     createScript () {
       if (!this.rule.uid) {
@@ -243,6 +231,22 @@ export default {
         this.load()
       })
     },
+    loadScriptModules () {
+      this.$oh.api.get('/rest/module-types/script.ScriptAction').then((data) => {
+        this.$set(this, 'scriptModuleType', data)
+        let languages = this.scriptModuleType.configDescriptions
+          .find((c) => c.name === 'type').options
+          .map((l) => {
+            return {
+              contentType: l.value,
+              name: l.label.split(' (')[0],
+              version: l.label.split(' (')[1].replace(')', '')
+            }
+          })
+        if (this.isBlockly) languages = languages.filter((l) => l.contentType.startsWith('application/javascript'))
+        this.$set(this, 'languages', languages)
+      })
+    },
     load () {
       if (this.loading) return
       this.loading = true
@@ -277,6 +281,8 @@ export default {
           this.script = triggerDescriptionComments + '\n' + this.script
         }
 
+        this.loadScriptModules()
+
         this.ready = true
         if (!this.eventSource) this.startEventSource()
       })
@@ -300,6 +306,8 @@ export default {
         }
       }
       this.currentModule.configuration.script = this.script
+      this.currentModule.configuration.type = this.mode
+      if (this.isScriptRule && !this.rule.tags.includes('Script')) this.rule.tags.push('Script')
       return this.$oh.api.put('/rest/rules/' + this.rule.uid, this.rule).then((data) => {
         this.dirty = false
         if (!noToast) {
@@ -317,6 +325,10 @@ export default {
         }).open()
       })
     },
+    changeLanguage (contentType) {
+      if (this.createMode) return
+      this.mode = contentType
+    },
     toggleDisabled () {
       if (this.createMode) return
       const enable = (this.rule.status.statusDetail === 'DISABLED')
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
index a4af69ada4..204883ca2e 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
@@ -12,11 +12,30 @@
                        @input="rule.description = $event.target.value" clear-button />
       </f7-list>
     </f7-col>
+    <f7-col>
+      <f7-block-title>Tags</f7-block-title>
+      <tag-input :item="rule" :disabled="false" />
+    </f7-col>
+    <f7-col v-if="!createMode && languages">
+      <f7-block-title>Scripting Language</f7-block-title>
+      <f7-list media-list>
+        <f7-list-item media-item radio radio-icon="start"
+                      :value="mode" :checked="mode === language.contentType" @change="$emit('newLanguage', language.contentType)"
+                      v-for="language in languages" :key="language.contentType"
+                      :title="language.name" :after="language.version" :footer="language.contentType" />
+      </f7-list>
+    </f7-col>
   </f7-block>
 </template>
 
 <script>
+import TagInput from '@/components/tags/tag-input.vue'
+
 export default {
-  props: ['rule', 'createMode', 'ready']
+  props: ['rule', 'createMode', 'ready', 'languages', 'mode'],
+  emits: ['newLanguage'],
+  components: {
+    TagInput
+  }
 }
 </script>

From c0fc1a79d51c208a46cac85258bf999b5d38d004 Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Thu, 22 Dec 2022 18:50:39 +0100
Subject: [PATCH 2/7] [MainUI] Enable script language setting for rules

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../web/src/pages/settings/rules/script/script-edit.vue     | 6 +++---
 .../pages/settings/rules/script/script-general-settings.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
index 7a3386013d..f886a2aba6 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
@@ -29,14 +29,14 @@
           <f7-button outline small :active="!blocklyCodePreview" icon-f7="ticket" :icon-size="($theme.aurora) ? 20 : 22" class="no-ripple" @click="blocklyCodePreview = false" />
           <f7-button outline small :active="blocklyCodePreview" icon-f7="doc_text" :icon-size="($theme.aurora) ? 20 : 22" class="no-ripple" @click="showBlocklyCode" />
         </f7-segmented>
-        <f7-link v-if="isScriptRule" class="right details-link padding-right" ref="detailsLink" @click="detailsOpened = true" icon-f7="chevron_up" />
+        <f7-link class="right details-link padding-right" ref="detailsLink" @click="detailsOpened = true" icon-f7="chevron_up" />
       </span>
     </f7-toolbar>
     <f7-icon v-if="ready && !newScript && (!isBlockly && !isEditable) || (blocklyCodePreview && isBlockly)" f7="lock" class="float-right margin" style="opacity:0.5; z-index: 4000; user-select: none;" size="50" color="gray"
              :tooltip="(isBlockly) ? 'Cannot edit the code generated by Blockly' : 'This rule is not editable because it has been provisioned from a file'" />
     <editor v-if="ready && !newScript && (!isBlockly || blocklyCodePreview)" class="rule-script-editor" :mode="mode" :value="script" @input="onEditorInput" :read-only="isBlockly || !isEditable" :tern-autocompletion-hook="true" />
     <blockly-editor ref="blocklyEditor" v-else-if="ready && !newScript && isBlockly" :blocks="currentModule.configuration.blockSource" @change="dirty = true" />
-    <script-general-settings v-else-if="createMode" :createMode="true" :rule="rule" />
+    <script-general-settings v-else-if="createMode" :createMode="true" :isScriptRule="true" :rule="rule" />
     <f7-block class="block-narrow" v-if="newScript">
       <f7-col>
         <f7-block-title medium class="margin-left margin-bottom">
@@ -85,7 +85,7 @@
           </div>
         </f7-toolbar>
         <f7-block class="block-narrow">
-          <script-general-settings :createMode="newScript" :rule="rule" :mode="mode" :languages="languages" @newLanguage="changeLanguage" />
+          <script-general-settings :createMode="newScript" :rule="rule" :isScriptRule="isScriptRule" :mode="mode" :languages="languages" @newLanguage="changeLanguage" />
           <f7-col v-if="isEditable">
             <f7-list>
               <f7-list-button color="red" @click="deleteRule">
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
index 204883ca2e..a18cca0e88 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
@@ -1,6 +1,6 @@
 <template>
   <f7-block v-if="!ready" class="block-narrow">
-    <f7-col>
+    <f7-col v-if="createMode || isScriptRule">
       <f7-list class="no-margin" inline-labels no-hairlines-md>
         <f7-list-input label="Unique ID" type="text" placeholder="Required" :value="rule.uid" required validate
                        :disabled="!createMode" :info="(createMode) ? 'Note: cannot be changed after the creation' : ''"
@@ -12,7 +12,7 @@
                        @input="rule.description = $event.target.value" clear-button />
       </f7-list>
     </f7-col>
-    <f7-col>
+    <f7-col v-if="createMode || isScriptRule">
       <f7-block-title>Tags</f7-block-title>
       <tag-input :item="rule" :disabled="false" />
     </f7-col>
@@ -32,7 +32,7 @@
 import TagInput from '@/components/tags/tag-input.vue'
 
 export default {
-  props: ['rule', 'createMode', 'ready', 'languages', 'mode'],
+  props: ['rule', 'createMode', 'ready', 'isScriptRule', 'languages', 'mode'],
   emits: ['newLanguage'],
   components: {
     TagInput

From a64f7129437e8f4b5c844b465fa0381fa81cd49b Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Thu, 22 Dec 2022 18:53:55 +0100
Subject: [PATCH 3/7] [MainUI] Improve wording of toast messages in script
 editor

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../src/pages/settings/rules/script/script-edit.vue  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
index f886a2aba6..a577de08a1 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
@@ -312,14 +312,14 @@ export default {
         this.dirty = false
         if (!noToast) {
           this.$f7.toast.create({
-            text: 'Rule updated',
+            text: (this.isScriptRule ? 'Script' : 'Rule') + ' updated',
             destroyOnClose: true,
             closeTimeout: 2000
           }).open()
         }
       }).catch((err) => {
         this.$f7.toast.create({
-          text: 'Error while saving rule: ' + err,
+          text: 'Error while saving: ' + err,
           destroyOnClose: true,
           closeTimeout: 2000
         }).open()
@@ -334,7 +334,7 @@ export default {
       const enable = (this.rule.status.statusDetail === 'DISABLED')
       this.$oh.api.postPlain('/rest/rules/' + this.rule.uid + '/enable', enable.toString()).then((data) => {
         this.$f7.toast.create({
-          text: (enable) ? 'Rule enabled' : 'Rule disabled',
+          text: (this.isScriptRule ? 'Script' : 'Rule') + (enable ? ' enabled' : ' disabled'),
           destroyOnClose: true,
           closeTimeout: 2000
         }).open()
@@ -356,7 +356,7 @@ export default {
         }).open()
       }
       this.$f7.toast.create({
-        text: 'Running rule',
+        text: 'Running ' + (this.isScriptRule ? 'script' : 'rule'),
         destroyOnClose: true,
         closeTimeout: 2000
       }).open()
@@ -366,7 +366,7 @@ export default {
       savePromise.then(() => {
         this.$oh.api.postPlain('/rest/rules/' + this.rule.uid + '/runnow', '').catch((err) => {
           this.$f7.toast.create({
-            text: 'Error while running rule: ' + err,
+            text: 'Error while running: ' + err,
             destroyOnClose: true,
             closeTimeout: 2000
           }).open()
@@ -376,7 +376,7 @@ export default {
     deleteRule () {
       this.$f7.dialog.confirm(
         `Are you sure you want to delete ${this.rule.name}?`,
-        'Delete Rule',
+        'Delete ' + (this.isScriptRule ? 'Script' : 'Rule'),
         () => {
           this.$oh.api.delete('/rest/rules/' + this.rule.uid).then(() => {
             this.$f7router.back('/settings/scripts/', { force: true })

From 14df26f099d1d59e19479d8c02965dd7e851fcca Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Thu, 22 Dec 2022 18:58:12 +0100
Subject: [PATCH 4/7] [MainUI] Hide "Delete Script" if script part of rule

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../web/src/pages/settings/rules/script/script-edit.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
index a577de08a1..6bbab7501d 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
@@ -86,7 +86,7 @@
         </f7-toolbar>
         <f7-block class="block-narrow">
           <script-general-settings :createMode="newScript" :rule="rule" :isScriptRule="isScriptRule" :mode="mode" :languages="languages" @newLanguage="changeLanguage" />
-          <f7-col v-if="isEditable">
+          <f7-col v-if="isEditable && isScriptRule">
             <f7-list>
               <f7-list-button color="red" @click="deleteRule">
                 Remove Script

From e79ab01354e3c9a0c027aa7d4fdbbe0f41d7a2a4 Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Thu, 22 Dec 2022 19:03:18 +0100
Subject: [PATCH 5/7] [MainUI] Hide "Script" tag in script editor

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../org.openhab.ui/web/src/components/tags/tag-input.vue  | 8 ++++++--
 .../settings/rules/script/script-general-settings.vue     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/components/tags/tag-input.vue b/bundles/org.openhab.ui/web/src/components/tags/tag-input.vue
index 8895a646b5..37f5bbb794 100644
--- a/bundles/org.openhab.ui/web/src/components/tags/tag-input.vue
+++ b/bundles/org.openhab.ui/web/src/components/tags/tag-input.vue
@@ -3,7 +3,7 @@
     <f7-list>
       <f7-list-item>
         <div slot="inner">
-          <f7-chip v-for="tag in item.tags.filter((t) => !isSemanticTag(t))" :key="tag" :text="tag" :deleteable="!disabled" @delete="deleteTag" media-bg-color="blue">
+          <f7-chip v-for="tag in item.tags.filter((t) => !isSemanticTag(t) && !isScriptTag(t))" :key="tag" :text="tag" :deleteable="!disabled" @delete="deleteTag" media-bg-color="blue">
             <f7-icon slot="media" ios="f7:tag_fill" md="material:label" aurora="f7:tag_fill" />
           </f7-chip>
         </div>
@@ -28,7 +28,7 @@
 import * as SemanticClasses from '@/assets/semantics.js'
 
 export default {
-  props: ['item', 'disabled'],
+  props: ['item', 'disabled', 'inScriptEditor'],
   data () {
     return {
       pendingTag: ''
@@ -41,6 +41,10 @@ export default {
         SemanticClasses.Points,
         SemanticClasses.Properties].some((t) => t.indexOf(tag) >= 0)
     },
+    isScriptTag (tag) {
+      if (this.inScriptEditor !== true) return false
+      if (tag === 'Script') return true
+    },
     addTag () {
       if (this.pendingTag && this.item.tags.indexOf(this.pendingTag) === -1) {
         this.item.tags.push(this.pendingTag)
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
index a18cca0e88..2bf26f4b04 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-general-settings.vue
@@ -14,7 +14,7 @@
     </f7-col>
     <f7-col v-if="createMode || isScriptRule">
       <f7-block-title>Tags</f7-block-title>
-      <tag-input :item="rule" :disabled="false" />
+      <tag-input :item="rule" :disabled="false" :inScriptEditor="true" />
     </f7-col>
     <f7-col v-if="!createMode && languages">
       <f7-block-title>Scripting Language</f7-block-title>

From 082915216a7b2d368868809744ae2ce38047de4a Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Fri, 23 Dec 2022 13:45:09 +0100
Subject: [PATCH 6/7] [MainUI] Fix regressions from previous commits

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../web/src/pages/settings/rules/script/script-edit.vue        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
index 6bbab7501d..5fb2a7ac4f 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
@@ -36,7 +36,7 @@
              :tooltip="(isBlockly) ? 'Cannot edit the code generated by Blockly' : 'This rule is not editable because it has been provisioned from a file'" />
     <editor v-if="ready && !newScript && (!isBlockly || blocklyCodePreview)" class="rule-script-editor" :mode="mode" :value="script" @input="onEditorInput" :read-only="isBlockly || !isEditable" :tern-autocompletion-hook="true" />
     <blockly-editor ref="blocklyEditor" v-else-if="ready && !newScript && isBlockly" :blocks="currentModule.configuration.blockSource" @change="dirty = true" />
-    <script-general-settings v-else-if="createMode" :createMode="true" :isScriptRule="true" :rule="rule" />
+    <script-general-settings v-else-if="createMode" :createMode="true" :rule="rule" />
     <f7-block class="block-narrow" v-if="newScript">
       <f7-col>
         <f7-block-title medium class="margin-left margin-bottom">
@@ -307,7 +307,6 @@ export default {
       }
       this.currentModule.configuration.script = this.script
       this.currentModule.configuration.type = this.mode
-      if (this.isScriptRule && !this.rule.tags.includes('Script')) this.rule.tags.push('Script')
       return this.$oh.api.put('/rest/rules/' + this.rule.uid, this.rule).then((data) => {
         this.dirty = false
         if (!noToast) {

From a42c802182212ff7804565a353ca44190b9017b6 Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Fri, 30 Dec 2022 12:24:58 +0100
Subject: [PATCH 7/7] [MainUI] Script Editor: Improve toast messages

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../web/src/pages/settings/rules/script/script-edit.vue       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
index 5fb2a7ac4f..6f65cac1c6 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
@@ -291,7 +291,7 @@ export default {
       if (!this.isEditable) return
       if (this.rule.status.status === 'RUNNING') {
         return this.$f7.toast.create({
-          text: 'Rule cannot be updated while running, please wait!',
+          text: `${this.isScriptRule ? 'Script' : 'Rule'} cannot be updated while running, please wait!`,
           destroyOnClose: true,
           closeTimeout: 2000
         }).open()
@@ -349,7 +349,7 @@ export default {
       if (this.createMode) return
       if (this.rule.status.status === 'RUNNING' || this.rule.status.status === 'UNINITIALIZED') {
         return this.$f7.toast.create({
-          text: `Rule cannot be run ${(this.rule.status.status === 'RUNNING') ? 'while already running, please wait' : 'if it is disabled'}!`,
+          text: `${this.isScriptRule ? 'Script' : 'Rule'} cannot be run ${(this.rule.status.status === 'RUNNING') ? 'while already running, please wait' : 'if it is uninitialized'}!`,
           destroyOnClose: true,
           closeTimeout: 2000
         }).open()