Teacher tool: fixed successful blocks for blocks exist new blocks exi…

…st schema (#9908) * fixed successful blocks for blocks exist new blocks exist schema * changed successful blocks to be a map, iterating through all block counts for blocksexist
microsoft · Mar 7, 2024 · 80c84d3 · 80c84d3
1 parent c93a681
commit 80c84d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pxteditor/code-validation/runValidatorPlan.ts b/pxteditor/code-validation/runValidatorPlan.ts
@@ -72,9 +72,10 @@ function runBlocksExistValidation(usedBlocks: Blockly.Block[], inputs: pxt.block
     const blockResults = validateBlocksExist({ usedBlocks, requiredBlockCounts });
     let successfulBlocks: Blockly.Block[] = [];
     if (blockResults.passed) {
-        const blockIdsFromValidator = Object.keys(inputs.blockCounts)
-        const blockId = blockIdsFromValidator?.[0];
-        successfulBlocks = blockResults.successfulBlocks.length ? blockResults.successfulBlocks[0][blockId] : [];
+        for (const blockCount of inputs.blockCounts) {
+            const blockId = blockCount.blockId;
+            successfulBlocks.push(...blockResults.successfulBlocks[blockId]);
+        }
     }
     return [successfulBlocks, blockResults.passed];
 }

diff --git a/pxteditor/code-validation/validateBlocksExist.ts b/pxteditor/code-validation/validateBlocksExist.ts
@@ -7,23 +7,23 @@ export function validateBlocksExist({ usedBlocks, requiredBlockCounts }: {
     missingBlocks: string[],
     disabledBlocks: string[],
     insufficientBlocks: string[],
-    successfulBlocks: pxt.Map<Blockly.Block[]>[],
+    successfulBlocks: pxt.Map<Blockly.Block[]>,
     passed: boolean
 } {
     let missingBlocks: string[] = [];
     let disabledBlocks: string[] = [];
     let insufficientBlocks: string[] = [];
-    let successfulBlocks: pxt.Map<Blockly.Block[]>[]  = [];
+    let successfulBlocks: pxt.Map<Blockly.Block[]> = {};
     const userBlocksEnabledByType = usedBlocks?.reduce((acc: pxt.Map<number>, block) => {
         acc[block.type] = (acc[block.type] || 0) + (block.isEnabled() ? 1 : 0);
         return acc;
     }, {});
 
     for (const [requiredBlockId, requiredCount] of Object.entries(requiredBlockCounts || {})) {
         const countForBlock = userBlocksEnabledByType[requiredBlockId];
-        const passedBlocks = usedBlocks.filter((block) => block.type === requiredBlockId);
+        const passedBlocks = usedBlocks.filter((block) => block.isEnabled() && block.type === requiredBlockId);
         if (passedBlocks.length > 0) {
-            successfulBlocks.push({ [requiredBlockId]: passedBlocks})
+            successfulBlocks[requiredBlockId] = passedBlocks;
         }
 
         if (countForBlock === undefined) {