From f8bb37e5af82b44ea4f1c55e9e3123375c1a7f90 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 9 Nov 2021 11:16:21 -0800 Subject: [PATCH] Add managed groups to auth method JUST if is type oidc. Within auth method, show the managed groups tabs JUST if type is oidc --- addons/api/mirage/factories/auth-method.js | 4 +++- addons/api/mirage/scenarios/default.js | 2 +- .../scope/auth-methods/auth-method/-navigation.hbs | 10 ++++++---- .../scopes/scope/auth-methods/auth-method/index.hbs | 3 ++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/addons/api/mirage/factories/auth-method.js b/addons/api/mirage/factories/auth-method.js index 051ea096f..755154b09 100644 --- a/addons/api/mirage/factories/auth-method.js +++ b/addons/api/mirage/factories/auth-method.js @@ -34,7 +34,9 @@ export default factory.extend({ user.update({ accountIds: [id] }); }); - server.createList('managed-group', 2, { scope, authMethod }); + if (type === 'oidc') { + server.createList('managed-group', 2, { scope, authMethod }); + } }, }), }); diff --git a/addons/api/mirage/scenarios/default.js b/addons/api/mirage/scenarios/default.js index 9291f8a3e..965234b5d 100644 --- a/addons/api/mirage/scenarios/default.js +++ b/addons/api/mirage/scenarios/default.js @@ -22,7 +22,7 @@ export default function (server) { // Auth const globalAuthMethods = server.createList( 'auth-method', - 1, + 4, { scope: globalScope }, 'withAccountsAndUsersAndManagedGroups' ); diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs index d13958255..40b38d901 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs @@ -10,8 +10,10 @@ {{/if}} {{#if (feature-flag 'managed-groups')}} - - {{t 'resources.managed-group.title_plural'}} - + {{#if @model.isOIDC}} + + {{t 'resources.managed-group.title_plural'}} + + {{/if}} {{/if}} - \ No newline at end of file + diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs index e3302df0b..52639ddc0 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs @@ -1,3 +1,4 @@ +

{{@model.type}}

\ No newline at end of file +/>