From ad90e60759b91719caab84d6a12b3de36ad040bb Mon Sep 17 00:00:00 2001
From: Michael Roytman <mroytman@edx.org>
Date: Wed, 14 Mar 2018 16:57:04 -0400
Subject: [PATCH] bump studio-frontend package version to 1.5.0

---
 .../tests/studio/test_studio_asset.py         |  2 +-
 package-lock.json                             | 27 ++++++++-----------
 package.json                                  |  2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/common/test/acceptance/tests/studio/test_studio_asset.py b/common/test/acceptance/tests/studio/test_studio_asset.py
index a9a95993de..df738e8fa9 100644
--- a/common/test/acceptance/tests/studio/test_studio_asset.py
+++ b/common/test/acceptance/tests/studio/test_studio_asset.py
@@ -41,8 +41,8 @@ class AssetIndexTestStudioFrontend(StudioCourseTest):
         assert not self.assert_table_exists()
         assert not self.assert_sortable_table_heading_elements_exist()
         assert not self.assert_pagination_element_exists()
-        assert not self.assert_status_element_exists()
 
+        assert self.assert_status_element_exists()
         assert self.assert_type_filter_exists()
         assert self.assert_upload_element_exists()
         assert self.assert_no_results_headings_exist()
diff --git a/package-lock.json b/package-lock.json
index 43d52557cc..cfb66e0d60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -62,9 +62,9 @@
       }
     },
     "@edx/studio-frontend": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@edx/studio-frontend/-/studio-frontend-1.4.1.tgz",
-      "integrity": "sha512-7vhB88GF2p7hGfgKmceJwUbtJLOyWHqFkM9SkpAOWTQLHhju8SnsYa/JOjxaxGFdPvYTLRGs9aDnzsRGKhRJbg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@edx/studio-frontend/-/studio-frontend-1.5.0.tgz",
+      "integrity": "sha512-SwcbToT/UCjfjmrgbkBbF8wF/0Nt8SEfjYSSj5mNdau4/N+F+q0BHZ95QUoVlS/t8sTWG6FU/GGrWfdQzGbX4A==",
       "requires": {
         "@edx/edx-bootstrap": "0.4.3",
         "@edx/paragon": "2.2.1",
@@ -76,12 +76,13 @@
         "popper.js": "1.12.9",
         "prop-types": "15.6.0",
         "react": "16.2.0",
-        "react-dom": "16.2.0",
+        "react-dom": "16.1.0",
         "react-dropzone": "4.2.9",
         "react-intl": "2.4.0",
         "react-intl-translations-manager": "5.0.1",
         "react-paginate": "5.1.0",
         "react-redux": "5.0.7",
+        "reactifex": "0.0.2",
         "redux": "3.7.2",
         "redux-devtools-extension": "2.13.2",
         "redux-thunk": "2.2.0",
@@ -102,7 +103,7 @@
             "mailto-link": "1.0.0",
             "prop-types": "15.6.0",
             "react": "16.2.0",
-            "react-dom": "16.2.0",
+            "react-dom": "16.1.0",
             "react-element-proptypes": "1.0.0",
             "react-proptype-conditional-require": "1.0.4"
           }
@@ -117,17 +118,6 @@
             "object-assign": "4.1.1",
             "prop-types": "15.6.0"
           }
-        },
-        "react-dom": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.2.0.tgz",
-          "integrity": "sha512-zpGAdwHVn9K0091d+hr+R0qrjoJ84cIBFL2uU60KvWBPfZ7LPSrfqviTxGHWN0sjPZb2hxWzMexwrvJdKePvjg==",
-          "requires": {
-            "fbjs": "0.8.16",
-            "loose-envify": "1.3.1",
-            "object-assign": "4.1.1",
-            "prop-types": "15.6.0"
-          }
         }
       }
     },
@@ -8090,6 +8080,11 @@
         "slick-carousel": "1.8.1"
       }
     },
+    "reactifex": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/reactifex/-/reactifex-0.0.2.tgz",
+      "integrity": "sha512-h4kBLr2U/W/Iw/uxkmwIhChu3BhaGYWfG0WdZkPHuwfPOzhsTTogrThX9ebdq2YE+ueKLRiiAxqBlRhgj8XhSQ=="
+    },
     "read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
diff --git a/package.json b/package.json
index 9030300d23..f92c18c1b2 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "dependencies": {
     "@edx/edx-bootstrap": "0.4.3",
     "@edx/paragon": "1.7.1",
-    "@edx/studio-frontend": "1.4.1",
+    "@edx/studio-frontend": "1.5.0",
     "babel-core": "6.26.0",
     "babel-loader": "6.4.1",
     "babel-plugin-transform-class-properties": "6.24.1",