From 5020d97e2c25f069fa1ac7dc5c1e26fb43cce1e7 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Thu, 5 Nov 2020 09:38:37 -0500
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20do=20not=20show=20grant?=
 =?UTF-8?q?=20scope=20field=20in=20new=20role=20form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/core/app/components/form/role/index.hbs | 110 +++++++++++----------
 ui/core/app/components/form/role/index.js  |   6 +-
 ui/core/mirage/serializers/role.js         |   4 +
 3 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/ui/core/app/components/form/role/index.hbs b/ui/core/app/components/form/role/index.hbs
index 0a87cde78..2530f4dbb 100644
--- a/ui/core/app/components/form/role/index.hbs
+++ b/ui/core/app/components/form/role/index.hbs
@@ -44,60 +44,62 @@
     {{/if}}
   </form.textarea>
 
-  <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}} as |radioGroup|>
-      <Rose::Dropdown
-        @text={{this.selectedGrantScope.displayName}}
-        @icon={{if this.selectedGrantScope.isProject "app-icons/project" (if this.selectedGrantScope.isOrg "app-icons/org" "app-icons/global")}}
-      as |dropdown|>
-        <ul>
-          {{#each @grantScopes as |grantScope|}}
-            <li>
-              <dropdown.item>
-                <radioGroup.radio
-                  @label={{grantScope.model.displayName}}
-                  @value={{grantScope.model.id}}
-                  @icon={{if grantScope.model.isOrg "app-icons/org" (if grantScope.model.isGlobal "app-icons/global")}}
-                />
-              </dropdown.item>
-              <ul class="indent-label-1">
-                {{#each grantScope.subScopes as |subScope|}}
-                  <li>
-                    <dropdown.item>
-                      <radioGroup.radio
-                        @label={{subScope.model.displayName}}
-                        @value={{subScope.model.id}}
-                        @icon={{unless subScope.model.isProject "app-icons/org"}}
-                      />
-                    </dropdown.item>
-                    <ul class="indent-label-2">
-                      {{#each subScope.subScopes as |subSubScope|}}
-                        <li>
-                          <dropdown.item>
-                            <radioGroup.radio
-                              @label={{subSubScope.displayName}}
-                              @value={{subSubScope.id}}
-                            />
-                          </dropdown.item>
-                        </li>
-                      {{/each}}
-                    </ul>
-                  </li>
-                {{/each}}
-              </ul>
-            </li>
-          {{/each}}
-        </ul>
-      </Rose::Dropdown>
-    </form.radioGroup>
-  </fieldset>
+  {{#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}} as |radioGroup|>
+        <Rose::Dropdown
+          @text={{this.selectedGrantScope.displayName}}
+          @icon={{if this.selectedGrantScope.isProject "app-icons/project" (if this.selectedGrantScope.isOrg "app-icons/org" "app-icons/global")}}
+        as |dropdown|>
+          <ul>
+            {{#each @grantScopes as |grantScope|}}
+              <li>
+                <dropdown.item>
+                  <radioGroup.radio
+                    @label={{grantScope.model.displayName}}
+                    @value={{grantScope.model.id}}
+                    @icon={{if grantScope.model.isOrg "app-icons/org" (if grantScope.model.isGlobal "app-icons/global")}}
+                  />
+                </dropdown.item>
+                <ul class="indent-label-1">
+                  {{#each grantScope.subScopes as |subScope|}}
+                    <li>
+                      <dropdown.item>
+                        <radioGroup.radio
+                          @label={{subScope.model.displayName}}
+                          @value={{subScope.model.id}}
+                          @icon={{unless subScope.model.isProject "app-icons/org"}}
+                        />
+                      </dropdown.item>
+                      <ul class="indent-label-2">
+                        {{#each subScope.subScopes as |subSubScope|}}
+                          <li>
+                            <dropdown.item>
+                              <radioGroup.radio
+                                @label={{subSubScope.displayName}}
+                                @value={{subSubScope.id}}
+                              />
+                            </dropdown.item>
+                          </li>
+                        {{/each}}
+                      </ul>
+                    </li>
+                  {{/each}}
+                </ul>
+              </li>
+            {{/each}}
+          </ul>
+        </Rose::Dropdown>
+      </form.radioGroup>
+    </fieldset>
+  {{/unless}}
 
   <form.actions
     @disabled={{if @model.cannotSave @model.cannotSave}}
diff --git a/ui/core/app/components/form/role/index.js b/ui/core/app/components/form/role/index.js
index 198fbf97f..bf99e029b 100644
--- a/ui/core/app/components/form/role/index.js
+++ b/ui/core/app/components/form/role/index.js
@@ -10,9 +10,7 @@ export default class FormRoleGrantsComponent extends Component {
    */
   @computed('args.model.{store,grant_scope_id}')
   get selectedGrantScope() {
-    return this.args.model.grant_scope_id
-      ? this.args.model.store
-        .peekRecord('scope', this.args.model.grant_scope_id)
-      : null;
+    return this.args.model.store
+      .peekRecord('scope', this.args.model.grant_scope_id);
   }
 }
diff --git a/ui/core/mirage/serializers/role.js b/ui/core/mirage/serializers/role.js
index 06009a6f3..73dec3023 100644
--- a/ui/core/mirage/serializers/role.js
+++ b/ui/core/mirage/serializers/role.js
@@ -17,6 +17,10 @@ export default ApplicationSerializer.extend({
     }));
     json.principals = [ ...serializedUsers, ...serializedGroups ];
     if (!json.principals.length) delete json.principals;
+
+    // default grant scope
+    if (!json.grant_scope_id) json.grant_scope_id = json.scope.id;
+
     return json;
   }
 });