html/admin.html

@@ -645,7 +645,7 @@
                             </div>
                         </div>
                         <input type="search" class="field ~neutral @low input search ml-2 mr-2" id="accounts-search" placeholder="{{ .strings.search }}">
-                        <span class="button ~neutral @low center ml-[-2.64rem] rounded-s-none accounts-search-clear" aria-label="{{ .strings.clearSearch }}" text="{{ .strings.clearSearch }}"><i class="ri-close-line"></i></span>
+                        <span class="button ~neutral @low center -ml-8" id="accounts-search-clear" aria-label="{{ .strings.clearSearch }}" text="{{ .strings.clearSearch }}"><i class="ri-close-line"></i></span>
                     </div>
                     <div class="supra py-1 sm hidden" id="accounts-search-options-header">{{ .strings.searchOptions }}</div>
                     <div class="row -mx-2 mb-2">
@@ -708,14 +708,6 @@
                             </thead>
                             <tbody id="accounts-list"></tbody>
                         </table>
-                        <div class="unfocused h-[100%] my-3" id="accounts-not-found">
-                            <div class="flex flex-col h-[100%] justify-center items-center">
-                                <span class="text-2xl font-medium italic mb-3">{{ .strings.noResultsFound }}</span>
-                                <button class="button ~neutral @low accounts-search-clear">
-                                    <span class="mr-2">{{ .strings.clearSearch }}</span><i class="ri-close-line"></i>
-                                </button>
-                            </div>
-                        </div>
                     </div>
                 </div>
             </div>
@@ -739,23 +731,13 @@
                         <div class="card @low dark:~d_neutral col" id="settings-sidebar">
                             <div class="flex-expand">
                                 <input type="search" class="field ~neutral @low input settings-section-button justify-between mb-2" id="settings-search" placeholder="{{ .strings.search }}">
-                                <button class="button ~neutral @low center -ml-10 rounded-s-none mb-2 settings-search-clear" aria-label="{{ .strings.clearSearch }}" text="{{ .strings.clearSearch }}"><i class="ri-close-line"></i></button>
+                                <button class="button ~neutral @low center -ml-8 mb-2" id="settings-search-clear" aria-label="{{ .strings.clearSearch }}" text="{{ .strings.clearSearch }}"><i class="ri-close-line"></i></button>
                             </div>
                             <aside class="aside sm ~urge dark:~d_info mb-2 @low" id="settings-message">Note: <span class="badge ~critical">*</span> indicates a required field, <span class="badge ~info dark:~d_warning">R</span> indicates changes require a restart.</aside> 
                             <span class="button ~neutral @low settings-section-button justify-between mb-2" id="setting-about"><span class="flex">{{ .strings.aboutProgram }} <i class="ri-information-line ml-2"></i></span></span>
                             <span class="button ~neutral @low settings-section-button justify-between mb-2" id="setting-profiles"><span class="flex">{{ .strings.userProfiles }} <i class="ri-user-line ml-2"></i></span></span>
                         </div>
-                        <div class="card ~neutral @low col overflow" id="settings-panel">
-                            <div class="settings-section unfocused h-[100%]" id="settings-not-found">
-                                <div class="flex flex-col h-[100%] justify-center items-center">
-                                    <span class="text-2xl font-medium italic mb-2">{{ .strings.noResultsFound }}</span>
-                                    <span class="mb-2 px-12 text-center">{{ .strings.settingsMaybeUnderAdvanced }}</span>
-                                    <button class="button ~neutral @low settings-search-clear">
-                                        <span class="mr-2">{{ .strings.clearSearch }}</span><i class="ri-close-line"></i>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
+                        <div class="card ~neutral @low col overflow" id="settings-panel"></div>
                     </div>
                 </div>
             </div>

lang/admin/en-us.json

@@ -55,7 +55,6 @@
         "donate": "Donate",
         "unlink": "Unlink Account",
         "sendPWR": "Send Password Reset",
-        "noResultsFound": "No Results Found",
         "contactThrough": "Contact through:",
         "extendExpiry": "Extend expiry",
         "sendPWRManual": "User {n} has no method of contact, press copy to get a link to send to them.",
@@ -87,7 +86,6 @@
         "settingsHiddenDependency": "Matching settings are hidden because they depend on the value of another setting:",
         "settingsDependsOn": "{setting}: Depends on {dependency}",
         "settingsAdvancedMode": "{setting}: Advanced Settings must be enabled",
