From 0c06517dcc136973d84ce802e7c96cff4e191ce3 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 9 Apr 2020 15:45:18 +0200
Subject: [PATCH] Remove sort now that data-table does it (#5508)

---
 .../config/automation/ha-config-automation.js      | 13 +------------
 src/panels/config/scene/ha-config-scene.ts         | 12 +-----------
 src/panels/config/script/ha-config-script.js       | 14 +-------------
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/src/panels/config/automation/ha-config-automation.js b/src/panels/config/automation/ha-config-automation.js
index d3052b9640..d1ed22cc7d 100644
--- a/src/panels/config/automation/ha-config-automation.js
+++ b/src/panels/config/automation/ha-config-automation.js
@@ -108,18 +108,7 @@ class HaConfigAutomation extends PolymerElement {
       }
     });
 
-    return automations.sort(function entitySortBy(entityA, entityB) {
-      var nameA = (entityA.attributes.alias || entityA.entity_id).toLowerCase();
-      var nameB = (entityB.attributes.alias || entityB.entity_id).toLowerCase();
-
-      if (nameA < nameB) {
-        return -1;
-      }
-      if (nameA > nameB) {
-        return 1;
-      }
-      return 0;
-    });
+    return automations;
   }
 
   computeShowEditor(_edittingAutomation, _creatingNew) {
diff --git a/src/panels/config/scene/ha-config-scene.ts b/src/panels/config/scene/ha-config-scene.ts
index ccc3521d7a..2488a5a6d1 100644
--- a/src/panels/config/scene/ha-config-scene.ts
+++ b/src/panels/config/scene/ha-config-scene.ts
@@ -1,5 +1,3 @@
-import "@polymer/app-route/app-route";
-
 import "./ha-scene-editor";
 import "./ha-scene-dashboard";
 
@@ -10,8 +8,6 @@ import {
 import { property, customElement, PropertyValues } from "lit-element";
 import { HomeAssistant } from "../../../types";
 import { computeStateDomain } from "../../../common/entity/compute_state_domain";
-import { computeStateName } from "../../../common/entity/compute_state_name";
-import { compare } from "../../../common/string/compare";
 import { SceneEntity } from "../../../data/scene";
 import memoizeOne from "memoize-one";
 import { HassEntities } from "home-assistant-js-websocket";
@@ -45,15 +41,9 @@ class HaConfigScene extends HassRouterPage {
       }
     });
 
-    return scenes.sort((a, b) => {
-      return compare(computeStateName(a), computeStateName(b));
-    });
+    return scenes;
   });
 
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-  }
-
   protected updatePageEl(pageEl, changedProps: PropertyValues) {
     pageEl.hass = this.hass;
     pageEl.narrow = this.narrow;
diff --git a/src/panels/config/script/ha-config-script.js b/src/panels/config/script/ha-config-script.js
index 08e809219e..6a316d55f6 100644
--- a/src/panels/config/script/ha-config-script.js
+++ b/src/panels/config/script/ha-config-script.js
@@ -5,7 +5,6 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "./ha-script-editor";
 import "./ha-script-picker";
 
-import { computeStateName } from "../../../common/entity/compute_state_name";
 import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 
 class HaConfigScript extends PolymerElement {
@@ -103,18 +102,7 @@ class HaConfigScript extends PolymerElement {
       }
     });
 
-    return scripts.sort(function entitySortBy(entityA, entityB) {
-      var nameA = computeStateName(entityA);
-      var nameB = computeStateName(entityB);
-
-      if (nameA < nameB) {
-        return -1;
-      }
-      if (nameA > nameB) {
-        return 1;
-      }
-      return 0;
-    });
+    return scripts;
   }
 
   computeShowEditor(_edittingScript, _creatingNew) {