From f3e5978e2b780cc31d52bcdbd755d1589da08d4e Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Tue, 28 Jul 2020 17:56:49 -0400
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20IAM=20scope=20?=
 =?UTF-8?q?adapteroptions=20for=20find,=20save,=20&=20del?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/core/app/routes/scopes/scope/groups.js       | 7 +++----
 ui/core/app/routes/scopes/scope/groups/group.js | 5 ++---
 ui/core/app/routes/scopes/scope/groups/new.js   | 3 ++-
 ui/core/app/routes/scopes/scope/roles.js        | 7 +++----
 ui/core/app/routes/scopes/scope/roles/new.js    | 3 ++-
 ui/core/app/routes/scopes/scope/roles/role.js   | 5 ++---
 ui/core/app/routes/scopes/scope/users.js        | 7 +++----
 ui/core/app/routes/scopes/scope/users/new.js    | 3 ++-
 ui/core/app/routes/scopes/scope/users/user.js   | 5 ++---
 9 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/ui/core/app/routes/scopes/scope/groups.js b/ui/core/app/routes/scopes/scope/groups.js
index 8c872a9c2..94441ca1e 100644
--- a/ui/core/app/routes/scopes/scope/groups.js
+++ b/ui/core/app/routes/scopes/scope/groups.js
@@ -38,7 +38,7 @@ export default class ScopesScopeGroupsRoute extends Route {
   async save(group) {
     const { isNew } = group;
     try {
-      await group.save(this.scopeAdapterOptions());
+      await group.save();
       this.refresh();
       this.notify.success(this.intl.t(
         isNew ? 'notify.create-success' : 'notify.save-success'
@@ -68,8 +68,7 @@ export default class ScopesScopeGroupsRoute extends Route {
   }
 
   scopeAdapterOptions() {
-    const { id: scope_id } = this.modelFor('scopes.scope');
-    const adapterOptions = { scopeID: scope_id };
-    return { adapterOptions };
+    const { id: scopeID } = this.modelFor('scopes.scope');
+    return { adapterOptions: { scopeID } };
   }
 }
diff --git a/ui/core/app/routes/scopes/scope/groups/group.js b/ui/core/app/routes/scopes/scope/groups/group.js
index da536ed07..ce0585e8d 100644
--- a/ui/core/app/routes/scopes/scope/groups/group.js
+++ b/ui/core/app/routes/scopes/scope/groups/group.js
@@ -10,8 +10,7 @@ export default class ScopesScopeGroupsGroupRoute extends Route {
    * @return {groupModel}
    */
   async model({ group_id }) {
-    const { id: scope_id } = this.modelFor('scopes.scope');
-    const adapterOptions = { scopeID: scope_id };
-    return this.store.findRecord('group', group_id, { adapterOptions });
+    const { id: scopeID } = this.modelFor('scopes.scope');
+    return this.store.findRecord('group', group_id, { adapterOptions: { scopeID } });
   }
 }
diff --git a/ui/core/app/routes/scopes/scope/groups/new.js b/ui/core/app/routes/scopes/scope/groups/new.js
index e33233f5f..3326dc7e4 100644
--- a/ui/core/app/routes/scopes/scope/groups/new.js
+++ b/ui/core/app/routes/scopes/scope/groups/new.js
@@ -8,6 +8,7 @@ export default class ScopesScopeGroupsNewRoute extends Route {
    * @return {GroupModel}
    */
   model() {
-    return this.store.createRecord('group');
+    const { id: scopeID } = this.modelFor('scopes.scope');
+    return this.store.createRecord('group', { scopeID });
   }
 }
diff --git a/ui/core/app/routes/scopes/scope/roles.js b/ui/core/app/routes/scopes/scope/roles.js
index 5b6b45106..a4d9d2c5b 100644
--- a/ui/core/app/routes/scopes/scope/roles.js
+++ b/ui/core/app/routes/scopes/scope/roles.js
@@ -38,7 +38,7 @@ export default class ScopesScopeRolesRoute extends Route {
   async save(role) {
     const { isNew } = role;
     try {
-      await role.save(this.scopeAdapterOptions());
+      await role.save();
       this.refresh();
       this.notify.success(this.intl.t(
         isNew ? 'notify.create-success' : 'notify.save-success'
@@ -68,8 +68,7 @@ export default class ScopesScopeRolesRoute extends Route {
   }
 
   scopeAdapterOptions() {
-    const { id: scope_id } = this.modelFor('scopes.scope');
-    const adapterOptions = { scopeID: scope_id };
-    return { adapterOptions };
+    const { id: scopeID } = this.modelFor('scopes.scope');
+    return { adapterOptions: { scopeID } };
   }
 }
diff --git a/ui/core/app/routes/scopes/scope/roles/new.js b/ui/core/app/routes/scopes/scope/roles/new.js
index f39f6e6c2..edc239e21 100644
--- a/ui/core/app/routes/scopes/scope/roles/new.js
+++ b/ui/core/app/routes/scopes/scope/roles/new.js
@@ -8,6 +8,7 @@ export default class ScopesScopeRolesNewRoute extends Route {
    * @return {RoleModel}
    */
   model() {
-    return this.store.createRecord('role');
+    const { id: scopeID } = this.modelFor('scopes.scope');
+    return this.store.createRecord('role', { scopeID });
   }
 }
diff --git a/ui/core/app/routes/scopes/scope/roles/role.js b/ui/core/app/routes/scopes/scope/roles/role.js
index 781bb4e47..98cbffcd0 100644
--- a/ui/core/app/routes/scopes/scope/roles/role.js
+++ b/ui/core/app/routes/scopes/scope/roles/role.js
@@ -10,8 +10,7 @@ export default class ScopesScopeRolesRoleRoute extends Route {
    * @return {RoleModel}
    */
   async model({ role_id }) {
-    const { id: scope_id } = this.modelFor('scopes.scope');
-    const adapterOptions = { scopeID: scope_id };
-    return this.store.findRecord('role', role_id, { adapterOptions });
+    const { id: scopeID } = this.modelFor('scopes.scope');
+    return this.store.findRecord('role', role_id, { adapterOptions: { scopeID } });
   }
 }
diff --git a/ui/core/app/routes/scopes/scope/users.js b/ui/core/app/routes/scopes/scope/users.js
index e70c25f2f..8beb4f146 100644
--- a/ui/core/app/routes/scopes/scope/users.js
+++ b/ui/core/app/routes/scopes/scope/users.js
@@ -39,7 +39,7 @@ export default class ScopesScopeUsersRoute extends Route {
   async save(user) {
     const { isNew } = user;
     try {
-      await user.save(this.scopeAdapterOptions());
+      await user.save();
       this.refresh();
       this.notify.success(this.intl.t(
         isNew ? 'notify.create-success' : 'notify.save-success'
@@ -69,8 +69,7 @@ export default class ScopesScopeUsersRoute extends Route {
   }
 
   scopeAdapterOptions() {
-    const { id: scope_id } = this.modelFor('scopes.scope');
-    const adapterOptions = { scopeID: scope_id };
-    return { adapterOptions };
+    const { id: scopeID } = this.modelFor('scopes.scope');
+    return { adapterOptions: { scopeID } };
   }
 }
diff --git a/ui/core/app/routes/scopes/scope/users/new.js b/ui/core/app/routes/scopes/scope/users/new.js
index 9b486a48b..25c4a0b52 100644
--- a/ui/core/app/routes/scopes/scope/users/new.js
+++ b/ui/core/app/routes/scopes/scope/users/new.js
@@ -8,6 +8,7 @@ export default class ScopesScopeUsersNewRoute extends Route {
    * @return {UserModel}
    */
   model() {
-    return this.store.createRecord('user');
+    const { id: scopeID } = this.modelFor('scopes.scope');
+    return this.store.createRecord('user', { scopeID });
   }
 }
diff --git a/ui/core/app/routes/scopes/scope/users/user.js b/ui/core/app/routes/scopes/scope/users/user.js
index f28ff4d56..b2bcc0911 100644
--- a/ui/core/app/routes/scopes/scope/users/user.js
+++ b/ui/core/app/routes/scopes/scope/users/user.js
@@ -10,8 +10,7 @@ export default class ScopesScopeUsersUserRoute extends Route {
    * @return {UserModel}
    */
   async model({ user_id }) {
-    const { id: scope_id } = this.modelFor('scopes.scope');
-    const adapterOptions = { scopeID: scope_id };
-    return this.store.findRecord('user', user_id, { adapterOptions });
+    const { id: scopeID } = this.modelFor('scopes.scope');
+    return this.store.findRecord('user', user_id, { adapterOptions: { scopeID } });
   }
 }