From 67b96ad2ff06588fa2cb85a2a564257369dba83f Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Fri, 22 Mar 2019 00:48:57 +0300
Subject: [PATCH]  FIX: discourse client should know about Logster (simpler
 approach) (#7237)

* Revert "FIX: discourse client should know about Logster (#7232)"

This reverts commit bfcbc4d2d679a4ddc45cdbf6cab164707bd4ff5e.

* FIX: discourse client should know about Logster (simpler approach)
---
 .../javascripts/discourse/lib/url.js.es6       |  3 ++-
 .../discourse/routes/app-route-map.js.es6      |  4 ----
 .../discourse/routes/logster.js.es6            | 18 ------------------
 3 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/routes/logster.js.es6

diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 827ef44410f..3c13dbc091a 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -22,7 +22,8 @@ const SERVER_SIDE_ONLY = [
   /^\/wizard/,
   /\.rss$/,
   /\.json$/,
-  /^\/admin\/upgrade$/
+  /^\/admin\/upgrade$/,
+  /^\/logs($|\/)/
 ];
 
 export function rewritePath(path) {
diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
index 743141426b8..b9fc992d74b 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -3,10 +3,6 @@ export default function() {
   this.route("exception", { path: "/exception" });
   this.route("exception-unknown", { path: "/404" });
 
-  this.route("logster", { path: "/logs" }, function() {
-    this.route("logster-routes", { path: "*path" });
-  });
-
   this.route("about", { path: "/about", resetNamespace: true });
 
   this.route("post", { path: "/p/:id" });
diff --git a/app/assets/javascripts/discourse/routes/logster.js.es6 b/app/assets/javascripts/discourse/routes/logster.js.es6
deleted file mode 100644
index ea71938dd0a..00000000000
--- a/app/assets/javascripts/discourse/routes/logster.js.es6
+++ /dev/null
@@ -1,18 +0,0 @@
-import getURL from "discourse-common/lib/get-url";
-import { getOwner } from "discourse-common/lib/get-owner";
-
-export default Discourse.Route.extend({
-  beforeModel(transition) {
-    const router = getOwner(this).lookup("router:main");
-    const currentURL = router.get("currentURL");
-    transition.abort();
-
-    // hack due to Ember bug https://github.com/emberjs/ember.js/issues/5210
-    // aborting the transition should revert the address bar to the
-    // previous route's url, otherwise we will end up with a broken
-    // back button
-    // workaround is to update the address bar ourselves
-    router.location.setURL(router.url);
-    window.location.href = getURL(currentURL);
-  }
-});