fix: type checks and image-field handling

Author: viv-helix

src/course-unit/add-component/AddComponent.tsx

@@ -188,7 +188,7 @@ const AddComponent = ({
         });
         break;
       case COMPONENT_TYPES.games:
-        handleCreateNewCourseXBlock({ type: type, category: type, parentLocator: blockId });
+        handleCreateNewCourseXBlock({ type, category: type, parentLocator: blockId });
         break;
       default:
     }

src/editors/containers/GameEditor/index.jsx

@@ -28,6 +28,7 @@ import {
   MoreHoriz,
   Check,
 } from '@openedx/paragon/icons';
+import { getConfig } from '@edx/frontend-platform';
 import {
   actions,
   selectors,
@@ -42,7 +43,6 @@ import SettingsOption from '../ProblemEditor/components/EditProblemView/Settings
 import Button from '../../sharedComponents/Button';
 import DraggableList, { SortableItem } from '../../../generic/DraggableList';
 import messages from './messages';
-import { getConfig } from '@edx/frontend-platform';
 
 export const hooks = {
   getContent: ({ type, settings, list }) => ({
@@ -142,9 +142,7 @@ export const GameEditor = ({
 
   // Backward compatible wrappers
   const saveTermImage = (index) => handleImageUpload(index, 'term');
-  const removeTermImage = (index) => handleImageRemove(index, 'term');
   const saveDefinitionImage = (index) => handleImageUpload(index, 'definition');
-  const removeDefintionImage = (index) => handleImageRemove(index, 'definition');
 
   const moveCardUp = (index) => {
     if (index === 0) { return; }

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

@@ -133,7 +133,7 @@ const triggerCourseRefresh = () => {
  */
 export const saveBlock = (content, returnToUnit) => (dispatch, getState) => {
   dispatch(actions.app.setBlockContent(content));
-  
+
   // Games block uses a custom handler for saving
   const blockType = selectors.blockType(getState());
   if (blockType === 'games' && content.gameType) {
@@ -147,7 +147,6 @@ export const saveBlock = (content, returnToUnit) => (dispatch, getState) => {
         returnToUnit(response.data);
       },
       onFailure: (error) => {
-        console.error('Failed to save games settings:', error);
         dispatch(actions.requests.failRequest({
           requestKey: RequestKeys.saveBlock,
           error,
@@ -156,7 +155,7 @@ export const saveBlock = (content, returnToUnit) => (dispatch, getState) => {
     }));
     return;
   }
-  
+
   // Standard save for other block types
   dispatch(requests.saveBlock({
     content,

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

@@ -36,7 +36,7 @@ describe('app thunkActions', () => {
   let getState;
   beforeEach(() => {
     dispatch = jest.fn((action) => ({ dispatch: action }));
-    getState = jest.fn().mockImplementation(() => ({ app: { blockId: 'blockId', images: {} } }));
+    getState = jest.fn().mockImplementation(() => ({ app: { blockId: 'blockId', blockType: 'html', images: {} } }));
   });
   describe('fetchBlock', () => {
     beforeEach(() => {
@@ -339,7 +339,7 @@ describe('app thunkActions', () => {
     let calls;
     beforeEach(() => {
       returnToUnit = jest.fn();
-      thunkActions.saveBlock(testValue, returnToUnit)(dispatch);
+      thunkActions.saveBlock(testValue, returnToUnit)(dispatch, getState);
       calls = dispatch.mock.calls;
     });
     it('dispatches actions.app.setBlockContent with content, before dispatching saveBlock', () => {

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

@@ -15,7 +15,7 @@ const actions = {
 export const loadGamesSettings = () => (dispatch) => {
   dispatch(requests.getGamesSettings({
     onSuccess: (response) => {
-      const data = response.data;
+      const { data } = response;
 
       if (data.game_type) {
         dispatch(actions.game.updateType(data.game_type));
@@ -50,7 +50,6 @@ export const loadGamesSettings = () => (dispatch) => {
       }
     },
     onFailure: (error) => {
-      console.error('Failed to load game settings:', error);
       dispatch(actions.requests.failRequest({
         requestKey: RequestKeys.fetchBlock,
         error,
@@ -72,15 +71,14 @@ export const uploadGameImage = ({ index, imageFile, imageType }) => (dispatch) =
       // Extract the URL from the response
       // Response format: { success: true, url: "/media/games/...", filename: "..." }
       const imageUrl = response.data?.url;
-      
+
       if (imageType === 'term') {
         dispatch(actions.game.updateTermImage({ index, termImage: imageUrl }));
       } else if (imageType === 'definition') {
         dispatch(actions.game.updateDefinitionImage({ index, definitionImage: imageUrl }));
       }
     },
     onFailure: (error) => {
-      console.error('Failed to upload game image:', error);
       dispatch(actions.requests.failRequest({
         requestKey: RequestKeys.uploadAsset,
         error,

src/editors/data/services/cms/api.ts

@@ -427,13 +427,22 @@ export const apiMethods = {
     hasTimer,
   }) => {
     // Transform cards to include order and format properly
-    const formattedCards = cards.map((card, index) => ({
-      term: card.term || '',
-      term_image: card.term_image || '',
-      definition: card.definition || '',
-      definition_image: card.definition_image || '',
-      order: index + 1,
-    }));
+    // For matching games, exclude image fields
+    const formattedCards = cards.map((card, index) => {
+      const baseCard = {
+        term: card.term || '',
+        definition: card.definition || '',
+        order: index + 1,
+      };
+      if (gameType === 'flashcards') {
+        return {
+          ...baseCard,
+          term_image: card.term_image || '',
+          definition_image: card.definition_image || '',
+        };
+      }
+      return baseCard;
+    });
 
     const payload: any = {
       game_type: gameType,