Add support for integration type

src/common/entity/compute_state_domain.ts

@@ -1,4 +1,4 @@
-import { HassEntity } from "home-assistant-js-websocket";
+import type { HassEntity } from "home-assistant-js-websocket";
 import { computeDomain } from "./compute_domain";
 
 export const computeStateDomain = (stateObj: HassEntity) =>

src/components/ha-selector/ha-selector-area.ts

@@ -28,7 +28,11 @@ export class HaAreaSelector extends LitElement {
         oldSelector !== this.selector &&
         this.selector.area.device?.integration
       ) {
-        this._loadConfigEntries();
+        getConfigEntries(this.hass, {
+          domain: this.selector.area.device.integration,
+        }).then((entries) => {
+          this._configEntries = entries;
+        });
       }
     }
   }
@@ -85,12 +89,6 @@ export class HaAreaSelector extends LitElement {
     }
     return true;
   };
-
-  private async _loadConfigEntries() {
-    this._configEntries = (await getConfigEntries(this.hass)).filter(
-      (entry) => entry.domain === this.selector.area.device?.integration
-    );
-  }
 }
 
 declare global {

src/components/ha-selector/ha-selector-device.ts

@@ -25,7 +25,11 @@ export class HaDeviceSelector extends LitElement {
     if (changedProperties.has("selector")) {
       const oldSelector = changedProperties.get("selector");
       if (oldSelector !== this.selector && this.selector.device?.integration) {
-        this._loadConfigEntries();
+        getConfigEntries(this.hass, {
+          domain: this.selector.device.integration,
+        }).then((entries) => {
+          this._configEntries = entries;
+        });
       }
     }
   }
@@ -88,12 +92,6 @@ export class HaDeviceSelector extends LitElement {
     }
     return true;
   };
