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-11-19 09:09:23 -06:00
commit a1f2003a77
108 changed files with 619 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ import path from "path";
import yaml from "js-yaml";
import checkAndCopyConfig from "utils/config/config";
import checkAndCopyConfig, { getSettings } from "utils/config/config";
import {
servicesFromConfig,
servicesFromDocker,
@ -52,6 +52,7 @@ export async function servicesResponse() {
let discoveredDockerServices;
let discoveredKubernetesServices;
let configuredServices;
let initialSettings;
try {
discoveredDockerServices = cleanServiceGroups(await servicesFromDocker());
@ -77,6 +78,14 @@ export async function servicesResponse() {
configuredServices = [];
}
try {
initialSettings = await getSettings();
} catch (e) {
console.error("Failed to load settings.yaml, please check for errors");
if (e) console.error(e);
initialSettings = {};
}
const mergedGroupsNames = [
...new Set([
discoveredDockerServices.map((group) => group.name),
@ -86,6 +95,7 @@ export async function servicesResponse() {
];
const mergedGroups = [];
const definedLayouts = initialSettings.layout ? Object.keys(initialSettings.layout) : null;
mergedGroupsNames.forEach((groupName) => {
const discoveredDockerGroup = discoveredDockerServices.find((group) => group.name === groupName) || { services: [] };
@ -101,7 +111,13 @@ export async function servicesResponse() {
].filter((service) => service),
};
mergedGroups.push(mergedGroup);
if (definedLayouts) {
const layoutIndex = definedLayouts.findIndex(layout => layout === mergedGroup.name);
if (layoutIndex > -1) mergedGroups.splice(layoutIndex, 0, mergedGroup);
else mergedGroups.push(mergedGroup);
} else {
mergedGroups.push(mergedGroup);
}
});
return mergedGroups;