Skip to content

Commit

Permalink
Fix: quick launch not showing nested services (#4561)
Browse files Browse the repository at this point in the history
Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>
  • Loading branch information
DeepSpace2 and shamoon authored Jan 5, 2025
1 parent 1b79e51 commit 2f7d948
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions src/pages/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,18 @@ const headerStyles = {
boxedWidgets: "m-5 mb-0 sm:m-9 sm:mb-0 sm:mt-1",
};

function getAllServices(services) {
function get(sg) {
let nestedServices = [...sg.services];
if (sg.groups.length > 0) {
nestedServices = [...nestedServices, ...sg.groups.map(get).flat()];
}
return nestedServices;
}

return [...services.map(get).flat()];
}

function Home({ initialSettings }) {
const { i18n } = useTranslation();
const { theme, setTheme } = useContext(ThemeContext);
Expand All @@ -182,10 +194,9 @@ function Home({ initialSettings }) {
const { data: bookmarks } = useSWR("/api/bookmarks");
const { data: widgets } = useSWR("/api/widgets");

const servicesAndBookmarks = [
...services.map((sg) => sg.services).flat(),
...bookmarks.map((bg) => bg.bookmarks).flat(),
].filter((i) => i?.href);
const servicesAndBookmarks = [...bookmarks.map((bg) => bg.bookmarks).flat(), ...getAllServices(services)].filter(
(i) => i?.href,
);

useEffect(() => {
if (settings.language) {
Expand Down

0 comments on commit 2f7d948

Please sign in to comment.