Merge pull request #1770 from martinpovolny/add_ui_select

Add ui_select dep. to match new ui-components.
ManageIQ · Jul 27, 2017 · baf457d · baf457d
2 parents 4f1c4ec + 15303b3
commit baf457d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -83,3 +83,4 @@
 //= require manageiq-ui-components/dist/js/ui-components
 //= require rx-angular/dist/rx.angular
 //= require patternfly-timeline/dist/timeline
+//= require ui-select/dist/select
diff --git a/app/assets/javascripts/miq_angular_application.js b/app/assets/javascripts/miq_angular_application.js
@@ -1,4 +1,5 @@
 ManageIQ.angular.app = angular.module('ManageIQ', [
+  'ui.select',
   'ui.bootstrap',
   'ui.codemirror',
   'patternfly',

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -27,4 +27,5 @@
  *= require xml_display
  *= require patternfly-timeline/dist/timeline
  *= require manageiq-ui-components/dist/css/ui-components
+ *= require ui-select/dist/select
 */
diff --git a/package.json b/package.json
@@ -28,6 +28,9 @@
     "eslint-plugin-react": "^5.1.1",
     "eslint-plugin-standard": "^2.0.1"
   },
+  "dependencies": {
+    "ui-select": "0.19.8"
+  },
   "engines": {
     "node": ">= 6.9.1",
     "npm": ">= 3.10.3"

diff --git a/tools/ci/setup_js_env.sh b/tools/ci/setup_js_env.sh
@@ -5,6 +5,8 @@ if ! cmp --silent bower.json vendor/assets/bower_components/bower.json; then
   rm -rf vendor/assets/bower_components
 fi
 
+yarn
+
 if [ -d vendor/assets/bower_components ]; then
   # Using bower_components from cache
   echo "bower assets installed... moving on."