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

Merge branch 'main' into kubernetes

Browse source
This commit is contained in:
James Wynn 2022-12-08 09:57:51 -06:00
commit 174cb651b4
81 changed files with 2717 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/utils/config/api-response.js
View file

@ -94,7 +94,8 @@ export async function servicesResponse() {
].flat()),
];
const mergedGroups = [];
const sortedGroups = [];
const unsortedGroups = [];
const definedLayouts = initialSettings.layout ? Object.keys(initialSettings.layout) : null;
mergedGroupsNames.forEach((groupName) => {
@ -113,12 +114,12 @@ export async function servicesResponse() {
if (definedLayouts) {
const layoutIndex = definedLayouts.findIndex(layout => layout === mergedGroup.name);
if (layoutIndex > -1) mergedGroups.splice(layoutIndex, 0, mergedGroup);
else mergedGroups.push(mergedGroup);
if (layoutIndex > -1) sortedGroups[layoutIndex] = mergedGroup;
else unsortedGroups.push(mergedGroup);
} else {
mergedGroups.push(mergedGroup);
unsortedGroups.push(mergedGroup);
}
});
return mergedGroups;
return [...sortedGroups.filter(g => g), ...unsortedGroups];
}