From fe9845d3579c150a71feecaf786d0e19db69bdd5 Mon Sep 17 00:00:00 2001
From: Westly Wright <westly.wright@gmail.com>
Date: Tue, 28 Aug 2018 14:30:25 -0700
Subject: [PATCH] fix property extensions

---
 lib/shared/addon/settings/service.js | 56 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/lib/shared/addon/settings/service.js b/lib/shared/addon/settings/service.js
index 4e9a0179f..10a581397 100644
--- a/lib/shared/addon/settings/service.js
+++ b/lib/shared/addon/settings/service.js
@@ -5,7 +5,7 @@ import Evented from '@ember/object/evented';
 import Service, { inject as service } from '@ember/service';
 import C from 'shared/utils/constants';
 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';
 
 export function normalizeName(str) {
@@ -84,11 +84,11 @@ export default Service.extend(Evented, {
     return value;
   },
 
-  promiseCountObserver: function() {
+  promiseCountObserver: observer('promiseCount', function() {
     if (get(this, 'promiseCount') <= 0) {
       this.trigger('settingsPromisesResolved');
     }
-  }.observes('promiseCount'),
+  }),
 
   findByName(name) {
     return get(this, 'asMap')[normalizeName(name)];
@@ -127,7 +127,15 @@ export default Service.extend(Evented, {
     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 = {};
 
     (get(this, 'all') || []).forEach((setting) => {
@@ -137,15 +145,15 @@ export default Service.extend(Evented, {
     });
 
     return out;
-  }.property('all.@each.{name,value,customized}'),
+  }),
 
-  uiVersion: function() {
+  uiVersion: computed('app.version', function() {
     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' +
-      `|Versions|Rancher \`${ get(this, 'rancherVersion') || '-' }\` ` +
+        `|Versions|Rancher \`${ get(this, 'rancherVersion') || '-' }\` ` +
         `UI: \`${ get(this, 'uiVersion') || '--' }\` |\n`;
 
     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) }`;
 
     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() {
     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();
 
     return out;
-  }.property(C.SETTING.PL),
+  }),
 
-  isEnterprise: function() {
+  isEnterprise: computed('rancherImage', function() {
     return get(this, 'rancherImage') === 'rancher/enterprise';
-  }.property('rancherImage'),
+  }),
 
-  appName: function() {
+  appName: computed('isRancher', C.SETTING.PL, function() {
     if ( get(this, 'isRancher') ) {
       return get(this, 'app.appName');
     }
 
     return get(this, C.SETTING.PL) || '';
-  }.property('isRancher', C.SETTING.PL),
+  }),
 
-  minDockerVersion: alias(`asMap.${ C.SETTING.MIN_DOCKER }.value`),
-
-  minorVersion: function() {
+  minorVersion: computed('rancherVersion', function() {
     let version = get(this, 'rancherVersion');
 
     if ( !version ) {
@@ -201,9 +201,9 @@ export default Service.extend(Evented, {
     }
 
     return minorVersion(version);
-  }.property('rancherVersion'),
+  }),
 
-  docsBase: function() {
+  docsBase: computed('intl.locale', 'minorVersion', function() {
     let full = get(this, 'rancherVersion');
     let version;
 
@@ -222,5 +222,5 @@ export default Service.extend(Evented, {
     }
 
     return `${ C.EXT_REFERENCES.DOCS }/${ version }/${ lang }`;
-  }.property('intl.locale', 'minorVersion')
+  })
 });