From 3e8d28ab498bec015ef74f676d899091f535f316 Mon Sep 17 00:00:00 2001 From: loganhz Date: Tue, 27 Mar 2018 10:59:05 +0800 Subject: [PATCH 1/5] Fix dashboard issue https://github.com/rancher/rancher/issues/12268 --- lib/shared/addon/components/node-gauges/component.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/shared/addon/components/node-gauges/component.js b/lib/shared/addon/components/node-gauges/component.js index a1d65439b..d31bbe472 100644 --- a/lib/shared/addon/components/node-gauges/component.js +++ b/lib/shared/addon/components/node-gauges/component.js @@ -1,4 +1,5 @@ import Component from '@ember/component'; +import { observer } from '@ember/object'; import { inject as service } from '@ember/service'; import { formatSi, parseSi } from 'shared/utils/parse-unit'; import layout from './template'; @@ -19,6 +20,10 @@ export default Component.extend({ }, 150); }, + updateDashboard: observer('nodes.@each.{allocatable,requested}', function () { + this.setDashboard(); + }), + setDashboard() { const cpuGauge = this.getCpuGauge(); const memoryGauge = this.getMemoryGauge(); From 1b97a2cebe501ff93a9489fdea6aded1ceb1e8bb Mon Sep 17 00:00:00 2001 From: loganhz Date: Tue, 27 Mar 2018 11:12:38 +0800 Subject: [PATCH 2/5] Remove coming soon https://github.com/rancher/rancher/issues/12280 --- app/volumes/index/template.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/volumes/index/template.hbs b/app/volumes/index/template.hbs index 94f2c66fd..5fa28e198 100644 --- a/app/volumes/index/template.hbs +++ b/app/volumes/index/template.hbs @@ -64,5 +64,5 @@ {{else if projectController.projects.current.isKubernetes}}
Coming soon for Kubernetes clusters
{{else}} - {{empty-table resource="container" newRoute="volumes.new" newTranslationKey="generic.comingSoon" disabled=true}} + {{empty-table resource="container" newRoute="volumes.new" newTranslationKey="nav.containers.addVolume"}} {{/if}} From c294ccea1c9375119a9e90e055a10b1aaee4a7e2 Mon Sep 17 00:00:00 2001 From: loganhz Date: Tue, 27 Mar 2018 11:29:11 +0800 Subject: [PATCH 3/5] Fix cluster list issue https://github.com/rancher/rancher/issues/12038 --- app/models/cluster.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/cluster.js b/app/models/cluster.js index b791715fd..b335c07a0 100644 --- a/app/models/cluster.js +++ b/app/models/cluster.js @@ -81,7 +81,7 @@ export default Resource.extend(ResourceUsage, { } }), - displayProvider: computed('configName','nodePools.firstObject.displayProvider','intl.locale', function() { + displayProvider: computed('configName','nodePools.@each.displayProvider','intl.locale', function() { const intl = get(this, 'intl'); const pools = get(this,'nodePools'); const firstPool = (pools||[]).objectAt(0); From c3a44be10b0161bc6a86a719a89385fe89624fdc Mon Sep 17 00:00:00 2001 From: loganhz Date: Tue, 27 Mar 2018 11:50:55 +0800 Subject: [PATCH 4/5] Add whitelist domain in node driver page https://github.com/rancher/rancher/issues/12113 --- .../addon/components/modal-edit-driver/component.js | 7 +++++++ .../addon/components/modal-edit-driver/template.hbs | 10 ++++++++++ translations/en-us.yaml | 5 +++++ 3 files changed, 22 insertions(+) diff --git a/lib/shared/addon/components/modal-edit-driver/component.js b/lib/shared/addon/components/modal-edit-driver/component.js index d05a6de51..d6d75501a 100644 --- a/lib/shared/addon/components/modal-edit-driver/component.js +++ b/lib/shared/addon/components/modal-edit-driver/component.js @@ -4,6 +4,7 @@ import { alias } from '@ember/object/computed'; import Component from '@ember/component'; import NewOrEdit from 'shared/mixins/new-or-edit'; import ModalBase from 'shared/mixins/modal-base'; +import { set } from '@ember/object'; import layout from './template'; export default Component.extend(ModalBase, NewOrEdit, { @@ -16,6 +17,12 @@ export default Component.extend(ModalBase, NewOrEdit, { primaryResource : alias('originalModel'), errors : null, + actions: { + updateWhitelist(list) { + set(this, 'primaryResource.whitelistDomains', list); + }, + }, + init() { this._super(...arguments); this.set('clone', this.get('originalModel').clone()); diff --git a/lib/shared/addon/components/modal-edit-driver/template.hbs b/lib/shared/addon/components/modal-edit-driver/template.hbs index 24d225077..baa3b920f 100644 --- a/lib/shared/addon/components/modal-edit-driver/template.hbs +++ b/lib/shared/addon/components/modal-edit-driver/template.hbs @@ -25,4 +25,14 @@ {{t 'modalEditDriver.checksum.help'}} +
+ {{form-value-array + initialValues=primaryResource.whitelistDomains + valueLabel="modalEditDriver.whitelist.label" + addActionLabel="modalEditDriver.whitelist.addActionLabel" + noDataLabel="modalEditDriver.whitelist.noData" + changed=(action "updateWhitelist") + }} +
+ {{save-cancel editing=editing save="save" cancel="cancel"}} diff --git a/translations/en-us.yaml b/translations/en-us.yaml index f77f6e584..23ea8720b 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -4151,6 +4151,11 @@ modalEditDriver: checksum: label: Checksum help: "Optional: Verify that the downloaded driver matches the expected checksum." + whitelist: + label: Whitelist Domains + addActionLabel: Add Domain + noData: No Domains + modalEditSetting: title: Edit Advanced Setting From 192985d7b92c7a4a357835320c9512803a9c6f10 Mon Sep 17 00:00:00 2001 From: loganhz Date: Tue, 27 Mar 2018 12:31:16 +0800 Subject: [PATCH 5/5] Fix add volume issue https://github.com/rancher/rancher/issues/12281 --- .../components/cru-persistent-volume-claim/component.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/shared/addon/components/cru-persistent-volume-claim/component.js b/lib/shared/addon/components/cru-persistent-volume-claim/component.js index 22cbaf28d..a518f9147 100644 --- a/lib/shared/addon/components/cru-persistent-volume-claim/component.js +++ b/lib/shared/addon/components/cru-persistent-volume-claim/component.js @@ -88,7 +88,7 @@ export default Component.extend(ViewNewEdit, ChildHook, { }); } else { const errors = []; - errors.push(intl.t('validation.required', {key: intl.t('cruPersistentVolumeClaim.capacity.label')})); + errors.push(intl.t('validation.required', {key: intl.t('cruPersistentVolumeClaim.capacity.label')})); set(this, 'errors', errors); return false; } @@ -96,7 +96,9 @@ export default Component.extend(ViewNewEdit, ChildHook, { } else { set(pr, 'storageClassId', null); set(pr, 'resources', null); - set(pr, 'resources', Object.assign({}, get(pr,'volume.capacity'))); + set(pr, 'resources', { + requests: Object.assign({}, get(pr, 'persistentVolume.capacity')), + }); } if ( !get(this,'actuallySave') ) {