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

fix property extensions

This commit is contained in:
Westly Wright 2018-08-28 14:30:25 -07:00
parent ef01a64c93
commit fe9845d357
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/shared/addon/settings/service.js
View File

@ -5,7 +5,7 @@ import Evented from '@ember/object/evented';
import Service, { inject as service } from '@ember/service'; import Service, { inject as service } from '@ember/service';
import C from 'shared/utils/constants'; import C from 'shared/utils/constants';
import { minorVersion } from 'shared/utils/parse-version'; import { minorVersion } from 'shared/utils/parse-version';
import { get, set, computed } from '@ember/object'; import { get, set, computed, observer } from '@ember/object';
import { isEmpty } from '@ember/utils'; import { isEmpty } from '@ember/utils';
export function normalizeName(str) { export function normalizeName(str) {
@ -84,11 +84,11 @@ export default Service.extend(Evented, {
return value; return value;
}, },
promiseCountObserver: function() { promiseCountObserver: observer('promiseCount', function() {
if (get(this, 'promiseCount') <= 0) { if (get(this, 'promiseCount') <= 0) {
this.trigger('settingsPromisesResolved'); this.trigger('settingsPromisesResolved');
} }
}.observes('promiseCount'), }),
findByName(name) { findByName(name) {
return get(this, 'asMap')[normalizeName(name)]; return get(this, 'asMap')[normalizeName(name)];
@ -127,7 +127,15 @@ export default Service.extend(Evented, {
return promise; return promise;
}, },
asMap: function() { cliVersion: alias(`asMap.${ C.SETTING.VERSION_CLI }.value`),
dockerMachineVersion: alias(`asMap.${ C.SETTING.VERSION_MACHINE }.value`),
helmVersion: alias(`asMap.${ C.SETTING.VERSION_HELM }.value`),
minDockerVersion: alias(`asMap.${ C.SETTING.MIN_DOCKER }.value`),
rancherImage: alias(`asMap.${ C.SETTING.IMAGE_RANCHER }.value`),
rancherVersion: alias(`asMap.${ C.SETTING.VERSION_RANCHER }.value`),
serverUrl: alias(`asMap.${ C.SETTING.SERVER_URL }.value`),
asMap: computed('all.@each.{name,value,customized}', function() {
var out = {}; var out = {};
(get(this, 'all') || []).forEach((setting) => { (get(this, 'all') || []).forEach((setting) => {
@ -137,15 +145,15 @@ export default Service.extend(Evented, {
}); });
return out; return out;
}.property('all.@each.{name,value,customized}'), }),
uiVersion: function() { uiVersion: computed('app.version', function() {
return `v${ get(this, 'app.version') }`; return `v${ get(this, 'app.version') }`;
}.property('app.version'), }),
issueUrl: function() { issueUrl: computed('app.currentRouteName', 'access.{provider,admin}', 'rancherVersion', 'uiVersion', function() {
var str = '*Describe your issue here*\n\n\n---\n| Useful | Info |\n| :-- | :-- |\n' + var str = '*Describe your issue here*\n\n\n---\n| Useful | Info |\n| :-- | :-- |\n' +
`|Versions|Rancher \`${ get(this, 'rancherVersion') || '-' }\` ` + `|Versions|Rancher \`${ get(this, 'rancherVersion') || '-' }\` ` +
`UI: \`${ get(this, 'uiVersion') || '--' }\` |\n`; `UI: \`${ get(this, 'uiVersion') || '--' }\` |\n`;
if ( get(this, 'access.enabled') ) { if ( get(this, 'access.enabled') ) {
@ -161,39 +169,31 @@ export default Service.extend(Evented, {
var url = `${ C.EXT_REFERENCES.GITHUB }/issues/new?body=${ encodeURIComponent(str) }`; var url = `${ C.EXT_REFERENCES.GITHUB }/issues/new?body=${ encodeURIComponent(str) }`;
return url; return url;
}.property('app.currentRouteName', 'access.{provider,admin}', 'rancherVersion', 'uiVersion'), }),
rancherImage: alias(`asMap.${ C.SETTING.IMAGE_RANCHER }.value`),
rancherVersion: alias(`asMap.${ C.SETTING.VERSION_RANCHER }.value`),
cliVersion: alias(`asMap.${ C.SETTING.VERSION_CLI }.value`),
dockerMachineVersion: alias(`asMap.${ C.SETTING.VERSION_MACHINE }.value`),
helmVersion: alias(`asMap.${ C.SETTING.VERSION_HELM }.value`),
serverUrl: alias(`asMap.${ C.SETTING.SERVER_URL }.value`),
serverUrlIsEmpty: computed('serverUrl', function() { serverUrlIsEmpty: computed('serverUrl', function() {
return isEmpty(get(this, 'serverUrl')); return isEmpty(get(this, 'serverUrl'));
}), }),
isRancher: function() { isRancher: computed(C.SETTING.PL, function() {
const out = (get(this, C.SETTING.PL) || '').toUpperCase() === C.SETTING.PL_RANCHER_VALUE.toUpperCase(); const out = (get(this, C.SETTING.PL) || '').toUpperCase() === C.SETTING.PL_RANCHER_VALUE.toUpperCase();
return out; return out;
}.property(C.SETTING.PL), }),
isEnterprise: function() { isEnterprise: computed('rancherImage', function() {
return get(this, 'rancherImage') === 'rancher/enterprise'; return get(this, 'rancherImage') === 'rancher/enterprise';
}.property('rancherImage'), }),
appName: function() { appName: computed('isRancher', C.SETTING.PL, function() {
if ( get(this, 'isRancher') ) { if ( get(this, 'isRancher') ) {
return get(this, 'app.appName'); return get(this, 'app.appName');
} }
return get(this, C.SETTING.PL) || ''; return get(this, C.SETTING.PL) || '';
}.property('isRancher', C.SETTING.PL), }),
minDockerVersion: alias(`asMap.${ C.SETTING.MIN_DOCKER }.value`), minorVersion: computed('rancherVersion', function() {
minorVersion: function() {
let version = get(this, 'rancherVersion'); let version = get(this, 'rancherVersion');
if ( !version ) { if ( !version ) {
@ -201,9 +201,9 @@ export default Service.extend(Evented, {
} }
return minorVersion(version); return minorVersion(version);
}.property('rancherVersion'), }),
docsBase: function() { docsBase: computed('intl.locale', 'minorVersion', function() {
let full = get(this, 'rancherVersion'); let full = get(this, 'rancherVersion');
let version; let version;
@ -222,5 +222,5 @@ export default Service.extend(Evented, {
} }
return `${ C.EXT_REFERENCES.DOCS }/${ version }/${ lang }`; return `${ C.EXT_REFERENCES.DOCS }/${ version }/${ lang }`;
}.property('intl.locale', 'minorVersion') })
}); });