-
-  private async _loadConfigEntries() {
-    this._configEntries = (await getConfigEntries(this.hass)).filter(
-      (entry) => entry.domain === this.selector.device.integration
-    );
-  }
 }
 
 declare global {

src/components/ha-selector/ha-selector-target.ts

@@ -134,9 +134,8 @@ export class HaTargetSelector extends SubscribeMixin(LitElement) {
   private async _loadConfigEntries() {
     this._configEntries = (await getConfigEntries(this.hass)).filter(
       (entry) =>
-        entry.domain ===
-        (this.selector.target.device?.integration ||
-          this.selector.target.entity?.integration)
+        entry.domain === this.selector.target.device?.integration ||
+        entry.domain === this.selector.target.entity?.integration
     );
   }
 

src/data/config_entries.ts

@@ -34,8 +34,24 @@ export const ERROR_STATES: ConfigEntry["state"][] = [
   "setup_retry",
 ];
 
-export const getConfigEntries = (hass: HomeAssistant) =>
-  hass.callApi<ConfigEntry[]>("GET", "config/config_entries/entry");
+export const getConfigEntries = (
+  hass: HomeAssistant,
+  filters?: { type?: "helper" | "integration"; domain?: string }
+): Promise<ConfigEntry[]> => {
+  const params = new URLSearchParams();
+  if (filters) {
+    if (filters.type) {
+      params.append("type", filters.type);
+    }
+    if (filters.domain) {
+      params.append("domain", filters.domain);
+    }
+  }
+  return hass.callApi<ConfigEntry[]>(
+    "GET",
+    `config/config_entries/entry?${params.toString()}`
+  );
+};
 
 export const updateConfigEntry = (
   hass: HomeAssistant,

src/data/config_flow.ts

@@ -65,8 +65,14 @@ export const ignoreConfigFlow = (
 export const deleteConfigFlow = (hass: HomeAssistant, flowId: string) =>
   hass.callApi("DELETE", `config/config_entries/flow/${flowId}`);
 
-export const getConfigFlowHandlers = (hass: HomeAssistant) =>
-  hass.callApi<string[]>("GET", "config/config_entries/flow_handlers");
+export const getConfigFlowHandlers = (
+  hass: HomeAssistant,
+  type?: "helper" | "integration"
+) =>
+  hass.callApi<string[]>(
+    "GET",
+    `config/config_entries/flow_handlers${type ? `?type=${type}` : ""}`
+  );
 
 export const fetchConfigFlowInProgress = (
   conn: Connection

src/data/energy.ts

@@ -241,14 +241,14 @@ const getEnergyData = async (
   end?: Date
 ): Promise<EnergyData> => {
   const [configEntries, entityRegistryEntries, info] = await Promise.all([
-    getConfigEntries(hass),
+    getConfigEntries(hass, { domain: "co2signal" }),
     subscribeOne(hass.connection, subscribeEntityRegistry),
     getEnergyInfo(hass),
   ]);
 
-  const co2SignalConfigEntry = configEntries.find(
-    (entry) => entry.domain === "co2signal"
-  );
+  const co2SignalConfigEntry = configEntries.length
+    ? configEntries[0]
+    : undefined;
 
   let co2SignalEntity: string | undefined;
 

src/data/helpers_crud.ts

@@ -0,0 +1,71 @@
+import { fetchCounter, updateCounter, deleteCounter } from "./counter";
+import {
+  fetchInputBoolean,
+  updateInputBoolean,
+  deleteInputBoolean,
+} from "./input_boolean";
+import {
+  fetchInputButton,
+  updateInputButton,
+  deleteInputButton,
+} from "./input_button";
+import {
+  fetchInputDateTime,
+  updateInputDateTime,
+  deleteInputDateTime,
+} from "./input_datetime";
+import {
+  fetchInputNumber,
+  updateInputNumber,
+  deleteInputNumber,
+} from "./input_number";
+import {
+  fetchInputSelect,
+  updateInputSelect,
+  deleteInputSelect,
+} from "./input_select";
+import { fetchInputText, updateInputText, deleteInputText } from "./input_text";
+import { fetchTimer, updateTimer, deleteTimer } from "./timer";
+
+export const HELPERS_CRUD = {
+  input_boolean: {
+    fetch: fetchInputBoolean,
+    update: updateInputBoolean,
+    delete: deleteInputBoolean,
+  },
+  input_button: {
+    fetch: fetchInputButton,
+    update: updateInputButton,
+    delete: deleteInputButton,
+  },
+  input_text: {
+    fetch: fetchInputText,
+    update: updateInputText,
+    delete: deleteInputText,
+  },
+  input_number: {
+    fetch: fetchInputNumber,
+    update: updateInputNumber,
+    delete: deleteInputNumber,
+  },
+  input_datetime: {
+    fetch: fetchInputDateTime,
+    update: updateInputDateTime,
+    delete: deleteInputDateTime,
+  },
+  input_select: {
+    fetch: fetchInputSelect,
+    update: updateInputSelect,
+    delete: deleteInputSelect,
+  },
+  counter: {
+    fetch: fetchCounter,
+    update: updateCounter,
+    delete: deleteCounter,
+  },
+  timer: {
+    fetch: fetchTimer,
+    update: updateTimer,
+    delete: deleteTimer,
+  },
+};

src/dialogs/config-flow/show-dialog-config-flow.ts

@@ -24,7 +24,7 @@ export const showConfigFlowDialog = (
     loadDevicesAndAreas: true,
     getFlowHandlers: async (hass) => {
       const [handlers] = await Promise.all([
-        getConfigFlowHandlers(hass),
+        getConfigFlowHandlers(hass, "integration"),
         hass.loadBackendTranslation("title", undefined, true),
       ]);
 

src/dialogs/config-flow/step-flow-pick-handler.ts

@@ -216,15 +216,16 @@ class StepFlowPickHandler extends LitElement {
 
     if (handler.is_add) {
       if (handler.slug === "zwave_js") {
-        const entries = await getConfigEntries(this.hass);
-        const entry = entries.find((ent) => ent.domain === "zwave_js");
+        const entries = await getConfigEntries(this.hass, {
+          domain: "zwave_js",
+        });
 
-        if (!entry) {
+        if (!entries.length) {
           return;
         }
 
         showZWaveJSAddNodeDialog(this, {
-          entry_id: entry.entry_id,
+          entry_id: entries[0].entry_id,
         });
       } else if (handler.slug === "zha") {
         navigate("/config/zha/add");

src/onboarding/onboarding-integrations.ts

@@ -169,8 +169,8 @@ class OnboardingIntegrations extends LitElement {
   }
 
   private async _loadConfigEntries() {
-    const entries = await getConfigEntries(this.hass!);
-    // We filter out the config entry for the local weather and rpi_power.
+    const entries = await getConfigEntries(this.hass!, { type: "integration" });
+    // We filter out the config entries that are automatically created during onboarding.
     // It is one that we create automatically and it will confuse the user
     // if it starts showing up during onboarding.
     this._entries = entries.filter(

src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts

@@ -58,12 +58,11 @@ export class HaDeviceInfoZWaveJS extends LitElement {
       return;
     }
 
-    const configEntries = await getConfigEntries(this.hass);
+    const configEntries = await getConfigEntries(this.hass, {
+      domain: "zwave_js",
+    });
     let zwaveJsConfEntries = 0;
     for (const entry of configEntries) {
-      if (entry.domain !== "zwave_js") {
-        continue;
-      }
       if (zwaveJsConfEntries) {
         this._multipleConfigEntries = true;
       }

src/panels/config/energy/components/ha-energy-grid-settings.ts

@@ -54,7 +54,7 @@ export class EnergyGridSettings extends LitElement {
   @property({ attribute: false })
   public validationResult?: EnergyPreferencesValidation;
 
-  @state() private _configEntries?: ConfigEntry[];
+  @state() private _co2ConfigEntry?: ConfigEntry;
 
   protected firstUpdated() {
     this._fetchCO2SignalConfigEntries();
@@ -195,28 +195,28 @@ export class EnergyGridSettings extends LitElement {
               "ui.panel.config.energy.grid.grid_carbon_footprint"
             )}
           </h3>
-          ${this._configEntries?.map(
-            (entry) => html`<div class="row" .entry=${entry}>
-              <img
-                referrerpolicy="no-referrer"
-                src=${brandsUrl({
-                  domain: "co2signal",
-                  type: "icon",
-                  darkOptimized: this.hass.themes?.darkMode,
-                })}
-              />
-              <span class="content">${entry.title}</span>
-              <a href=${`/config/integrations#config_entry=${entry.entry_id}`}>
-                <ha-icon-button .path=${mdiPencil}></ha-icon-button>
-              </a>
-              <ha-icon-button
-                @click=${this._removeCO2Sensor}
-                .path=${mdiDelete}
-              ></ha-icon-button>
-            </div>`
-          )}
-          ${this._configEntries?.length === 0
-            ? html`
+          ${this._co2ConfigEntry
+            ? html`<div class="row" .entry=${this._co2ConfigEntry}>
+                <img
+                  referrerpolicy="no-referrer"
+                  src=${brandsUrl({
+                    domain: "co2signal",
+                    type: "icon",
+                    darkOptimized: this.hass.themes?.darkMode,
+                  })}
+                />
+                <span class="content">${this._co2ConfigEntry.title}</span>
+                <a
+                  href=${`/config/integrations#config_entry=${this._co2ConfigEntry.entry_id}`}
+                >
+                  <ha-icon-button .path=${mdiPencil}></ha-icon-button>
+                </a>
+                <ha-icon-button
+                  @click=${this._removeCO2Sensor}
+                  .path=${mdiDelete}
+                ></ha-icon-button>
+              </div>`
+            : html`
                 <div class="row border-bottom">
                   <img
                     referrerpolicy="no-referrer"
@@ -232,17 +232,15 @@ export class EnergyGridSettings extends LitElement {
                     )}
                   </mwc-button>
                 </div>
-              `
-            : ""}
+              `}
         </div>
       </ha-card>
     `;
   }
 
   private async _fetchCO2SignalConfigEntries() {
-    this._configEntries = (await getConfigEntries(this.hass)).filter(
-      (entry) => entry.domain === "co2signal"
-    );
+    const entries = await getConfigEntries(this.hass, { domain: "co2signal" });
+    this._co2ConfigEntry = entries.length ? entries[0] : undefined;
   }
 
   private _addCO2Sensor() {

src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts

@@ -176,9 +176,17 @@ export class DialogEnergySolarSettings
 
   private async _fetchSolarForecastConfigEntries() {
     const domains = this._params!.info.solar_forecast_domains;
-    this._configEntries = (await getConfigEntries(this.hass)).filter((entry) =>
-      domains.includes(entry.domain)
-    );
+    this._configEntries =
+      domains.length === 0
+        ? []
+        : domains.length === 1
+        ? await getConfigEntries(this.hass, {
+            type: "integration",
+            domain: domains[0],
+          })
+        : (await getConfigEntries(this.hass, { type: "integration" })).filter(
+            (entry) => domains.includes(entry.domain)
+          );
   }
 
   private _handleForecastChanged(ev: CustomEvent) {