Browse Source

ui: Split up the socket mode from the socket path (#10581)

pull/10832/head
Kenia 3 years ago committed by GitHub
parent
commit
ab6a675209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      .changelog/10581.txt
  2. 26
      ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs
  3. 5
      ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss

3
.changelog/10581.txt

@ -0,0 +1,3 @@
```release-note:feature
ui: Splitting up the socket mode and socket path in the Upstreams Instance List
```

26
ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs

@ -38,32 +38,24 @@
</dl> </dl>
{{/if}} {{/if}}
{{#if item.LocalBindSocketPath}} {{#if item.LocalBindSocketPath}}
{{#let (if item.LocalBindSocketMode <dl>
(hash
label=(concat '(Local bind mode)')
value=(concat '(Mode:' item.LocalBindSocketMode ')')
)
(hash
label=""
value=""
)
)
as |mode|}}
<dl class="local-bind-socket">
<dt> <dt>
<span> Local bind socket path
Local bind socket {{mode.label}}
</span>
</dt> </dt>
<dd> <dd>
<CopyButton <CopyButton
@value={{item.LocalBindSocketPath}} @value={{item.LocalBindSocketPath}}
@name="Socket path" @name="Local bind socket path"
/> />
{{item.LocalBindSocketPath}} {{item.LocalBindSocketPath}}
</dd> </dd>
</dl> </dl>
{{/let}} <dl class="local-bind-mode">
<dt class>mode</dt>
<dd>
{{or item.LocalBindSocketMode '-'}}
</dd>
</dl>
{{else}} {{else}}
{{#if (gt item.LocalBindPort 0)}} {{#if (gt item.LocalBindPort 0)}}
{{#let (concat (or item.LocalBindAddress '127.0.0.1') ':' item.LocalBindPort) as |combinedAddress|}} {{#let (concat (or item.LocalBindAddress '127.0.0.1') ':' item.LocalBindPort) as |combinedAddress|}}

5
ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss

@ -3,7 +3,7 @@
@extend %composite-row; @extend %composite-row;
} }
dl { dl {
@extend %icon-definition; @extend %horizontal-kv-list;
} }
dl.datacenter dt::before { dl.datacenter dt::before {
@extend %with-user-organization-mask, %as-pseudo; @extend %with-user-organization-mask, %as-pseudo;
@ -11,4 +11,7 @@
dl.nspace dt::before { dl.nspace dt::before {
@extend %with-folder-outline-mask, %as-pseudo; @extend %with-folder-outline-mask, %as-pseudo;
} }
dl.local-bind-mode dt {
font-weight: $typo-weight-semibold;
}
} }

Loading…
Cancel
Save