Fix: dont discard service groups not included in layout (#4456)

src/utils/config/api-response.js

@@ -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);

src/utils/config/service-helpers.js

@@ -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;
       }
     }