DEV: rename the "upgrade" route to "update" and change references. (#210

)

This PR will rename the route "`/admin/upgrade`" to "`/admin/update`" and it will add a redirect for the old route.

Follow-up to the PR: #208

admin/assets/javascripts/discourse/components/docker-manager/repo-status.js

@@ -51,6 +51,6 @@ export default class RepoStatus extends Component {
 
   @action
   upgrade() {
-    this.router.transitionTo("upgrade.show", this.args.repo);
+    this.router.transitionTo("update.show", this.args.repo);
   }
 }

admin/assets/javascripts/discourse/components/docker-manager/upgrade-notice.hbs

@@ -3,7 +3,7 @@
     <div class="upgrades-banner">
       {{i18n "admin.docker.outdated_notice"}}
 
-      <LinkTo @route="upgrade">
+      <LinkTo @route="update">
         {{i18n "admin.docker.perform_update"}}
       </LinkTo>
     </div>

admin/assets/javascripts/discourse/controllers/upgrade-index.js → admin/assets/javascripts/discourse/controllers/update-index.js

@@ -26,6 +26,6 @@ export default class UpgradeIndex extends Controller {
 
   @action
   upgradeAllButton() {
-    this.router.transitionTo("upgrade.show", "all");
+    this.router.transitionTo("update.show", "all");
   }
 }

admin/assets/javascripts/discourse/docker-manager-route-map.js

