From eca4a225a03dabdf66edf661814142f1939162ce Mon Sep 17 00:00:00 2001 From: Kenia <19161242+kaxcode@users.noreply.github.com> Date: Wed, 11 Aug 2021 13:00:32 -0400 Subject: [PATCH] ui: Split up the socket mode from the socket path (#10581) --- .changelog/10581.txt | 3 +++ .../consul/upstream-instance/list/index.hbs | 26 +++++++------------ .../consul/upstream-instance/list/index.scss | 5 +++- 3 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 .changelog/10581.txt diff --git a/.changelog/10581.txt b/.changelog/10581.txt new file mode 100644 index 000000000..574945a52 --- /dev/null +++ b/.changelog/10581.txt @@ -0,0 +1,3 @@ +```release-note:feature +ui: Splitting up the socket mode and socket path in the Upstreams Instance List +``` \ No newline at end of file diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs index df4d2391c..0f9737699 100644 --- a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs @@ -38,32 +38,24 @@ {{/if}} {{#if item.LocalBindSocketPath}} -{{#let (if item.LocalBindSocketMode - (hash - label=(concat '(Local bind mode)') - value=(concat '(Mode:' item.LocalBindSocketMode ')') - ) - (hash - label="" - value="" - ) - ) -as |mode|}} -
+
- - Local bind socket {{mode.label}} - + Local bind socket path
{{item.LocalBindSocketPath}}
-{{/let}} +
+
mode
+
+ {{or item.LocalBindSocketMode '-'}} +
+
{{else}} {{#if (gt item.LocalBindPort 0)}} {{#let (concat (or item.LocalBindAddress '127.0.0.1') ':' item.LocalBindPort) as |combinedAddress|}} diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss index ea1017138..63f2ecf79 100644 --- a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss +++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss @@ -3,7 +3,7 @@ @extend %composite-row; } dl { - @extend %icon-definition; + @extend %horizontal-kv-list; } dl.datacenter dt::before { @extend %with-user-organization-mask, %as-pseudo; @@ -11,4 +11,7 @@ dl.nspace dt::before { @extend %with-folder-outline-mask, %as-pseudo; } + dl.local-bind-mode dt { + font-weight: $typo-weight-semibold; + } }