refactor: change isCreateBlock for shouldCreateBlock

.env.test

@@ -39,4 +39,5 @@ INVITE_STUDENTS_EMAIL_TO="someone@domain.com"
 ENABLE_HOME_PAGE_COURSE_API_V2=true
 ENABLE_CHECKLIST_QUALITY=true
 ENABLE_GRADING_METHOD_IN_PROBLEMS=false
+# "other" is used to test the workflow for creating blocks that aren't supported by the built-in editors
 LIBRARY_SUPPORTED_BLOCKS="problem,video,html,other"

src/editors/containers/EditorContainer/hooks.ts

@@ -30,11 +30,11 @@ export const handleSaveClicked = ({
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const returnUrl = useSelector(selectors.app.returnUrl);
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const isCreateBlock = useSelector(selectors.app.isCreateBlock);
+  const createBlockOnSave = useSelector(selectors.app.shouldCreateBlock);
   const destination = returnFunction ? '' : returnUrl;
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const analytics = useSelector(selectors.app.analytics);
-  if (isCreateBlock) {
+  if (createBlockOnSave) {
     return () => createBlock({
       analytics,
       content: getContent({ dispatch }),

src/editors/containers/ProblemEditor/index.test.tsx

@@ -27,7 +27,7 @@ jest.mock('../../data/redux', () => ({
   selectors: {
     app: {
       blockValue: jest.fn(state => ({ blockValue: state })),
-      isCreateBlock: jest.fn(state => ({ isCreateBlock: state })),
+      shouldCreateBlock: jest.fn(state => ({ shouldCreateBlock: state })),
     },
     problem: {
       problemType: jest.fn(state => ({ problemType: state })),
@@ -106,15 +106,15 @@ describe('ProblemEditor', () => {
       expect(
         mapStateToProps(testState).blockFinished,
       ).toEqual(
-        selectors.app.isCreateBlock(testState)
+        selectors.app.shouldCreateBlock(testState)
         || selectors.requests.isFinished(testState, { requestKey: RequestKeys.fetchBlock }),
       );
     });
     test('advancedSettingsFinished from requests.isFinished', () => {
       expect(
         mapStateToProps(testState).advancedSettingsFinished,
       ).toEqual(
-        selectors.app.isCreateBlock(testState)
+        selectors.app.shouldCreateBlock(testState)
         || selectors.requests.isFinished(testState, { requestKey: RequestKeys.fetchAdvancedSettings }),
       );
     });

src/editors/containers/ProblemEditor/index.tsx

@@ -65,12 +65,12 @@ const ProblemEditor: React.FC<Props> = ({
 };
 
 export const mapStateToProps = (state) => ({
-  blockFinished: selectors.app.isCreateBlock(state)
+  blockFinished: selectors.app.shouldCreateBlock(state)
   || selectors.requests.isFinished(state, { requestKey: RequestKeys.fetchBlock }),
   blockFailed: selectors.requests.isFailed(state, { requestKey: RequestKeys.fetchBlock }),
   problemType: selectors.problem.problemType(state),
   blockValue: selectors.app.blockValue(state),
-  advancedSettingsFinished: selectors.app.isCreateBlock(state)
+  advancedSettingsFinished: selectors.app.shouldCreateBlock(state)
   || selectors.requests.isFinished(state, { requestKey: RequestKeys.fetchAdvancedSettings }),
 });
 

src/editors/containers/TextEditor/index.jsx

@@ -132,7 +132,7 @@ export const mapStateToProps = (state) => ({
   blockFailed: selectors.requests.isFailed(state, { requestKey: RequestKeys.fetchBlock }),
   blockId: selectors.app.blockId(state),
   showRawEditor: selectors.app.showRawEditor(state),
-  blockFinished: selectors.app.isCreateBlock(state)
+  blockFinished: selectors.app.shouldCreateBlock(state)
   || selectors.requests.isFinished(state, { requestKey: RequestKeys.fetchBlock }),
   learningContextId: selectors.app.learningContextId(state),
   images: selectors.app.images(state),

src/editors/containers/TextEditor/index.test.jsx

@@ -55,7 +55,7 @@ jest.mock('../../data/redux', () => ({
   selectors: {
     app: {
       blockValue: jest.fn(state => ({ blockValue: state })),
-      isCreateBlock: jest.fn(state => ({ isCreateBlock: state })),
+      shouldCreateBlock: jest.fn(state => ({ shouldCreateBlock: state })),
       lmsEndpointUrl: jest.fn(state => ({ lmsEndpointUrl: state })),
       studioEndpointUrl: jest.fn(state => ({ studioEndpointUrl: state })),
       showRawEditor: jest.fn(state => ({ showRawEditor: state })),
@@ -127,7 +127,7 @@ describe('TextEditor', () => {
     test('blockFinished from requests.isFinished', () => {
       expect(
         mapStateToProps(testState).blockFinished,
-      ).toEqual(selectors.app.isCreateBlock(testState)
+      ).toEqual(selectors.app.shouldCreateBlock(testState)
       || selectors.requests.isFinished(testState, { requestKey: RequestKeys.fetchBlock }));
     });
     test('learningContextId from app.learningContextId', () => {

src/editors/containers/VideoEditor/index.tsx

@@ -23,7 +23,7 @@ const VideoEditor: React.FC<EditorComponent> = ({
     (state) => selectors.requests.isFinished(state, { requestKey: RequestKeys.fetchStudioView }),
   );
   const isLibrary = useSelector(selectors.app.isLibrary) as boolean;
-  const isCreateBlock = useSelector(selectors.app.isCreateBlock) as boolean;
+  const isCreateWorkflow = useSelector(selectors.app.shouldCreateBlock) as boolean;
   const {
     error,
     validateEntry,
@@ -37,7 +37,7 @@ const VideoEditor: React.FC<EditorComponent> = ({
         returnFunction={returnFunction}
         validateEntry={validateEntry}
       >
-        {(isCreateBlock || studioViewFinished) ? (
+        {(isCreateWorkflow || studioViewFinished) ? (
           <div className="video-editor">
             <VideoEditorModal {...{ isLibrary }} />
           </div>

src/editors/data/redux/app/selectors.test.ts

@@ -88,7 +88,7 @@ describe('app selectors unit tests', () => {
         simpleSelectors.unitUrl,
         simpleSelectors.blockValue,
         selectors.isLibrary,
-        selectors.isCreateBlock,
+        selectors.shouldCreateBlock,
       ]);
     });
     describe('for library blocks', () => {
@@ -120,7 +120,7 @@ describe('app selectors unit tests', () => {
       });
     });
     describe('component creation workflow', () => {
-      it('returns true if is isCreateBlock is truthy', () => {
+      it('returns true if is shouldCreateBlock is truthy', () => {
         const { resultFunc: cb } = selectors.isInitialized;
 
         [
@@ -195,9 +195,9 @@ describe('app selectors unit tests', () => {
       });
     });
   });
-  describe('isCreateBlock', () => {
+  describe('shouldCreateBlock', () => {
     it('should return false if the editor is initialized with a blockId', () => {
-      expect(selectors.isCreateBlock.resultFunc('block-v1:', 'text')).toEqual(false);
+      expect(selectors.shouldCreateBlock.resultFunc('block-v1:', 'text')).toEqual(false);
     });
   });
 });

src/editors/data/redux/app/selectors.ts

@@ -54,7 +54,7 @@ export const isLibrary = createSelector(
   },
 );
 
-export const isCreateBlock = createSelector(
+export const shouldCreateBlock = createSelector(
   [simpleSelectors.blockId,
     simpleSelectors.blockType,
   ],
@@ -71,10 +71,10 @@ export const isInitialized = createSelector(
     simpleSelectors.unitUrl,
     simpleSelectors.blockValue,
     isLibrary,
-    isCreateBlock,
+    shouldCreateBlock,
   ],
-  (unitUrl, blockValue, isLibraryBlock, isCreateEditor) => {
-    if (isCreateEditor) {
+  (unitUrl, blockValue, isLibraryBlock, initCreateWorkflow) => {
+    if (initCreateWorkflow) {
       return true;
     }
 
@@ -122,5 +122,5 @@ export default {
   displayTitle,
   analytics,
   isLibrary,
-  isCreateBlock,
+  shouldCreateBlock,
 };

src/editors/data/redux/thunkActions/app.js

@@ -169,7 +169,7 @@ export const createBlock = (content, returnToUnit) => (dispatch, getState) => {
 };
 
 export const uploadAsset = ({ file, setSelection }) => (dispatch, getState) => {
-  if (selectors.isCreateBlock(getState())) {
+  if (selectors.shouldCreateBlock(getState())) {
     const tempFileURL = URL.createObjectURL(file);
     const tempImage = {
       displayName: file.name,

src/editors/data/redux/thunkActions/app.test.js

@@ -382,7 +382,7 @@ describe('app thunkActions', () => {
         error,
       }));
     });
-    test.only('should call batchUploadAssets if the block has images', () => {
+    test('should call batchUploadAssets if the block has images', () => {
       mockImageData.map(image => ({ ...image, file: 'file' }));
       getState.mockReturnValueOnce({ app: { blockId: '', images: mockImageData } });
       const data = { id: 'block-id' };