support for using a different field when getting comparison value inp…

…ut, used with advanced search
openbroadcaster · Jul 26, 2024 · 2e24ed1 · 2e24ed1
1 parent 9ff4daf
commit 2e24ed1
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 16 deletions.
diff --git a/js/sidebar.js b/js/sidebar.js
@@ -1359,7 +1359,7 @@ OB.Sidebar.advancedSearchFilterChange = function () {
     if (type) {
         metadataContainer.innerHTML = "";
         const metadataElement = document.createElement("ob-field-" + type);
-        const metadataOperators = metadataElement?.constructor?.operators;
+        const metadataOperators = metadataElement?.constructor?.comparisonOperators;
 
         const operatorElement = document.createElement("select");
         Object.entries(metadataOperators).forEach((operator) => {
@@ -1371,8 +1371,18 @@ OB.Sidebar.advancedSearchFilterChange = function () {
 
         metadataContainer.appendChild(operatorElement);
 
-        metadataElement.editable = true;
-        metadataContainer.appendChild(metadataElement);
+        // field specifies a different comparison field
+        if (metadataElement?.constructor?.comparisonField) {
+            const comparisonField = document.createElement("ob-field-" + metadataElement.constructor.comparisonField);
+            comparisonField.editable = true;
+            metadataContainer.appendChild(comparisonField);
+        }
+
+        // field uses itself as the comparison field
+        else {
+            metadataElement.editable = true;
+            metadataContainer.appendChild(metadataElement);
+        }
 
         metadataContainer.style.display = "inline-flex";
     } else {

diff --git a/ui/fields/bool.js b/ui/fields/bool.js
@@ -2,7 +2,7 @@ import { html, render } from "../vendor.js";
 import { OBField } from "../base/field.js";
 
 class OBFieldBool extends OBField {
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
     };

diff --git a/ui/fields/country.js b/ui/fields/country.js
@@ -4,7 +4,7 @@ import { OBField } from "../base/field.js";
 class OBFieldCountry extends OBField {
     static countries = null;
 
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
     };

diff --git a/ui/fields/datetime.js b/ui/fields/datetime.js
@@ -5,7 +5,7 @@ class OBFieldDatetime extends OBField {
     valueFormat = "YYYY-MM-DD HH:mm:ss";
     valueStringFormat = "MMM D, YYYY h:mm A";
 
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
         gt: "greater than",

diff --git a/ui/fields/formatted.js b/ui/fields/formatted.js
@@ -5,13 +5,15 @@ class OBFieldFormatted extends OBField {
     #init;
     #editorInstance;
 
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
         contains: "contains",
         ncontains: "does not contain",
     };
 
+    static comparisonField = "text";
+
     renderEdit() {
         if (this.#editorInstance) {
             // update value only

diff --git a/ui/fields/genre.js b/ui/fields/genre.js
@@ -9,7 +9,7 @@ class OBFieldGenre extends OBField {
     #currentGenre;
     #genres;
 
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
     };

diff --git a/ui/fields/language.js b/ui/fields/language.js
@@ -6,7 +6,7 @@ class OBFieldLanguage extends OBField {
     static languages = null;
     static popularLanguages = null;
 
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
     };

diff --git a/ui/fields/media.js b/ui/fields/media.js
@@ -20,7 +20,7 @@ class OBFieldMedia extends OBField {
 
     #init;
 
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
     };

diff --git a/ui/fields/number.js b/ui/fields/number.js
@@ -2,7 +2,7 @@ import { OBField } from "../base/field.js";
 import { html, render } from "../vendor.js";
 
 class OBFieldNumber extends OBField {
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
         gt: "greater than",

diff --git a/ui/fields/playlist.js b/ui/fields/playlist.js
@@ -6,7 +6,7 @@ class OBFieldPlaylist extends OBField {
     #playlistContent;
     #setValue;
 
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
     };

diff --git a/ui/fields/select.js b/ui/fields/select.js
@@ -5,7 +5,7 @@ class OBFieldSelect extends OBField {
     #options;
     filterVal = "";
 
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
     };

diff --git a/ui/fields/tags.js b/ui/fields/tags.js
@@ -7,11 +7,13 @@ class OBFieldTags extends OBField {
     #suggestions;
     #currentTag;
 
-    static operators = {
+    static comparisonOperators = {
         has: "has",
         nhas: "does not have",
     };
 
+    static comparisonField = "text";
+
     // TODO loading tags and suggestions via OB-OPTION and OB-TAGS temporarily disabled.
     // fix needed as these are currently overwriting set value.
     /*

diff --git a/ui/fields/text.js b/ui/fields/text.js
@@ -2,7 +2,7 @@ import { OBField } from "../base/field.js";
 import { html, render } from "../vendor.js";
 
 class OBFieldText extends OBField {
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
         contains: "contains",

diff --git a/ui/fields/textarea.js b/ui/fields/textarea.js
@@ -2,13 +2,15 @@ import { OBField } from "../base/field.js";
 import { html, render } from "../vendor.js";
 
 class OBFieldTextarea extends OBField {
-    static operators = {
+    static comparisonOperators = {
         eq: "is",
         neq: "is not",
         contains: "contains",
         ncontains: "does not contain",
     };
 
+    static comparisonField = "text";
+
     renderView() {
         render(html`<div id="view">${this.value}</div>`, this.root);
     }