From ce9a4ae9b2d8cc91cb5acaafdb95aabb791cb2b0 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 5 Jan 2021 17:41:02 -0500
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20new=20auth=20method?=
 =?UTF-8?q?=20route=20must=20be=20reached=20with=20a=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addon/components/rose/dropdown/link/index.hbs  |  2 ++
 ui/admin/app/components/form/auth-method/index.hbs | 12 +++++++-----
 .../controllers/scopes/scope/auth-methods/new.js   |  2 ++
 .../app/routes/scopes/scope/auth-methods/new.js    | 12 ++++++++++--
 .../templates/scopes/scope/auth-methods/index.hbs  | 14 +++++++++++---
 ui/admin/tests/acceptance/auth-methods-test.js     |  2 +-
 6 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/addons/rose/addon/components/rose/dropdown/link/index.hbs b/addons/rose/addon/components/rose/dropdown/link/index.hbs
index 0213454f6..f4c2623f8 100644
--- a/addons/rose/addon/components/rose/dropdown/link/index.hbs
+++ b/addons/rose/addon/components/rose/dropdown/link/index.hbs
@@ -2,6 +2,7 @@
   <LinkTo
     ...attributes
     @route={{@route}}
+    @query={{@query}}
     @model={{@model}}
     class="rose-dropdown-link {{if  @style (concat "rose-dropdown-link-" @style)}}"
   >
@@ -11,6 +12,7 @@
   <LinkTo
     ...attributes
     @route={{@route}}
+    @query={{@query}}
     class="rose-dropdown-link {{if  @style (concat "rose-dropdown-link-" @style)}}"
   >
     {{yield}}
diff --git a/ui/admin/app/components/form/auth-method/index.hbs b/ui/admin/app/components/form/auth-method/index.hbs
index e5fa05828..907940056 100644
--- a/ui/admin/app/components/form/auth-method/index.hbs
+++ b/ui/admin/app/components/form/auth-method/index.hbs
@@ -1,5 +1,7 @@
-{{component (concat "form/auth-method/" @model.type)
-  model=@model
-  submit=@submit
-  cancel=@cancel
-}}
+{{#if @model.type}}
+  {{component (concat "form/auth-method/" @model.type)
+    model=@model
+    submit=@submit
+    cancel=@cancel
+  }}
+{{/if}}
diff --git a/ui/admin/app/controllers/scopes/scope/auth-methods/new.js b/ui/admin/app/controllers/scopes/scope/auth-methods/new.js
index ba550f456..4e562ae91 100644
--- a/ui/admin/app/controllers/scopes/scope/auth-methods/new.js
+++ b/ui/admin/app/controllers/scopes/scope/auth-methods/new.js
@@ -8,6 +8,8 @@ export default class ScopesScopeAuthMethodsNewController extends Controller {
 
   // =attributes
 
+  queryParams = ['type'];
+
   /**
    * Translated new auth-method breadcrumb
    * @type {string}
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/new.js b/ui/admin/app/routes/scopes/scope/auth-methods/new.js
index dca9fcbdb..04ab0aacf 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/new.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/new.js
@@ -1,17 +1,25 @@
 import Route from '@ember/routing/route';
 
 export default class ScopesScopeAuthMethodsNewRoute extends Route {
+  // =attributes
+
+  queryParams = {
+    type: {
+      refreshModel: true
+    }
+  };
+
   // =methods
 
   /**
    * Create a new unsaved auth-method.
    * @return {AuthMethodModel}
    */
-  model() {
+  model(params) {
     const scopeModel = this.modelFor('scopes.scope');
     return this.store.createRecord('auth-method', {
       scopeModel,
-      type: 'password',
+      type: params.type,
     });
   }
 }
diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
index a796c66f5..0d10df1b5 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -13,9 +13,17 @@
 
   <page.actions>
     {{#if @model}}
-      <Rose::LinkButton @route="scopes.scope.auth-methods.new" @style="primary">
-        {{t "titles.new"}}
-      </Rose::LinkButton>
+      <Rose::Dropdown
+        @text={{t "titles.new"}}
+        @dropdownRight={{true}}
+      as |dropdown|>
+        <dropdown.link
+          @route="scopes.scope.auth-methods.new"
+          @query={{hash type="password"}}
+        >
+          {{t 'resources.auth-method.types.password'}}
+        </dropdown.link>
+      </Rose::Dropdown>
     {{/if}}
   </page.actions>
 
diff --git a/ui/admin/tests/acceptance/auth-methods-test.js b/ui/admin/tests/acceptance/auth-methods-test.js
index b6d4bd912..bdc509df2 100644
--- a/ui/admin/tests/acceptance/auth-methods-test.js
+++ b/ui/admin/tests/acceptance/auth-methods-test.js
@@ -44,7 +44,7 @@ module('Acceptance | auth methods', function (hooks) {
     // Generate route URLs for resources
     urls.orgScope = `/scopes/${instances.scopes.org.id}`;
     urls.authMethods = `${urls.orgScope}/auth-methods`;
-    urls.newAuthMethod = `${urls.authMethods}/new`;
+    urls.newAuthMethod = `${urls.authMethods}/new?type=password`;
     urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`;
   });