From 1e58488dcdd30a713ec0befc1a4ffc98625bbdb2 Mon Sep 17 00:00:00 2001 From: Arnav Palnitkar Date: Tue, 24 Aug 2021 12:13:53 -0700 Subject: [PATCH 1/6] Client count config view - Switched to toggle button from checkbox and updated the design - Switched to ember octane - Update ember concurrency dependency --- ui/app/components/pricing-metrics-config.js | 66 +++++++++++-------- .../components/pricing-metrics-config.hbs | 60 ++++++++++++----- ui/package.json | 2 +- ui/yarn.lock | 17 ++++- 4 files changed, 97 insertions(+), 48 deletions(-) diff --git a/ui/app/components/pricing-metrics-config.js b/ui/app/components/pricing-metrics-config.js index 50ad103545b72..898307b86ce22 100644 --- a/ui/app/components/pricing-metrics-config.js +++ b/ui/app/components/pricing-metrics-config.js @@ -10,19 +10,20 @@ * @param {string} [mode=show] - mode is either show or edit. Show results in a table with the config, show has a form. */ +import Component from '@glimmer/component'; import { computed } from '@ember/object'; -import Component from '@ember/component'; +import { action } from '@ember/object'; import { inject as service } from '@ember/service'; +import { tracked } from '@glimmer/tracking'; import { task } from 'ember-concurrency'; -export default Component.extend({ - router: service(), - mode: 'show', - model: null, +export default class PricingMetricsConfigComponent extends Component { + @service router; + @tracked mode = 'show'; + @tracked modalOpen = false; + error = null; - error: null, - modalOpen: false, - infoRows: computed(function() { + get infoRows() { return [ { label: 'Usage data collection', @@ -40,35 +41,42 @@ export default Component.extend({ valueKey: 'defaultReportMonths', }, ]; - }), - modalTitle: computed('model.enabled', function() { + } + + @computed('args.model.enabled') + get modalTitle() { let content = 'Turn usage tracking off?'; - if (this.model.enabled === 'On') { + if (this.args.model && this.args.model.enabled === 'On') { content = 'Turn usage tracking on?'; } return content; - }), + } - save: task(function*() { - let model = this.model; + @(task(function*() { try { - yield model.save(); + yield this.args.model.save(); } catch (err) { - this.set('error', err.message); + this.error = err.message; return; } this.router.transitionTo('vault.cluster.metrics.config'); - }).drop(), + }).drop()) + save; + + @action + updateBooleanValue(attr, value) { + let valueToSet = value === true ? attr.options.trueValue : attr.options.falseValue; + this.args.model[attr.name] = valueToSet; + } - actions: { - onSaveChanges: function(evt) { - evt.preventDefault(); - const changed = this.model.changedAttributes(); - if (!changed.enabled) { - this.save.perform(); - return; - } - this.set('modalOpen', true); - }, - }, -}); + @action + onSaveChanges(evt) { + evt.preventDefault(); + const changed = this.args.model.changedAttributes(); + if (!changed.enabled) { + this.save.perform(); + return; + } + this.modalOpen = true; + } +} diff --git a/ui/app/templates/components/pricing-metrics-config.hbs b/ui/app/templates/components/pricing-metrics-config.hbs index 4581569bbf8d8..088e43c7f0089 100644 --- a/ui/app/templates/components/pricing-metrics-config.hbs +++ b/ui/app/templates/components/pricing-metrics-config.hbs @@ -1,13 +1,43 @@ -{{#if (eq mode "edit")}} +{{#if (eq @mode "edit")}}
- - {{#each model.configAttrs as |attr|}} - + + {{#each @model.configAttrs as |attr|}} + {{#if (and (eq attr.type "string") (eq attr.options.editType "boolean"))}} + + {{#if attr.options.helpText}} +

{{attr.options.helpText}} {{#if attr.options.docLink}}See our documentation for help.{{/if}}

+ {{/if}} +
+ + +
+ {{else if (eq attr.type "number")}} +
+ + {{#if attr.options.subText}} +

{{attr.options.subText}} {{#if attr.options.docLink}}See our documentation for help.{{/if}}

+ {{/if}} +
+ +
+
+ {{/if}} {{/each}}
@@ -29,14 +59,14 @@
- {{#if (eq model.enabled "On")}} + {{#if (eq @model.enabled "On")}}

Vault will start tracking data starting from today’s date, {{date-format (now) "d MMMM yyyy"}}. You will not be able to see or query usage until the end of the month.

If you’ve previously enabled usage tracking, that historical data will still be available to you.

{{else}} @@ -56,7 +86,7 @@ @@ -64,11 +94,11 @@ {{else}}
- {{#each infoRows as |item|}} + {{#each this.infoRows as |item|}} {{/each}}
diff --git a/ui/package.json b/ui/package.json index 29a72148e1af5..05225e58a73b2 100644 --- a/ui/package.json +++ b/ui/package.json @@ -93,7 +93,7 @@ "ember-cli-string-helpers": "^4.0.0", "ember-cli-terser": "^4.0.0", "ember-composable-helpers": "^4.3.0", - "ember-concurrency": "^1.3.0", + "ember-concurrency": "^2.1.2", "ember-concurrency-test-waiter": "^0.3.2", "ember-copy": "^1.0.0", "ember-cp-validations": "^4.0.0-beta.12", diff --git a/ui/yarn.lock b/ui/yarn.lock index 20373c586a03a..bcb121b06ea88 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -7827,7 +7827,7 @@ ember-cli-htmlbars@^3.0.0, ember-cli-htmlbars@^3.0.1: json-stable-stringify "^1.0.1" strip-bom "^3.0.0" -ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.7.1: +ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.6.3, ember-cli-htmlbars@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.1.tgz#eb5b88c7d9083bc27665fb5447a9b7503b32ce4f" integrity sha512-9laCgL4tSy48orNoQgQKEHp93MaqAs9ZOl7or5q+8iyGGJHW6sVXIYrVv5/5O9HfV6Ts8/pW1rSoaeKyLUE+oA== @@ -8216,7 +8216,7 @@ ember-concurrency-test-waiter@^0.3.2: dependencies: ember-cli-babel "^6.6.0" -"ember-concurrency@^0.8.27 || ^0.9.0 || ^0.10.0 || ^1.0.0", ember-concurrency@^1.3.0: +"ember-concurrency@^0.8.27 || ^0.9.0 || ^0.10.0 || ^1.0.0": version "1.3.0" resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-1.3.0.tgz#66f90fb792687470bcee1172adc0ebf33f5e8b9c" integrity sha512-DwGlfWFpYyAkTwsedlEtK4t1DznJSculAW6Vq5S1C0shVPc5b6tTpHB2FFYisannSYkm+wpm1f1Pd40qiNPtOQ== @@ -8225,6 +8225,17 @@ ember-concurrency-test-waiter@^0.3.2: ember-compatibility-helpers "^1.2.0" ember-maybe-import-regenerator "^0.1.6" +ember-concurrency@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-2.1.2.tgz#a27178fb24951933fa72dd7cf1dca852693cc5c1" + integrity sha512-xC6L/SKuM08e9TK5igkSEwbAtkX2sqrj9Xap9G3zYSYdAIO7fcS6ZNEaD5e+dVXwPqH3tOIq41ZT7fqQ7mQ0KQ== + dependencies: + "@glimmer/tracking" "^1.0.2" + ember-cli-babel "^7.22.1" + ember-cli-htmlbars "^5.6.3" + ember-compatibility-helpers "^1.2.0" + ember-destroyable-polyfill "^2.0.2" + ember-copy@1.0.0, ember-copy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-copy/-/ember-copy-1.0.0.tgz#426554ba6cf65920f31d24d0a3ca2cb1be16e4aa" @@ -8280,7 +8291,7 @@ ember-debug-handlers-polyfill@^1.1.1: resolved "https://registry.yarnpkg.com/ember-debug-handlers-polyfill/-/ember-debug-handlers-polyfill-1.1.1.tgz#e9ae0a720271a834221179202367421b580002ef" integrity sha512-lO7FBAqJjzbL+IjnWhVfQITypPOJmXdZngZR/Vdn513W4g/Q6Sjicao/mDzeDCb48Y70C4Facwk0LjdIpSZkRg== -ember-destroyable-polyfill@^2.0.3: +ember-destroyable-polyfill@^2.0.2, ember-destroyable-polyfill@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1" integrity sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw== From 9cc98c91a25187d283cdfcf43e14e03e5ec6eb33 Mon Sep 17 00:00:00 2001 From: Arnav Palnitkar Date: Tue, 24 Aug 2021 13:48:19 -0700 Subject: [PATCH 2/6] Fixed integration tests --- .../templates/components/pricing-metrics-config.hbs | 4 ++-- .../components/pricing-metrics-config-test.js | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ui/app/templates/components/pricing-metrics-config.hbs b/ui/app/templates/components/pricing-metrics-config.hbs index 088e43c7f0089..fd5a7aaf21417 100644 --- a/ui/app/templates/components/pricing-metrics-config.hbs +++ b/ui/app/templates/components/pricing-metrics-config.hbs @@ -9,7 +9,7 @@

{{attr.options.helpText}} {{#if attr.options.docLink}}See our documentation for help.{{/if}}

{{/if}}
-