diff --git a/src/components/ha-related-items.ts b/src/components/ha-related-items.ts index 942eba715d..21ff177f2c 100644 --- a/src/components/ha-related-items.ts +++ b/src/components/ha-related-items.ts @@ -223,7 +223,6 @@ export class HaRelatedItems extends LitElement { .src=${brandsUrl({ domain: entry.domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" @@ -249,7 +248,6 @@ export class HaRelatedItems extends LitElement { .src=${brandsUrl({ domain: integration, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" diff --git a/src/components/ha-selector/ha-selector-media.ts b/src/components/ha-selector/ha-selector-media.ts index 2cac6f93f6..7ff43cdc5e 100644 --- a/src/components/ha-selector/ha-selector-media.ts +++ b/src/components/ha-selector/ha-selector-media.ts @@ -87,7 +87,6 @@ export class HaMediaSelector extends LitElement { this._thumbnailUrl = brandsUrl({ domain: extractDomainFromBrandUrl(thumbnail), type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, }); } else { diff --git a/src/components/media-player/ha-media-player-browse.ts b/src/components/media-player/ha-media-player-browse.ts index 33c8329d2b..0b038cb919 100644 --- a/src/components/media-player/ha-media-player-browse.ts +++ b/src/components/media-player/ha-media-player-browse.ts @@ -793,7 +793,6 @@ export class HaMediaPlayerBrowse extends LitElement { thumbnailUrl = brandsUrl({ domain: extractDomainFromBrandUrl(thumbnailUrl), type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, }); } diff --git a/src/panels/config/backup/components/config/ha-backup-config-agents.ts b/src/panels/config/backup/components/config/ha-backup-config-agents.ts index a2ed30af78..8e44f4695f 100644 --- a/src/panels/config/backup/components/config/ha-backup-config-agents.ts +++ b/src/panels/config/backup/components/config/ha-backup-config-agents.ts @@ -152,7 +152,6 @@ class HaBackupConfigAgents extends LitElement { .src=${brandsUrl({ domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" diff --git a/src/panels/config/backup/components/ha-backup-agents-picker.ts b/src/panels/config/backup/components/ha-backup-agents-picker.ts index 8c52b25ca2..91523fc6b6 100644 --- a/src/panels/config/backup/components/ha-backup-agents-picker.ts +++ b/src/panels/config/backup/components/ha-backup-agents-picker.ts @@ -66,7 +66,6 @@ class HaBackupAgentsPicker extends LitElement { .src=${brandsUrl({ domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" diff --git a/src/panels/config/backup/ha-config-backup-backups.ts b/src/panels/config/backup/ha-config-backup-backups.ts index 0246ad06a8..dc460fe408 100644 --- a/src/panels/config/backup/ha-config-backup-backups.ts +++ b/src/panels/config/backup/ha-config-backup-backups.ts @@ -226,7 +226,6 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) { .src=${brandsUrl({ domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} height="24" diff --git a/src/panels/config/backup/ha-config-backup-details.ts b/src/panels/config/backup/ha-config-backup-details.ts index 9f616a7923..490f8f831b 100644 --- a/src/panels/config/backup/ha-config-backup-details.ts +++ b/src/panels/config/backup/ha-config-backup-details.ts @@ -207,7 +207,6 @@ class HaConfigBackupDetails extends LitElement { .src=${brandsUrl({ domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} diff --git a/src/panels/config/backup/ha-config-backup-settings.ts b/src/panels/config/backup/ha-config-backup-settings.ts index 290a0b2511..6105d62179 100644 --- a/src/panels/config/backup/ha-config-backup-settings.ts +++ b/src/panels/config/backup/ha-config-backup-settings.ts @@ -252,7 +252,6 @@ class HaConfigBackupSettings extends LitElement { .src=${brandsUrl({ domain: "cloud", type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" diff --git a/src/panels/config/helpers/dialog-helper-detail.ts b/src/panels/config/helpers/dialog-helper-detail.ts index 8847bd7109..c109a4c91c 100644 --- a/src/panels/config/helpers/dialog-helper-detail.ts +++ b/src/panels/config/helpers/dialog-helper-detail.ts @@ -227,7 +227,6 @@ export class DialogHelperDetail extends LitElement { src=${brandsUrl({ domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" diff --git a/src/panels/config/integrations/ha-domain-integrations.ts b/src/panels/config/integrations/ha-domain-integrations.ts index 0cbe588ec7..be1b62bbf0 100644 --- a/src/panels/config/integrations/ha-domain-integrations.ts +++ b/src/panels/config/integrations/ha-domain-integrations.ts @@ -60,7 +60,6 @@ class HaDomainIntegrations extends LitElement { src=${brandsUrl({ domain: flow.handler, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" @@ -106,7 +105,6 @@ class HaDomainIntegrations extends LitElement { src=${brandsUrl({ domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" @@ -170,7 +168,6 @@ class HaDomainIntegrations extends LitElement { src=${brandsUrl({ domain: this.domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" diff --git a/src/panels/config/integrations/ha-integration-list-item.ts b/src/panels/config/integrations/ha-integration-list-item.ts index 4e6458444e..36039e3f91 100644 --- a/src/panels/config/integrations/ha-integration-list-item.ts +++ b/src/panels/config/integrations/ha-integration-list-item.ts @@ -57,7 +57,6 @@ export class HaIntegrationListItem extends ListItemBase { src=${brandsUrl({ domain: this.integration.domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, brand: this.brand, })} diff --git a/src/panels/config/labs/ha-config-labs.ts b/src/panels/config/labs/ha-config-labs.ts index 985d6ed21a..843b776265 100644 --- a/src/panels/config/labs/ha-config-labs.ts +++ b/src/panels/config/labs/ha-config-labs.ts @@ -203,7 +203,6 @@ class HaConfigLabs extends SubscribeMixin(LitElement) { src=${brandsUrl({ domain: preview_feature.domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" diff --git a/src/panels/config/repairs/ha-config-repairs.ts b/src/panels/config/repairs/ha-config-repairs.ts index 156d559ce9..b658c3db33 100644 --- a/src/panels/config/repairs/ha-config-repairs.ts +++ b/src/panels/config/repairs/ha-config-repairs.ts @@ -75,7 +75,6 @@ class HaConfigRepairs extends LitElement { src=${brandsUrl({ domain: issue.issue_domain || issue.domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} .title=${domainName} diff --git a/src/panels/config/repairs/integrations-startup-time.ts b/src/panels/config/repairs/integrations-startup-time.ts index 27b0adca2b..f737804bef 100644 --- a/src/panels/config/repairs/integrations-startup-time.ts +++ b/src/panels/config/repairs/integrations-startup-time.ts @@ -58,7 +58,6 @@ class IntegrationsStartupTime extends LitElement { src=${brandsUrl({ domain: setup.domain, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, })} crossorigin="anonymous" diff --git a/src/panels/logbook/ha-logbook-renderer.ts b/src/panels/logbook/ha-logbook-renderer.ts index 8ba5497dac..9b8987c5cc 100644 --- a/src/panels/logbook/ha-logbook-renderer.ts +++ b/src/panels/logbook/ha-logbook-renderer.ts @@ -160,7 +160,6 @@ class HaLogbookRenderer extends LitElement { ? brandsUrl({ domain: domain!, type: "icon", - useFallback: true, darkOptimized: this.hass.themes?.darkMode, }) : undefined; diff --git a/src/util/brands-url.ts b/src/util/brands-url.ts index e5afa95320..4ea8b7ab32 100644 --- a/src/util/brands-url.ts +++ b/src/util/brands-url.ts @@ -1,7 +1,6 @@ export interface BrandsOptions { domain: string; type: "icon" | "logo" | "icon@2x" | "logo@2x"; - useFallback?: boolean; darkOptimized?: boolean; brand?: boolean; } @@ -14,11 +13,9 @@ export interface HardwareBrandsOptions { } export const brandsUrl = (options: BrandsOptions): string => - `https://brands.home-assistant.io/${options.brand ? "brands/" : ""}${ - options.useFallback ? "_/" : "" - }${options.domain}/${options.darkOptimized ? "dark_" : ""}${ - options.type - }.png`; + `https://brands.home-assistant.io/${options.brand ? "brands/" : ""}_/${options.domain}/${ + options.darkOptimized ? "dark_" : "" + }${options.type}.png`; export const hardwareBrandsUrl = (options: HardwareBrandsOptions): string => `https://brands.home-assistant.io/hardware/${options.category}/${ diff --git a/test/util/generate-brands-url.test.ts b/test/util/generate-brands-url.test.ts index 68930fbffa..bd169771e3 100644 --- a/test/util/generate-brands-url.test.ts +++ b/test/util/generate-brands-url.test.ts @@ -2,40 +2,26 @@ import { assert, describe, it } from "vitest"; import { brandsUrl } from "../../src/util/brands-url"; describe("Generate brands Url", () => { - it("Generate logo brands url for cloud component without fallback", () => { + it("Generate logo brands url for cloud component", () => { assert.strictEqual( // @ts-ignore brandsUrl({ domain: "cloud", type: "logo" }), - "https://brands.home-assistant.io/cloud/logo.png" - ); - }); - it("Generate icon brands url for cloud component without fallback", () => { - assert.strictEqual( - // @ts-ignore - brandsUrl({ domain: "cloud", type: "icon" }), - "https://brands.home-assistant.io/cloud/icon.png" - ); - }); - it("Generate logo brands url for cloud component with fallback", () => { - assert.strictEqual( - // @ts-ignore - brandsUrl({ domain: "cloud", type: "logo", useFallback: true }), "https://brands.home-assistant.io/_/cloud/logo.png" ); }); - it("Generate icon brands url for cloud component with fallback", () => { + it("Generate icon brands url for cloud component", () => { assert.strictEqual( // @ts-ignore - brandsUrl({ domain: "cloud", type: "icon", useFallback: true }), + brandsUrl({ domain: "cloud", type: "icon" }), "https://brands.home-assistant.io/_/cloud/icon.png" ); }); - it("Generate dark theme optimized logo brands url for cloud component without fallback", () => { + it("Generate dark theme optimized logo brands url for cloud component", () => { assert.strictEqual( // @ts-ignore brandsUrl({ domain: "cloud", type: "logo", darkOptimized: true }), - "https://brands.home-assistant.io/cloud/dark_logo.png" + "https://brands.home-assistant.io/_/cloud/dark_logo.png" ); }); });