From e60b774d05ec59c5999834be44b6df381b9ad2ac Mon Sep 17 00:00:00 2001
From: Cameron Perera <cameron.perera@hashicorp.com>
Date: Mon, 10 Jun 2024 17:00:07 -0500
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20remove=20grant=5Fsco?=
 =?UTF-8?q?pe=5Fid=20and=20its=20uses=20(#2325)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: https://hashicorp.atlassian.net/browse/ICU-13877
---
 addons/api/addon/generated/models/role.js     |  6 --
 addons/api/addon/models/role.js               |  9 ---
 addons/api/mirage/factories/role.js           |  2 -
 addons/api/mirage/serializers/role.js         |  2 -
 .../api/tests/unit/serializers/role-test.js   |  1 -
 ui/admin/app/components/form/role/index.hbs   | 77 -------------------
 ui/admin/app/components/form/role/index.js    | 18 -----
 ui/admin/app/routes/onboarding.js             |  2 -
 8 files changed, 117 deletions(-)
 delete mode 100644 ui/admin/app/components/form/role/index.js

diff --git a/addons/api/addon/generated/models/role.js b/addons/api/addon/generated/models/role.js
index db9f0bd9d..fa8d3caf4 100644
--- a/addons/api/addon/generated/models/role.js
+++ b/addons/api/addon/generated/models/role.js
@@ -22,12 +22,6 @@ export default class GeneratedRoleModel extends BaseModel {
   })
   description;
 
