From e56f22891ea5fe903e041ebe067e9965ae12f6be Mon Sep 17 00:00:00 2001 From: Ben Warzeski Date: Tue, 5 Oct 2021 15:07:02 -0400 Subject: [PATCH] re-organize ReviewModal and ReviewActions --- .../__snapshots__/ReviewActions.test.jsx.snap | 0 .../__snapshots__/StartGradingButton.test.jsx.snap | 0 .../__snapshots__/SubmissionNavigation.test.jsx.snap | 0 .../components}/StartGradingButton.jsx | 0 .../components}/StartGradingButton.test.jsx | 0 .../components}/SubmissionNavigation.jsx | 0 .../components}/SubmissionNavigation.test.jsx | 0 .../ReviewActions.jsx => ReviewActions/index.jsx} | 5 ++--- .../ReviewActions.test.jsx => ReviewActions/index.test.jsx} | 6 +++--- src/containers/ReviewModal/index.jsx | 2 +- 10 files changed, 6 insertions(+), 7 deletions(-) rename src/containers/{ReviewModal => ReviewActions}/__snapshots__/ReviewActions.test.jsx.snap (100%) rename src/containers/{ReviewModal => ReviewActions}/__snapshots__/StartGradingButton.test.jsx.snap (100%) rename src/containers/{ReviewModal => ReviewActions}/__snapshots__/SubmissionNavigation.test.jsx.snap (100%) rename src/containers/{ReviewModal => ReviewActions/components}/StartGradingButton.jsx (100%) rename src/containers/{ReviewModal => ReviewActions/components}/StartGradingButton.test.jsx (100%) rename src/containers/{ReviewModal => ReviewActions/components}/SubmissionNavigation.jsx (100%) rename src/containers/{ReviewModal => ReviewActions/components}/SubmissionNavigation.test.jsx (100%) rename src/containers/{ReviewModal/ReviewActions.jsx => ReviewActions/index.jsx} (91%) rename src/containers/{ReviewModal/ReviewActions.test.jsx => ReviewActions/index.test.jsx} (93%) diff --git a/src/containers/ReviewModal/__snapshots__/ReviewActions.test.jsx.snap b/src/containers/ReviewActions/__snapshots__/ReviewActions.test.jsx.snap similarity index 100% rename from src/containers/ReviewModal/__snapshots__/ReviewActions.test.jsx.snap rename to src/containers/ReviewActions/__snapshots__/ReviewActions.test.jsx.snap diff --git a/src/containers/ReviewModal/__snapshots__/StartGradingButton.test.jsx.snap b/src/containers/ReviewActions/__snapshots__/StartGradingButton.test.jsx.snap similarity index 100% rename from src/containers/ReviewModal/__snapshots__/StartGradingButton.test.jsx.snap rename to src/containers/ReviewActions/__snapshots__/StartGradingButton.test.jsx.snap diff --git a/src/containers/ReviewModal/__snapshots__/SubmissionNavigation.test.jsx.snap b/src/containers/ReviewActions/__snapshots__/SubmissionNavigation.test.jsx.snap similarity index 100% rename from src/containers/ReviewModal/__snapshots__/SubmissionNavigation.test.jsx.snap rename to src/containers/ReviewActions/__snapshots__/SubmissionNavigation.test.jsx.snap diff --git a/src/containers/ReviewModal/StartGradingButton.jsx b/src/containers/ReviewActions/components/StartGradingButton.jsx similarity index 100% rename from src/containers/ReviewModal/StartGradingButton.jsx rename to src/containers/ReviewActions/components/StartGradingButton.jsx diff --git a/src/containers/ReviewModal/StartGradingButton.test.jsx b/src/containers/ReviewActions/components/StartGradingButton.test.jsx similarity index 100% rename from src/containers/ReviewModal/StartGradingButton.test.jsx rename to src/containers/ReviewActions/components/StartGradingButton.test.jsx diff --git a/src/containers/ReviewModal/SubmissionNavigation.jsx b/src/containers/ReviewActions/components/SubmissionNavigation.jsx similarity index 100% rename from src/containers/ReviewModal/SubmissionNavigation.jsx rename to src/containers/ReviewActions/components/SubmissionNavigation.jsx diff --git a/src/containers/ReviewModal/SubmissionNavigation.test.jsx b/src/containers/ReviewActions/components/SubmissionNavigation.test.jsx similarity index 100% rename from src/containers/ReviewModal/SubmissionNavigation.test.jsx rename to src/containers/ReviewActions/components/SubmissionNavigation.test.jsx diff --git a/src/containers/ReviewModal/ReviewActions.jsx b/src/containers/ReviewActions/index.jsx similarity index 91% rename from src/containers/ReviewModal/ReviewActions.jsx rename to src/containers/ReviewActions/index.jsx index de2317a..66ed1b0 100644 --- a/src/containers/ReviewModal/ReviewActions.jsx +++ b/src/containers/ReviewActions/index.jsx @@ -11,9 +11,8 @@ import actions from 'data/actions'; import selectors from 'data/selectors'; import StatusBadge from 'components/StatusBadge'; -import StartGradingButton from './StartGradingButton'; -import SubmissionNavigation from './SubmissionNavigation'; -import './ReviewModal.scss'; +import StartGradingButton from './components/StartGradingButton'; +import SubmissionNavigation from './components/SubmissionNavigation'; export const ReviewActions = ({ gradingStatus, diff --git a/src/containers/ReviewModal/ReviewActions.test.jsx b/src/containers/ReviewActions/index.test.jsx similarity index 93% rename from src/containers/ReviewModal/ReviewActions.test.jsx rename to src/containers/ReviewActions/index.test.jsx index 6c439d5..37ac095 100644 --- a/src/containers/ReviewModal/ReviewActions.test.jsx +++ b/src/containers/ReviewActions/index.test.jsx @@ -4,7 +4,7 @@ import { shallow } from 'enzyme'; import actions from 'data/actions'; import selectors from 'data/selectors'; -import { ReviewActions, mapStateToProps, mapDispatchToProps } from './ReviewActions'; +import { ReviewActions, mapStateToProps, mapDispatchToProps } from '.'; jest.mock('@edx/paragon', () => ({ ActionRow: () => 'ActionRow', @@ -23,8 +23,8 @@ jest.mock('data/selectors', () => ({ }, })); jest.mock('components/StatusBadge', () => 'StatusBadge'); -jest.mock('./StartGradingButton', () => 'StartGradingButton'); -jest.mock('./SubmissionNavigation', () => 'SubmissionNavigation'); +jest.mock('./components/StartGradingButton', () => 'StartGradingButton'); +jest.mock('./components/SubmissionNavigation', () => 'SubmissionNavigation'); describe('ReviewActions component', () => { describe('component', () => { diff --git a/src/containers/ReviewModal/index.jsx b/src/containers/ReviewModal/index.jsx index 131231e..311c516 100644 --- a/src/containers/ReviewModal/index.jsx +++ b/src/containers/ReviewModal/index.jsx @@ -14,7 +14,7 @@ import actions from 'data/actions'; import ResponseDisplay from 'components/ResponseDisplay'; import Rubric from 'containers/Rubric'; -import ReviewActions from './ReviewActions'; +import ReviewActions from 'containers/ReviewActions'; import './ReviewModal.scss';