-        "settingsMaybeUnderAdvanced": "Tip: You might find what you're looking for by enabling Advanced Settings.",
         "ombiProfile": "Ombi user profile",
         "ombiUserDefaultsDescription": "Create an Ombi user and configure it, then select it below. It's settings/permissions will be stored and applied to new Ombi users created by jfa-go when this profile is selected.",
         "userProfiles": "User Profiles",

ts/modules/accounts.ts

@@ -946,8 +946,6 @@ export class accountsList {
         }
     }
 
-    private _notFoundPanel: HTMLElement = document.getElementById("accounts-not-found");
-
     search = (query: String): string[] => {
         console.log(this._queries);
         this._filterArea.textContent = "";
@@ -2023,25 +2021,17 @@ export class accountsList {
                 this._inSearch = true;
                 // this.setVisibility(this.search(query), true);
             }
-            const results = this.search(query);
-            this.setVisibility(results, true);
+            this.setVisibility(this.search(query), true);
             this._checkCheckCount();
             this.showHideSearchOptionsHeader();
-            if (results.length == 0) {
-                this._notFoundPanel.classList.remove("unfocused");
-            } else {
-                this._notFoundPanel.classList.add("unfocused");
-            }
         };
         this._search.oninput = onchange;
 
-        const clearSearchButtons = Array.from(document.getElementsByClassName("accounts-search-clear")) as Array<HTMLSpanElement>;
-        for (let b of clearSearchButtons) {
-            b.addEventListener("click", () => {
-                this._search.value = "";
-                onchange();
-            });
-        }
+        const clearSearchButton = document.getElementById("accounts-search-clear") as HTMLSpanElement;
+        clearSearchButton.addEventListener("click", () => {
+            this._search.value = "";
+            onchange();
+        });
 
         this._announceTextarea.onkeyup = this.loadPreview;
         addDiscord = newDiscordSearch(window.lang.strings("linkDiscord"), window.lang.strings("searchDiscordUser"), window.lang.strings("add"), (user: DiscordUser, id: string) => { 
@@ -2094,15 +2084,8 @@ export class accountsList {
             // console.log("ordering by", event.detail, ": ", this._ordering);
             if (!(this._inSearch)) {
                 this.setVisibility(this._ordering, true);
-                this._notFoundPanel.classList.add("unfocused");
             } else {
-                const results = this.search(this._search.value);
-                this.setVisibility(results, true);
-                if (results.length == 0) {
-                    this._notFoundPanel.classList.remove("unfocused");
-                } else {
-                    this._notFoundPanel.classList.add("unfocused");
-                }
+                this.setVisibility(this.search(this._search.value), true);
             }
             this.showHideSearchOptionsHeader();
         });
@@ -2212,15 +2195,8 @@ export class accountsList {
                 this._ordering = this._columns[this._activeSortColumn].sort(this._users);
                 if (!(this._inSearch)) {
                     this.setVisibility(this._ordering, true);
-                    this._notFoundPanel.classList.add("unfocused");
                 } else {
-                    const results = this.search(this._search.value);
-                    if (results.length == 0) {
-                        this._notFoundPanel.classList.remove("unfocused");
-                    } else {
-                        this._notFoundPanel.classList.add("unfocused");
-                    }
-                    this.setVisibility(results, true);
+                    this.setVisibility(this.search(this._search.value), true);
                 }
                 this._checkCheckCount();
             }

ts/modules/settings.ts

@@ -622,7 +622,6 @@ export class settingsList {
 
     private _panel = document.getElementById("settings-panel") as HTMLDivElement;
     private _sidebar = document.getElementById("settings-sidebar") as HTMLDivElement;
-    private _visibleSection: string;
     private _sections: { [name: string]: sectionPanel }
     private _buttons: { [name: string]: HTMLSpanElement }
     private _needsRestart: boolean = false;
@@ -631,9 +630,7 @@ export class settingsList {
     private _advanced: boolean = false;
 
     private _searchbox: HTMLInputElement = document.getElementById("settings-search") as HTMLInputElement;
-    private _clearSearchboxButtons: Array<HTMLButtonElement> = Array.from(document.getElementsByClassName("settings-search-clear")) as Array<HTMLButtonElement>;
-
-    private _noResultsPanel: HTMLElement = document.getElementById("settings-not-found");
+    private _clearSearchbox: HTMLButtonElement = document.getElementById("settings-search-clear") as HTMLButtonElement;
 
 
     addSection = (name: string, s: Section, subButton?: HTMLElement) => {
@@ -684,7 +681,6 @@ export class settingsList {
         for (let n in this._sections) {
             if (n == name) {
                 this._sections[name].visible = true;
-                this._visibleSection = name;
                 this._buttons[name].classList.add("selected");
             } else {
                 this._sections[n].visible = false;
@@ -767,11 +763,9 @@ export class settingsList {
         this._searchbox.oninput = () => {
             this.search(this._searchbox.value);
         };
-        for (let b of this._clearSearchboxButtons) {
-            b.onclick = () => {
-                this._searchbox.value = "";
-                this._searchbox.oninput(null);
-            };
+        this._clearSearchbox.onclick = () => {
+            this._searchbox.value = "";
+            this._searchbox.oninput(null);
         };
     }
 
@@ -867,11 +861,8 @@ export class settingsList {
         }
     })
 
-    // FIXME: Search "About" & "User profiles", pseudo-search "User profiles" for things like "Ombi", "Referrals", etc.
     search = (query: string) => {
-        query = query.toLowerCase().trim();
-        // Make sure a blank search is detected when there's just whitespace.
-        if (query.replace(/\s+/g, "") == "") query = "";
+        query = query.toLowerCase();
 
         let firstVisibleSection = "";
         for (let section of this._settings.order) {
@@ -884,15 +875,12 @@ export class settingsList {
             // hide button, unhide if matched
             this._buttons[section].classList.add("unfocused");
 
-            let matchedSection = false;
-
             if (section.toLowerCase().includes(query) ||
                 this._settings.sections[section].meta.name.toLowerCase().includes(query) ||
                 this._settings.sections[section].meta.description.toLowerCase().includes(query)) {
                 if ((this._settings.sections[section].meta.advanced && this._advanced) || !(this._settings.sections[section].meta.advanced)) {
                     this._buttons[section].classList.remove("unfocused");
                     firstVisibleSection = firstVisibleSection || section;
-                    matchedSection = true;
                 }
             }
             const sectionElement = this._sections[section].asElement();
@@ -900,13 +888,6 @@ export class settingsList {
                 if (this._settings.sections[section].settings[setting].type == "note") continue;
                 const element = sectionElement.querySelector(`div[data-name="${setting}"]`) as HTMLElement;
 
-                // If we match the whole section, don't bother searching settings.
-                if (matchedSection) {
-                    element.classList.remove("opacity-50", "pointer-events-none");
-                    element.setAttribute("aria-disabled", "false");
-                    continue;
-                }
-
                 // element.classList.remove("-mx-2", "my-2", "p-2", "aside", "~neutral", "@low");
                 element.classList.add("opacity-50", "pointer-events-none");
                 element.setAttribute("aria-disabled", "true");
@@ -921,12 +902,12 @@ export class settingsList {
                     const shouldShow = (query != "" &&
                                     ((this._settings.sections[section].settings[setting].advanced && this._advanced) ||
                                     !(this._settings.sections[section].settings[setting].advanced)));
-                    if (shouldShow || query == "") {
+                    if (shouldShow) {
                         // element.classList.add("-mx-2", "my-2", "p-2", "aside", "~neutral", "@low");
                         element.classList.remove("opacity-50", "pointer-events-none");
                         element.setAttribute("aria-disabled", "false");
                     }
-                    if (query != "" && ((shouldShow && element.querySelector("label").classList.contains("unfocused")) || (!shouldShow))) {
+                    if ((shouldShow && element.querySelector("label").classList.contains("unfocused")) || (!shouldShow)) {
                         // Add a note explaining why the setting is hidden
                         if (!dependencyCard) {
                             dependencyCard = document.createElement("aside");
@@ -961,16 +942,10 @@ export class settingsList {
                 }
             }
         }
-        if (firstVisibleSection && (query != "" || this._visibleSection == "")) {
+        if (firstVisibleSection) {
             this._buttons[firstVisibleSection].onclick(null);
-            this._noResultsPanel.classList.add("unfocused");
-        } else if (query != "") {
-            this._noResultsPanel.classList.remove("unfocused");
-            if (this._visibleSection) {
-                this._sections[this._visibleSection].visible = false;
-                this._buttons[this._visibleSection].classList.remove("selected");
-                this._visibleSection = "";
-            }
+        } else {
+            // FIXME: Show "no results found" in right panel (mention enabling advanced settings
         }
     }
 }