Merge branch 'dev' of github.com:home-assistant/frontend into combine…

…-component(s)-entries
home-assistant · Feb 27, 2024 · b0614dd · b0614dd
2 parents 2a8b12d + 29954e5
commit b0614dd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/common/config/can_show_page.ts b/src/common/config/can_show_page.ts
@@ -5,14 +5,21 @@ import { isComponentLoaded } from "./is_component_loaded";
 
 export const canShowPage = (hass: HomeAssistant, page: PageNavigation) =>
   (isCore(page) || isLoadedIntegration(hass, page)) &&
-  !hideAdvancedPage(hass, page);
+  !hideAdvancedPage(hass, page) &&
+  isNotLoadedIntegration(hass, page);
 
 const isLoadedIntegration = (hass: HomeAssistant, page: PageNavigation) =>
   !page.component ||
   ensureArray(page.component).some((integration) =>
     isComponentLoaded(hass, integration)
   );
 
+const isNotLoadedIntegration = (hass: HomeAssistant, page: PageNavigation) =>
+  !page.not_component ||
+  !ensureArray(page.not_component).some((integration) =>
+    isComponentLoaded(hass, integration)
+  );
+
 const isCore = (page: PageNavigation) => page.core;
 const isAdvancedPage = (page: PageNavigation) => page.advancedOnly;
 const userWantsAdvanced = (hass: HomeAssistant) => hass.userData?.showAdvanced;

diff --git a/src/layouts/hass-tabs-subpage.ts b/src/layouts/hass-tabs-subpage.ts
@@ -25,6 +25,7 @@ export interface PageNavigation {
   translationKey?: string;
   component?: string | string[];
   name?: string;
+  not_component?: string | string[];
   core?: boolean;
   advancedOnly?: boolean;
   iconPath?: string;

diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts
@@ -309,6 +309,7 @@ export const configSections: { [name: string]: PageNavigation[] } = {
       iconPath: mdiBackupRestore,
       iconColor: "#0D47A1",
       component: "backup",
+      not_component: "hassio",
     },
     {
       path: "/hassio/backups",