From db9db523bc426961efdbdc6c9297763b5c740e2f Mon Sep 17 00:00:00 2001
From: GitButler <gitbutler@gitbutler.com>
Date: Thu, 11 Apr 2024 13:05:35 +0200
Subject: [PATCH 1/2] GitButler Integration Commit

This is an integration commit for the virtual branches that GitButler is tracking.

Due to GitButler managing multiple virtual branches, you cannot switch back and
forth between git branches and virtual branches easily.

If you switch to another branch, GitButler will need to be reinitialized.
If you commit on this branch, GitButler will throw it away.

Here are the branches that are currently applied:
 - notifications-feature (refs/gitbutler/notifications-feature)
   branch head: 6f8601c6f5f3720991d4c0a3691b8777e2d72ecb
   - src/views/MqttViewer.vue
   - src/models/TreeNode.js
   - src/main.js

Your previous branch was: refs/heads/master

The sha for that commit was: d41693b547994f8f634021818adf025cabc3e33e

For more information about what we're doing here, check out our docs:
https://docs.gitbutler.com/features/virtual-branches/integration-branch
---
 src/main.js              |   3 +
 src/models/TreeNode.js   |   7 ++
 src/views/MqttViewer.vue | 144 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 152 insertions(+), 2 deletions(-)

diff --git a/src/main.js b/src/main.js
index ef4acde..7f5fba4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -114,6 +114,9 @@ Vue.mixin({
 
       document.head.appendChild(scrollTheme);
     },
+    sendNotification(title, body, onClick = () => {}) {
+      new window.Notification(title, { body }).onclick = onClick;
+    },
   },
 });
 
diff --git a/src/models/TreeNode.js b/src/models/TreeNode.js
index 1dcd248..ace558b 100644
--- a/src/models/TreeNode.js
+++ b/src/models/TreeNode.js
@@ -68,6 +68,13 @@ class TreeNode {
     );
   }
 
+  deepSearch(searchTerm, mode) {
+    return [
+      this.search(searchTerm, mode) ? this : undefined,
+      ...(this.child?.deepSearch(searchTerm, mode) ?? []),
+    ];
+  }
+
   #idFun = () => {};
 
   #blink = () => {
diff --git a/src/views/MqttViewer.vue b/src/views/MqttViewer.vue
index 84b42b1..42e3da7 100644
--- a/src/views/MqttViewer.vue
+++ b/src/views/MqttViewer.vue
@@ -116,7 +116,22 @@
         </v-text-field>
       </v-slide-y-transition>
       <v-spacer />
-      <div v-if="selectedId !== -1" center-vertical>
+      <div>
+        <v-tooltip bottom>
+          <template v-slot:activator="{ on, attrs }">
+            <v-btn
+              v-bind="attrs"
+              v-on:click="notifySettings = true"
+              v-on="on"
+              icon
+            >
+              <v-icon>mdi-bell-cog-outline</v-icon>
+            </v-btn>
+          </template>
+          <span>Enable notifications</span>
+        </v-tooltip>
+      </div>
+      <div v-if="selectedId !== -1" center-vertical class="ms-2">
         <v-tooltip bottom>
           <template v-slot:activator="{ on, attrs }">
             <v-btn
@@ -145,12 +160,13 @@
           open-on-click
           rounded
         >
-          <template slot="label" slot-scope="{ item, leaf }" class="ma-0">
+          <template slot="label" slot-scope="{ item, leaf }">
             <div
               v-bind:class="{
                 primary: item.blink || selectedId === item.id,
                 'white--text': item.blink || selectedId === item.id,
                 'px-2': true,
+                'ma-0': true,
                 rounded: true,
               }"
               v-on:click="getProperties(item)"
@@ -452,6 +468,98 @@
       </v-card>
     </v-dialog>
 