@@ -2,7 +2,7 @@ export default {
   resource: "admin",
 
   map() {
-    this.route("upgrade", { resetNamespace: true }, function () {
+    this.route("update", { resetNamespace: true }, function () {
       this.route("processes");
       this.route("show", { path: "/:id" });
     });

admin/assets/javascripts/discourse/initializers/admin-sidebar.js

@@ -7,7 +7,7 @@ export default {
     withPluginApi("1.24.0", (api) => {
       api.addAdminSidebarSectionLink("root", {
         name: "admin_upgrade",
-        route: "upgrade.index",
+        route: "update.index",
         label: "admin.docker.update_tab",
         icon: "rocket",
       });

admin/assets/javascripts/discourse/models/repo.js

@@ -37,15 +37,15 @@ export default class Repo {
   }
 
   static upgradeAll() {
-    return ajax("/admin/docker/upgrade", {
+    return ajax("/admin/docker/update", {
       dataType: "text",
       type: "POST",
       data: { path: "all" },
     });
   }
 
   static resetAll(repos) {
-    return ajax("/admin/docker/upgrade", {
+    return ajax("/admin/docker/update", {
       dataType: "text",
       type: "DELETE",
       data: { path: "all", version: concatVersions(repos) },
@@ -172,7 +172,7 @@ export default class Repo {
   }
 
   async resetUpgrade() {
-    await this.repoAjax("/admin/docker/upgrade", {
+    await this.repoAjax("/admin/docker/update", {
       dataType: "text",
       type: "DELETE",
     });
@@ -184,7 +184,7 @@ export default class Repo {
     this.upgrading = true;
 
     try {
-      await this.repoAjax("/admin/docker/upgrade", {
+      await this.repoAjax("/admin/docker/update", {
         dataType: "text",
         type: "POST",
       });

admin/assets/javascripts/discourse/routes/upgrade-index.js → admin/assets/javascripts/discourse/routes/update-index.js

@@ -2,7 +2,7 @@ import Route from "@ember/routing/route";
 
 export default class UpgradeIndex extends Route {
   model() {
-    return this.modelFor("upgrade");
+    return this.modelFor("update");
   }
 
   async loadRepos(list) {

admin/assets/javascripts/discourse/routes/upgrade.js → admin/assets/javascripts/discourse/routes/update.js

@@ -13,11 +13,11 @@ export default class Upgrade extends Route {
   }
 
   activate() {
-    this.messageBus.subscribe("/docker/upgrade", this.onUpgradeMessage);
+    this.messageBus.subscribe("/docker/update", this.onUpgradeMessage);
   }
 
   deactivate() {
-    this.messageBus.unsubscribe("/docker/upgrade", this.onUpgradeMessage);
+    this.messageBus.unsubscribe("/docker/update", this.onUpgradeMessage);
   }
 
   setupController(controller, model) {
@@ -46,7 +46,7 @@ export default class Upgrade extends Route {
       case "status":
         this.upgradeStore.upgradeStatus = msg.value;
         // Get the resolved model
-        const model = this.modelFor("upgrade");
+        const model = this.modelFor("update");
 
         if (msg.value === "complete") {
           for (const repo of model) {

admin/assets/javascripts/discourse/templates/connectors/admin-menu/upgrade-link.hbs

@@ -1,3 +1,3 @@
 {{#if this.currentUser.admin}}
-  <NavItem @route="upgrade" @label="admin.docker.update_tab" />
+  <NavItem @route="update" @label="admin.docker.update_tab" />
 {{/if}}

admin/assets/javascripts/discourse/templates/upgrade.hbs → admin/assets/javascripts/discourse/templates/update.hbs

@@ -2,13 +2,13 @@
   <nav>
     <ul class="nav nav-pills">
       <li>
-        <LinkTo @route="upgrade.index">
+        <LinkTo @route="update.index">
           {{i18n "admin.docker.navigation.versions"}}
         </LinkTo>
       </li>
 
       <li>
-        <LinkTo @route="upgrade.processes">
+        <LinkTo @route="update.processes">
           {{i18n "admin.docker.navigation.processes"}}
         </LinkTo>
       </li>

config/routes.rb

@@ -2,14 +2,16 @@
 
 DockerManager::Engine.routes.draw do
   scope "/admin", constraints: AdminConstraint.new do
-    get "/upgrade" => "admin#index"
-    get "/upgrade/:id" => "admin#index"
+    get "/upgrade", to: redirect("/admin/update")
+    get "/upgrade/:id", to: redirect("/admin/update/%{id}")
+    get "/update" => "admin#index"
+    get "/update/:id" => "admin#index"
     get "/docker/repos" => "admin#repos"
     get "/docker/latest" => "admin#latest"
     get "/docker/progress" => "admin#progress"
     get "/docker/ps" => "admin#ps"
 
-    post "/docker/upgrade" => "admin#upgrade"
-    delete "/docker/upgrade" => "admin#reset_upgrade"
+    post "/docker/update" => "admin#upgrade"
+    delete "/docker/update" => "admin#reset_upgrade"
   end
 end

lib/docker_manager/upgrader.rb

@@ -157,7 +157,7 @@ def upgrade
 
   def publish(type, value)
     MessageBus.publish(
-      "/docker/upgrade",
+      "/docker/update",
       { type: type, value: value, repos: @repos.map(&:name) },
       user_ids: [@user_id],
     )
@@ -259,7 +259,7 @@ def status(val)
 
   def log_version_upgrade
     StaffActionLogger.new(User.find(@user_id)).log_custom(
-      "discourse_upgrade",
+      "discourse_update",
       from_version: @from_version,
       repository: @repos.map(&:path).join(", "),
     )

spec/requests/admin_controller_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe DockerManager::AdminController do
   describe "anonymous user" do
     it "should be a 404" do
-      get "/admin/upgrade"
+      get "/admin/update"
 
       expect(response.status).to eq(404)
     end
@@ -13,7 +13,7 @@
     it "should 404" do
       sign_in(Fabricate(:user))
 
-      get "/admin/upgrade"
+      get "/admin/update"
       expect(response.status).to eq(404)
     end
   end
@@ -22,9 +22,19 @@
     it "should return the right response" do
       sign_in(Fabricate(:admin))
 
-      get "/admin/upgrade"
+      get "/admin/update"
       expect(response.status).to eq(200)
     end
+
+    it "should redirect to the new route" do
+      sign_in(Fabricate(:admin))
+
+      get "/admin/upgrade"
+      expect(response.status).to eq(301)
+
+      uri = URI.parse(response.headers["Location"])
+      expect(uri.path).to eq("/admin/update")
+    end
   end
 
   describe "#repos" do

test/javascripts/acceptance/docker-manager-test.js

@@ -62,7 +62,7 @@ acceptance("docker_manager", function (needs) {
     });
 
     await click(".upgrades-banner a");
-    assert.strictEqual(currentURL(), "/admin/upgrade");
+    assert.strictEqual(currentURL(), "/admin/update");
 
     assert.dom(".docker-manager table#repos tbody tr").exists({ count: 2 });
     assert.dom(".new.commit-hash").hasText("v3.1.0.beta2 +241");