-  @attr('string', {
-    description:
-      "The scope to which this role applies.  Defaults to the role's scope.",
-  })
-  grant_scope_id;
-
   @attr('array', {
     description:
       "The scopes to which this role applies.  Defaults to the role's scope.",
diff --git a/addons/api/addon/models/role.js b/addons/api/addon/models/role.js
index f5b6f1326..20f56aa73 100644
--- a/addons/api/addon/models/role.js
+++ b/addons/api/addon/models/role.js
@@ -33,15 +33,6 @@ export default class RoleModel extends GeneratedRoleModel {
    */
   @attr({ readOnly: true, emptyArrayIfMissing: true }) grant_strings;
 
-  /**
-   * Convenience for looking up the grant scope, if loaded.
-   */
-  get grantScope() {
-    return this.grant_scope_id
-      ? this.store.peekRecord('scope', this.grant_scope_id)
-      : null;
-  }
-
   /**
    * A list of IDs for principals of type `user`.
    * @type {string[]}
diff --git a/addons/api/mirage/factories/role.js b/addons/api/mirage/factories/role.js
index 448a53c24..088281402 100644
--- a/addons/api/mirage/factories/role.js
+++ b/addons/api/mirage/factories/role.js
@@ -26,8 +26,6 @@ export default factory.extend({
   ],
 
   id: () => generateId('r_'),
-  // TODO: all grant_scope_id instances will be removed in future PR
-  grant_scope_id: 'this',
   grant_scope_ids: () => ['this'],
 
   /**
diff --git a/addons/api/mirage/serializers/role.js b/addons/api/mirage/serializers/role.js
index 7c63726b6..b5753dc12 100644
--- a/addons/api/mirage/serializers/role.js
+++ b/addons/api/mirage/serializers/role.js
@@ -39,8 +39,6 @@ export default ApplicationSerializer.extend({
     if (!json.principals.length) delete json.principals;
 
     // default grant scopes
-    // TODO: all grant_scope_id instances will be removed in future PR
-    if (!json.grant_scope_id) json.grant_scope_id = 'this';
     if (json.grant_scope_ids.length === 0) {
       json.grant_scope_ids = ['this'];
     }
diff --git a/addons/api/tests/unit/serializers/role-test.js b/addons/api/tests/unit/serializers/role-test.js
index abf7d56cd..20fe41c28 100644
--- a/addons/api/tests/unit/serializers/role-test.js
+++ b/addons/api/tests/unit/serializers/role-test.js
@@ -25,7 +25,6 @@ module('Unit | Serializer | role', function (hooks) {
       name: 'User',
       description: 'Description',
       version: 1,
-      grant_scope_id: null,
       grant_scope_ids: [],
     });
   });
diff --git a/ui/admin/app/components/form/role/index.hbs b/ui/admin/app/components/form/role/index.hbs
index a25bf7a18..144be81f8 100644
--- a/ui/admin/app/components/form/role/index.hbs
+++ b/ui/admin/app/components/form/role/index.hbs
@@ -51,83 +51,6 @@
     {{/if}}
   </Hds::Form::Textarea::Field>
 
-  {{#unless @model.isNew}}
-    <fieldset
-      aria-labelledby='legend-text-grant-scope'
-      aria-describedby='helper-text-grant-scope'
-    >
-      <legend id='legend-text-grant-scope'>
-        {{t 'form.grant_scope.label'}}
-      </legend>
-      <Rose::Form::HelperText
-        @id='helper-text-grant-scope'
-        @error={{@model.errors.grant_scope_id}}
-      >
-        {{t 'form.grant_scope.help'}}
-      </Rose::Form::HelperText>
-      <form.radioGroup
-        @name='grant_scope_id'
-        @selectedValue={{@model.grant_scope_id}}
-        @changed={{this.updateGrantScopeID}}
-        as |radioGroup|
-      >
-        <Rose::Dropdown
-          @text={{@model.grantScope.displayName}}
-          @icon={{if
-            @model.grantScope.isProject
-            'flight-icons/svg/grid-16'
-            (if
-              @model.grantScope.isOrg
-              'flight-icons/svg/org-16'
-              'flight-icons/svg/globe-16'
-            )
-          }}
-          as |dropdown|
-        >
-          <ul>
-            {{#each @grantScopes as |grantScope|}}
-              <li class={{if grantScope.model.isProject 'is-project'}}>
-                <dropdown.item>
-                  <radioGroup.radio
-                    @label={{grantScope.model.displayName}}
-                    @value={{grantScope.model.id}}
-                    @icon={{concat 'app-icons/' grantScope.model.type}}
-                  />
-                </dropdown.item>
-                <ul class='indent-label-1'>
-                  {{#each grantScope.subScopes as |subScope|}}
-                    <li class={{if subScope.model.isProject 'is-project'}}>
-                      <dropdown.item>
-                        <radioGroup.radio
-                          @label={{subScope.model.displayName}}
-                          @value={{subScope.model.id}}
-                          @icon={{concat 'app-icons/' subScope.model.type}}
-                        />
-                      </dropdown.item>
-                      <ul class='indent-label-2'>
-                        {{#each subScope.subScopes as |subSubScope|}}
-                          <li class={{if subSubScope.isProject 'is-project'}}>
-                            <dropdown.item>
-                              <radioGroup.radio
-                                @label={{subSubScope.displayName}}
-                                @value={{subSubScope.id}}
-                                @icon={{concat 'app-icons/' subSubScope.type}}
-                              />
-                            </dropdown.item>
-                          </li>
-                        {{/each}}
-                      </ul>
-                    </li>
-                  {{/each}}
-                </ul>
-              </li>
-            {{/each}}
-          </ul>
-        </Rose::Dropdown>
-      </form.radioGroup>
-    </fieldset>
-    <br />
-  {{/unless}}
   {{#if (can 'save model' @model)}}
     <form.actions
       @enableEditText={{t 'actions.edit-form'}}
diff --git a/ui/admin/app/components/form/role/index.js b/ui/admin/app/components/form/role/index.js
deleted file mode 100644
index 31987ef40..000000000
--- a/ui/admin/app/components/form/role/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-
-export default class FormRoleGrantsComponent extends Component {
-  // =actions
-
-  @action
-  updateGrantScopeID(id) {
-    // TODO: all grant_scope_id instances will be removed in future PR
-    this.args.model.grant_scope_id = id;
-    this.args.model.grant_scope_ids = [id];
-  }
-}
diff --git a/ui/admin/app/routes/onboarding.js b/ui/admin/app/routes/onboarding.js
index 913540d56..1d6eb39fd 100644
--- a/ui/admin/app/routes/onboarding.js
+++ b/ui/admin/app/routes/onboarding.js
@@ -132,8 +132,6 @@ export default class OnboardingRoute extends Route {
 
   async createGrants(org, project, target, role) {
     role.scopeID = org.id;
-    // TODO: all grant_scope_id instances will be removed in future PR
-    role.grant_scope_id = project.id;
     role.grant_scope_ids = [project.id];
     try {
       await role.save();