Merge branch 'rc'

home-assistant · Dec 9, 2024 · f9844e8 · f9844e8
2 parents 54bc052 + 86f9909
commit f9844e8
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 30 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -4,7 +4,6 @@ on:
   release:
     types:
       - published
-  workflow_dispatch:
 
 env:
   PYTHON_VERSION: "3.12"
@@ -82,3 +81,57 @@ jobs:
           arch: amd64
           wheels-key: ${{ secrets.WHEELS_KEY }}
           requirements: "requirements.txt"
+
+  release-landing-page:
+    name: Release landing-page frontend
+    if: github.event.release.prerelease == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/[email protected]
+      - name: Setup Node
+        uses: actions/[email protected]
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+      - name: Install dependencies
+        run: yarn install
+      - name: Download Translations
+        run: ./script/translations_download
+        env:
+          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
+      - name: Build landing-page
+        run: landing-page/script/build_landing_page
+      - name: Tar folder
+        run: tar -czf landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz -C landing-page/dist .
+      - name: Upload release asset
+        uses: softprops/[email protected]
+        with:
+          files: landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz
+
+  release-supervisor:
+    name: Release supervisor frontend
+    if: github.event.release.prerelease == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/[email protected]
+      - name: Setup Node
+        uses: actions/[email protected]
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+      - name: Install dependencies
+        run: yarn install
+      - name: Download Translations
+        run: ./script/translations_download
+        env:
+          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
+      - name: Build supervisor
+        run: hassio/script/build_hassio
+      - name: Tar folder
+        run: tar -czf hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz -C hassio/build .
+      - name: Upload release asset
+        uses: softprops/[email protected]
+        with:
+          files: hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20241127.6"
+version      = "20241127.7"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"

diff --git a/src/data/scene.ts b/src/data/scene.ts
@@ -17,6 +17,7 @@ export const SCENE_IGNORED_DOMAINS = [
   "person",
   "scene",
   "schedule",
+  "script",
   "sensor",
   "sun",
   "update",

diff --git a/src/panels/config/integrations/ha-config-integration-page.ts b/src/panels/config/integrations/ha-config-integration-page.ts
@@ -368,11 +368,12 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
                     `
                   : nothing}
                 ${this._manifest?.is_built_in === false
-                  ? html`<div class="integration-info warn">
-                      <ha-svg-icon
-                        class="warning"
-                        path=${mdiPackageVariant}
-                      ></ha-svg-icon>
+                  ? html`<div
+                      class=${`integration-info ${
+                        this._manifest.overwrites_built_in ? "error" : "warn"
+                      }`}
+                    >
+                      <ha-svg-icon path=${mdiPackageVariant}></ha-svg-icon>
                       <a
                         href=${documentationUrl(
                           this.hass,
@@ -382,7 +383,9 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
                         target="_blank"
                       >
                         ${this.hass.localize(
-                          "ui.panel.config.integrations.config_entry.custom_integration"
+                          this._manifest.overwrites_built_in
+                            ? "ui.panel.config.integrations.config_entry.custom_overwrites_core"
+                            : "ui.panel.config.integrations.config_entry.custom_integration"
                         )}
                       </a>
                     </div>`
@@ -627,19 +630,18 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
                           "ui.panel.config.integrations.integration_page.no_entries"
                         )}
                   </div>`
-                : nothing}
-              <ha-md-list>
-                ${normalEntries.map(
-                  (item, index) =>
-                    html`${this._renderConfigEntry(item)}
-                    ${index < normalEntries.length - 1
-                      ? html` <ha-md-divider
-                          role="separator"
-                          tabindex="-1"
-                        ></ha-md-divider>`
-                      : nothing}`
-                )}
-              </ha-md-list>
+                : html`<ha-md-list>
+                    ${normalEntries.map(
+                      (item, index) =>
+                        html`${this._renderConfigEntry(item)}
+                        ${index < normalEntries.length - 1
+                          ? html` <ha-md-divider
+                              role="separator"
+                              tabindex="-1"
+                            ></ha-md-divider>`
+                          : nothing}`
+                    )}
+                  </ha-md-list>`}
               <div class="card-actions">
                 <ha-button @click=${this._addIntegration}>
                   ${this._manifest?.integration_type
@@ -1490,7 +1492,7 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
           padding-bottom: 0;
         }
         .no-entries {
-          padding-top: 12px;
+          padding: 12px 16px;
         }
         .logo-container {
           display: flex;
@@ -1530,6 +1532,9 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
         .integration-info.warn ha-svg-icon {
           color: var(--warning-color);
         }
+        .integration-info.error ha-svg-icon {
+          color: var(--error-color);
+        }
         .integration-info.info ha-svg-icon {
           color: var(--info-color);
         }

diff --git a/src/panels/config/voice-assistants/assist-pref.ts b/src/panels/config/voice-assistants/assist-pref.ts
@@ -42,6 +42,7 @@ import { showVoiceAssistantPipelineDetailDialog } from "./show-dialog-voice-assi
 import { showVoiceCommandDialog } from "../../../dialogs/voice-command-dialog/show-ha-voice-command-dialog";
 import { stopPropagation } from "../../../common/dom/stop_propagation";
 import { computeDomain } from "../../../common/entity/compute_domain";
+import { navigate } from "../../../common/navigate";
 
 @customElement("assist-pref")
 export class AssistPref extends LitElement {
@@ -159,14 +160,16 @@ export class AssistPref extends LitElement {
                     )}
                     <ha-svg-icon slot="graphic" .path=${mdiStar}></ha-svg-icon>
                   </ha-list-item>
-                  <a href=${`/config/voice-assistants/debug/${pipeline.id}`}>
-                    <ha-list-item graphic="icon">
-                      ${this.hass.localize(
-                        "ui.panel.config.voice_assistants.assistants.pipeline.detail.debug"
-                      )}
-                      <ha-svg-icon slot="graphic" .path=${mdiBug}></ha-svg-icon>
-                    </ha-list-item>
-                  </a>
+                  <ha-list-item
+                    graphic="icon"
+                    .id=${pipeline.id}
+                    @request-selected=${this._debugPipeline}
+                  >
+                    ${this.hass.localize(
+                      "ui.panel.config.voice_assistants.assistants.pipeline.detail.debug"
+                    )}
+                    <ha-svg-icon slot="graphic" .path=${mdiBug}></ha-svg-icon>
+                  </ha-list-item>
                   <ha-list-item
                     class="danger"
                     graphic="icon"
@@ -233,6 +236,11 @@ export class AssistPref extends LitElement {
     this._preferred = id;
   }
 
+  private async _debugPipeline(ev) {
+    const id = ev.currentTarget.id as string;
+    navigate(`/config/voice-assistants/debug/${id}`);
+  }
+
   private async _deletePipeline(ev) {
     const id = ev.currentTarget.id as string;
     if (this._preferred === id) {