From ef257565344f6c1db818609b94e01eec28993b31 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 30 Jan 2024 10:10:06 -0800
Subject: [PATCH] Refactor quicklaunch fallback to search widget suggestions
 setting

---
 src/components/quicklaunch.jsx | 16 ++++------------
 src/pages/index.jsx            |  5 +----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/components/quicklaunch.jsx b/src/components/quicklaunch.jsx
index 59ce2483..25068d0f 100644
--- a/src/components/quicklaunch.jsx
+++ b/src/components/quicklaunch.jsx
@@ -1,7 +1,6 @@
 import { useTranslation } from "react-i18next";
 import { useEffect, useState, useRef, useCallback, useContext } from "react";
 import classNames from "classnames";
-import useSWR from "swr";
 
 import ResolvedIcon from "./resolvedicon";
 
@@ -17,18 +16,11 @@ export default function QuickLaunch({
 }) {
   const { t } = useTranslation();
 
-  const { data: widgets } = useSWR("/api/widgets");
-  const searchWidget = Object.values(widgets).find((w) => w.type === "search");
-
   const { settings } = useContext(SettingsContext);
-  const { searchDescriptions, hideVisitURL } = settings?.quicklaunch
-    ? settings.quicklaunch
-    : {
-        searchDescriptions: false,
-        hideVisitURL: false,
-      };
-  const showSearchSuggestions =
-    settings?.quicklaunch?.showSearchSuggestions ?? searchWidget.options.showSearchSuggestions ?? false;
+  const { searchDescriptions = false, hideVisitURL = false } = settings?.quicklaunch ?? {};
+  const showSearchSuggestions = !!(
+    settings?.quicklaunch?.showSearchSuggestions ?? searchProvider.showSearchSuggestions
+  );
 
   const searchField = useRef();
 
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index d9f27d19..554fff59 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -211,10 +211,7 @@ function Home({ initialSettings }) {
       // if search provider is a list, try to retrieve from localstorage, fall back to the first
       searchProvider = getStoredProvider() ?? searchProviders[searchWidget.options.provider[0]];
     } else if (searchWidget.options?.provider === "custom") {
-      searchProvider = {
-        url: searchWidget.options.url,
-        suggestionUrl: searchWidget.options.suggestionUrl,
-      };
+      searchProvider = searchWidget.options;
     } else {
       searchProvider = searchProviders[searchWidget.options?.provider];
     }