Merge branch 'master' of https://github.com/microsoft/pxt into thspar…

…ks/teachertool/variable_validator
microsoft · Apr 30, 2024 · 8422afb · 8422afb
2 parents 0076acd + 1234c4f
commit 8422afb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/common-docs/teachertool/catalog-shared.json b/common-docs/teachertool/catalog-shared.json
@@ -1,5 +1,25 @@
 {
     "criteria": [
+        {
+            "id": "59AAC5BA-B0B3-4389-AA90-1E767EFA8563",
+            "use": "block_used_n_times",
+            "template": "${Block} used ${count} times",
+            "description": "This block was used the specified number of times in your project.",
+            "docPath": "/teachertool",
+            "params": [
+                {
+                    "name": "block",
+                    "type": "block",
+                    "paths": ["checks[0].blockCounts[0].blockId"]
+                },
+                {
+                    "name": "count",
+                    "type": "number",
+                    "default": 1,
+                    "paths": ["checks[0].blockCounts[0].count"]
+                }
+            ]
+        },
         {
             "id": "D21D76A2-D9FD-4F9B-B0AC-973CB870EA78",
             "use": "variable_set",
@@ -32,26 +52,6 @@
                 }
             ]
         },
-        {
-            "id": "59AAC5BA-B0B3-4389-AA90-1E767EFA8563",
-            "use": "block_used_n_times",
-            "template": "${Block} used ${count} times",
-            "description": "This block was used the specified number of times in your project.",
-            "docPath": "/teachertool",
-            "params": [
-                {
-                    "name": "block",
-                    "type": "block",
-                    "paths": ["checks[0].blockCounts[0].blockId"]
-                },
-                {
-                    "name": "count",
-                    "type": "number",
-                    "default": 1,
-                    "paths": ["checks[0].blockCounts[0].count"]
-                }
-            ]
-        },
         {
             "id": "B8987394-1531-4C71-8661-BE4086CE0C6E",
             "use": "n_loops",

diff --git a/teachertool/src/transforms/loadCatalogAsync.ts b/teachertool/src/transforms/loadCatalogAsync.ts
@@ -4,8 +4,8 @@ import * as Actions from "../state/actions";
 import { CatalogCriteria } from "../types/criteria";
 
 const prodFiles = [
-    "/teachertool/catalog.json", // target-specific catalog
     "/teachertool/catalog-shared.json", // shared across all targets
+    "/teachertool/catalog.json", // target-specific catalog
 ];
 
 export async function loadCatalogAsync() {