Skip to content

Commit

Permalink
Ember upgrade to 3.28.6 (#14763)
Browse files Browse the repository at this point in the history
* initial upgrade running ember-cli-update --to 3.28

* bumps node-sass version

* fragments bump

* fixes overriding errors prop on policy model causing issues

* bumps some addon versions related to Ember Global deprecation warning on build

* bumps back ember-test-selectors version for now

* removes ember-promise-helpers addon and creates await helper

* upgrades ember-template-lint and adds prettier plugin

* Ember 3.28 Upgrade Lint Fixes (#14890)

* fixes js lint errors

* fixes hbs lint errors

* allow multiple node versions for now to get tests runinng

* fixes tests

* Upgrade ember-test-selectors (#14937)

* updates ember-test-selectors, ember-cli-page-object and ember-cli-string-helpers

* adds attributeBindings to classic components with data-test property

* glimmerizes toolbar-link component and removes data-test args

* glimmerizes toolbar-secret-link and secret-link components and removes data-test and class args

* glimmerizes linked-block component

* glimmerizes toggle-button component

* updates toggle-button test

* fixes remaining test selector issues

* comments out test assertions related to cp-validations bug

* adds todo to comment

* Model Validations (#14991)

* adds model-validations decorator and validators util

* converts key-mixin to decorator

* updates models to use validations decorator instead of ember-cp-validations

* updates invocation of model validations

* removes ember-cp-validations

* reverts secret-v2 model updates

* adds initials to TODO comment

* flight-icons (#14993)

* flight-icons

* basic dropdown

* UI/merge main (#14997)

* Vault documentation: changing references from learn to tutorial (#14844)

* changed learn to tutorial references

* changed learn to tutorial

* Update website/content/docs/plugins/plugin-portal.mdx

Co-authored-by: Yoko Hyakuna <[email protected]>

* Update website/content/docs/platform/aws/run.mdx

Co-authored-by: Yoko Hyakuna <[email protected]>

Co-authored-by: Yoko Hyakuna <[email protected]>

* UI/Only show form values if have read access (#14794)

* only show value in edit form if has read capabilities

* revert messing with form

* delete secret data from secret

* add check for selected version

* remove added line

* add changelog

* modified text (#14854)

* fixed a link issue (#14850)

* docs: add known issue to 1.10 release notes (#14859)

* Vault 3999 Change permissions for directory/archive created by debug command  (#14846)

* adding debug changes from ent

* adding changelog

* Vault 3992 ToB Config and Plugins Permissions  (#14817)

* updating changes from ent PR

* adding changelog

* fixing err

* fixing semgrep error

* updated references from learn to tutorial (#14866)

* updated references from learn to tutorial (#14867)

* changed reference from learn to tutorial (#14868)

* Fix handling of default zero SignatureBits value with Any key type in PKI Secrets Engine (#14875)

* Correctly handle minimums, default SignatureBits

When using KeyType = "any" on a role (whether explicitly or implicitly
via a sign-verbatim like operation), we need to update the value of
SignatureBits from its new value 0 to a per-key-type default value. This
will allow sign operations on these paths to function correctly, having
the correctly inferred default signature bit length.

Additionally, this allows the computed default value for key type to be
used for minimum size validation in the RSA/ECDSA paths. We additionally
enforce the 2048-minimum in this case as well.

Signed-off-by: Alexander Scheel <[email protected]>

* Fix defaults and validation of "any" KeyType

When certutil is given the placeholder any keytype, it attempts to
validate and update the default zero value. However, in lacking a
default value for SignatureBits, it cannot update the value from the
zero value, thus causing validation to fail.

Add more awareness to the placeholder "any" value to certutil.

Signed-off-by: Alexander Scheel <[email protected]>

* Add role-based regression tests for key bits

This adds regression tests for Key Type, Key Bits, and Signature Bits
parameters on the role. We test several values, including the "any"
value to ensure it correctly restricts key sizes.

Signed-off-by: Alexander Scheel <[email protected]>

* Add sign-verbatim test for key type

This ensures that we test sign-verbatim against a variety of key types.

Signed-off-by: Alexander Scheel <[email protected]>

* Add changelog entry

Signed-off-by: Alexander Scheel <[email protected]>

Co-authored-by: Steven Clark <[email protected]>

* Subtle docs change for allow_store_key (#14889)

* Subtle docs change for allow_store_key

* errant space

* Adds Vault version prerelease and metadata to logical.PluginEnvironment (#14851)

* docs: fix formatting on plugin upgrade page (#14874)

* docs: fix formatting on plugin upgrade page

* fix more formatting issues

* Update CC docs (#14714)

* Update CC docs

* Add sample response

* Address review feedback

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Meggie <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: Loann Le <[email protected]>

* Minor edits

* Update partial month API

Co-authored-by: Loann Le <[email protected]>
Co-authored-by: Meggie <[email protected]>

* Docs improvements for Managed Keys (#14756)

* Add more color around managed keys in their concepts page, and create additional links between
the various docs pages related to them.

* Typos

* sdk/useragent: plugin version string consistent with Vault version string (#14912)

* clean up (#14911)

* website: fix usages of img tag  (#14910)

* fix usages of img tag and integrate dev-portal workflows

* Adjust Makefile

* remove mount_accessor from the docs (#14927)

* Add extra test coverage to PKI  (#14767)

* Add PKI test for delete role

 - Create a role, validate that defaults are what we expect
   and delete the role, verifying it is gone on subsequent read
   attempts.

* Add PKI test for crl/rotate command

 - Missing a unit test that validates the crl/rotate command works. The test validates the rotate command was successful
   by checking if we have a different/new update time on the CRL.

* Rework PKI TestBackend_PathFetchValidRaw test to not write directly to storage

 - Rework the existing test to not write directly to storage as we might change that in the future.
 - Add tests that validate the ca_chain behaviour of not returning the root authority cert

* PR Feedback

* Additional PR feedback

* Use WriteWithContext in auth helpers (#14775)

* Add ability to pass certificate PEM bytes to vault/api (#14753)

* Respect increment value in grace period calculations (api/LifetimeWatcher) (#14836)

* Mount flag syntax to mitigate confusion from KV-v2 path discrepancies (#14807)

* Add explanation to help text and flag usage text

* KV get with new mount flag

* Clearer naming

* KV Put, Patch, Metadata Get + corresponding tests

* KV Delete, Destroy, Rollback, Undelete, MetadataDelete, MetadataPatch, MetadataPut

* Update KV-v2 docs to use mount flag syntax

* Add changelog

* Run make fmt

* Clarify deprecation message in help string

* Address style comments

* Update vault-plugin-auth-gcp to newest pseudo-version (#14923)

* docs: added hello-vault-spring repo link to developer-qs.mdx. (#14928)

* Update developer-qs.mdx

docs: added link to Java / Spring Boot sample app repo in developer quick start.

* removed space.

* trigger ci

Co-authored-by: taoism4504 <[email protected]>

* OIDC Login Bug (#14916)

* fixes issue logging in with oidc from listed auth path tab

* adds changelog entry

* adds more tests for oidc auth workflow

* updates oidc auth method test to use non-standard path

* Fix handling of SignatureBits for ECDSA issuers (#14943)

When adding SignatureBits control logic, we incorrectly allowed
specification of SignatureBits in the case of an ECDSA issuer. As noted
in the original request, NIST and Mozilla (and others) are fairly
prescriptive in the choice of signatures (matching the size of the
NIST P-curve), and we shouldn't usually use a smaller (or worse, larger
and truncate!) hash.

Ignore the configuration of signature bits and always use autodetection
for ECDSA like ed25519.

Signed-off-by: Alexander Scheel <[email protected]>

* Bug Fix and Glimmerize secret-edit component (#14941)

* inital glimmerize

* wip

* wip

* wip

* fix maybeQueryRecord

* fix

* fix

* fix test

* cleanup

* add changelog

* clean up

* Agent error log level is mismatched (#14424)

* [VAULT-1618] Agent error log level is mismatched

`logLevelToStringPtr` translates `go-hclog`'s `ERROR` to `"ERROR"` for
Consul Template's runner, but that expects `ERR` and is quite strict
about it.

This will address hashicorp/vault-k8s#223
after it is set as the default image in `vault-k8s`.

I didn't find a simple way to test this other than starting up a full
server and agent and letting them run, which is unfortunately fairly
slow.

I confirmed that this addresses the original issue by modifying the helm
chart with the values in this commit and patching the log level to `err`.

* VAULT-1618 Add changelog/14424.txt

* VAULT-1618 Update changelog/14424.txt based on @kalafut suggestion

Co-authored-by: Jim Kalafut <[email protected]>

* VAULT-1618 Move cancel and server stop into defer in tests

* VAULT-1618 Triggering CircleCI tests

* VAULT-1618 Replace ioutil with os functions for agent template tests

Co-authored-by: Jim Kalafut <[email protected]>

* UI/Add months to activity serializer (#14942)

* add mock monthly data to mirage handler

* add months to serializer for activity response

* change selectors

Co-authored-by: Chelsea Shaw <[email protected]>

* clean up serializer

* please stop being flakey <3

Co-authored-by: Chelsea Shaw <[email protected]>

* Revert the WithContext changes to vault tests (#14947)

* adding env var (#14958)

* Fix dead link for JWT supported algorithms (#14953)

* Don't clone OutputCurlString value (#14968)

* Don't clone OutputCurlString value, add flag to docs

* Add changelog

* Ensure initialMmapSize is 0 on Windows (#14977)

* ensure initialMmapSize is 0 on windows

* add changelog

* Vault 3992 documentation changes (#14918)

* doc changes

* adding config changes

* adding chnages to plugins

* using include

* making doc changes

* adding newline

* aws auth displayName (#14954)

* set displayName to include RoleSessionName

* Add Windows error (#14982)

* Warnings indicating ignored and replaced parameters (#14962)

* Warnings indicating ignored and replaced parameters

* Avoid additional var creation

* Add warnings only if the response is non-nil

* Return the response even when error is non-nil

* Fix tests

* Rearrange comments

* Print warning in the log

* Fix another test

* Add CL

* Fix edit capabilities call in auth method (#14966)

* Fix edit capabilities call in auth method

- Capabilities call was not getting triggered correctly as apiPath
  method was missing the correct context.

* Added changelog

* make linting fix

Co-authored-by: Loann Le <[email protected]>
Co-authored-by: Yoko Hyakuna <[email protected]>
Co-authored-by: claire bontempo <[email protected]>
Co-authored-by: Austin Gebauer <[email protected]>
Co-authored-by: akshya96 <[email protected]>
Co-authored-by: Alexander Scheel <[email protected]>
Co-authored-by: Steven Clark <[email protected]>
Co-authored-by: Scott Miller <[email protected]>
Co-authored-by: John-Michael Faircloth <[email protected]>
Co-authored-by: Vishal Nayak <[email protected]>
Co-authored-by: Meggie <[email protected]>
Co-authored-by: Bryce Kalow <[email protected]>
Co-authored-by: Josh Black <[email protected]>
Co-authored-by: Anton Averchenkov <[email protected]>
Co-authored-by: VAL <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: mryan-hashi <[email protected]>
Co-authored-by: taoism4504 <[email protected]>
Co-authored-by: Jordan Reimer <[email protected]>
Co-authored-by: Christopher Swenson <[email protected]>
Co-authored-by: Jim Kalafut <[email protected]>
Co-authored-by: Chelsea Shaw <[email protected]>
Co-authored-by: Tom Proctor <[email protected]>
Co-authored-by: Jose Estrada <[email protected]>
Co-authored-by: Arnav Palnitkar <[email protected]>

* skips kmip tests with concurrency issues for now

* changelog

* skips another test

* Remove ModelWrap Component (#15001)

* removes ModelWrap component which was not working in Ember 3.28

* removes kmip test skips

* updates role controller class name

* adds annotations to model-validations file

* pr feedback

* lint fixes after main merge

Co-authored-by: Jordan Reimer <[email protected]>
Co-authored-by: Loann Le <[email protected]>
Co-authored-by: Yoko Hyakuna <[email protected]>
Co-authored-by: claire bontempo <[email protected]>
Co-authored-by: Austin Gebauer <[email protected]>
Co-authored-by: akshya96 <[email protected]>
Co-authored-by: Alexander Scheel <[email protected]>
Co-authored-by: Steven Clark <[email protected]>
Co-authored-by: Scott Miller <[email protected]>
Co-authored-by: John-Michael Faircloth <[email protected]>
Co-authored-by: Vishal Nayak <[email protected]>
Co-authored-by: Meggie <[email protected]>
Co-authored-by: Bryce Kalow <[email protected]>
Co-authored-by: Josh Black <[email protected]>
Co-authored-by: Anton Averchenkov <[email protected]>
Co-authored-by: VAL <[email protected]>
Co-authored-by: Robert <[email protected]>
Co-authored-by: mryan-hashi <[email protected]>
Co-authored-by: taoism4504 <[email protected]>
Co-authored-by: Christopher Swenson <[email protected]>
Co-authored-by: Jim Kalafut <[email protected]>
Co-authored-by: Chelsea Shaw <[email protected]>
Co-authored-by: Tom Proctor <[email protected]>
Co-authored-by: Jose Estrada <[email protected]>
Co-authored-by: Arnav Palnitkar <[email protected]>
  • Loading branch information
1 parent 17747dc commit 0b26b1a
Show file tree
Hide file tree
Showing 257 changed files with 3,297 additions and 2,064 deletions.
3 changes: 3 additions & 0 deletions changelog/14763.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:change
ui: Upgrade Ember to version 3.28
```
1 change: 1 addition & 0 deletions ui/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
Expand Down
24 changes: 14 additions & 10 deletions ui/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,15 @@ module.exports = {
// node files
{
files: [
'.eslintrc.js',
'.prettierrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js',
'scripts/start-vault.js',
'server/**/*.js',
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./lib/*/index.js',
'./server/**/*.js',
],
parserOptions: {
sourceType: 'script',
Expand All @@ -58,5 +57,10 @@ module.exports = {
'node/no-unpublished-require': 'off',
},
},
{
// Test files:
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
],
};
40 changes: 33 additions & 7 deletions ui/.template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,40 @@
'use strict';
const recommended = require('ember-template-lint/lib/config/recommended').rules; // octane extends recommended - no additions as of 3.14
const stylistic = require('ember-template-lint/lib/config/stylistic').rules;

const testOverrides = { ...recommended, ...stylistic };
for (const key in testOverrides) {
testOverrides[key] = false;
const fs = require('fs');
let testOverrides = {};
try {
// ember-template-lint no longer exports anything so we cannot access the rule definitions conventionally
// read file, convert to json string and parse
const toJSON = (str) => {
return JSON.parse(
str
.slice(str.indexOf(':') + 2) // get rid of export statement
.slice(0, -(str.length - str.lastIndexOf(','))) // remove trailing brackets from export
.replace(/:.*,/g, `: ${false},`) // convert values to false
.replace(/,([^,]*)$/, '$1') // remove last comma
.replace(/'/g, '"') // convert to double quotes
.replace(/(\w[^"].*[^"]):/g, '"$1":') // wrap quotes around single word keys
.trim()
);
};
const recommended = toJSON(
fs.readFileSync('node_modules/ember-template-lint/lib/config/recommended.js').toString()
);
const stylistic = toJSON(
fs.readFileSync('node_modules/ember-template-lint/lib/config/stylistic.js').toString()
);
testOverrides = {
...recommended,
...stylistic,
prettier: false,
};
} catch (error) {
console.log(error);
}

module.exports = {
extends: ['octane', 'stylistic'],
plugins: ['ember-template-lint-plugin-prettier'],
extends: ['recommended', 'ember-template-lint-plugin-prettier:recommended'],
rules: {
'no-bare-strings': 'off',
'no-action': 'off',
Expand All @@ -22,7 +48,7 @@ module.exports = {
},
ignore: ['lib/story-md', 'tests/**'],
// ember language server vscode extension does not currently respect the ignore field
// override all rules manually as workround to align with cli
// override all rules manually as workaround to align with cli
overrides: [
{
files: ['**/*-test.js'],
Expand Down
2 changes: 1 addition & 1 deletion ui/app/components/b64-toggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const B64 = 'base64';
const UTF8 = 'utf-8';
export default Component.extend({
tagName: 'button',
attributeBindings: ['type'],
attributeBindings: ['type', 'data-test-transit-b64-toggle'],
type: 'button',
classNames: ['button', 'b64-toggle'],
classNameBindings: ['isInput:is-input:is-textarea'],
Expand Down
1 change: 1 addition & 0 deletions ui/app/components/console/log-json.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ import Component from '@ember/component';

export default Component.extend({
'data-test-component': 'console/log-json',
attributeBindings: ['data-test-component'],
});
1 change: 1 addition & 0 deletions ui/app/components/console/log-text.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ import Component from '@ember/component';

export default Component.extend({
'data-test-component': 'console/log-text',
attributeBindings: ['data-test-component'],
});
1 change: 1 addition & 0 deletions ui/app/components/console/output-log.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ import Component from '@ember/component';

export default Component.extend({
'data-test-component': 'console/output-log',
attributeBindings: ['data-test-component'],
log: null,
});
1 change: 1 addition & 0 deletions ui/app/components/console/ui-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default Component.extend({
controlGroup: service(),
store: service(),
'data-test-component': 'console/ui-panel',
attributeBindings: ['data-test-component'],

classNames: 'console-ui-panel',
classNameBindings: ['isFullscreen:fullscreen'],
Expand Down
16 changes: 8 additions & 8 deletions ui/app/components/generated-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,16 @@ export default Component.extend({
actions: {
onKeyUp(name, value) {
this.model.set(name, value);
if (this.model.validations) {
if (this.model.validate) {
// Set validation error message for updated attribute
this.model.validations.attrs[name] && this.model.validations.attrs[name].isValid
? set(this.validationMessages, name, '')
: set(this.validationMessages, name, this.model.validations.attrs[name].message);

const { isValid, state } = this.model.validate();
if (state[name]) {
state[name].isValid
? set(this.validationMessages, name, '')
: set(this.validationMessages, name, state[name].errors.join('. '));
}
// Set form button state
this.model.validate().then(({ validations }) => {
this.set('isFormInvalid', !validations.isValid);
});
this.set('isFormInvalid', !isValid);
} else {
this.set('isFormInvalid', false);
}
Expand Down
1 change: 1 addition & 0 deletions ui/app/components/hover-copy-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Component from '@ember/component';

export default Component.extend({
'data-test-hover-copy': true,
attributeBindings: ['data-test-hover-copy'],
classNameBindings: 'alwaysShow:hover-copy-button-static:hover-copy-button',
copyValue: null,
alwaysShow: false,
Expand Down
1 change: 1 addition & 0 deletions ui/app/components/identity/edit-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { waitFor } from '@ember/test-waiters';
export default Component.extend({
flashMessages: service(),
'data-test-component': 'identity-edit-form',
attributeBindings: ['data-test-component'],
model: null,

// 'create', 'edit', 'merge'
Expand Down
25 changes: 11 additions & 14 deletions ui/app/components/mount-backend-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default Component.extend({

showEnable: false,

// cp-validation related properties
// validation related properties
validationMessages: null,
isFormInvalid: false,

Expand Down Expand Up @@ -166,27 +166,24 @@ export default Component.extend({

actions: {
onKeyUp(name, value) {
this.mountModel.set(name, value);
const {
isValid,
state: { path, maxVersions },
} = this.mountModel.validate();
// validate path
if (name === 'path') {
this.mountModel.set('path', value);
this.mountModel.validations.attrs.path.isValid
path.isValid
? set(this.validationMessages, 'path', '')
: set(this.validationMessages, 'path', this.mountModel.validations.attrs.path.message);
: set(this.validationMessages, 'path', path.errors.join('. '));
}
// check maxVersions is a number
if (name === 'maxVersions') {
this.mountModel.set('maxVersions', value);
this.mountModel.validations.attrs.maxVersions.isValid
maxVersions.isValid
? set(this.validationMessages, 'maxVersions', '')
: set(
this.validationMessages,
'maxVersions',
this.mountModel.validations.attrs.maxVersions.message
);
: set(this.validationMessages, 'maxVersions', maxVersions.errors.join('. '));
}
this.mountModel.validate().then(({ validations }) => {
this.set('isFormInvalid', !validations.isValid);
});
this.set('isFormInvalid', !isValid);
},
onTypeChange(path, value) {
if (path === 'type') {
Expand Down
1 change: 1 addition & 0 deletions ui/app/components/nav-header.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { computed } from '@ember/object';
export default Component.extend({
router: service(),
'data-test-navheader': true,
attributeBindings: ['data-test-navheader'],
classNameBindings: 'consoleFullscreen:panel-fullscreen',
tagName: 'header',
navDrawerOpen: false,
Expand Down
1 change: 1 addition & 0 deletions ui/app/components/pgp-file.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const BASE_64_REGEX = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]

export default Component.extend({
'data-test-pgp-file': true,
attributeBindings: ['data-test-pgp-file'],
classNames: ['box', 'is-fullwidth', 'is-marginless', 'is-shadowless'],
key: null,
index: null,
Expand Down
2 changes: 1 addition & 1 deletion ui/app/components/radial-progress.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default Component.extend({
'data-test-radial-progress': true,
tagName: 'svg',
classNames: 'radial-progress',
attributeBindings: ['size:width', 'size:height', 'viewBox'],
attributeBindings: ['size:width', 'size:height', 'viewBox', 'data-test-radial-progress'],
progressDecimal: null,
size: 20,
strokeWidth: 1,
Expand Down
2 changes: 1 addition & 1 deletion ui/app/components/regex-validator.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
spellcheck="false"
value={{this.testValue}}
{{on "change" this.updateTestValue}}
class="input {{if this.regexError "has-error"}}"
class="input {{if this.regexError 'has-error'}}"
/>

{{#if this.testValue}}
Expand Down
8 changes: 6 additions & 2 deletions ui/app/components/secret-edit-metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export default class SecretEditMetadata extends Component {
if (value) {
if (name === 'customMetadata') {
// cp validations won't work on an object so performing validations here
// JLR TODO: review this and incorporate into model-validations system
/* eslint-disable no-useless-escape */
let regex = /^[^\\]+$/g; // looking for a backward slash
value.match(regex)
Expand All @@ -62,9 +63,12 @@ export default class SecretEditMetadata extends Component {
}
if (name === 'maxVersions') {
this.args.model.maxVersions = value;
this.args.model.validations.attrs.maxVersions.isValid
const {
state: { maxVersions },
} = this.args.model.validate();
maxVersions.isValid
? set(this.validationMessages, name, '')
: set(this.validationMessages, name, this.args.model.validations.attrs.maxVersions.message);
: set(this.validationMessages, name, maxVersions.errors.join('. '));
}
}

Expand Down
42 changes: 20 additions & 22 deletions ui/app/components/secret-link.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
import { computed } from '@ember/object';
import Component from '@ember/component';
import Component from '@glimmer/component';
import { action } from '@ember/object';
import { encodePath } from 'vault/utils/path-encoding-helpers';

export default Component.extend({
onLinkClick() {},
tagName: '',
// so that ember-test-selectors doesn't log a warning
supportsDataTestProperties: true,
mode: 'list',

secret: null,
queryParams: null,
ariaLabel: null,

link: computed('mode', 'secret', function () {
const route = `vault.cluster.secrets.backend.${this.mode}`;
if ((this.mode !== 'versions' && !this.secret) || this.secret === ' ') {
export default class SecretLink extends Component {
get link() {
const { mode, secret } = this.args;
const route = `vault.cluster.secrets.backend.${mode}`;
if ((mode !== 'versions' && !secret) || secret === ' ') {
return { route: `${route}-root`, models: [] };
} else {
return { route, models: [encodePath(this.secret)] };
return { route, models: [encodePath(secret)] };
}
}),
query: computed('queryParams', function () {
const qp = this.queryParams || {};
}
get query() {
const qp = this.args.queryParams || {};
return qp.isQueryParams ? qp.values : qp;
}),
});
}

@action
onLinkClick() {
if (this.args.onLinkClick) {
this.args.onLinkClick(...arguments);
}
}
}
21 changes: 6 additions & 15 deletions ui/app/components/toolbar-secret-link.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Component from '@glimmer/component';
/**
* @module ToolbarSecretLink
* `ToolbarSecretLink` styles SecretLink for the Toolbar.
Expand All @@ -16,18 +17,8 @@
*
* @param type="" {String} - Use "add" to change icon
*/

import OuterHTML from './outer-html';
import { computed } from '@ember/object';

export default OuterHTML.extend({
glyph: computed('type', function () {
if (this.type == 'add') {
return 'plus';
} else {
return 'chevron-right';
}
}),
tagName: '',
supportsDataTestProperties: true,
});
export default class ToolbarSecretLink extends Component {
get glyph() {
return this.args.type === 'add' ? 'plus' : 'chevron-right';
}
}
Loading

0 comments on commit 0b26b1a

Please sign in to comment.