Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enhancement: separate Internet search settings for quicklaunch #3541

Merged
merged 11 commits into from
Jun 1, 2024
Merged

Enhancement: separate Internet search settings for quicklaunch #3541

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c31b6c0
Enhancement: Separated quicklaunch's search provider dependency from …
vycdev Apr 6, 2024
f211449
Merge branch 'gethomepage:main' into main
vycdev May 30, 2024
9bfd8df
documentation: removed "optional" comments as it did not fit the rest…
vycdev May 30, 2024
7911cf7
implemented backwards compatibilty
vycdev May 31, 2024
5f00f88
updated docs
vycdev May 31, 2024
77cf609
deleted empty line
vycdev May 31, 2024
a54f618
Handle case when custom provider but no url given
shamoon Jun 1, 2024
2df7988
No reason to be a separate method
shamoon Jun 1, 2024
fb08a73
Update quicklaunch.jsx
shamoon Jun 1, 2024
1ead020
Revert some docs changes
shamoon Jun 1, 2024
6e1ccdb
Update quicklaunch.jsx
shamoon Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Handle case when custom provider but no url given
  • Loading branch information
@shamoon
shamoon committed Jun 1, 2024
commit a54f618dfdd073a5ec345ab5a814785934466829
10 changes: 4 additions & 6 deletions src/components/quicklaunch.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
const { data: widgets } = useSWR("/api/widgets");

function getSearchProvider() {
if (settings?.quicklaunch?.hideInternetSearch) return null;

const searchWidget = Object.values(widgets).find((w) => w.type === "search");
let searchProvider = null;
let searchProvider;

if (settings?.quicklaunch?.provider === "custom") {
if (settings?.quicklaunch?.provider === "custom" && settings?.quicklaunch?.url?.length > 0) {
searchProvider = settings.quicklaunch;
} else if (settings?.quicklaunch?.provider) {
} else if (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
Expand All @@ -57,7 +55,7 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
return searchProvider;
}

const searchProvider = getSearchProvider();
const searchProvider = settings?.quicklaunch?.hideInternetSearch === false ? null : getSearchProvider();

function openCurrentItem(newWindow) {
const result = results[currentItemIndex];
Expand Down