From ab1a642f6637f0e2504ba86fc323eb76c70b85d8 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 31 Aug 2021 10:56:54 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20show=20dropdown=20link?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../routes/scopes/scope/auth-methods/index.js | 5 +++ .../scopes/scope/auth-methods/index.hbs | 40 +++++++++---------- ui/admin/jsconfig.json | 1 + .../acceptance/auth-methods/list-test.js | 2 +- 4 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 ui/admin/jsconfig.json diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/index.js b/ui/admin/app/routes/scopes/scope/auth-methods/index.js index 913b4f8ff..0d727524a 100644 --- a/ui/admin/app/routes/scopes/scope/auth-methods/index.js +++ b/ui/admin/app/routes/scopes/scope/auth-methods/index.js @@ -12,4 +12,9 @@ export default class ScopesScopeAuthMethodsIndexRoute extends Route { const scopeModel = this.modelFor('scopes.scope'); controller.scopeModel = scopeModel; } + // setupController(controller) { + // const scope = this.modelFor('scopes.scope'); + // super.setupController(...arguments); + // controller.setProperties({ scope }); + // } } 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 a795d6449..566c844e8 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -13,28 +13,26 @@ - {{#if @model}} - {{#if (can 'create collection' this.scope collection='auth-methods')}} - {{#if @model}} - + - - {{t 'resources.auth-method.types.password'}} - - - {{t 'resources.auth-method.types.oidc'}} - - - {{/if}} + {{t 'resources.auth-method.types.password'}} + + + {{t 'resources.auth-method.types.oidc'}} + + {{/if}} {{/if}} diff --git a/ui/admin/jsconfig.json b/ui/admin/jsconfig.json new file mode 100644 index 000000000..f408cac8c --- /dev/null +++ b/ui/admin/jsconfig.json @@ -0,0 +1 @@ +{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]} \ No newline at end of file diff --git a/ui/admin/tests/acceptance/auth-methods/list-test.js b/ui/admin/tests/acceptance/auth-methods/list-test.js index bd9a8dfcd..1dbe3f23f 100644 --- a/ui/admin/tests/acceptance/auth-methods/list-test.js +++ b/ui/admin/tests/acceptance/auth-methods/list-test.js @@ -53,7 +53,7 @@ module('Acceptance | auth-methods | list', function (hooks) { authenticateSession({}); }); - test('can navigate to users with proper authorization', async function (assert) { + test('can navigate to auth methods with proper authorization', async function (assert) { assert.expect(2); await visit(orgURL); assert.ok(