@robotical/martyblocksjr 4.2.5 → 4.2.7

package/editions/free/src/localizations/uk.json

@@ -599,7 +599,7 @@
   "COG_AND_MARTY_TUTORIAL_MARTY_MODE": "Тепер перейдемо до Марті. Нам потрібно ввімкнути режим Марті, щоб побачити блоки Марті. Натисніть кнопку режиму Марті.",
   "COG_AND_MARTY_TUTORIAL_ONMESSAGE_BLOCK": "У режимі Marty перетягніть блок «on message» із категорії Marty Start до області сценарію. Цей блок прослуховуватиме повідомлення, надіслане Cog.",
   "COG_AND_MARTY_TUTORIAL_MARTY_MOTION_BLOCKS": "Тепер давайте виберемо блоки руху Марті. Клацніть категорію «Рух» блоків Марті.",
-  "COG_AND_MARTY_TUTORIAL_MARTY_DANCE_BLOCK": "Ми майже на місці! Перетягніть блок «Marty Dance» в область сценарію. Цей блок змусить Марті танцювати, коли буде отримано повідомлення.",
+  "COG_AND_MARTY_TUTORIAL_MARTY_DANCE_BLOCK": "Ми майже на місці! Перетягніть блок «Marty Dance» під блок «on touch cog». Марті танцюватиме, коли буде натиснуто кнопку Cog.",
   "COG_AND_MARTY_TUTORIAL_END": "Чудова робота! Ви успішно закодували Cog і Marty для взаємодії один з одним. Тепер натисніть кнопку Cog, щоб побачити танці Марті!",
   "COG_JRBLOCKS1_TITLE": "1. Складіть мелодію",
   "COG_JRBLOCKS1_STEP_1_TEXT": "Давайте змусимо Cog заграти мелодію!",
@@ -1149,6 +1149,7 @@
   "MARTY_JRBLOCKS5_STEP_23_TEXT": "Завершіть це блоком <b/>лічильника запуску/зупинки</b>, щоб ваш рахунок скидався щоразу, коли ви починаєте нову гру.",
   "MARTY_JRBLOCKS5_END": "Ви зробили це! Натисніть зелений прапорець і грайте в гру \"Гол-боут Марті\"!",
   "A11Y_APP_NAVIGATION": "App navigation",
+  "A11Y_CHANGE_SURFACE": "Change surface",
   "A11Y_CLEAR_TRACE": "Clear trace",
   "A11Y_CLOSE": "Close",
   "A11Y_CONNECTION_LOST": "Connection lost",
@@ -1175,6 +1176,7 @@
   "A11Y_RUN_PROJECT": "Run project",
   "A11Y_SKIP_TO_MAIN": "Skip to main content",
   "A11Y_STOP": "Stop",
+  "A11Y_STOP_PROJECT": "Stop project",
   "A11Y_TRACE": "Trace",
   "A11Y_TUTORIAL_DIALOG": "Tutorial media",
   "A11Y_ADD_PAGE": "Add page",

package/editions/free/src/localizations/zh-cn.json

@@ -599,7 +599,7 @@
   "COG_AND_MARTY_TUTORIAL_MARTY_MODE": "现在让我们转到 Marty。我们需要启用 Marty 模式才能查看 Marty 积木。点击 Marty 模式按钮。",
   "COG_AND_MARTY_TUTORIAL_ONMESSAGE_BLOCK": "进入 Marty 模式后，将“on message”积木从 Marty Start 类别拖到脚本区域。该积木将监听 Co​​g 发送的消息。",
   "COG_AND_MARTY_TUTORIAL_MARTY_MOTION_BLOCKS": "现在，让我们选择 Marty 的运动积木。点击 Marty 积木的“运动”类别。",
-  "COG_AND_MARTY_TUTORIAL_MARTY_DANCE_BLOCK": "快完成了！将“Marty Dance”积木拖到脚本区域。这个积木会让 Marty 在收到消息时跳舞。",
+  "COG_AND_MARTY_TUTORIAL_MARTY_DANCE_BLOCK": "快完成了！将“Marty Dance”积木连接到“on touch cog”积木下方。按下 Cog 的按钮时，Marty 就会跳舞。",
   "COG_AND_MARTY_TUTORIAL_END": "太棒了！你成功编写了 Cog 和 Marty 之间的交互代码。现在点击 Cog 的按钮，就能看到 Marty 跳舞啦！",
   "COG_JRBLOCKS1_TITLE": "1. 创作一首曲子",
   "COG_JRBLOCKS1_STEP_1_TEXT": "让我们让 Cog 演奏一段曲子吧！",