+    <v-dialog v-model="notifySettings" max-width="70ch" persistent scrollable>
+      <v-card>
+        <v-card-title>Notifications</v-card-title>
+        <v-card-text class="d-flex flex-column">
+          <div class="d-flex align-center">
+            <v-text-field
+              v-model="notifyEntry"
+              v-bind:outlined="outline"
+              v-on:click:append-outer="addNotifyEntry"
+              v-on:keyup.enter="addNotifyEntry"
+              append-outer-icon="mdi-bell-plus-outline"
+              clear-icon="mdi-close"
+              label="Notify topic"
+              clearable
+            />
+            <v-btn-toggle v-model="notifyFilterType" class="ms-4">
+              <v-btn
+                v-bind:value="searchModes.CASES"
+                v-on:click.stop
+                title="Uppercase/Lowercase"
+                small
+                icon
+              >
+                <v-icon small>mdi-format-letter-case</v-icon>
+              </v-btn>
+              <v-btn
+                v-bind:value="searchModes.WORDS"
+                v-on:click.stop
+                title="Match whole word"
+                small
+                icon
+              >
+                <v-icon small>mdi-format-letter-matches</v-icon>
+              </v-btn>
+              <v-btn
+                v-bind:value="searchModes.REG_EXP"
+                v-on:click.stop
+                title="Regular expression"
+                small
+                icon
+              >
+                <v-icon small>mdi-regex</v-icon>
+              </v-btn>
+            </v-btn-toggle>
+            <v-tooltip bottom>
+              <template v-slot:activator="{ on, attrs }">
+                <v-btn
+                  v-bind="attrs"
+                  v-on="on"
+                  v-on:click="searchInfoDialog = true"
+                  class="ms-2"
+                  icon
+                >
+                  <v-icon>mdi-information-outline</v-icon>
+                </v-btn>
+              </template>
+              <span>Information about searching</span>
+            </v-tooltip>
+          </div>
+          <div class="mt-2">
+            <div>Notifications active for:</div>
+            <v-list>
+              <div v-for="(entry, i) in notifyEntries" v-bind:key="entry">
+                <v-list-item>
+                  <v-list-item-avatar>
+                    <v-icon>mdi-bell-outline</v-icon>
+                  </v-list-item-avatar>
+                  <v-list-item-content>
+                    <v-list-item-title>{{ entry }}</v-list-item-title>
+                  </v-list-item-content>
+                  <v-list-item-action>
+                    <v-btn
+                      v-on:click="deleteNotifyEntry(entry)"
+                      color="error"
+                      icon
+                    >
+                      <v-icon>mdi-delete-outline</v-icon>
+                    </v-btn>
+                  </v-list-item-action>
+                </v-list-item>
+                <v-divider v-if="i < notifyEntries.length - 1" />
+              </div>
+            </v-list>
+          </div>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer />
+          <v-btn v-on:click="notifySettings = false" text> Done </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+
     <v-dialog v-model="searchInfoDialog" max-width="70ch" persistent scrollable>
       <v-card>
         <v-card-title>How to search</v-card-title>
@@ -615,6 +723,10 @@ export default {
     filterType: undefined,
     searchModes: SearchEngine.modes,
     searchQuery: SearchEngine.QUERY,
+    notifySettings: false,
+    notifyFilterType: undefined,
+    notifyEntry: undefined,
+    notifyEntries: [],
   }),
 
   computed: {
@@ -777,8 +889,36 @@ export default {
         this.treeData.splice(index, 1);
       }
 
+      if (!toDelete) {
+        this.notify(node);
+      }
+
       return toDelete;
     },
+    addNotifyEntry() {
+      if (!this.notifyEntry) return;
+
+      this.notifyEntries.push(this.notifyEntry);
+
+      this.notifyEntries = [...new Set(this.notifyEntries)];
+      this.notifyEntry = undefined;
+    },
+    deleteNotifyEntry(entry) {
+      this.notifyEntries = this.notifyEntries.filter((item) => item !== entry);
+    },
+    notify(node) {
+      this.notifyEntries
+        .flatMap((entry) => {
+          return node.deepSearch(
+            entry,
+            this.notifyFilterType || SearchEngine.modes.ALL
+          );
+        })
+        .forEach((foundNode) => {
+          if (!foundNode?.value) return;
+          this.sendNotification(foundNode.value.topic, foundNode.value.payload);
+        });
+    },
     publishItem() {
       this.itemEditing.value.topic = this.itemEditing.topic;
 

From 89331c71f62bba66af06a2165e6622b020ce5222 Mon Sep 17 00:00:00 2001
From: Leonardo Cossutta <leonardo.cossutta@gmail.com>
Date: Thu, 11 Apr 2024 13:09:08 +0200
Subject: [PATCH 2/2] 1.13.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3cf445f..9d4eddb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mqtt5-explorer",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "private": false,
   "license": "GPLv3",
   "description": "A simple MQTT client that supports MQTT5 protocol.",