Merge branch 'dev' into feature/next-15

src/styles/globals.css

@@ -63,3 +63,7 @@ dialog ::-webkit-scrollbar {
 ::-webkit-details-marker {
   display: none;
 }
+
+.chart + .chart {
+  margin-top: 36px;
+}

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

src/widgets/glances/components/container.jsx

@@ -18,7 +18,7 @@ export default function Container({ children, widget, error = null, chart = true
   }
 
   return (
-    <div className={classNames("service-container relative", chart ? "h-[120px]" : "")}>
+    <div className={classNames("service-container relative", chart ? "chart h-[84px]" : "")}>
       {children}
       <div className={`absolute top-0 right-0 bottom-0 left-0 overflow-clip pointer-events-none ${className}`} />
       {chart && <div className="chart h-[68px] overflow-clip" />}

src/widgets/glances/metrics/process.jsx

@@ -45,7 +45,7 @@ export default function Component({ service }) {
 
   return (
     <Container chart={chart}>
-      <Block position="top-4 right-3 left-3">
+      <Block position="top-0 right-3 left-3">
         <div className="flex items-center text-xs">
           <div className="grow" />
           <div className="w-14 text-right italic">{t("resources.cpu")}</div>
@@ -53,7 +53,7 @@ export default function Component({ service }) {
         </div>
       </Block>
 
-      <Block position="bottom-4 right-3 left-3">
+      <Block position="bottom-2 right-3 left-3">
         <div className="pointer-events-none text-theme-900 dark:text-theme-200">
           {data.map((item) => (
             <div key={item.pid} className="text-[0.75rem] h-[0.8rem]">