Skip to content

Commit

Permalink
Fix: dont discard service groups not included in layout (#4456)
Browse files Browse the repository at this point in the history
  • Loading branch information
shamoon authored Dec 20, 2024
1 parent f4adebc commit ac39ffd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/utils/config/api-response.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export async function servicesResponse() {
if (definedLayouts) {
const layoutIndex = definedLayouts.findIndex((layout) => layout === mergedGroup.name);
if (layoutIndex > -1) sortedGroups[layoutIndex] = mergedGroup;
else if (configuredGroup.name) {
else if (configuredGroup.parent) {
// this is a nested group, so find the parent group and merge the services
mergeSubgroups(configuredServices, mergedGroup);
} else unsortedGroups.push(mergedGroup);
Expand Down
1 change: 1 addition & 0 deletions src/utils/config/service-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,7 @@ export function findGroupByName(groups, name) {
} else if (group.groups) {
const foundGroup = findGroupByName(group.groups, name);
if (foundGroup) {
foundGroup.parent = group;
return foundGroup;
}
}
Expand Down

0 comments on commit ac39ffd

Please sign in to comment.