Address deprecation warnings

rancher · Jun 27, 2023 · 0a4b433 · 0a4b433
1 parent c5bad36
commit 0a4b433
Show file tree

Hide file tree

Showing 35 changed files with 68 additions and 170 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -87,7 +87,7 @@ module.exports = {
     'ember/no-classic-components':                    'off',
     'ember/no-actions-hash':                          'off',
     'ember/no-component-lifecycle-hooks':             'off',
-    'ember/no-string-prototype-extensions':           'off',
+    'ember/no-string-prototype-extensions':           'error',
     'ember/require-super-in-lifecycle-hooks':         'off',
     'ember/no-controller-access-in-routes':           'off',
     'ember/no-private-routing-service':               'off',

diff --git a/app/authenticated/prefs/route.js b/app/authenticated/prefs/route.js
@@ -12,9 +12,6 @@ export default Route.extend({
     return get(this, 'globalStore').find('user', null, {
       forceReload: true,
       filter:      { me: true }
-    })
-      .then((user) => EmberObject.create({
-        account: get(user, 'firstObject'), // dont like this
-      }));
+    }).then((user) => EmberObject.create({ account: get(user, 'firstObject'), /* dont like this */ }));
   },
 });
diff --git a/app/components/container/form-upgrade/component.js b/app/components/container/form-upgrade/component.js
@@ -1,6 +1,7 @@
 import Component from '@ember/component';
 import layout from './template';
 import { get, computed } from '@ember/object';
+import { dasherize } from '@ember/string';
 
 export default Component.extend({
   layout,
@@ -27,6 +28,6 @@ export default Component.extend({
   }),
 
   componentName: computed('scaleMode', function() {
-    return `container/form-upgrade-${  get(this, 'scaleMode').dasherize() }`;
+    return `container/form-upgrade-${ dasherize(get(this, 'scaleMode')) }`;
   }),
 });
diff --git a/app/components/form-scoped-roles/component.js b/app/components/form-scoped-roles/component.js
@@ -7,6 +7,7 @@ import layout from './template';
 import NewOrEdit from 'ui/mixins/new-or-edit';
 import { next } from '@ember/runloop';
 import $ from 'jquery';
+import { capitalize } from '@ember/string';
 
 const CUSTOM = 'custom';
 
@@ -37,7 +38,7 @@ export default Component.extend(NewOrEdit, {
       primaryResource: this.make(model),
       stdUser:         `${ get(this, 'type') }-member`,
       admin:           `${ get(this, 'type') }-owner`,
-      cTyped:          get(this, 'type').capitalize(),
+      cTyped:          capitalize(get(this, 'type')),
     });
   },
 

diff --git a/app/components/modal-rollback-app/component.js b/app/components/modal-rollback-app/component.js
@@ -4,6 +4,7 @@ import ModalBase from 'shared/mixins/modal-base';
 import layout from './template';
 import jsondiffpatch from 'jsondiffpatch';
 import moment from 'moment';
+import { htmlSafe } from '@ember/string';
 
 const HIDDEN_FIELDS = ['digest'];
 
