From 3f731867ac36d284ea92e413caad862b691768f3 Mon Sep 17 00:00:00 2001
From: Dharini Jeeva <dharini@hashicorp.com>
Date: Fri, 25 Aug 2023 09:43:02 -0700
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20toarray=20deprecation=20w?=
 =?UTF-8?q?arning=20(#1865)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/core/addon/initializers/deprecations.js           | 9 +++++++--
 .../app/routes/scopes/scope/roles/role/add-principals.js | 2 +-
 .../targets/target/enable-session-recording/index.js     | 4 ++--
 ui/admin/app/routes/scopes/scope/users.js                | 3 +--
 ui/admin/app/routes/scopes/scope/users/user.js           | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/core/addon/initializers/deprecations.js b/addons/core/addon/initializers/deprecations.js
index 9da9892e7..d92114547 100644
--- a/addons/core/addon/initializers/deprecations.js
+++ b/addons/core/addon/initializers/deprecations.js
@@ -5,12 +5,17 @@
 
 import { registerDeprecationHandler } from '@ember/debug';
 
+const deprecationList = [
+  'ember-data:deprecate-early-static',
+  'ember-data:deprecate-array-like',
+];
+
 export function initialize() {
   registerDeprecationHandler((message, options, next) => {
-    // TODO: fix `deprecate-early-static` warning before ember 5 upgrade
+    // TODO: fix `deprecate-early-static` and `deprecate-array-prototype-extension` warning before ember 5 upgrade
     //silence deprecate-early-static warnings till we find a way to
     //fix ember-cli-mirage discoverEmberDataModels
-    if (options?.id === 'ember-data:deprecate-early-static') {
+    if (options?.id && deprecationList.includes(options.id)) {
       return;
     }
     if (options?.url) {
diff --git a/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js b/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js
index 720376d09..7a0f7c6b4 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js
@@ -46,7 +46,7 @@ export default class ScopesScopeRolesRoleAddPrincipalsRoute extends Route {
    */
   async model() {
     const role = this.modelFor('scopes.scope.roles.role');
-    const scopes = this.store.peekAll('scope').toArray();
+    const scopes = this.store.peekAll('scope');
     const scopeIDs = this.scope?.map((scope) => scope.id);
     const users = scopeIDs?.length
       ? this.resourceFilterStore.queryBy(
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/index.js b/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/index.js
index 8db0e001f..75835ccc1 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/index.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/index.js
@@ -41,8 +41,8 @@ export default class ScopesScopeTargetsTargetEnableSessionRecordingIndexRoute ex
     });
 
     const storageBucketList = [
-      ...globalScopeStorageBuckets.toArray(),
-      ...orgScopeStorageBuckets.toArray(),
+      ...globalScopeStorageBuckets,
+      ...orgScopeStorageBuckets,
     ];
     this.storageBucketList = storageBucketList;
   }
diff --git a/ui/admin/app/routes/scopes/scope/users.js b/ui/admin/app/routes/scopes/scope/users.js
index 47de23494..76857a235 100644
--- a/ui/admin/app/routes/scopes/scope/users.js
+++ b/ui/admin/app/routes/scopes/scope/users.js
@@ -14,7 +14,6 @@ export default class ScopesScopeUsersRoute extends Route {
   // =services
 
   @service store;
-  @service intl;
   @service session;
   @service can;
   @service router;
@@ -32,7 +31,7 @@ export default class ScopesScopeUsersRoute extends Route {
    * Load all users under current scope.
    * @return {Promise{[UserModel]}}
    */
-  async model() {
+  model() {
     const scope = this.modelFor('scopes.scope');
     const { id: scope_id } = scope;
     if (this.can.can('list model', scope, { collection: 'users' })) {
diff --git a/ui/admin/app/routes/scopes/scope/users/user.js b/ui/admin/app/routes/scopes/scope/users/user.js
index 3cec37e00..31621188c 100644
--- a/ui/admin/app/routes/scopes/scope/users/user.js
+++ b/ui/admin/app/routes/scopes/scope/users/user.js
@@ -19,7 +19,7 @@ export default class ScopesScopeUsersUserRoute extends Route {
    * @param {string} params.user_id
    * @return {UserModel}
    */
-  async model({ user_id }) {
+  model({ user_id }) {
     return this.store.findRecord('user', user_id);
   }
 }