From 6f4ead71af6f72492499b5e940aeebe99217f12d Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Sat, 24 Mar 2018 03:31:26 -0700
Subject: [PATCH] Lint

---
 app/models/volume.js                                |  2 +-
 lib/shared/addon/components/cru-volume/component.js | 13 ++++++++-----
 .../components/settings/server-url/component.js     |  2 +-
 .../volume-source/source-host-path/component.js     |  4 ----
 lib/shared/addon/mixins/volume-source.js            |  1 -
 package.json                                        |  4 ++--
 translations/en-us.yaml                             |  1 -
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/models/volume.js b/app/models/volume.js
index 736651388..b3cd7d593 100644
--- a/app/models/volume.js
+++ b/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);
diff --git a/lib/shared/addon/components/cru-volume/component.js b/lib/shared/addon/components/cru-volume/component.js
index ba02929ac..432977813 100644
--- a/lib/shared/addon/components/cru-volume/component.js
+++ b/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 ) {
-          entry.priority = 1;
-        } else {
+        if ( p.persistent ) {
           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() {
diff --git a/lib/shared/addon/components/settings/server-url/component.js b/lib/shared/addon/components/settings/server-url/component.js
index 665d689b0..ebd433489 100644
--- a/lib/shared/addon/components/settings/server-url/component.js
+++ b/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://';
diff --git a/lib/shared/addon/components/volume-source/source-host-path/component.js b/lib/shared/addon/components/volume-source/source-host-path/component.js
index 9dc71c473..501fa7dd7 100644
--- a/lib/shared/addon/components/volume-source/source-host-path/component.js
+++ b/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,
diff --git a/lib/shared/addon/mixins/volume-source.js b/lib/shared/addon/mixins/volume-source.js
index 149fe24f3..ac6635627 100644
--- a/lib/shared/addon/mixins/volume-source.js
+++ b/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({
 
diff --git a/package.json b/package.json
index 791489ae1..610e632a0 100644
--- a/package.json
+++ b/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",
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 6a8f6863b..2d5384926 100644
--- a/translations/en-us.yaml
+++ b/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