From 4118497978d86543cf4bbc48f5208c003038954a Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 12 Mar 2019 11:06:23 -0700
Subject: [PATCH] Lint

---
 src/data/cloud.ts                             |  7 -------
 .../config/cloud/cloud-exposed-entities.ts    |  2 +-
 .../cloud/cloud-webhook-manage-dialog.ts      |  2 +-
 src/panels/config/cloud/cloud-webhooks.ts     | 21 ++++++-------------
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/data/cloud.ts b/src/data/cloud.ts
index 582ff12115..75348bc94a 100644
--- a/src/data/cloud.ts
+++ b/src/data/cloud.ts
@@ -1,5 +1,4 @@
 import { HomeAssistant } from "../types";
-import { Webhook } from "./webhook";
 
 export interface EntityFilter {
   include_domains: string[];
@@ -41,12 +40,6 @@ export interface SubscriptionInfo {
   human_description: string;
 }
 
-export interface WebhookDialogParams {
-  webhook: Webhook;
-  cloudhook: CloudWebhook;
-  disableHook: () => void;
-}
-
 export interface CloudWebhook {
   webhook_id: string;
   cloudhook_id: string;
diff --git a/src/panels/config/cloud/cloud-exposed-entities.ts b/src/panels/config/cloud/cloud-exposed-entities.ts
index ed61664535..a1aca9a007 100644
--- a/src/panels/config/cloud/cloud-exposed-entities.ts
+++ b/src/panels/config/cloud/cloud-exposed-entities.ts
@@ -12,12 +12,12 @@ import "../../../components/entity/ha-state-icon";
 
 import { fireEvent } from "../../../common/dom/fire_event";
 import { HomeAssistant } from "../../../types";
-import { EntityFilter } from "./types";
 import computeStateName from "../../../common/entity/compute_state_name";
 import {
   FilterFunc,
   generateFilter,
 } from "../../../common/entity/entity_filter";
+import { EntityFilter } from "../../../data/cloud";
 
 export class CloudExposedEntities extends LitElement {
   public hass?: HomeAssistant;
diff --git a/src/panels/config/cloud/cloud-webhook-manage-dialog.ts b/src/panels/config/cloud/cloud-webhook-manage-dialog.ts
index 9d9034f88d..09e9a76371 100644
--- a/src/panels/config/cloud/cloud-webhook-manage-dialog.ts
+++ b/src/panels/config/cloud/cloud-webhook-manage-dialog.ts
@@ -17,8 +17,8 @@ import { PaperDialogElement } from "@polymer/paper-dialog/paper-dialog";
 import { PaperInputElement } from "@polymer/paper-input/paper-input";
 
 import { HomeAssistant } from "../../../types";
-import { WebhookDialogParams } from "./types";
 import { haStyle } from "../../../resources/styles";
+import { WebhookDialogParams } from "./show-cloud-webhook-manage-dialog";
 
 const inputLabel = "Public URL – Click to copy to clipboard";
 
diff --git a/src/panels/config/cloud/cloud-webhooks.ts b/src/panels/config/cloud/cloud-webhooks.ts
index 7d4ec3581b..88ae355426 100644
--- a/src/panels/config/cloud/cloud-webhooks.ts
+++ b/src/panels/config/cloud/cloud-webhooks.ts
@@ -10,23 +10,15 @@ import "@polymer/paper-item/paper-item-body";
 import "@polymer/paper-spinner/paper-spinner";
 import "../../../components/ha-card";
 
-import { fireEvent } from "../../../common/dom/fire_event";
-
 import { HomeAssistant, WebhookError } from "../../../types";
-import { WebhookDialogParams, CloudStatusLoggedIn } from "./types";
 import { Webhook, fetchWebhooks } from "../../../data/webhook";
 import {
   createCloudhook,
   deleteCloudhook,
   CloudWebhook,
+  CloudStatusLoggedIn,
 } from "../../../data/cloud";
-
-declare global {
-  // for fire event
-  interface HASSDomEvents {
-    "manage-cloud-webhook": WebhookDialogParams;
-  }
-}
+import { showManageCloudhookDialog } from "./show-cloud-webhook-manage-dialog";
 
 export class CloudWebhooks extends LitElement {
   public hass?: HomeAssistant;
@@ -138,14 +130,13 @@ export class CloudWebhooks extends LitElement {
   private _showDialog(webhookId: string) {
     const webhook = this._localHooks!.find(
       (ent) => ent.webhook_id === webhookId
-    );
+    )!;
     const cloudhook = this._cloudHooks![webhookId];
-    const params: WebhookDialogParams = {
-      webhook: webhook!,
+    showManageCloudhookDialog(this, {
+      webhook,
       cloudhook,
       disableHook: () => this._disableWebhook(webhookId),
-    };
-    fireEvent(this, "manage-cloud-webhook", params);
+    });
   }
 
   private _handleManageButton(ev: MouseEvent) {