Fix prometheus menus (#384)

* Fixed prometheus menus.

* 2.22.0

* Replaced dashes.

* 2.22.1

* Added forgotten replacement.

* 2.22.2

Author: novykh

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@netdata/dashboard",
-  "version": "2.21.8",
+  "version": "2.22.2",
   "homepage": ".",
   "main": "./lib/src/index-npm.js",
   "files": [

package.json

@@ -1,12 +1,12 @@
 export default (
   { id, name, family, context, priority, chartLabels },
   submenuNames,
-  hasKubernetes
+  { hasKubernetes, composite } = {}
 ) => {
   const subMenuId = family || "all"
   const clusterId = hasKubernetes && chartLabels?.k8s_cluster_id?.[0]
 
-  const [type, typeB] = id.split(".")
+  const [type, typeB, typeC] = id.split(".")
   const parts = type.split("_")
   const [part1, part2] = parts
 
@@ -81,7 +81,13 @@ export default (
     }
 
     case "prometheus": {
-      if (parts.length !== 1) return emit({ menuPattern: "prometheus" })
+      if (parts.length !== 1) {
+        if (composite && typeC) return emit({ menuPattern: `${type} ${typeB.replace("-", " ")}` })
+
+        return emit({ menuPattern: "prometheus" })
+      }
+
+      if (composite && typeC) return emit({ menu: `${type} ${typeB.replace("-", " ")}` })
 
       const familyPart = family.split("_")[0]
       return emit({ menu: `prometheus ${familyPart}` })

src/domains/charts/getChartMenu.js

@@ -5,7 +5,7 @@ import getChartMenu from "./getChartMenu"
 import getChartHeads from "./getChartHeads"
 import getMenuChartAttributes from "./getMenuChartAttributes"
 
-export const getMenuInfo = (chartIds, getChart, hasKubernetes) => {
+export const getMenuInfo = (chartIds, getChart, { hasKubernetes, composite } = {}) => {
   const submenuNames = {}
   const chartMenus = {}
   const menuChartsAttributeById = {}
@@ -16,7 +16,7 @@ export const getMenuInfo = (chartIds, getChart, hasKubernetes) => {
   chartIds.forEach(id => {
     const chart = getChart(id)
     menuChartsAttributeById[id] = getMenuChartAttributes(chart)
-    chartMenus[id] = getChartMenu(chart, submenuNames, hasKubernetes)
+    chartMenus[id] = getChartMenu(chart, submenuNames, { hasKubernetes, composite })
   })
 
   const sortedChartIds = [...chartIds].sort(
@@ -47,15 +47,15 @@ export const getMenuInfo = (chartIds, getChart, hasKubernetes) => {
   }
 }
 
-export default (chartIds, getChart, { hasKubernetes } = {}) => {
+export default (chartIds, getChart, { hasKubernetes, composite } = {}) => {
   const {
     chartMenus,
     menuChartsAttributeById,
     menuGroups,
     menuGroupChartIds,
     subMenus,
     submenuNames,
-  } = getMenuInfo(chartIds, getChart, hasKubernetes)
+  } = getMenuInfo(chartIds, getChart, { hasKubernetes, composite })
 
   const menuGroupById = Object.keys(menuGroups).reduce((acc, menuId) => {
     const chartIds = menuGroupChartIds[menuId]

src/domains/charts/getMenu.js

@@ -14,10 +14,11 @@ const Provider = ({
   getChart,
   dashboardAttributes,
   hasKubernetes,
+  composite,
   children,
 }) => {
   const { menuGroupIds, menuGroupById, subMenuById, menuChartsAttributeById } = useMemo(
-    () => getMenu(chartIds, getChart, { hasKubernetes }),
+    () => getMenu(chartIds, getChart, { hasKubernetes, composite }),
     [chartIds, getChart]
   )
 

src/domains/charts/provider.js

@@ -23,6 +23,7 @@ const Provider = ({
   chartIds,
   theme,
   hasKubernetes,
+  composite,
   children,
 }) => {
   const ref = useRef()
@@ -45,6 +46,7 @@ const Provider = ({
               onAttributesChange={onAttributesChange}
               dashboardAttributes={dashboardAttributes}
               hasKubernetes={hasKubernetes}
+              composite={composite}
             >
               {children}
             </DashboardMenuProvider>