diff --git a/package.json b/package.json index 23820bec..4da1cb80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@edx/studio-frontend", - "version": "0.6.6", + "version": "0.6.7", "description": "The frontend for the Open edX platform", "repository": "edx/studio-frontend", "scripts": { @@ -13,7 +13,7 @@ "license": "AGPL-3.0", "dependencies": { "@edx/edx-bootstrap": "^0.4.0", - "@edx/paragon": "^1.4.10", + "@edx/paragon": "^1.4.11", "babel-polyfill": "^6.26.0", "classnames": "^2.2.5", "copy-to-clipboard": "^3.0.8", diff --git a/src/components/AssetsTable/AssetsTable.scss b/src/components/AssetsTable/AssetsTable.scss new file mode 100644 index 00000000..9bf52df3 --- /dev/null +++ b/src/components/AssetsTable/AssetsTable.scss @@ -0,0 +1 @@ +@import '../../SFE.scss'; diff --git a/src/components/AssetsTable/AssetsTable.test.jsx b/src/components/AssetsTable/AssetsTable.test.jsx index f2faa32b..4b9822ab 100644 --- a/src/components/AssetsTable/AssetsTable.test.jsx +++ b/src/components/AssetsTable/AssetsTable.test.jsx @@ -372,7 +372,7 @@ describe('', () => { ); const trashButtons = wrapper.find('button').filterWhere(button => button.hasClass('fa-trash')); - const deleteButton = wrapper.find('[role="dialog"] button').filterWhere(button => button.hasClass('btn-primary') && button.matchesElement()); + const deleteButton = wrapper.find('[role="dialog"] button').filterWhere(button => button.hasClass('btn-primary') && button.matchesElement()); trashButtons.at(0).simulate('click'); deleteButton.simulate('click'); @@ -391,7 +391,7 @@ describe('', () => { ); const trashButtons = wrapper.find('button').filterWhere(button => button.hasClass('fa-trash')); - const deleteButton = wrapper.find('[role="dialog"] button').filterWhere(button => button.hasClass('btn-primary') && button.matchesElement()); + const deleteButton = wrapper.find('[role="dialog"] button').filterWhere(button => button.hasClass('btn-primary') && button.matchesElement()); trashButtons.at(0).simulate('click'); deleteButton.simulate('click'); @@ -459,7 +459,7 @@ describe('', () => { }); it('moves from modal to status alert on asset delete', () => { - const deleteButton = wrapper.find('[role="dialog"] button').filterWhere(button => button.hasClass('btn-primary') && button.matchesElement()); + const deleteButton = wrapper.find('[role="dialog"] button').filterWhere(button => button.hasClass('btn-primary') && button.matchesElement()); const statusAlert = wrapper.find('StatusAlert'); const closeStatusAlertButton = statusAlert.find('button').filterWhere(button => button.matchesElement()); @@ -494,7 +494,7 @@ describe('', () => { wrapper.setProps({ deleteAsset: mockDeleteAsset }); - const deleteButton = wrapper.find('[role="dialog"] button').filterWhere(button => button.hasClass('btn-primary') && button.matchesElement()); + const deleteButton = wrapper.find('[role="dialog"] button').filterWhere(button => button.hasClass('btn-primary') && button.matchesElement()); const statusAlert = wrapper.find('StatusAlert'); const closeStatusAlertButton = statusAlert.find('button').filterWhere(button => button.matchesElement()); diff --git a/src/components/AssetsTable/index.jsx b/src/components/AssetsTable/index.jsx index 17851dca..6115b095 100644 --- a/src/components/AssetsTable/index.jsx +++ b/src/components/AssetsTable/index.jsx @@ -8,6 +8,7 @@ import classNames from 'classnames'; import { connect } from 'react-redux'; import FontAwesomeStyles from 'font-awesome/css/font-awesome.min.css'; +import styles from './AssetsTable.scss'; import { assetActions } from '../../data/constants/actionTypes'; import { assetLoading } from '../../data/constants/loadingTypes'; import { clearAssetsStatus, deleteAsset, sortUpdate, toggleLockAsset } from '../../data/actions/assets'; @@ -316,7 +317,7 @@ export class AssetsTable extends React.Component { onClose={this.closeModal} buttons={[