FIX: don’t break browser history on dashboard visit (#6186)

app/assets/javascripts/admin/controllers/admin-dashboard-next-moderation.js.es6

@@ -2,8 +2,6 @@ import computed from "ember-addons/ember-computed-decorators";
 import PeriodComputationMixin from "admin/mixins/period-computation";
 
 export default Ember.Controller.extend(PeriodComputationMixin, {
-  exceptionController: Ember.inject.controller("exception"),
-
   @computed
   flagsStatusOptions() {
     return {

app/assets/javascripts/admin/models/admin-dashboard-next.js.es6

@@ -6,7 +6,7 @@ const AdminDashboardNext = Discourse.Model.extend({});
 
 AdminDashboardNext.reopenClass({
   fetch() {
-    return ajax("/admin/dashboard-next.json").then(json => {
+    return ajax("/admin/dashboard.json").then(json => {
       const model = AdminDashboardNext.create();
       model.set("version_check", json.version_check);
       return model;

app/assets/javascripts/admin/routes/admin-dashboard-next.js.es6

@@ -5,19 +5,5 @@ export default Discourse.Route.extend({
     this.controllerFor("admin-dashboard-next").fetchProblems();
     this.controllerFor("admin-dashboard-next").fetchDashboard();
     scrollTop();
-  },
-
-  afterModel(model, transition) {
-    if (transition.targetName === "admin.dashboardNext.index") {
-      this.transitionTo("admin.dashboardNext.general");
-    }
-  },
-
-  actions: {
-    willTransition(transition) {
-      if (transition.targetName === "admin.dashboardNext.index") {
-        this.transitionTo("admin.dashboardNext.general");
-      }
-    }
   }
 });

app/assets/javascripts/admin/routes/admin-route-map.js.es6

@@ -3,8 +3,11 @@ export default function() {
     this.route("dashboard", { path: "/dashboard-old" });
 
     this.route("dashboardNext", { path: "/" }, function() {
-      this.route("general", { path: "/dashboard/general" });
+      this.route("general", { path: "/" });
-      this.route("moderation", { path: "/dashboard/moderation" });
+      this.route("admin.dashboardNextModeration", {
+        path: "/dashboard/moderation",
+        resetNamespace: true
+      });
     });
 
     this.route(

app/assets/javascripts/admin/templates/dashboard_next.hbs

@@ -17,7 +17,7 @@
     {{/link-to}}
   </li>
   <li class="navigation-item moderation">
-    {{#link-to "admin.dashboardNext.moderation" class="navigation-link"}}
+    {{#link-to "admin.dashboardNextModeration" class="navigation-link"}}
       {{i18n "admin.dashboard.moderation_tab"}}
     {{/link-to}}
   </li>

app/assets/stylesheets/common/admin/dashboard_next.scss

@@ -31,7 +31,7 @@
     border-bottom: 10px solid $secondary;
   }
 
-  &.moderation .navigation-item.moderation {
+  &.dashboard-next-moderation .navigation-item.moderation {
     @include active-navigation-item;
   }
 

app/controllers/admin/dashboard_next_controller.rb

@@ -11,6 +11,9 @@ class Admin::DashboardNextController < Admin::AdminController
     render json: data
   end
 
+  def moderation
+  end
+
   def general
     data = AdminDashboardNextGeneralData.fetch_cached_stats
 

config/routes.rb

@@ -236,9 +236,11 @@ Discourse::Application.routes.draw do
 
     get "version_check" => "versions#show"
 
-    get "dashboard-next" => "dashboard_next#index"
+    get "dashboard" => "dashboard_next#index"
-    get "dashboard-old" => "dashboard#index"
     get "dashboard/general" => "dashboard_next#general"
+    get "dashboard/moderation" => "dashboard_next#moderation"
+
+    get "dashboard-old" => "dashboard#index"
 
     resources :dashboard, only: [:index] do
       collection do

test/javascripts/fixtures/dashboard-next.js.es6

@@ -1,5 +1,5 @@
 export default {
-  "/admin/dashboard-next.json": {
+  "/admin/dashboard.json": {
     updated_at: "2018-04-25T08:06:11.292Z"
   }
 };