From db51c132dc9d42c3aaaca6db05377c06c706dd20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20H=C3=B6hn?= <mail@stefanhoehn.com>
Date: Fri, 17 Feb 2023 23:57:58 +0100
Subject: [PATCH 1/3] [blockly] add blockly workspace search
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stefan Höhn <mail@stefanhoehn.com>
---
 bundles/org.openhab.ui/web/package-lock.json   | 18 ++++++++++++++++++
 bundles/org.openhab.ui/web/package.json        |  1 +
 .../settings/rules/script/blockly-editor.vue   |  4 ++++
 3 files changed, 23 insertions(+)

diff --git a/bundles/org.openhab.ui/web/package-lock.json b/bundles/org.openhab.ui/web/package-lock.json
index 0d4354ac22..63415158dd 100644
--- a/bundles/org.openhab.ui/web/package-lock.json
+++ b/bundles/org.openhab.ui/web/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "@blockly/field-slider": "^4.0.3",
         "@blockly/plugin-cross-tab-copy-paste": "^2.0.4",
+        "@blockly/plugin-workspace-search": "^6.0.7",
         "@blockly/theme-dark": "^4.0.1",
         "@blockly/zoom-to-fit": "^3.0.3",
         "@jsep-plugin/arrow": "^1.0.5",
@@ -2780,6 +2781,17 @@
         "blockly": "^9.0.0"
       }
     },
+    "node_modules/@blockly/plugin-workspace-search": {
+      "version": "6.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/plugin-workspace-search/-/plugin-workspace-search-6.0.7.tgz",
+      "integrity": "sha512-MXMR5pgbFCm47QZ5cyFVyF4TwP6bIP0Po59/Sp3QzlutD+OTiecLolXivBYXGriQfBYpNzlD5BQvWD0UtoDDXA==",
+      "engines": {
+        "node": ">=8.17.0"
+      },
+      "peerDependencies": {
+        "blockly": "^9.0.0"
+      }
+    },
     "node_modules/@blockly/theme-dark": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-4.0.1.tgz",
@@ -26566,6 +26578,12 @@
       "integrity": "sha512-dznGTmY+wdUdFDhoAl9BK5c6TLXTa6u6W4t0I2oQq4oaJwXflY/lQraEmBTF7+1UTHsEBh2sOH9j2cHO6Xo2nA==",
       "requires": {}
     },
+    "@blockly/plugin-workspace-search": {
+      "version": "6.0.7",
+      "resolved": "https://registry.npmjs.org/@blockly/plugin-workspace-search/-/plugin-workspace-search-6.0.7.tgz",
+      "integrity": "sha512-MXMR5pgbFCm47QZ5cyFVyF4TwP6bIP0Po59/Sp3QzlutD+OTiecLolXivBYXGriQfBYpNzlD5BQvWD0UtoDDXA==",
+      "requires": {}
+    },
     "@blockly/theme-dark": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@blockly/theme-dark/-/theme-dark-4.0.1.tgz",
diff --git a/bundles/org.openhab.ui/web/package.json b/bundles/org.openhab.ui/web/package.json
index 4537b22a74..b8fe765652 100644
--- a/bundles/org.openhab.ui/web/package.json
+++ b/bundles/org.openhab.ui/web/package.json
@@ -63,6 +63,7 @@
   "dependencies": {
     "@blockly/field-slider": "^4.0.3",
     "@blockly/plugin-cross-tab-copy-paste": "^2.0.4",
+    "@blockly/plugin-workspace-search": "^6.0.7",
     "@blockly/theme-dark": "^4.0.1",
     "@blockly/zoom-to-fit": "^3.0.3",
     "@jsep-plugin/arrow": "^1.0.5",
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue
index 40692b9e1a..4c40a52559 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue
@@ -1002,8 +1002,10 @@
   z-index 9000
 </style>
 
+<script src="./node_modules/@blockly/plugin-workspace-search/dist/index.js"></script>
 <script>
 import Blockly from 'blockly'
+import { WorkspaceSearch } from '@blockly/plugin-workspace-search';
 import { javascriptGenerator } from 'blockly/javascript'
 import DarkTheme from '@blockly/theme-dark'
 import { CrossTabCopyPaste } from '@blockly/plugin-cross-tab-copy-paste'
@@ -1111,6 +1113,8 @@ export default {
           },
         trashcan: false
       })
+      const workspaceSearch = new WorkspaceSearch(this.workspace);
+      workspaceSearch.init();
 
       Blockly.HSV_SATURATION = 0.45 // default
       Blockly.HSV_VALUE = 0.65 // a little bit more contract for the different colors

From 56fe4994a23dd0bbcedd4785d4accee54012e141 Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Sun, 19 Feb 2023 23:00:19 +0100
Subject: [PATCH 2/3] Adjust styling of search box to fix dark mode

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../settings/rules/script/blockly-editor.vue  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue
index 4c40a52559..3a85f3c1ef 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue
@@ -1000,9 +1000,13 @@
       stroke inherit
 .blocklyDropDownDiv
   z-index 9000
+.blockly-ws-search
+  background var(--blockly-ws-search-bg-color)
+  border-color var(--blockly-ws-search-border-color)
+  box-shadow none
+  color var(--blockly-ws-search-text-color)
 </style>
 
-<script src="./node_modules/@blockly/plugin-workspace-search/dist/index.js"></script>
 <script>
 import Blockly from 'blockly'
 import { WorkspaceSearch } from '@blockly/plugin-workspace-search';
@@ -1044,6 +1048,15 @@ export default {
       this.initBlockly(this.blockLibraries)
     }
   },
+  computed: {
+    cssVars () {
+      return {
+        '--blockly-ws-search-bg-color': this.$f7.data.themeOptions.dark === 'dark' ? '#1e1e1e' : 'white',
+        '--blockly-ws-search-border-color': this.$f7.data.themeOptions.dark === 'dark' ? 'lightgrey' : 'grey',
+        '--blockly-ws-search-text-color': this.$f7.data.themeOptions.dark === 'dark' ? 'white' : 'black'
+      }
+    }
+  },
   mounted () {
     this.load()
   },
@@ -1113,8 +1126,8 @@ export default {
           },
         trashcan: false
       })
-      const workspaceSearch = new WorkspaceSearch(this.workspace);
-      workspaceSearch.init();
+      const workspaceSearch = new WorkspaceSearch(this.workspace)
+      workspaceSearch.init()
 
       Blockly.HSV_SATURATION = 0.45 // default
       Blockly.HSV_VALUE = 0.65 // a little bit more contract for the different colors

From 2d3ea66a5438196385896d0d655a10c4f7774121 Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Sun, 19 Feb 2023 23:04:13 +0100
Subject: [PATCH 3/3] Fix lint

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

diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue
index 3a85f3c1ef..2b6e7d9bd5 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/blockly-editor.vue
@@ -1009,7 +1009,7 @@
 
 <script>
 import Blockly from 'blockly'
-import { WorkspaceSearch } from '@blockly/plugin-workspace-search';
+import { WorkspaceSearch } from '@blockly/plugin-workspace-search'
 import { javascriptGenerator } from 'blockly/javascript'
 import DarkTheme from '@blockly/theme-dark'
 import { CrossTabCopyPaste } from '@blockly/plugin-cross-tab-copy-paste'