@@ -95,7 +96,7 @@ export default Component.extend(ModalBase, {
 
       jsondiffpatch.formatters.html.hideUnchanged();
 
-      return jsondiffpatch.formatters.html.format(delta, left).htmlSafe();
+      return htmlSafe(jsondiffpatch.formatters.html.format(delta, left));
     }
 
     return null;

diff --git a/app/components/modal-rollback-mc-app/component.js b/app/components/modal-rollback-mc-app/component.js
@@ -5,6 +5,7 @@ import layout from './template';
 import jsondiffpatch from 'jsondiffpatch';
 import moment from 'moment';
 import { notEmpty } from '@ember/object/computed';
+import { htmlSafe } from '@ember/string';
 
 const HIDDEN_FIELDS = ['digest', 'created', 'createdTS', 'links', 'uuid', 'id', 'name'];
 
@@ -95,7 +96,7 @@ export default Component.extend(ModalBase, {
 
     jsondiffpatch.formatters.html.hideUnchanged();
 
-    return jsondiffpatch.formatters.html.format(delta, left).htmlSafe();
+    return htmlSafe(jsondiffpatch.formatters.html.format(delta, left));
   },
 
   getMultiClusterAppRevisions() {

diff --git a/app/components/modal-rollback-service/component.js b/app/components/modal-rollback-service/component.js
@@ -5,6 +5,7 @@ import ModalBase from 'shared/mixins/modal-base';
 import layout from './template';
 import C from 'shared/utils/constants';
 import moment from 'moment';
+import { htmlSafe } from '@ember/string';
 
 import jsondiffpatch from 'jsondiffpatch';
 
@@ -120,7 +121,7 @@ export default Component.extend(ModalBase, {
 
       jsondiffpatch.formatters.html.hideUnchanged();
 
-      return jsondiffpatch.formatters.html.format(delta, left).htmlSafe();
+      return htmlSafe(jsondiffpatch.formatters.html.format(delta, left));
     }
 
     return null;

diff --git a/app/components/modal-view-template-diff/component.js b/app/components/modal-view-template-diff/component.js
@@ -3,6 +3,7 @@ import { get, set } from '@ember/object';
 import { inject as service } from '@ember/service';
 import jsondiffpatch from 'jsondiffpatch';
 import ModalBase from 'shared/mixins/modal-base';
+import { htmlSafe } from '@ember/string';
 
 import layout from './template';
 
@@ -36,7 +37,7 @@ export default Component.extend(ModalBase, {
 
       jsondiffpatch.formatters.html.hideUnchanged();
 
-      const diff = jsondiffpatch.formatters.html.format(delta, templates[0]).htmlSafe();
+      const diff = htmlSafe(jsondiffpatch.formatters.html.format(delta, templates[0]));
 
       set(this, 'diff', diff);
     } else {

diff --git a/app/components/page-header-project/component.js b/app/components/page-header-project/component.js
@@ -9,6 +9,7 @@ import { next } from '@ember/runloop';
 import { escapeRegex, escapeHtml } from 'shared/utils/util';
 import $ from 'jquery';
 import { isEmpty } from '@ember/utils';
+import { htmlSafe } from '@ember/string';
 
 const ITEM_HEIGHT      = 50;
 const BUFFER_HEIGHT    = 150;
@@ -563,7 +564,7 @@ export default Component.extend(ThrottledResize, {
     const rows    = Math.max(3, Math.min(want, roomFor));
     const height  = rows * ITEM_HEIGHT;
 
-    set(this, 'columnStyle', `height: ${ height }px`.htmlSafe());
+    set(this, 'columnStyle', htmlSafe(`height: ${ height }px`));
 
     let cw = Math.max(MIN_COLUMN_WIDTH, get(this, 'clustersWidth') + 60); // 20px icon, 20px padding, 20px scrollbar
     let pw = Math.max(MIN_COLUMN_WIDTH, get(this, 'projectsWidth') + 60);
@@ -576,7 +577,7 @@ export default Component.extend(ThrottledResize, {
       pw = roomFor - cw;
     }
 
-    set(this, 'menuStyle', `grid-template-columns: ${ cw }px ${ pw }px`.htmlSafe());
+    set(this, 'menuStyle', htmlSafe(`grid-template-columns: ${ cw }px ${ pw }px`));
   },
 
   isTransitioning() {
@@ -634,7 +635,7 @@ function highlightMatches(needle, haystack) {
   // 5. Return as a safe string
   return {
     found,
-    match: haystack.htmlSafe()
+    match: htmlSafe(haystack)
   }
 }
 

diff --git a/app/components/progress-bar-multi/component.js b/app/components/progress-bar-multi/component.js
@@ -1,4 +1,5 @@
 import { defineProperty, computed, get, observer } from '@ember/object';
+import { htmlSafe } from '@ember/string';
 import Component from '@ember/component';
 import layout from './template';
 import $ from 'jquery';
@@ -74,7 +75,7 @@ export default Component.extend({
       }
 
       out.forEach((obj) => {
-        obj.css = (`width: ${  obj.percent }%`).htmlSafe();
+        obj.css = htmlSafe((`width: ${  obj.percent }%`));
       });
 
       return out.filter((obj) => obj.percent);

diff --git a/app/models/cluster.js b/app/models/cluster.js
@@ -13,6 +13,7 @@ import moment from 'moment';
 import jsondiffpatch from 'jsondiffpatch';
 import { isArray } from '@ember/array';
 import Semver from 'semver';
+import { capitalize } from '@ember/string';
 
 const TRUE = 'True';
 const CLUSTER_TEMPLATE_ID_PREFIX = 'cattle-global-data:';
@@ -595,7 +596,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
         case 'rancherd':
           return intl.t('clusterNew.rancherd.shortLabel');
         default:
-          return driverName.capitalize();
+          return capitalize(driverName);
         }
       } else {
         return intl.t('clusterNew.import.shortLabel');

diff --git a/app/models/kontainerdriver.js b/app/models/kontainerdriver.js
@@ -1,6 +1,7 @@
 import Resource from '@rancher/ember-api-store/models/resource';
 import { computed, get } from '@ember/object';
 import { inject as service } from '@ember/service';
+import { capitalize } from '@ember/string';
 
 var KontainerDriver = Resource.extend({
   intl:         service(),
@@ -40,7 +41,7 @@ var KontainerDriver = Resource.extend({
     } if ( intl.exists(keyById) ) {
       return intl.t(keyById);
     } else if ( name ) {
-      return name.capitalize();
+      return capitalize(name);
     } else {
       return `(${  get(this, 'id')  })`;
     }

diff --git a/app/models/mountentry.js b/app/models/mountentry.js
@@ -3,6 +3,7 @@ import { equal } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Resource from '@rancher/ember-api-store/models/resource';
 import { reference } from '@rancher/ember-api-store/utils/denormalize';
+import { htmlSafe } from '@ember/string';
 
 export default Resource.extend({
   intl:        service(),
@@ -16,7 +17,7 @@ export default Resource.extend({
     let name = this.get('volumeName');
 
     if ( name.match(/^[0-9a-f]{64}$/) ) {
-      return (`${ name.substr(0, 12) }&hellip;`).htmlSafe();
+      return htmlSafe(`${ name.substr(0, 12) }&hellip;`);
     }
 
     return name;

diff --git a/app/models/nodedriver.js b/app/models/nodedriver.js
@@ -1,5 +1,6 @@
 import { get, computed } from '@ember/object';
 import { inject as service } from '@ember/service';
+import { capitalize } from '@ember/string';
 import Resource from '@rancher/ember-api-store/models/resource';
 import C from 'ui/utils/constants';
 import { parseExternalId } from 'ui/utils/parse-externalid';
@@ -53,7 +54,7 @@ export default Resource.extend({
     if ( name && intl.exists(key) ) {
       return intl.t(key);
     } else if ( name ) {
-      return name.capitalize();
+      return capitalize(name);
     } else {
       return `(${  get(this, 'id')  })`;
     }

diff --git a/app/models/nodetemplate.js b/app/models/nodetemplate.js
@@ -125,7 +125,7 @@ export default Resource.extend({
 
       this.registerDynamicComputedProperty('displaySize', computedKeys, size.getDisplayProperty);
     } else {
-      set(this, 'displaySize', get(this, 'config.size') || 'N/A');
+      // set(this, 'displaySize', get(this, 'config.size') || 'N/A');
     }
   },
 

diff --git a/app/models/template.js b/app/models/template.js
@@ -1,4 +1,4 @@
-import { htmlSafe } from '@ember/string';
+import { htmlSafe, underscore } from '@ember/string';
 import { computed, get } from '@ember/object';
 import { inject as service } from '@ember/service';
 import Resource from '@rancher/ember-api-store/models/resource';
@@ -93,7 +93,7 @@ const Template = Resource.extend({
   }),
 
   categoryLowerArray: computed('categoryArray.[]', function() {
-    return get(this, 'categoryArray').map((x) => (x || '').underscore().toLowerCase());
+    return get(this, 'categoryArray').map((x) => underscore(x || '').toLowerCase());
   }),
 
   certifiedType: computed('catalogId', 'labels', function() {

diff --git a/lib/global-admin/addon/components/new-edit-role/component.js b/lib/global-admin/addon/components/new-edit-role/component.js
@@ -1,5 +1,6 @@
 import { alias, or } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
+import { capitalize } from '@ember/string';
 import Component from '@ember/component';
 import C from 'ui/utils/constants';
 import layout from './template';
@@ -92,7 +93,7 @@ export default Component.extend(ViewNewEdit, {
   },
 
   readableRole: computed('roleType', function() {
-    return (get(this, 'roleType') || '').capitalize();
+    return capitalize(get(this, 'roleType') || '');
   }),
 
   isDefault: computed('model.role', 'roleType', {

diff --git a/lib/global-admin/addon/mixins/saml-auth.js b/lib/global-admin/addon/mixins/saml-auth.js
@@ -6,6 +6,7 @@ import {
 import { alias } from '@ember/object/computed';
 import C from 'ui/utils/constants';
 import { isEmpty } from '@ember/utils';
+import { capitalize } from '@ember/string';
 
 export default Mixin.create({
   intl:             service(),
@@ -142,15 +143,15 @@ export default Mixin.create({
   }),
 
   numUsers: computed('[email protected]', 'providerName', 'wasRestricted', function() {
-    let type = `PROJECT.TYPE_${ get(this, 'providerName').capitalize() }_USER`;
+    let type = `PROJECT.TYPE_${ capitalize(get(this, 'providerName')) }_USER`;
 
     type = get(C, type);
 
     return (this.get('authConfig.allowedIdentities') || []).filterBy('externalIdType', type).get('length');
   }),
 
   numOrgs: computed('[email protected]', 'providerName', 'wasRestricted', function() {
-    let type = `PROJECT.TYPE_${ get(this, 'providerName').capitalize() }_GROUP`;
+    let type = `PROJECT.TYPE_${ capitalize(get(this, 'providerName')) }_GROUP`;
 
     type = get(C, type);
 

diff --git a/lib/global-admin/addon/security/roles/index/controller.js b/lib/global-admin/addon/security/roles/index/controller.js
@@ -1,6 +1,7 @@
 import Controller from '@ember/controller';
 import { computed, get, set } from '@ember/object';
 import { next } from '@ember/runloop';
+import { capitalize } from '@ember/string';
 import C from 'ui/utils/constants';
 import { equal } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
@@ -71,7 +72,7 @@ export default Controller.extend({
   }),
 
   readableMode: computed('context', function() {
-    return (get(this, 'context') || '').capitalize();
+    return capitalize(get(this, 'context') || '');
   }),
 
   globalRows: computed('model.globalRoles.@each.{name,state}', function() {