From 447d4604c631d5f9d1abc8a9646b15a0ce3f1c2b Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 16 Mar 2020 12:22:21 +0100
Subject: [PATCH] Require hyphen in lovelace dashboard url path (#5214)

* Require hyphen in url path

* Update dialog-lovelace-dashboard-detail.ts
---
 .../dashboards/dialog-lovelace-dashboard-detail.ts    | 11 +++++------
 src/translations/en.json                              |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
index 441f6d3728..6a87e7ec48 100644
--- a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
+++ b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
@@ -57,7 +57,7 @@ export class DialogLovelaceDashboardDetail extends LitElement {
     if (!this._params) {
       return html``;
     }
-    const urlInvalid = !/^[a-zA-Z0-9_-]+$/.test(this._urlPath);
+    const urlInvalid = !/^[a-zA-Z0-9_-]+-[a-zA-Z0-9_-]+$/.test(this._urlPath);
     const titleInvalid = !this._urlPath.trim();
     return html`
       <ha-dialog
@@ -215,14 +215,13 @@ export class DialogLovelaceDashboardDetail extends LitElement {
   }
 
   private _fillUrlPath() {
-    if (this._urlPath) {
+    if (this._urlPath || !this._title) {
       return;
     }
-    const parts = this._title.split(" ");
+    const parts = this._title.toLowerCase().split(" ");
 
-    if (parts.length) {
-      this._urlPath = parts.join("_").toLowerCase();
-    }
+    this._urlPath =
+      parts.length === 1 ? `lovelace-${parts[0]}` : parts.join("_");
   }
 
   private _showSidebarChanged(ev: Event) {
diff --git a/src/translations/en.json b/src/translations/en.json
index f55e5b2658..9a844b9499 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -887,7 +887,7 @@
               "title": "Title",
               "title_required": "Title is required.",
               "url": "Url",
-              "url_error_msg": "The url can not contain spaces or special characters, except for _ and -",
+              "url_error_msg": "The url should contain a - and can not contain spaces or special characters, except for _ and -",
               "require_admin": "Admin only",
               "delete": "Delete",
               "update": "Update",