From 32e7b45f4ae335b069d25813facc8328adc2fd7d Mon Sep 17 00:00:00 2001
From: Devon Anderson <devon.anderson@hashicorp.com>
Date: Thu, 2 Mar 2023 10:08:13 -0500
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20revise=20storage=20b?=
 =?UTF-8?q?uckets=20route=20(#86)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 💡 revise storage buckets route

Move `storage-buckets` route outside of nested `session-recordings`

✅ Closes: ICU-8307

* Update en-us.yaml

removed unneeded resource

* Update en-us.yaml

* refactor: 💡 clean up translations

Cleaned up multiple readable strings in translations.

✅ Closes: ICU-8307
---
 addons/core/translations/resources/en-us.yaml | 15 ++++++---------
 ui/admin/app/router.js                        |  2 +-
 .../session-recordings/storage-buckets.js     | 19 -------------------
 .../storage-buckets/index.js                  |  3 ---
 .../routes/scopes/scope/storage-buckets.js    |  3 +++
 .../scopes/scope/storage-buckets/index.js     |  3 +++
 .../scopes/scope/session-recordings.hbs       |  3 ++-
 .../session-recordings/storage-buckets.hbs    |  3 ---
 .../scopes/scope/storage-buckets.hbs          |  3 +++
 .../storage-buckets/index.hbs                 |  0
 .../storage-buckets-test.js                   | 11 -----------
 .../storage-buckets/index-test.js             | 11 -----------
 .../scopes/scope/storage-buckets-test.js      | 11 +++++++++++
 .../scope/storage-buckets/index-test.js       | 11 +++++++++++
 14 files changed, 40 insertions(+), 58 deletions(-)
 delete mode 100644 ui/admin/app/routes/scopes/scope/session-recordings/storage-buckets.js
 delete mode 100644 ui/admin/app/routes/scopes/scope/session-recordings/storage-buckets/index.js
 create mode 100644 ui/admin/app/routes/scopes/scope/storage-buckets.js
 create mode 100644 ui/admin/app/routes/scopes/scope/storage-buckets/index.js
 delete mode 100644 ui/admin/app/templates/scopes/scope/session-recordings/storage-buckets.hbs
 create mode 100644 ui/admin/app/templates/scopes/scope/storage-buckets.hbs
 rename ui/admin/app/templates/scopes/scope/{session-recordings => }/storage-buckets/index.hbs (100%)
 delete mode 100644 ui/admin/tests/unit/routes/scopes/scope/session-recordings/storage-buckets-test.js
 delete mode 100644 ui/admin/tests/unit/routes/scopes/scope/session-recordings/storage-buckets/index-test.js
 create mode 100644 ui/admin/tests/unit/routes/scopes/scope/storage-buckets-test.js
 create mode 100644 ui/admin/tests/unit/routes/scopes/scope/storage-buckets/index-test.js

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index e17787053..11ef2d88b 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -211,18 +211,15 @@ org:
     new: New Org
   actions:
     delete: Delete Org
-session-recordings:
-  title: Session Recording
-  title_plural: Session Recordings
-  recorded-sessions:
-    title: Recorded Session
-    title_plural: Recorded Sessions
-  storage-bucket:
-    title: Storage Bucket
-    title_plural: Storage Buckets
+session-recording:
+  title: Recorded Session
+  title_plural: Recorded Sessions
   channel:
     title: Channel
     title_plural: Channels
+storage-bucket:
+  title: Storage Bucket
+  title_plural: Storage Buckets
 project:
   title: Project
   title_plural: Projects
diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js
index 41947d0f4..26ba1f57b 100644
--- a/ui/admin/app/router.js
+++ b/ui/admin/app/router.js
@@ -147,8 +147,8 @@ Router.map(function () {
             });
           }
         );
-        this.route('storage-buckets', function () {});
       });
+      this.route('storage-buckets', function () {});
     });
   });
 
