rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3584 from westlywright/mc.app.display.issues 

Mc.app.display.issues
This commit is contained in:
Westly Wright 2019-11-15 09:44:13 -07:00 committed by GitHub
parent 3d4b81e2d6 5062e53a45
commit 1feaf4c1b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/global-admin/addon/components/new-multi-cluster-app/component.js
View File

@ -85,10 +85,7 @@ export default Component.extend(NewOrEdit, CatalogApp, {
isClone: false, isClone: false,
projectsToAddOnUpgrade: null, projectsToAddOnUpgrade: null,
projectsToRemoveOnUpgrade: null, projectsToRemoveOnUpgrade: null,
editable: { editable: null,
selectedTemplateUrl: null,
multiClusterApp: { targets: [], },
},
mcAppIsSaving: false, mcAppIsSaving: false,
overridesHeaders: OVERRIDE_HEADERS, overridesHeaders: OVERRIDE_HEADERS,
@ -101,6 +98,11 @@ export default Component.extend(NewOrEdit, CatalogApp, {
init() { init() {
this._super(...arguments); this._super(...arguments);
set(this, 'editable', {
selectedTemplateUrl: null,
multiClusterApp: { targets: [], },
});
this.initAttrs(); this.initAttrs();
this.initUpgradeStrategy(); this.initUpgradeStrategy();
@ -110,6 +112,7 @@ export default Component.extend(NewOrEdit, CatalogApp, {
} else { } else {
this.initSelectedTemplateModel(); this.initSelectedTemplateModel();
} }
set(this, 'editable.selectedTemplateUrl', get(this, 'selectedTemplateUrl')); set(this, 'editable.selectedTemplateUrl', get(this, 'selectedTemplateUrl'));
}); });
if (get(this, 'multiClusterApp.targets')) { if (get(this, 'multiClusterApp.targets')) {

2
lib/shared/addon/components/schema/input-password/component.js
View File

@ -22,7 +22,7 @@ export default Component.extend({
set(this, 'value', randomStr); set(this, 'value', randomStr);
var $field = $('INPUT'); var $field = $(this.element).find('INPUT');
$field.attr('type', 'text'); $field.attr('type', 'text');
setTimeout(() => { setTimeout(() => {

7
lib/shared/addon/mixins/catalog-app.js
View File

@ -7,6 +7,7 @@ import { compare as compareVersion } from 'ui/utils/parse-version';
import { stringifyAnswer } from 'shared/utils/evaluate'; import { stringifyAnswer } from 'shared/utils/evaluate';
import C from 'ui/utils/constants'; import C from 'ui/utils/constants';
import { evaluate } from 'shared/utils/evaluate'; import { evaluate } from 'shared/utils/evaluate';
import { isEmpty } from '@ember/utils';
export default Mixin.create({ export default Mixin.create({
previewTabDidChange: observer('previewTab', 'previewOpen', function() { previewTabDidChange: observer('previewTab', 'previewOpen', function() {
@ -35,7 +36,11 @@ export default Mixin.create({
}), }),
templateChanged: observer('editable.selectedTemplateUrl', 'templateResource.defaultVersion', function() { templateChanged: observer('editable.selectedTemplateUrl', 'templateResource.defaultVersion', function() {
return this.getTemplate.perform(); const { editable : { selectedTemplateUrl = '' } } = this;
if (!isEmpty(selectedTemplateUrl)) {
this.getTemplate.perform();
}
}), }),
filenames: computed('selectedTemplateModel', 'selectedTemplateModel.filesAsArray.[]', function(){ filenames: computed('selectedTemplateModel', 'selectedTemplateModel.filesAsArray.[]', function(){