From 22131864f888c10436f0411ac40dbc95da392daa Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 25 Mar 2021 12:48:38 -0400 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20primary=20badge=20?= =?UTF-8?q?to=20auth=20methods=20UI=20(listing/form)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/translations/states/en-us.yaml | 1 + .../addon/styles/rose/components/_badge.scss | 6 +++++ .../auth-methods/auth-method/-header.hbs | 7 +++++ .../scopes/scope/auth-methods/index.hbs | 8 ++++++ yarn.lock | 27 ++++--------------- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/addons/core/translations/states/en-us.yaml b/addons/core/translations/states/en-us.yaml index db8c30478..aa8e846bd 100644 --- a/addons/core/translations/states/en-us.yaml +++ b/addons/core/translations/states/en-us.yaml @@ -7,3 +7,4 @@ copied: Copied connection: success: description: "Local proxy address ({protocol}): {address}:{port}" +primary: Primary diff --git a/addons/rose/addon/styles/rose/components/_badge.scss b/addons/rose/addon/styles/rose/components/_badge.scss index 6637559db..cb3e8b7a8 100644 --- a/addons/rose/addon/styles/rose/components/_badge.scss +++ b/addons/rose/addon/styles/rose/components/_badge.scss @@ -19,6 +19,7 @@ &.rose-badge-outline { --border-color: var(--ui-gray-starker-1); + --background-color: none; } &.rose-badge-dark { @@ -40,6 +41,7 @@ &.rose-badge-informational-outline { --color: var(--info-starker-1); --border-color: var(--info-starker-1); + --background-color: none; } &.rose-badge-alert { @@ -50,6 +52,7 @@ &.rose-badge-alert-outline { --color: var(--alert-starker-1); --border-color: var(--alert-starker-1); + --background-color: none; } &.rose-badge-error { @@ -60,6 +63,7 @@ &.rose-badge-error-outline { --color: var(--failure-starker-1); --border-color: var(--failure-starker-1); + --background-color: none; } &.rose-badge-success { @@ -70,6 +74,7 @@ &.rose-badge-success-outline { --color: var(--success-starker-1); --border-color: var(--success-starker-1); + --background-color: none; } &.rose-badge-warning { @@ -80,5 +85,6 @@ &.rose-badge-warning-outline { --color: var(--warning-starker-1); --border-color: var(--warning-starker-1); + --background-color: none; } } diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs index 080012f3b..bdb83f5bc 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs @@ -1,5 +1,12 @@

{{t "resources.auth-method.title"}} + {{#if @model.isPrimary}} +   + + {{t 'states.primary'}} + +   + {{/if}}

{{t "resources.auth-method.description"}}

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 e0c150dfa..c8d9c3ea9 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -36,6 +36,7 @@ {{t 'form.name.label'}} {{t 'form.type.label'}} {{t 'form.id.label'}} + @@ -65,6 +66,13 @@ {{authMethod.id}} + + {{#if authMethod.isPrimary}} + + {{t 'states.primary'}} + + {{/if}} + {{/each}} diff --git a/yarn.lock b/yarn.lock index aeaef9f2a..3dec64ee6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7795,7 +7795,7 @@ debug@~4.1.0: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -12679,7 +12679,7 @@ import-lazy@^4.0.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -14362,11 +14362,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -14375,16 +14370,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*, lodash._bindcallback@^3.0.0: +lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -14394,19 +14384,12 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: +lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= @@ -14619,7 +14602,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@*, lodash.restparam@^3.0.0: +lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=