From f7c80c88697661ec510f307bf66dc5cd1b7fd51e Mon Sep 17 00:00:00 2001 From: Cameron Perera Date: Wed, 11 Jan 2023 15:46:47 -0600 Subject: [PATCH] UI target worker filter deprecation message (#1574) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 🎸 Add worker_filter deprecation message to target form * test: 💍 fix test selectors for worker_filter message --- addons/core/translations/resources/en-us.yaml | 6 ++ .../components/form/target/details/index.hbs | 91 ++++++++++++++----- .../components/form/target/details/index.js | 8 ++ ui/admin/app/styles/app.scss | 12 +++ .../tests/acceptance/targets/create-test.js | 2 + .../tests/acceptance/targets/read-test.js | 55 +++++++++++ .../tests/acceptance/targets/update-test.js | 28 ++++++ 7 files changed, 180 insertions(+), 22 deletions(-) diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index eacbb9877..a997fc77a 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -353,6 +353,12 @@ target: add: title: Add Injected Application Credential Sources description: Select injected Application credential sources to assign to this target. + workers: + title: Workers + description: Optional. You can customize how your workers route traffic to this target by setting up a filter that matches specific worker tags. If your target is in a private network, we recommend setting up an egress filter to specify a worker inside the network so that Boundary can access the host. Ingress and egress filters are allowed to select the same worker. + deprecation_message: + title: Worker filters have been updated + description: This target is configured using an older version of worker filters. You can update to the new filters but this will also update this field in the Boundary API. We will continue to use this filter until you update. credential-store: title: Credential Store title_plural: Credential Stores diff --git a/ui/admin/app/components/form/target/details/index.hbs b/ui/admin/app/components/form/target/details/index.hbs index 454224518..1dbaa3d25 100644 --- a/ui/admin/app/components/form/target/details/index.hbs +++ b/ui/admin/app/components/form/target/details/index.hbs @@ -125,28 +125,6 @@ {{/if}} - - {{t 'form.worker_filter.label'}} - {{t 'form.worker_filter.help'}} - {{#if @model.errors.worker_filter}} - - {{#each @model.errors.worker_filter as |error|}} - {{error.message}} - {{/each}} - - {{/if}} - - + {{#if (feature-flag 'target-worker-filters-v2')}} + + {{t 'resources.target.workers.title'}} + {{t 'resources.target.workers.description'}} + {{#if this.showDeprecationMessage}} + + + {{t + 'resources.target.workers.deprecation_message.title' + }} + {{t + 'resources.target.workers.deprecation_message.description' + }} + + + {{/if}} + + + {{t 'form.worker_filter.label'}} + {{t 'form.worker_filter.help'}} + {{#if @model.errors.worker_filter}} + + {{#each @model.errors.worker_filter as |error|}} + {{error.message}} + {{/each}} + + {{/if}} + + + + {{else}} + + {{t 'form.worker_filter.label'}} + {{t 'form.worker_filter.help'}} + {{#if @model.errors.worker_filter}} + + {{#each @model.errors.worker_filter as |error|}} + {{error.message}} + {{/each}} + + {{/if}} + + {{/if}} + {{#if (can 'save model' @model)}}