dominik/homepage-plus
1
0
Fork 0
mirror of https://github.com/DI0IK/homepage-plus.git synced 2025-07-17 02:09:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Enhancement: separate Internet search settings for quicklaunch (#3541)

Browse source 
---------

Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>
This commit is contained in:
vycdev 2024-06-01 07:24:42 +03:00 • committed by GitHub
parent a53b042fec
commit 48170fe899
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 53 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/components/quicklaunch.jsx
View file

@ -1,26 +1,18 @@
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";
import { getStoredProvider, searchProviders } from "./widgets/search/search";
import { SettingsContext } from "utils/contexts/settings";
export default function QuickLaunch({
servicesAndBookmarks,
searchString,
setSearchString,
isOpen,
close,
searchProvider,
}) {
export default function QuickLaunch({ servicesAndBookmarks, searchString, setSearchString, isOpen, close }) {
const { t } = useTranslation();
const { settings } = useContext(SettingsContext);
const { searchDescriptions = false, hideVisitURL = false } = settings?.quicklaunch ?? {};
const showSearchSuggestions = !!(
settings?.quicklaunch?.showSearchSuggestions ?? searchProvider?.showSearchSuggestions
);
const searchField = useRef();
@ -29,9 +21,42 @@ export default function QuickLaunch({
const [url, setUrl] = useState(null);
const [searchSuggestions, setSearchSuggestions] = useState([]);
const { data: widgets } = useSWR("/api/widgets");
const searchWidget = Object.values(widgets).find((w) => w.type === "search");
let searchProvider;
if (settings?.quicklaunch?.provider === "custom" && settings?.quicklaunch?.url?.length > 0) {
searchProvider = settings.quicklaunch;
} else if (settings?.quicklaunch?.provider && settings?.quicklaunch?.provider !== "custom") {
searchProvider = searchProviders[settings.quicklaunch.provider];
} else if (searchWidget) {
// If there is no search provider in quick launch settings, try to get it from the search widget
if (Array.isArray(searchWidget.options?.provider)) {
// 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 = searchWidget.options;
} else {
searchProvider = searchProviders[searchWidget.options?.provider];
}
}
if (searchProvider) {
searchProvider.showSearchSuggestions = !!(
settings?.quicklaunch?.showSearchSuggestions ??
searchWidget?.options?.showSearchSuggestions ??
false
);
}
function openCurrentItem(newWindow) {
const result = results[currentItemIndex];
window.open(result.href, newWindow ? "_blank" : result.target ?? settings.target ?? "_blank", "noreferrer");
window.open(
result.href,
newWindow ? "_blank" : result.target ?? searchProvider?.target ?? settings.target ?? "_blank",
"noreferrer",
);
}
const closeAndReset = useCallback(() => {
@ -119,7 +144,7 @@ export default function QuickLaunch({
type: "search",
});
if (showSearchSuggestions && searchProvider.suggestionUrl) {
if (searchProvider.showSearchSuggestions && searchProvider.suggestionUrl) {
if (searchString.trim() !== searchSuggestions[0]?.trim()) {
fetch(
`/api/search/searchSuggestion?query=${encodeURIComponent(searchString)}&providerName=${
@ -172,17 +197,7 @@ export default function QuickLaunch({
return () => {
abortController.abort();
};
}, [
searchString,
servicesAndBookmarks,
searchDescriptions,
hideVisitURL,
showSearchSuggestions,
searchSuggestions,
searchProvider,
url,
t,
]);
}, [searchString, servicesAndBookmarks, searchDescriptions, hideVisitURL, searchSuggestions, searchProvider, url, t]);
const [hidden, setHidden] = useState(true);
useEffect(() => {

16
src/pages/index.jsx
View file

@ -26,7 +26,6 @@ import { bookmarksResponse, servicesResponse, widgetsResponse } from "utils/conf
import ErrorBoundary from "components/errorboundry";
import themes from "utils/styles/themes";
import QuickLaunch from "components/quicklaunch";
import { getStoredProvider, searchProviders } from "components/widgets/search/search";
const ThemeToggle = dynamic(() => import("components/toggles/theme"), {
ssr: false,
@ -204,20 +203,6 @@ function Home({ initialSettings }) {
const [searching, setSearching] = useState(false);
const [searchString, setSearchString] = useState("");
let searchProvider = null;
const searchWidget = Object.values(widgets).find((w) => w.type === "search");
if (searchWidget) {
if (Array.isArray(searchWidget.options?.provider)) {
// 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 = searchWidget.options;
} else {
searchProvider = searchProviders[searchWidget.options?.provider];
}
// to pass to quicklaunch
searchProvider.showSearchSuggestions = searchWidget.options?.showSearchSuggestions;
}
const headerStyle = settings?.headerStyle || "underlined";
useEffect(() => {
@ -404,7 +389,6 @@ function Home({ initialSettings }) {
setSearchString={setSearchString}
isOpen={searching}
close={setSearching}
searchProvider={settings.quicklaunch?.hideInternetSearch ? null : searchProvider}
/>
<div
id="information-widgets"