Merge pull request #1762 from vincent99/master

Lint

app/models/volume.js

@@ -9,7 +9,7 @@ registerSource('azure-disk',     'azureDisk',              true,     true,     t
 registerSource('azure-file',     'azureFile',              true,     true,     true);
 registerSource('cephfs',         'cephfs',                 true,     true,     true);
 registerSource('cinder',         'cinder',                 true,     true,     true);
-//registerSource('config-map',     'configMap',              true,     true,     false);
+registerSource('config-map',     'configMap',              true,     true,     false);
 //registerSource('downward-api',   'downwardAPI',            true,     true,     false);
 registerSource('empty-dir',      'emptyDir',               true,     true,     false);
 registerSource('fc',             'fc',                     true,     true,     true);

lib/shared/addon/components/cru-volume/component.js

@@ -62,15 +62,18 @@ export default Component.extend(ViewNewEdit, {
 
   sourceChoices: computed('intl.locale', function() {
     const intl = get(this, 'intl');
+    const skip = ['host-path','secret'];
     const out = getSources('ephemeral').map((p) => {
       const entry = Object.assign({}, p);
       const key = `volumeSource.${entry.name}.title`;
-      if ( intl.exists(key) ) {
+      if ( skip.includes(entry.name) ) {
+        entry.priority = 0;
+      } else if ( intl.exists(key) ) {
         entry.label = intl.t(key);
-        if ( p.ephemeral ) {
+        if ( p.persistent ) {
-          entry.priority = 1;
-        } else {
           entry.priority = 2;
+        } else {
+          entry.priority = 1;
         }
       } else {
         entry.label = entry.name;
@@ -80,7 +83,7 @@ export default Component.extend(ViewNewEdit, {
       return entry;
     });
 
-    return out.sortBy('priority','label');
+    return out.filter(x => x.priority > 0 ).sortBy('priority','label');
   }),
 
   sourceComponent: computed('sourceName', function() {

lib/shared/addon/components/settings/server-url/component.js

@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import layout from './template';
-import { get, set, setProperties } from '@ember/object';
+import { get, set } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 const SCHEME = 'https://';

lib/shared/addon/components/volume-source/source-host-path/component.js

@@ -1,9 +1,5 @@
 import Component from '@ember/component';
 import layout from './template';
-import { get } from '@ember/object';
-
-const FIELD = 'hostPath';
-const TYPE = 'hostPathVolumeSource';
 
 export default Component.extend({
   layout,

lib/shared/addon/mixins/volume-source.js

@@ -1,6 +1,5 @@
 import Mixin from '@ember/object/mixin';
 import { get, set, computed } from '@ember/object';
-import { inject as service } from '@ember/service';
 
 export default Mixin.create({
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "2.0.26",
+  "version": "2.0.27",
   "private": true,
   "directories": {
     "doc": "doc",
@@ -24,7 +24,7 @@
     "ansi_up": "^2.0.2",
     "broccoli-asset-rev": "^2.6.0",
     "dotenv": "^4.0.0",
-    "ember-api-store": "2.6.3",
+    "ember-api-store": "2.6.4",
     "ember-browserify": "^1.2.0",
     "ember-cli": "~2.16.2",
     "ember-cli-app-version": "^3.0.0",

translations/en-us.yaml

@@ -2480,7 +2480,6 @@ cruStorageClass:
       placeholder: "e.g. 32"
     repl:
       label: Repl
-      placeholder: "e.g. 1"
       placeholder: "e.g. 1; 0 for entire device"
     io_priority:
       label: I/O Priority