chore(curriculum): add blockLayout when missing from meta (freeCodeCamp#57138)

Co-authored-by: Huyen Nguyen <25715018+huyenltnguyen@users.noreply.github.com>

Author: ojeytonwilliams

client/src/templates/Introduction/components/block.test.tsx

@@ -13,7 +13,7 @@ import {
   BilibiliIds
 } from '../../../redux/prop-types';
 import { isAuditedSuperBlock } from '../../../../../shared/utils/is-audited';
-import { BlockTypes } from '../../../../../shared/config/blocks';
+import { BlockLayouts, BlockTypes } from '../../../../../shared/config/blocks';
 import Block from './block';
 
 jest.mock('../../../../../shared/utils/is-audited', () => ({
@@ -22,10 +22,12 @@ jest.mock('../../../../../shared/utils/is-audited', () => ({
 
 const defaultProps = {
   block: 'test-block',
+  blockType: null,
   challenges: [
     {
       block: 'testblock',
       blockType: BlockTypes.lab,
+      blockLayout: BlockLayouts.ChallengeGrid,
       certification: 'mockCertification',
       challengeOrder: 1,
       challengeType: 0,

client/src/templates/Introduction/components/block.tsx

@@ -444,34 +444,20 @@ class Block extends Component<BlockProps> {
       </ScrollableAnchor>
     );
 
-    const blockRenderer = () => {
-      const blockLayout = challenges[0].blockLayout;
-
-      // `blockLayout` property isn't available in all challenges
-      if (!blockLayout) {
-        if (isProjectBlock)
-          return isGridBlock ? LegacyLinkBlock : ProjectListBlock;
-        return isGridBlock
-          ? LegacyChallengeGridBlock
-          : LegacyChallengeListBlock;
-      }
-
-      // blockLayout is only being used in new certs at the moment, so I made some new components for them for now to not interfere with the existing ones
-      if (blockLayout === BlockLayouts.ChallengeGrid) return ChallengeGridBlock;
-      if (blockLayout === BlockLayouts.ChallengeList) return ChallengeListBlock;
-      if (blockLayout === BlockLayouts.Link) return LinkBlock;
-      if (blockLayout === BlockLayouts.ProjectList) return ProjectListBlock;
-      if (blockLayout === BlockLayouts.LegacyLink) return LegacyLinkBlock;
-      if (blockLayout === BlockLayouts.LegacyChallengeList)
-        return LegacyChallengeListBlock;
-      if (blockLayout === BlockLayouts.LegacyChallengeGrid)
-        return LegacyChallengeGridBlock;
+    const layoutToComponent = {
+      [BlockLayouts.ChallengeGrid]: ChallengeGridBlock,
+      [BlockLayouts.ChallengeList]: ChallengeListBlock,
+      [BlockLayouts.Link]: LinkBlock,
+      [BlockLayouts.ProjectList]: ProjectListBlock,
+      [BlockLayouts.LegacyLink]: LegacyLinkBlock,
+      [BlockLayouts.LegacyChallengeList]: LegacyChallengeListBlock,
+      [BlockLayouts.LegacyChallengeGrid]: LegacyChallengeGridBlock
     };
 
     return (
       <>
-        {blockRenderer()}
-        {isGridBlock && !isProjectBlock ? null : <Spacer size='m' />}
+        {layoutToComponent[challenges[0].blockLayout]}
+        {(!isGridBlock || isProjectBlock) && <Spacer size='m' />}
       </>
     );
   }

curriculum/challenges/_meta/a2-english-for-developers-certification-exam/meta.json

@@ -10,5 +10,6 @@
       "id": "6721db5d9f0c116e6a0fe25a",
       "title": "A2 English for Developers Certification Exam"
     }
-  ]
-}
+  ],
+  "blockLayout": "project-list"
+}

curriculum/challenges/_meta/add-logic-to-c-sharp-console-applications/meta.json

@@ -38,5 +38,6 @@
       "id": "647f882207d29547b3bee1c0",
       "title": "Trophy - Add Logic to C# Console Applications"
     }
-  ]
+  ],
+  "blockLayout": "legacy-challenge-list"
 }

curriculum/challenges/_meta/advanced-node-and-express/meta.json

@@ -94,5 +94,6 @@
       "id": "589fc832f9fc0f352b528e79",
       "title": "Send and Display Chat Messages"
     }
-  ]
-}
+  ],
+  "blockLayout": "legacy-challenge-list"
+}

curriculum/challenges/_meta/algorithms/meta.json

@@ -46,5 +46,6 @@
       "id": "61abc7ebf3029b56226de5b6",
       "title": "Implement Binary Search"
     }
-  ]
+  ],
+  "blockLayout": "legacy-challenge-list"
 }

curriculum/challenges/_meta/applied-accessibility/meta.json

@@ -94,5 +94,6 @@
       "id": "587d7790367417b2b2512ab1",
       "title": "Use tabindex to Specify the Order of Keyboard Focus for Several Elements"
     }
-  ]
-}
+  ],
+  "blockLayout": "legacy-challenge-list"
+}

curriculum/challenges/_meta/applied-visual-design/meta.json

@@ -214,5 +214,6 @@
       "id": "587d78a9367417b2b2512aea",
       "title": "Make Motion More Natural Using a Bezier Curve"
     }
-  ]
+  ],
+  "blockLayout": "legacy-challenge-list"
 }

curriculum/challenges/_meta/back-end-development-and-apis-projects/meta.json

@@ -26,5 +26,6 @@
       "id": "bd7158d8c443edefaeb5bd0f",
       "title": "File Metadata Microservice"
     }
-  ]
+  ],
+  "blockLayout": "project-list"
 }

curriculum/challenges/_meta/basic-algorithm-scripting/meta.json

@@ -70,5 +70,6 @@
       "id": "a9bd25c716030ec90084d8a1",
       "title": "Chunky Monkey"
     }
-  ]
+  ],
+  "blockLayout": "legacy-challenge-list"
 }