diff --git a/ui/admin/app/routes/scopes/scope/session-recordings/storage-buckets.js b/ui/admin/app/routes/scopes/scope/session-recordings/storage-buckets.js
deleted file mode 100644
index 14e19a947..000000000
--- a/ui/admin/app/routes/scopes/scope/session-recordings/storage-buckets.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class ScopesScopeSessionRecordingsStorageBucketsRoute extends Route {
-  // =services
-
-  // TODO: store, can, and router services
-
-  // =methods
-
-  /**
-   * Loads all storage buckets under global and org scopes.
-   * @returns {Promise[StorageBucketModel]}
-  */
-  // TODO: async model hook
-
-  // =actions
-
-  // TODO: save, cancel, and delete actions
-}
diff --git a/ui/admin/app/routes/scopes/scope/session-recordings/storage-buckets/index.js b/ui/admin/app/routes/scopes/scope/session-recordings/storage-buckets/index.js
deleted file mode 100644
index b7ab4668d..000000000
--- a/ui/admin/app/routes/scopes/scope/session-recordings/storage-buckets/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class ScopesScopeSessionRecordingsStorageBucketsIndexRoute extends Route {}
diff --git a/ui/admin/app/routes/scopes/scope/storage-buckets.js b/ui/admin/app/routes/scopes/scope/storage-buckets.js
new file mode 100644
index 000000000..9d17270e6
--- /dev/null
+++ b/ui/admin/app/routes/scopes/scope/storage-buckets.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeStorageBucketsRoute extends Route {}
diff --git a/ui/admin/app/routes/scopes/scope/storage-buckets/index.js b/ui/admin/app/routes/scopes/scope/storage-buckets/index.js
new file mode 100644
index 000000000..e27e0a0dc
--- /dev/null
+++ b/ui/admin/app/routes/scopes/scope/storage-buckets/index.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeStorageBucketsIndexRoute extends Route {}
diff --git a/ui/admin/app/templates/scopes/scope/session-recordings.hbs b/ui/admin/app/templates/scopes/scope/session-recordings.hbs
index cff117f14..fde0c392e 100644
--- a/ui/admin/app/templates/scopes/scope/session-recordings.hbs
+++ b/ui/admin/app/templates/scopes/scope/session-recordings.hbs
@@ -1,2 +1,3 @@
-{{page-title (t 'resources.session-recordings.title_plural')}}
+{{page-title (t 'resources.session-recording.title_plural')}}
+
 {{outlet}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/storage-buckets.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/storage-buckets.hbs
deleted file mode 100644
index 343dc50e5..000000000
--- a/ui/admin/app/templates/scopes/scope/session-recordings/storage-buckets.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{page-title (t 'resources.session-recordings.storage-bucket.title_plural')}}
-
-{{outlet}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/storage-buckets.hbs b/ui/admin/app/templates/scopes/scope/storage-buckets.hbs
new file mode 100644
index 000000000..5fda700a0
--- /dev/null
+++ b/ui/admin/app/templates/scopes/scope/storage-buckets.hbs
@@ -0,0 +1,3 @@
+{{page-title (t 'resources.storage-bucket.title_plural')}}
+
+{{outlet}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/storage-buckets/index.hbs b/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/session-recordings/storage-buckets/index.hbs
rename to ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs
diff --git a/ui/admin/tests/unit/routes/scopes/scope/session-recordings/storage-buckets-test.js b/ui/admin/tests/unit/routes/scopes/scope/session-recordings/storage-buckets-test.js
deleted file mode 100644
index 2a85b533d..000000000
--- a/ui/admin/tests/unit/routes/scopes/scope/session-recordings/storage-buckets-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'admin/tests/helpers';
-
-module('Unit | Route | scopes/scope/session-recordings/storage-buckets', function (hooks) {
-  setupTest(hooks);
-
-  test('it exists', function (assert) {
-    let route = this.owner.lookup('route:scopes/scope/session-recordings/storage-buckets');
-    assert.ok(route);
-  });
-});
diff --git a/ui/admin/tests/unit/routes/scopes/scope/session-recordings/storage-buckets/index-test.js b/ui/admin/tests/unit/routes/scopes/scope/session-recordings/storage-buckets/index-test.js
deleted file mode 100644
index 1252f2956..000000000
--- a/ui/admin/tests/unit/routes/scopes/scope/session-recordings/storage-buckets/index-test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'admin/tests/helpers';
-
-module('Unit | Route | scopes/scope/session-recordings/storage-buckets/index', function (hooks) {
-  setupTest(hooks);
-
-  test('it exists', function (assert) {
-    let route = this.owner.lookup('route:scopes/scope/session-recordings/storage-buckets/index');
-    assert.ok(route);
-  });
-});
diff --git a/ui/admin/tests/unit/routes/scopes/scope/storage-buckets-test.js b/ui/admin/tests/unit/routes/scopes/scope/storage-buckets-test.js
new file mode 100644
index 000000000..59c84d020
--- /dev/null
+++ b/ui/admin/tests/unit/routes/scopes/scope/storage-buckets-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'admin/tests/helpers';
+
+module('Unit | Route | scopes/scope/storage-buckets', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let route = this.owner.lookup('route:scopes/scope/storage-buckets');
+    assert.ok(route);
+  });
+});
diff --git a/ui/admin/tests/unit/routes/scopes/scope/storage-buckets/index-test.js b/ui/admin/tests/unit/routes/scopes/scope/storage-buckets/index-test.js
new file mode 100644
index 000000000..4c19c6e24
--- /dev/null
+++ b/ui/admin/tests/unit/routes/scopes/scope/storage-buckets/index-test.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'admin/tests/helpers';
+
+module('Unit | Route | scopes/scope/storage-buckets/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let route = this.owner.lookup('route:scopes/scope/storage-buckets/index');
+    assert.ok(route);
+  });
+});