@@ -1149,6 +1149,7 @@
   "MARTY_JRBLOCKS5_STEP_23_TEXT": "最后添加一个<b/>开始/停止计数器</b>模块，这样每次开始新游戏时，你的分数都会重置。",
   "MARTY_JRBLOCKS5_END": "你成功了！按下绿旗，开始玩马蒂的射门游戏吧！",
   "A11Y_APP_NAVIGATION": "App navigation",
+  "A11Y_CHANGE_SURFACE": "Change surface",
   "A11Y_CLEAR_TRACE": "Clear trace",
   "A11Y_CLOSE": "Close",
   "A11Y_CONNECTION_LOST": "Connection lost",
@@ -1175,6 +1176,7 @@
   "A11Y_RUN_PROJECT": "Run project",
   "A11Y_SKIP_TO_MAIN": "Skip to main content",
   "A11Y_STOP": "Stop",
+  "A11Y_STOP_PROJECT": "Stop project",
   "A11Y_TRACE": "Trace",
   "A11Y_TUTORIAL_DIALOG": "Tutorial media",
   "A11Y_ADD_PAGE": "Add page",

package/editions/free/src/localizations/zh-tw.json

@@ -599,7 +599,7 @@
   "COG_AND_MARTY_TUTORIAL_MARTY_MODE": "現在讓我們轉到 Marty。我們需要啟用 Marty 模式才能查看 Marty 積木。點擊 Marty 模式按鈕。",
   "COG_AND_MARTY_TUTORIAL_ONMESSAGE_BLOCK": "進入 Marty 模式後，將「on message」積木從 Marty Start 類別拖曳到腳本區域。該積木將監聽 Cog 發送的訊息。",
   "COG_AND_MARTY_TUTORIAL_MARTY_MOTION_BLOCKS": "現在，讓我們選擇 Marty 的運動積木。點選 Marty 積木的「運動」類別。",
-  "COG_AND_MARTY_TUTORIAL_MARTY_DANCE_BLOCK": "快完成了！將“Marty Dance”積木拖到腳本區域。這個積木會讓 Marty 在收到消息時跳舞。",
+  "COG_AND_MARTY_TUTORIAL_MARTY_DANCE_BLOCK": "快完成了！將「Marty Dance」積木連接到「on touch cog」積木下方。按下 Cog 的按鈕時，Marty 就會跳舞。",
   "COG_AND_MARTY_TUTORIAL_END": "太棒了！你成功寫了 Cog 和 Marty 之間的互動程式碼。現在點擊 Cog 的按鈕，就能看到 Marty 跳舞啦！",
   "COG_JRBLOCKS1_TITLE": "1. 創作一首曲子",
   "COG_JRBLOCKS1_STEP_1_TEXT": "讓我們讓 Cog 演奏一段曲子吧！",
@@ -1149,6 +1149,7 @@
   "MARTY_JRBLOCKS5_STEP_23_TEXT": "最後增加一個<b/>開始/停止計數器</b>模組，這樣每次開始新遊戲時，你的分數都會重置。",
   "MARTY_JRBLOCKS5_END": "你成功了！按下綠旗，開始玩馬蒂的射門遊戲吧！",
   "A11Y_APP_NAVIGATION": "App navigation",
+  "A11Y_CHANGE_SURFACE": "Change surface",
   "A11Y_CLEAR_TRACE": "Clear trace",
   "A11Y_CLOSE": "Close",
   "A11Y_CONNECTION_LOST": "Connection lost",
@@ -1175,6 +1176,7 @@
   "A11Y_RUN_PROJECT": "Run project",
   "A11Y_SKIP_TO_MAIN": "Skip to main content",
   "A11Y_STOP": "Stop",
+  "A11Y_STOP_PROJECT": "Stop project",
   "A11Y_TRACE": "Trace",
   "A11Y_TUTORIAL_DIALOG": "Tutorial media",
   "A11Y_ADD_PAGE": "Add page",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/martyblocksjr",
