diff --git a/ui/lib/core/addon/components/message-error.js b/ui/lib/core/addon/components/message-error.js
index 9a29f158b..cdd7b1812 100644
--- a/ui/lib/core/addon/components/message-error.js
+++ b/ui/lib/core/addon/components/message-error.js
@@ -1,6 +1,6 @@
-import { computed } from '@ember/object';
-import Component from '@ember/component';
+import Component from '@glimmer/component';
import layout from '../templates/components/message-error';
+import { setComponentTemplate } from '@ember/component';
/**
* @module MessageError
@@ -11,48 +11,37 @@ import layout from '../templates/components/message-error';
*
* ```
*
- * @param model=null{DS.Model} - An Ember data model that will be used to bind error statest to the internal
+ * @param {object} [model=null] - An Ember data model that will be used to bind error states to the internal
* `errors` property.
- * @param errors=null{Array} - An array of error strings to show.
- * @param errorMessage=null{String} - An Error string to display.
+ * @param {array} [errors=null] - An array of error strings to show.
+ * @param {string} [errorMessage=null] - An Error string to display.
*/
-export default Component.extend({
- layout,
- model: null,
- errors: null,
- errorMessage: null,
- displayErrors: computed(
- 'errorMessage',
- 'model.{isError,adapterError.message,adapterError.errors.@each}',
- 'errors',
- 'errors.[]',
- function () {
- const errorMessage = this.errorMessage;
- const errors = this.errors;
- const modelIsError = this.model?.isError;
- if (errorMessage) {
- return [errorMessage];
- }
-
- if (errors && errors.length > 0) {
- return errors;
- }
-
- if (modelIsError) {
- if (!this.model.adapterError) {
- return;
- }
- if (this.model.adapterError.errors.length > 0) {
- return this.model.adapterError.errors.map((e) => {
- if (typeof e === 'object') return e.title || e.message || JSON.stringify(e);
- return e;
- });
- }
- return [this.model.adapterError.message];
- }
-
- return 'no error';
+class MessageError extends Component {
+ get displayErrors() {
+ let { errorMessage, errors, model } = this.args;
+ if (errorMessage) {
+ return [errorMessage];
}
- ),
-});
+
+ if (errors && errors.length > 0) {
+ return errors;
+ }
+
+ if (model?.isError) {
+ let adapterError = model?.adapterError;
+ if (!adapterError) {
+ return null;
+ }
+ if (adapterError.errors.length > 0) {
+ return adapterError.errors.map((e) => {
+ if (typeof e === 'object') return e.title || e.message || JSON.stringify(e);
+ return e;
+ });
+ }
+ return [adapterError.message];
+ }
+ return null;
+ }
+}
+export default setComponentTemplate(layout, MessageError);
diff --git a/ui/lib/core/addon/templates/components/message-error.hbs b/ui/lib/core/addon/templates/components/message-error.hbs
index 6790d458a..af5c40866 100644
--- a/ui/lib/core/addon/templates/components/message-error.hbs
+++ b/ui/lib/core/addon/templates/components/message-error.hbs
@@ -1,5 +1,5 @@
-{{#if this.displayErrors.length}}
+{{#if this.displayErrors}}
{{#each this.displayErrors as |error|}}
-
+
{{/each}}
{{/if}}
\ No newline at end of file
diff --git a/ui/tests/acceptance/client-current-test.js b/ui/tests/acceptance/client-current-test.js
index 28cdb0b0c..00cc5bd2c 100644
--- a/ui/tests/acceptance/client-current-test.js
+++ b/ui/tests/acceptance/client-current-test.js
@@ -112,9 +112,8 @@ module('Acceptance | clients current', function (hooks) {
// FILTER BY NAMESPACE
await clickTrigger();
await searchSelect.options.objectAt(0).click();
- await waitUntil(() => {
- return find('[data-test-horizontal-bar-chart]');
- });
+ await settled();
+ await waitUntil(() => find('[data-test-horizontal-bar-chart]'));
assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('15');
assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('5');
assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('10');
@@ -145,18 +144,14 @@ module('Acceptance | clients current', function (hooks) {
// FILTER BY AUTH METHOD
await clickTrigger();
await searchSelect.options.objectAt(0).click();
- await waitUntil(() => {
- return find('#auth-method-search-select');
- });
+ await waitUntil(() => find('#auth-method-search-select'));
assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('5');
assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('3');
assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('2');
assert.dom(SELECTORS.attributionBlock).doesNotExist('Does not show attribution block');
// Delete auth filter goes back to filtered only on namespace
await click('#auth-method-search-select [data-test-selected-list-button="delete"]');
- await waitUntil(() => {
- return find('[data-test-horizontal-bar-chart]');
- });
+ await waitUntil(() => find('[data-test-horizontal-bar-chart]'));
assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('15');
assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('5');
assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('10');
diff --git a/ui/tests/acceptance/settings/configure-secret-backends/pki/section-urls-test.js b/ui/tests/acceptance/settings/configure-secret-backends/pki/section-urls-test.js
index a67d8c902..b70d1b8d2 100644
--- a/ui/tests/acceptance/settings/configure-secret-backends/pki/section-urls-test.js
+++ b/ui/tests/acceptance/settings/configure-secret-backends/pki/section-urls-test.js
@@ -1,4 +1,4 @@
-import { currentRouteName, settled } from '@ember/test-helpers';
+import { currentRouteName, settled, find, waitUntil } from '@ember/test-helpers';
import { module, test } from 'qunit';
import { setupApplicationTest } from 'ember-qunit';
import page from 'vault/tests/pages/settings/configure-secret-backends/pki/section';
@@ -22,8 +22,7 @@ module('Acceptance | settings/configure/secrets/pki/urls', function (hooks) {
await page.form.fields.objectAt(0).textarea('foo').change();
await page.form.submit();
- await settled();
-
+ await waitUntil(() => find('[data-test-error]'));
assert.ok(page.form.hasError, 'shows error on invalid input');
await page.form.fields.objectAt(0).textarea('foo.example.com').change();
diff --git a/ui/tests/acceptance/settings/mount-secret-backend-test.js b/ui/tests/acceptance/settings/mount-secret-backend-test.js
index d73eaf746..2f3cbfe07 100644
--- a/ui/tests/acceptance/settings/mount-secret-backend-test.js
+++ b/ui/tests/acceptance/settings/mount-secret-backend-test.js
@@ -89,7 +89,7 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
await page.enableEngine();
await page.selectType('kv');
await page.next().path(path).submit();
- assert.dom('.alert-banner-message-body').hasText('This mount path already exist.');
+ assert.dom('.alert-banner-message-body').containsText(`path is already in use at ${path}`);
assert.equal(currentRouteName(), 'vault.cluster.settings.mount-secret-backend');
await page.secretList();
diff --git a/ui/tests/integration/components/auth-form-test.js b/ui/tests/integration/components/auth-form-test.js
index d414fa089..ba34ba09d 100644
--- a/ui/tests/integration/components/auth-form-test.js
+++ b/ui/tests/integration/components/auth-form-test.js
@@ -61,7 +61,7 @@ module('Integration | Component | auth form', function (hooks) {
this.set('cluster', EmberObject.create({ standby: true }));
this.set('selectedAuth', 'token');
await render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
- assert.equal(component.errorText, '');
+ assert.equal(component.errorMessagePresent, false);
component.login();
// because this is an ember-concurrency backed service,
// we have to manually force settling the run queue
diff --git a/ui/tests/integration/components/ttl-picker-test.js b/ui/tests/integration/components/ttl-picker-test.js
index 3999aae44..1142c0fc9 100644
--- a/ui/tests/integration/components/ttl-picker-test.js
+++ b/ui/tests/integration/components/ttl-picker-test.js
@@ -17,11 +17,10 @@ module('Integration | Component | ttl picker', function (hooks) {
let callCount = this.changeSpy.callCount;
await fillIn('[data-test-ttl-value]', 'foo');
- assert.equal(this.changeSpy.callCount, callCount, "it did't call onChange again");
+ assert.equal(this.changeSpy.callCount, callCount, "it didn't call onChange again");
assert.dom('[data-test-ttl-error]').includesText('Error', 'renders the error box');
-
await fillIn('[data-test-ttl-value]', '33');
- assert.dom('[data-test-ttl-error]').doesNotIncludeText('Error', 'removes the error box');
+ assert.dom('[data-test-ttl-error]').doesNotExist('removes the error box');
});
test('it shows 30s for invalid duration initialValue input', async function (assert) {
diff --git a/ui/tests/pages/components/auth-form.js b/ui/tests/pages/components/auth-form.js
index 64c1de34e..4c10de515 100644
--- a/ui/tests/pages/components/auth-form.js
+++ b/ui/tests/pages/components/auth-form.js
@@ -1,4 +1,4 @@
-import { collection, clickable, fillable, text, value } from 'ember-cli-page-object';
+import { collection, clickable, fillable, text, value, isPresent } from 'ember-cli-page-object';
export default {
tabs: collection('[data-test-auth-method]', {
@@ -11,6 +11,7 @@ export default {
tokenValue: value('[data-test-token]'),
password: fillable('[data-test-password]'),
errorText: text('[data-test-auth-error]'),
+ errorMessagePresent: isPresent('[data-test-auth-error]'),
descriptionText: text('[data-test-description]'),
login: clickable('[data-test-auth-submit]'),
};