From b684affe48a77d6cedb728f7cb879b205edab5ea Mon Sep 17 00:00:00 2001 From: sukuwc Date: Wed, 4 Mar 2026 13:59:15 +0100 Subject: [PATCH 1/5] SUKU simple intensity block created based on simple color specification --- src/renderer/config-blocks/LedColor.svelte | 284 ------------------ ...LedPhase.svelte => SimpleIntensity.svelte} | 178 ++++++----- 2 files changed, 100 insertions(+), 362 deletions(-) delete mode 100644 src/renderer/config-blocks/LedColor.svelte rename src/renderer/config-blocks/{LedPhase.svelte => SimpleIntensity.svelte} (65%) diff --git a/src/renderer/config-blocks/LedColor.svelte b/src/renderer/config-blocks/LedColor.svelte deleted file mode 100644 index 32c555796..000000000 --- a/src/renderer/config-blocks/LedColor.svelte +++ /dev/null @@ -1,284 +0,0 @@ - - - - - -
- {#each [0, 1] as i} - { - const { value, validationError } = e.detail; - scriptSegments[i] = value; - validators[i].value = !validationError; - sendData(value, i); - }} - on:change={() => dispatch("sync")} - postProcessor={GridScript.shortify} - preProcessor={GridScript.humanize} - /> - {/each} -
- -
- -
-
- dispatch("sync")} - /> - { - updateColor(e); - dispatch("sync"); - }} - /> -
- -
- {#each [2, 3, 4] as i} - { - const { value, validationError } = e.detail; - scriptSegments[i]; - validators[i].value = !validationError; - sendData(value, i); - }} - on:change={() => dispatch("sync")} - postProcessor={GridScript.shortify} - preProcessor={GridScript.humanize} - /> - {/each} -
- - - - - diff --git a/src/renderer/config-blocks/LedPhase.svelte b/src/renderer/config-blocks/SimpleIntensity.svelte similarity index 65% rename from src/renderer/config-blocks/LedPhase.svelte rename to src/renderer/config-blocks/SimpleIntensity.svelte index 4dfd80603..9bb905b4b 100644 --- a/src/renderer/config-blocks/LedPhase.svelte +++ b/src/renderer/config-blocks/SimpleIntensity.svelte @@ -1,17 +1,16 @@ - -
- {#each scriptSegments as script, i} + + {#if $appSettings.persistent.userLevelMinimalist == false} + + { + const { value, validationError } = e.detail; + element = value; + validators[0].value = !validationError; + sendData(); + }} + on:change={() => dispatch("sync")} + postProcessor={GridScript.shortify} + preProcessor={GridScript.humanize} + /> { const { value, validationError } = e.detail; - script = value; - validators[i].value = !validationError; - sendData(value, i); + layer = value; + validators[1].value = !validationError; + sendData(); }} on:change={() => dispatch("sync")} postProcessor={GridScript.shortify} preProcessor={GridScript.humanize} /> - {/each} -
- + + {/if} + { + const { value, validationError } = e.detail; + intensity = value; + validators[2].value = !validationError; + sendData(); + }} + on:change={() => dispatch("sync")} + postProcessor={GridScript.shortify} + preProcessor={GridScript.humanize} + /> + From 4862ab8722e599624172617a31a0c3b93d3abac1 Mon Sep 17 00:00:00 2001 From: sukuwc Date: Wed, 4 Mar 2026 14:28:59 +0100 Subject: [PATCH 2/5] SUKU playwright spec updated --- playwright-tests/data/actionBlockElements.json | 13 ++----------- playwright-tests/data/actionBlockLocators.js | 13 +++++-------- playwright-tests/data/actionBlocks.json | 2 +- playwright-tests/tests/actionsOperation.spec.js | 4 ++-- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/playwright-tests/data/actionBlockElements.json b/playwright-tests/data/actionBlockElements.json index 90f2fb645..5fb755de5 100644 --- a/playwright-tests/data/actionBlockElements.json +++ b/playwright-tests/data/actionBlockElements.json @@ -11,17 +11,8 @@ "led": { "Start Animation": ["ledNumber", "Layer", "Phase", "Rate", "Shape"], "Stop Animation": ["ledNumber", "Layer"], - "Color": [ - "ledNumber", - "Layer", - "Red", - "Green", - "Blue", - "Canva", - "Random", - "Beauty" - ], - "Intensity": ["LED Number", "Layer", "Intensity"] + "Simple Color": ["ledNumber", "Layer", "Red", "Green", "Blue"], + "Simple Intensity": ["Element", "Layer", "Intensity"] }, "midi": { "MIDI": ["Channel", "Command", "Parameter1", "Parameter2"], diff --git a/playwright-tests/data/actionBlockLocators.js b/playwright-tests/data/actionBlockLocators.js index bc99d060a..fa9095f1c 100644 --- a/playwright-tests/data/actionBlockLocators.js +++ b/playwright-tests/data/actionBlockLocators.js @@ -65,23 +65,20 @@ export const blocks = (page) => ({ Layer: page.getByLabel("Layer"), }, }, - Color: { - block: page.locator("#action-menu").getByText("Color", { exact: true }), + "Simple Color": { + block: page.locator("#action-menu").getByText("Simple Color"), elements: { ledNumber: page.getByLabel("LED Number"), Layer: page.getByLabel("Layer"), Red: page.getByLabel("Red"), Green: page.getByLabel("Green"), Blue: page.getByLabel("Blue"), - Canva: page.getByTestId("rgb-color-picker-canvas"), - Random: page.getByTestId("random-color-generator"), - Beauty: page.locator("#cfg-0").getByRole("checkbox"), }, }, - Intensity: { - block: page.locator("#action-menu").getByText("Intensity"), + "Simple Intensity": { + block: page.locator("#action-menu").getByText("Simple Intensity"), elements: { - "LED Number": page.getByLabel("LED Number"), + Element: page.getByLabel("Element"), Layer: page.getByLabel("Layer"), Intensity: page.getByLabel("Intensity"), }, diff --git a/playwright-tests/data/actionBlocks.json b/playwright-tests/data/actionBlocks.json index f073a2149..e19602573 100644 --- a/playwright-tests/data/actionBlocks.json +++ b/playwright-tests/data/actionBlocks.json @@ -1,7 +1,7 @@ { "Function": ["Function"], "variables": ["Lookup", "Global", "Locals", "Self"], - "led": ["Start Animation", "Stop Animation", "Color", "Intensity"], + "led": ["Start Animation", "Stop Animation", "Simple Color", "Simple Intensity"], "midi": ["MIDI", "MIDI 14", "SysEX", "MIDI NRPN"], "hid": [ "GamePad Axis", diff --git a/playwright-tests/tests/actionsOperation.spec.js b/playwright-tests/tests/actionsOperation.spec.js index 0ab7e6ce2..3b5bd5977 100644 --- a/playwright-tests/tests/actionsOperation.spec.js +++ b/playwright-tests/tests/actionsOperation.spec.js @@ -26,9 +26,9 @@ test.describe("Action Block Operations", () => { test("Add Action Block to empty element", async () => { await configPage.openActionsOnEmptyElement(); - await configPage.addActionBlock("led", "Color"); + await configPage.addActionBlock("led", "Simple Color"); await expect( - configPage.blocks["led"]["Color"]["elements"]["Blue"], + configPage.blocks["led"]["Simple Color"]["elements"]["Blue"], ).toBeVisible(); }); From 06fbefd687cd56ea226237fe0dbd1e4e5a9142b6 Mon Sep 17 00:00:00 2001 From: sukuwc Date: Wed, 4 Mar 2026 14:30:30 +0100 Subject: [PATCH 3/5] SUKU format fixed --- playwright-tests/data/actionBlocks.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/playwright-tests/data/actionBlocks.json b/playwright-tests/data/actionBlocks.json index e19602573..c6538124a 100644 --- a/playwright-tests/data/actionBlocks.json +++ b/playwright-tests/data/actionBlocks.json @@ -1,7 +1,12 @@ { "Function": ["Function"], "variables": ["Lookup", "Global", "Locals", "Self"], - "led": ["Start Animation", "Stop Animation", "Simple Color", "Simple Intensity"], + "led": [ + "Start Animation", + "Stop Animation", + "Simple Color", + "Simple Intensity" + ], "midi": ["MIDI", "MIDI 14", "SysEX", "MIDI NRPN"], "hid": [ "GamePad Axis", From d92b44008c59e10ca5300566f3219d32f0a1b013 Mon Sep 17 00:00:00 2001 From: gergelybartha Date: Fri, 6 Mar 2026 12:27:59 +0100 Subject: [PATCH 4/5] fix test --- playwright-tests/data/actionBlockLocators.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playwright-tests/data/actionBlockLocators.js b/playwright-tests/data/actionBlockLocators.js index fa9095f1c..a17278a27 100644 --- a/playwright-tests/data/actionBlockLocators.js +++ b/playwright-tests/data/actionBlockLocators.js @@ -68,7 +68,7 @@ export const blocks = (page) => ({ "Simple Color": { block: page.locator("#action-menu").getByText("Simple Color"), elements: { - ledNumber: page.getByLabel("LED Number"), + ledNumber: page.getByLabel("Element"), Layer: page.getByLabel("Layer"), Red: page.getByLabel("Red"), Green: page.getByLabel("Green"), From 3d3d6349101cb6afb2e798f53e0cdfd8d4b93eda Mon Sep 17 00:00:00 2001 From: gergelybartha Date: Fri, 6 Mar 2026 13:15:33 +0100 Subject: [PATCH 5/5] test update --- playwright-tests/tests/actionBlockExistence.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playwright-tests/tests/actionBlockExistence.spec.js b/playwright-tests/tests/actionBlockExistence.spec.js index 40d4dfcbf..e89e756e9 100644 --- a/playwright-tests/tests/actionBlockExistence.spec.js +++ b/playwright-tests/tests/actionBlockExistence.spec.js @@ -142,7 +142,7 @@ test.describe("Interactable input field", () => { const fieldCount = await inputFields.count(); const monacoCount = await monacoFields.count(); - const expectedValue = "123"; + const expectedValue = "test"; // Loop through monaco fields and interact with them for (let i = 0; i < monacoCount; i++) { @@ -153,7 +153,7 @@ test.describe("Interactable input field", () => { await keyboardActions.selectAll(); await keyboardActions.type(expectedValue); const value = await monacoField.innerText(); - expect(value).toMatch("123"); + expect(value).toMatch("test"); } // Loop through input fields and interact with them