CyberCoveLLC/threshold-ui
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #68 from hashicorp/oss/merge-main-2d1ed7b8bde405fafd9aaa104e00f2263d094223

Browse Source 
[main] OSS to ENT merge of (2d1ed7b)
This commit is contained in:
hc-github-team-secure-boundary authored and GitHub committed 2023-02-15 14:40:27 -05:00
2 parents eea5844691 876e6c9fae
commit cb7a7624e8
6 files changed
+82 -88
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ui/admin/app/components/ordered-series-diagram/index.hbs
+8 -10
View File
@@ -1,10 +1,8 @@
<div class='worker-wrapper'>
<ol ...attributes class='ordered-series-diagram'>
{{yield
(hash
Item=(component 'ordered-series-diagram/item')
Group=(component 'ordered-series-diagram/group')
)
}}
</ol>
</div>
<ol class='ordered-series-diagram' ...attributes>
{{yield
(hash
Item=(component 'ordered-series-diagram/item')
Group=(component 'ordered-series-diagram/group')
)
}}
</ol>
ui/admin/app/components/worker-diagram/dual-filter/hcp/index.hbs
+20 -22
View File
@@ -18,13 +18,11 @@
</D.Item>
</D.Group>
</OrderedSeriesDiagram>
<div class='worker-diagram-explainer'>
<Hds::Form::HelperText>
{{t
'resources.target.workers.filter-explainer.dual-egress-on-ingress-on'
}}
</Hds::Form::HelperText>
</div>
<p
class='hds-foreground-faint hds-typography-body-100 hds-font-weight-regular'
>
{{t 'resources.target.workers.filter-explainer.dual-egress-on-ingress-on'}}
</p>
{{else if @ingressWorkerFilterEnabled}}
<OrderedSeriesDiagram data-test-dual-filter-hcp-egress-off-ingress-on as |D|>
<D.Item @icon='user'>
@@ -37,11 +35,11 @@
{{t 'resources.target.workers.diagram.host'}}
</D.Item>
</OrderedSeriesDiagram>
<div class='worker-diagram-explainer'>
<Hds::Form::HelperText>
{{t 'resources.target.workers.filter-explainer.ingress-worker'}}
</Hds::Form::HelperText>
</div>
<p
class='hds-foreground-faint hds-typography-body-100 hds-font-weight-regular'
>
{{t 'resources.target.workers.filter-explainer.ingress-worker'}}
</p>
{{else if @egressWorkerFilterEnabled}}
<OrderedSeriesDiagram data-test-dual-filter-hcp-egress-on-ingress-off as |D|>
<D.Item @icon='user'>
@@ -66,11 +64,11 @@
</D.Item>
</D.Group>
</OrderedSeriesDiagram>
<div class='worker-diagram-explainer'>
<Hds::Form::HelperText>
{{t 'resources.target.workers.filter-explainer.hcp-dual-egress-on'}}
</Hds::Form::HelperText>
</div>
<p
class='hds-foreground-faint hds-typography-body-100 hds-font-weight-regular'
>
{{t 'resources.target.workers.filter-explainer.hcp-dual-egress-on'}}
</p>
{{else}}
<OrderedSeriesDiagram data-test-dual-filter-hcp-egress-off-ingress-off as |D|>
<D.Item @icon='user'>
@@ -83,9 +81,9 @@
{{t 'resources.target.workers.diagram.host'}}
</D.Item>
</OrderedSeriesDiagram>
<div class='worker-diagram-explainer'>
<Hds::Form::HelperText>
{{t 'resources.target.workers.filter-explainer.hcp-worker'}}
</Hds::Form::HelperText>
</div>
<p
class='hds-foreground-faint hds-typography-body-100 hds-font-weight-regular'
>
{{t 'resources.target.workers.filter-explainer.hcp-worker'}}
</p>
{{/if}}
ui/admin/app/components/worker-diagram/dual-filter/index.hbs
+20 -22
View File
@@ -18,13 +18,11 @@
</D.Item>
</D.Group>
</OrderedSeriesDiagram>
<div class='worker-diagram-explainer'>
<Hds::Form::HelperText>
{{t
'resources.target.workers.filter-explainer.dual-egress-on-ingress-on'
}}
</Hds::Form::HelperText>
</div>
<p
class='hds-foreground-faint hds-typography-body-100 hds-font-weight-regular'
>
{{t 'resources.target.workers.filter-explainer.dual-egress-on-ingress-on'}}
</p>
{{else if @ingressWorkerFilterEnabled}}
<OrderedSeriesDiagram data-test-dual-filter-egress-off-ingress-on as |D|>
<D.Item @icon='user'>
@@ -37,11 +35,11 @@
{{t 'resources.target.workers.diagram.host'}}
</D.Item>
</OrderedSeriesDiagram>
<div class='worker-diagram-explainer'>
<Hds::Form::HelperText>
{{t 'resources.target.workers.filter-explainer.ingress-worker'}}
</Hds::Form::HelperText>
</div>
<p
class='hds-foreground-faint hds-typography-body-100 hds-font-weight-regular'
>
{{t 'resources.target.workers.filter-explainer.ingress-worker'}}
</p>
{{else if @egressWorkerFilterEnabled}}
<OrderedSeriesDiagram data-test-dual-filter-egress-on-ingress-off as |D|>
<D.Item @icon='user'>
@@ -62,11 +60,11 @@
</D.Item>
</D.Group>
</OrderedSeriesDiagram>
<div class='worker-diagram-explainer'>
<Hds::Form::HelperText>
{{t 'resources.target.workers.filter-explainer.dual-egress-on'}}
</Hds::Form::HelperText>
</div>
<p
class='hds-foreground-faint hds-typography-body-100 hds-font-weight-regular'
>
{{t 'resources.target.workers.filter-explainer.dual-egress-on'}}
</p>
{{else}}
<OrderedSeriesDiagram data-test-dual-filter-egress-off-ingress-off as |D|>
<D.Item @icon='user'>
@@ -79,9 +77,9 @@
{{t 'resources.target.workers.diagram.host'}}
</D.Item>
</OrderedSeriesDiagram>
<div class='worker-diagram-explainer'>
<Hds::Form::HelperText>
{{t 'resources.target.workers.filter-explainer.any-worker'}}
</Hds::Form::HelperText>
</div>
<p
class='hds-foreground-faint hds-typography-body-100 hds-font-weight-regular'
>
{{t 'resources.target.workers.filter-explainer.any-worker'}}
</p>
{{/if}}
ui/admin/app/components/worker-diagram/index.hbs
+15 -13
View File
@@ -1,17 +1,19 @@
{{#if (feature-flag 'target-worker-filters-v2-ingress')}}
{{#if (feature-flag 'target-worker-filters-v2-hcp')}}
<WorkerDiagram::DualFilter::Hcp
@egressWorkerFilterEnabled={{@egressWorkerFilterEnabled}}
@ingressWorkerFilterEnabled={{@ingressWorkerFilterEnabled}}
/>
<div class='worker-diagram'>
{{#if (feature-flag 'target-worker-filters-v2-ingress')}}
{{#if (feature-flag 'target-worker-filters-v2-hcp')}}
<WorkerDiagram::DualFilter::Hcp
@egressWorkerFilterEnabled={{@egressWorkerFilterEnabled}}
@ingressWorkerFilterEnabled={{@ingressWorkerFilterEnabled}}
/>
{{else}}
<WorkerDiagram::DualFilter
@egressWorkerFilterEnabled={{@egressWorkerFilterEnabled}}
@ingressWorkerFilterEnabled={{@ingressWorkerFilterEnabled}}
/>
{{/if}}
{{else}}
<WorkerDiagram::DualFilter
<WorkerDiagram::SingleFilter
@egressWorkerFilterEnabled={{@egressWorkerFilterEnabled}}
@ingressWorkerFilterEnabled={{@ingressWorkerFilterEnabled}}
/>
{{/if}}
{{else}}
<WorkerDiagram::SingleFilter
@egressWorkerFilterEnabled={{@egressWorkerFilterEnabled}}
/>
{{/if}}
</div>
ui/admin/app/components/worker-diagram/single-filter/index.hbs
+10 -10
View File
@@ -15,11 +15,11 @@
</D.Item>
</D.Group>
</OrderedSeriesDiagram>
<div class='worker-diagram-explainer'>
<Hds::Form::HelperText>
{{t 'resources.target.workers.filter-explainer.egress-worker'}}
</Hds::Form::HelperText>
</div>
<p
class='hds-foreground-faint hds-typography-body-100 hds-font-weight-regular'
>
{{t 'resources.target.workers.filter-explainer.egress-worker'}}
</p>
{{else}}
<OrderedSeriesDiagram data-test-single-filter-egress-off as |D|>
<D.Item @icon='user'>
@@ -32,9 +32,9 @@
{{t 'resources.target.workers.diagram.host'}}
</D.Item>
</OrderedSeriesDiagram>
<div class='worker-diagram-explainer'>
<Hds::Form::HelperText>
{{t 'resources.target.workers.filter-explainer.any-worker'}}
</Hds::Form::HelperText>
</div>
<p
class='hds-foreground-faint hds-typography-body-100 hds-font-weight-regular'
>
{{t 'resources.target.workers.filter-explainer.any-worker'}}
</p>
{{/if}}
ui/admin/app/styles/app.scss
+9 -11
View File
@@ -559,8 +559,6 @@
}
&-group {
display: flex;
&-content {
border-radius: 0.5rem;
padding: 0 0.75rem 0.75rem;
@@ -600,6 +598,10 @@
.hds-form-legend {
font-size: sizing.rems(l) - sizing.rems(xxs); // 20
+ .hds-form-helper-text {
margin-bottom: 1rem;
}
}
.hds-alert {
@@ -626,16 +628,12 @@
}
}
.worker-diagram-explainer {
min-height: 4rem; // 1
}
.worker-diagram {
min-height: 15rem;
.worker-wrapper {
display: flex;
align-items: center;
min-height: 11rem;
margin-top: sizing.rems(xs) - sizing.rems(xxxxs); // 10
width: 100%;
.ordered-series-diagram {
min-height: 10rem;
}
}
}