-  "version": "4.2.5",
+  "version": "4.2.7",
   "description": "ScratchJr",
   "repository": {
     "type": "git",

package/tests/GoToLink.test.js

@@ -0,0 +1,48 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import goToLink from "../src/utils/goToLink";
+
+describe("goToLink", () => {
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
+  it("keeps query parameters when the server redirects HTML pages to clean URLs", async () => {
+    const targetWindow = { location: { href: "initial" } };
+    const fetchMock = vi.fn().mockResolvedValue({ redirected: true });
+    vi.stubGlobal("fetch", fetchMock);
+
+    await goToLink(
+      "http://localhost:3011/editor.html?pmd5=-1&mode=edit&tutorial=marty-jr-blocks-1",
+      targetWindow
+    );
+
+    expect(fetchMock).toHaveBeenCalledWith(
+      "http://localhost:3011/editor.html?pmd5=-1&mode=edit&tutorial=marty-jr-blocks-1"
+    );
+    expect(targetWindow.location.href).toBe(
+      "http://localhost:3011/editor?pmd5=-1&mode=edit&tutorial=marty-jr-blocks-1"
+    );
+  });
+
+  it("keeps HTML page URLs for wrapper servers that do not redirect", async () => {
+    const targetWindow = { location: { href: "initial" } };
+    vi.stubGlobal("fetch", vi.fn().mockResolvedValue({ redirected: false }));
+
+    await goToLink("./MartyBlocksJR/editor.html?tutorial=cog-jrblocks-1", targetWindow);
+
+    expect(targetWindow.location.href).toBe(
+      "./MartyBlocksJR/editor.html?tutorial=cog-jrblocks-1"
+    );
+  });
+
+  it("falls back to the HTML page URL when redirect detection is unavailable", async () => {
+    const targetWindow = { location: { href: "initial" } };
+    vi.stubGlobal("fetch", vi.fn().mockRejectedValue(new Error("fetch unavailable")));
+
+    await goToLink("editor.html?tutorial=cog-and-marty-tutorial", targetWindow);
+
+    expect(targetWindow.location.href).toBe(
+      "editor.html?tutorial=cog-and-marty-tutorial"
+    );
+  });
+});

package/tests/e2e/top-toolbar-tooltips.e2e.test.js

@@ -108,6 +108,53 @@ describe("top toolbar tooltips", () => {
 
         expect(invalidTooltips).toEqual([]);
 
+        const initialActionLabels = await page.evaluate(() => ({
+          background: document.getElementById("setbkg").getAttribute("data-tooltip"),
+          run: document.getElementById("go").getAttribute("data-tooltip"),
+        }));
+        expect(initialActionLabels).toEqual({
+          background: "Change Background",
+          run: "Run project",
+        });
+
+        const runningActionLabels = await page.evaluate(() => {
+          const runtime = window.ScratchJr.runtime;
+          const previousThreads = runtime.threadsRunning;
+          runtime.threadsRunning = [{
+            isRunning: true,
+            firstBlock: { blocktype: "onflag" },
+          }];
+          window.ScratchJr.updateRunStopButtons();
+
+          const go = document.getElementById("go");
+          const labels = {
+            ariaLabel: go.getAttribute("aria-label"),
+            tooltip: go.getAttribute("data-tooltip"),
+          };
+
+          runtime.threadsRunning = previousThreads;
+          window.ScratchJr.updateRunStopButtons();
+          return labels;
+        });
+        expect(runningActionLabels).toEqual({
+          ariaLabel: "Stop project",
+          tooltip: "Stop project",
+        });
+
+        await page.click("#martyMode");
+        await page.waitForFunction(
+          () => document.getElementById("setbkg").getAttribute("data-tooltip") === "Change surface",
+          { timeout: 5_000 }
+        );
+        const martyBackgroundLabels = await page.$eval("#setbkg", (button) => ({
+          ariaLabel: button.getAttribute("aria-label"),
+          tooltip: button.getAttribute("data-tooltip"),
+        }));
+        expect(martyBackgroundLabels).toEqual({
+          ariaLabel: "Change surface",
+          tooltip: "Change surface",
+        });
+
         await page.hover("#grid");
         await new Promise((resolve) => setTimeout(resolve, 200));
 

package/tests/tutorial/CogAndMartyTutorial.test.js

@@ -0,0 +1,42 @@
+import { describe, expect, it, vi } from 'vitest';
+
+vi.mock('@/utils/Localization', () => ({
+    default: {
+        localize: key => key
+    }
+}));
+
+describe('Cog and Marty tutorial', () => {
+    it('builds one direct Cog-triggered Marty script in Marty mode', async () => {
+        const { default: tutorial } = await import('@/tutorial/tutorials-data/cog-and-marty.js');
+        const steps = tutorial.tutorialSteps;
+        const actions = steps.flatMap(step => [
+            ...(step.instructionActions || []),
+            ...(step.nextStepActions || []),
+            ...(step.hintActions || [])
+        ]);
+
+        expect(steps).toHaveLength(8);
+        const cogCategoryStep = steps.find(step =>
+            step.instructionActions.some(action => action.text === 'COG_AND_MARTY_TUTORIAL_COG_BLOCKS'));
+        expect(cogCategoryStep.nextStepActions[0]).toEqual({ type: 'ShowMartyMode' });
+        expect(actions.filter(action => action.type === 'HighlightElement').map(action => action.elementId))
+            .not.toContain('martyMode');
+
+        expect(actions.filter(action => action.type === 'ShowCategory').map(action => action.category))
+            .not.toContain('sprite-start');
+        expect(actions.flatMap(action => action.blocks || (action.block ? [action.block] : [])))
+            .not.toEqual(expect.arrayContaining(['message_block', 'onmessage_block']));
+        expect(actions.filter(action => action.type === 'ShowInstructorText').map(action => action.text))
+            .not.toEqual(expect.arrayContaining([
+                'COG_AND_MARTY_TUTORIAL_SPRITE_BLOCKS',
+                'COG_AND_MARTY_TUTORIAL_MESSAGE_BLOCK',
+                'COG_AND_MARTY_TUTORIAL_ONMESSAGE_BLOCK'
+            ]));
+
+        expect(steps.flatMap(step => step.expectedCode || [])).toEqual([
+            'ontouchcog',
+            'ontouchcog=>martyDance'
+        ]);
+    });
+});

package/tutorial.ts

@@ -33,7 +33,7 @@ type TutorialStep = {
     instructionActions: Action[];
     hintActions?: Action[];
     buttons: ("previous" | "next" | "hint")[]; 
-    expectedCode: string[]; // e.g: ["onmessage=>martyDance"] each element of the array corresponds to a script. each script is a series of blocks connected with =>
+    expectedCode: string[]; // e.g: ["ontouchcog=>martyDance"] each element of the array corresponds to a script. each script is a series of blocks connected with =>
     presenter: "marty"; // or any other sprite
 };
 
@@ -112,7 +112,7 @@ const cogAndMartyTutorial: Tutorial = {
             expectedCode: [],
             presenter: "marty"
         },
-        /* STEP 2 -- go to cog event blocks */
+        /* STEP 2 -- enter Marty mode and go to Cog event blocks */
         {
             instructionActions: [
                 {
@@ -121,6 +121,9 @@ const cogAndMartyTutorial: Tutorial = {
                 }
             ],
             nextStepActions: [
+                {
+                    type: "ShowMartyMode",
+                },
                 {
                     type: "HighlightElement",
                     elementId: "cog-start",
@@ -130,10 +133,10 @@ const cogAndMartyTutorial: Tutorial = {
             ],
             hintActions: [],
             buttons: ["previous", "next"],
-            expectedCode: ["ontouchcog_block", "message_block"],
+            expectedCode: [],
             presenter: "marty"
         },
-        /* STEP 3 -- add ontouchcog block */
+        /* STEP 3 -- add ontouchcog block to Marty's script */
         {
             instructionActions: [
                 {
@@ -143,15 +146,8 @@ const cogAndMartyTutorial: Tutorial = {
             ],
             nextStepActions: [
                 {
-                    type: "ShowCategory",
-                    category: "cog-start"
-                },
-                {
-                    type: "HighlightBlocks",
-                    blocks: ["ontouchcog_block"]
+                    type: "ShowMartyMode",
                 },
-            ],
-            hintActions: [
                 {
                     type: "ShowCategory",
                     category: "cog-start"
@@ -160,114 +156,6 @@ const cogAndMartyTutorial: Tutorial = {
                     type: "HighlightBlocks",
                     blocks: ["ontouchcog_block"]
                 },
-                {
-                    type: "DragBlockToScriptArea",
-                    block: "ontouchcog_block",
-                }
-            ],
-            buttons: ["previous", "next", "hint"],
-            expectedCode: ["ontouchcog"],
-            presenter: "marty"
-        },
-        /* STEP 4 -- go to sprite event blocks */
-        {
-            instructionActions: [
-                {
-                    type: "ShowInstructorText",
-                    text: "Great! Now let's move to the Sprite blocks, which are on the left side of the screen."
-                }
-            ],
-            nextStepActions: [
-                {
-                    type: "HighlightElement",
-                    elementId: "sprite-start",
-                    hexColor: "#855cd659",
-                    onClickAction: "NextStep"
-                },
-            ],
-            hintActions: [],
-            buttons: ["previous", "next"],
-            expectedCode: [],
-            presenter: "marty"
-        },
-        /* STEP 5 -- add message block after the ontouchcog block */
-        {
-            instructionActions: [
-                {
-                    type: "ShowInstructorText",
-                    text: "Now drag the 'message' block from the Sprite Start category to the script area. This block will send a message to Marty when the sprite is clicked"
-                }
-            ],
-            nextStepActions: [
-                {
-                    type: "ShowCategory",
-                    category: "sprite-start"
-                },
-                {
-                    type: "HighlightBlocks",
-                    blocks: ["message_block"]
-                },
-            ],
-            hintActions: [
-                {
-                    type: "ShowCategory",
-                    category: "sprite-start"
-                },
-                {
-                    type: "HighlightBlocks",
-                    blocks: ["message_block"]
-                },
-                {
-                    type: "DragBlockToScriptArea",
-                    block: "message_block",
-                }
-            ],
-            buttons: ["previous", "next", "hint"],
-            expectedCode: ["ontouchcog=>message"],
-            presenter: "marty"
-        },
-        /* STEP 6 -- go to marty mode */
-        {
-            instructionActions: [
-                {
-                    type: "ShowInstructorText",
-                    text: "Now let's move to Marty. We need to enable Marty Mode to see the Marty blocks. Click on the Marty Mode button."
-                }
-            ],
-            nextStepActions: [
-                {
-                    type: "HighlightElement",
-                    elementId: "martyMode",
-                    hexColor: "#855cd659",
-                    onClickAction: "NextStep"
-                }
-            ],
-            hintActions: [
-            ],
-            buttons: ["previous", "next"],
-            expectedCode: [],
-            presenter: "marty"
-        },
-        /* STEP 7 -- add onmessage block */
-        {
-            instructionActions: [
-                {
-                    type: "ShowInstructorText",
-                    text: "Once in Marty Mode, drag the 'on message' block from the Marty Start category to the script area. This block will listen for the message sent by Cog"
-                }
-            ],
-            nextStepActions: [
-                {
-                    type: "ShowMartyMode",
-                },
-                {
-                    type: "ShowCategory",
-                    category: "marty-start"
-                },
-                {
-                    type: "HighlightBlocks",
-                    blocks: ["onmessage_block"]
-                }
             ],
             hintActions: [
                 {
@@ -275,22 +163,22 @@ const cogAndMartyTutorial: Tutorial = {
                 },
                 {
                     type: "ShowCategory",
-                    category: "marty-start"
+                    category: "cog-start"
                 },
                 {
                     type: "HighlightBlocks",
-                    blocks: ["onmessage_block"]
+                    blocks: ["ontouchcog_block"]
                 },
                 {
                     type: "DragBlockToScriptArea",
-                    block: "onmessage_block",
+                    block: "ontouchcog_block",
                 }
             ],
             buttons: ["previous", "next", "hint"],
-            expectedCode: ["onmessage"],
+            expectedCode: ["ontouchcog"],
             presenter: "marty"
         },
-        /* STEP 8 -- go to marty motion blocks */
+        /* STEP 4 -- go to marty motion blocks */
         {
             instructionActions: [
                 {
@@ -316,12 +204,12 @@ const cogAndMartyTutorial: Tutorial = {
             expectedCode: [],
             presenter: "marty"
         },
-        /* STEP 9 -- add marty dance block */
+        /* STEP 5 -- add marty dance block after the Cog trigger */
         {
             instructionActions: [
                 {
                     type: "ShowInstructorText",
-                    text: "We're almost there! Drag the 'marty dance' block to the script area. This block will make Marty dance when the message is received"
+                    text: "We're almost there! Drag the 'Marty Dance' block beneath the 'on touch cog' block. Marty will dance when Cog's button is pressed."
                 }
             ],
             nextStepActions: [
@@ -355,15 +243,15 @@ const cogAndMartyTutorial: Tutorial = {
                 }
             ],
             buttons: ["previous", "next", "hint"],
-            expectedCode: ["onmessage=>martyDance"],
+            expectedCode: ["ontouchcog=>martyDance"],
             presenter: "marty"
         },
-        /* STEP 10 -- end */
+        /* STEP 6 -- end */
         {
             instructionActions: [
                 {
                     type: "ShowInstructorText",
-                    text: "Great job! You have successfully coded Cog and Marty to interact with each other. No click Cog's button to see Marty dance!"
+                    text: "Great job! You have successfully coded Cog and Marty to interact with each other. Now click Cog's button to see Marty dance!"
                 }
             ],
             nextStepActions: [],