chore: Review-Kommentare umgesetzt (#453)

Author: georgi-s

cypress/e2e/code-editor.cy.js

@@ -19,8 +19,8 @@ describe("Code Editor Page Tests", () => {
   it("[CodeEditor] opens reset dialog", () => {
     cy.visit("/codeeditor");
     cy.get('img[alt="Sensebox ESP"]').click();
-    cy.get("button").contains(/Reset code|Code zurücksetzen/).click();
-    cy.get("button").contains(/Reset|Zurücksetzen/).should("exist");
+    cy.get("button").contains("Reset code").click();
+    cy.get("button").contains("Zurücksetzen").should("exist");
   });
 
   it("[CodeEditor] fetches libraries", () => {

src/components/Blockly/BlocklyWindow.jsx

@@ -26,9 +26,10 @@ class BlocklyWindow extends Component {
 
   // Hilfsfunktion für die Block-Validierung
   validateArduinoFunctionBlock = (workspace, newBlock) => {
-    const existingBlocks = workspace.getAllBlocks()
-      .filter(block => block.type === 'arduino_functions');
-    
+    const existingBlocks = workspace
+      .getAllBlocks()
+      .filter((block) => block.type === "arduino_functions");
+
     if (existingBlocks.length > 0) {
       if (newBlock) {
         const oldBlock = existingBlocks[0];
@@ -43,17 +44,18 @@ class BlocklyWindow extends Component {
 
   // Backpack Event-Handler
   handleBackpackDragStart = (block) => {
-    if (block.type === 'arduino_functions') {
+    if (block.type === "arduino_functions") {
       this.backpackBlockPosition = block.getRelativeToSurfaceXY();
     }
   };
 
   handleBackpackDragEnd = (block) => {
-    if (block.type === 'arduino_functions') {
+    if (block.type === "arduino_functions") {
       const workspace = Blockly.getMainWorkspace();
-      const existingBlocks = workspace.getAllBlocks()
-        .filter(b => b.type === 'arduino_functions');
-      
+      const existingBlocks = workspace
+        .getAllBlocks()
+        .filter((b) => b.type === "arduino_functions");
+
       if (existingBlocks.length > 1) {
         existingBlocks[0].dispose();
         block.moveTo(this.backpackBlockPosition);
@@ -62,7 +64,7 @@ class BlocklyWindow extends Component {
   };
 
   handleBackpackDrop = (block) => {
-    if (block.type === 'arduino_functions') {
+    if (block.type === "arduino_functions") {
       const workspace = Blockly.getMainWorkspace();
       this.validateArduinoFunctionBlock(workspace, block);
     }
@@ -71,44 +73,44 @@ class BlocklyWindow extends Component {
   // Aktualisiere die Backpack-UI
   updateBackpackUI = () => {
     if (!this.backpack) return;
-    
+
     try {
-      const backpackElement = document.querySelector('.blocklyBackpack');
+      const backpackElement = document.querySelector(".blocklyBackpack");
       if (backpackElement) {
-        backpackElement.setAttribute('title', Blockly.Msg['EMPTY_BACKPACK']);
+        backpackElement.setAttribute("title", Blockly.Msg["EMPTY_BACKPACK"]);
       }
-      
+
       if (this.backpack) {
         this.backpack.options.contextMenu = {
           emptyBackpack: true,
           removeFromBackpack: true,
           copyToBackpack: true,
           copyAllToBackpack: true,
           pasteAllToBackpack: true,
-          disablePreconditionChecks: false
+          disablePreconditionChecks: false,
         };
       }
-      
-      if (process.env.NODE_ENV === 'development') {
-        console.log('Backpack UI updated');
+
+      if (process.env.NODE_ENV === "development") {
+        console.log("Backpack UI updated");
       }
     } catch (error) {
-      if (process.env.NODE_ENV === 'development') {
-        console.error('Error updating Backpack UI:', error);
+      if (process.env.NODE_ENV === "development") {
+        console.error("Error updating Backpack UI:", error);
       }
     }
   };
 
   // Initialisiere den Backpack
   initializeBackpack = (workspace) => {
     if (this.backpackInitialized) {
-      if (process.env.NODE_ENV === 'development') {
-        console.log('Backpack already initialized, updating translations only');
+      if (process.env.NODE_ENV === "development") {
+        console.log("Backpack already initialized, updating translations only");
       }
       this.updateBackpackUI();
       return;
     }
-    
+
     const backpackOptions = {
       allowEmptyBackpackOpen: true,
       useFilledBackpackImage: true,
@@ -119,45 +121,49 @@ class BlocklyWindow extends Component {
         copyToBackpack: true,
         copyAllToBackpack: true,
         pasteAllToBackpack: true,
-        disablePreconditionChecks: false
-      }
+        disablePreconditionChecks: false,
+      },
     };
-    
+
     this.backpack = new Backpack(workspace, backpackOptions);
-    
+
     this.backpack.onDragStart = (block) => {
-      if (block.type === 'arduino_functions') {
+      if (block.type === "arduino_functions") {
         return false;
       }
       return true;
     };
-    
+
     const originalCopyToBackpack = this.backpack.copyToBackpack;
     this.backpack.copyToBackpack = (block) => {
-      if (block.type === 'arduino_functions') {
+      if (block.type === "arduino_functions") {
         return;
       }
       return originalCopyToBackpack.call(this.backpack, block);
     };
-    
+
     const originalCopyAllToBackpack = this.backpack.copyAllToBackpack;
     this.backpack.copyAllToBackpack = (blocks) => {
-      const filteredBlocks = blocks.filter(block => block.type !== 'arduino_functions');
+      const filteredBlocks = blocks.filter(
+        (block) => block.type !== "arduino_functions",
+      );
       return originalCopyAllToBackpack.call(this.backpack, filteredBlocks);
     };
-    
+
     const originalPasteAllFromBackpack = this.backpack.pasteAllFromBackpack;
     this.backpack.pasteAllFromBackpack = (blocks) => {
-      const filteredBlocks = blocks.filter(block => block.type !== 'arduino_functions');
+      const filteredBlocks = blocks.filter(
+        (block) => block.type !== "arduino_functions",
+      );
       return originalPasteAllFromBackpack.call(this.backpack, filteredBlocks);
     };
-    
+
     this.backpack.init();
     this.backpackInitialized = true;
-    if (process.env.NODE_ENV === 'development') {
-      console.log('Backpack initialized');
+    if (process.env.NODE_ENV === "development") {
+      console.log("Backpack initialized");
     }
-    
+
     this.updateBackpackUI();
   };
 
@@ -166,32 +172,35 @@ class BlocklyWindow extends Component {
     this.props.onChangeWorkspace({});
     this.props.clearStats();
     workspace.addChangeListener(Blockly.Events.disableOrphans);
-    
+
     workspace.addChangeListener((event) => {
       this.props.onChangeWorkspace(event);
 
       try {
-        if (event.type === Blockly.Events.BLOCK_CREATE || 
-            event.type === Blockly.Events.BLOCK_PASTE ||
-            event.type === Blockly.Events.BACKPACK_DRAG) {
-          
+        if (
+          event.type === Blockly.Events.BLOCK_CREATE ||
+          event.type === Blockly.Events.BLOCK_PASTE ||
+          event.type === Blockly.Events.BACKPACK_DRAG
+        ) {
           const allBlocks = workspace.getAllBlocks();
-          const arduinoFunctionBlocks = allBlocks.filter(block => block.type === 'arduino_functions');
-          
+          const arduinoFunctionBlocks = allBlocks.filter(
+            (block) => block.type === "arduino_functions",
+          );
+
           if (arduinoFunctionBlocks.length > 1) {
             const firstBlock = arduinoFunctionBlocks[0];
             const position = firstBlock.getRelativeToSurfaceXY();
-            
-            arduinoFunctionBlocks.slice(1).forEach(block => {
+
+            arduinoFunctionBlocks.slice(1).forEach((block) => {
               block.dispose();
             });
-            
+
             firstBlock.moveTo(position);
           }
         }
       } catch (error) {
-        if (process.env.NODE_ENV === 'development') {
-          console.error('Error validating blocks:', error);
+        if (process.env.NODE_ENV === "development") {
+          console.error("Error validating blocks:", error);
         }
       }
     });
@@ -225,20 +234,25 @@ class BlocklyWindow extends Component {
       if (!xml) xml = initialXml;
       Blockly.Xml.domToWorkspace(Blockly.utils.xml.textToDom(xml), workspace);
     }
-    
+
     if (prevProps.language !== this.props.language) {
-      if (process.env.NODE_ENV === 'development') {
-        console.log('Language changed from', prevProps.language, 'to', this.props.language);
+      if (process.env.NODE_ENV === "development") {
+        console.log(
+          "Language changed from",
+          prevProps.language,
+          "to",
+          this.props.language,
+        );
       }
-      
+
       this.updateBackpackUI();
-      
+
       xml = localStorage.getItem("autoSaveXML");
       if (!xml) xml = initialXml;
       xmlDom = Blockly.utils.xml.textToDom(xml);
       Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace);
     }
-    
+
     Blockly.svgResize(workspace);
   }
 

src/components/Blockly/blocks/procedures.js

@@ -30,39 +30,22 @@ Blockly.Blocks["arduino_functions"] = {
     this.setHelpUrl("https://arduino.cc/en/Reference/Loop");
     this.contextMenu = false;
     this.data = board;
-    
-    
-    this.isBackpackable = function() {
-      return false;
-    };
 
-    this.onDragStart = function() {
-      return false;
-    };
-    
-    this.isDeletable = function() {
-      return false;
-    };
-    
-    this.isDuplicatable = function() {
-      return false;
-    };
-    
-    this.isCopyable = function() {
-      return false;
-    };
-    
-    this.isPasteable = function() {
-      return false;
-    };
-    
-    this.isMovable = function() {
-      return false;
-    };
-    
-    this.isEditable = function() {
-      return false;
-    };
+    this.isBackpackable = false;
+
+    this.onDragStart = false;
+
+    this.isDeletable = false;
+
+    this.isDuplicatable = false;
+
+    this.isCopyable = false;
+
+    this.isPasteable = false;
+
+    this.isMovable = false;
+
+    this.isEditable = false;
   },
   /** @return {!boolean} True if the block instance is in the workspace. */
   getArduinoLoopsInstance: function () {
@@ -943,9 +926,7 @@ Blockly.Blocks["procedures_callnoreturn"] = {
         if (quarkId in this.quarkConnections_) {
           const connection = this.quarkConnections_[quarkId];
           try {
-            if (connection && 
-              !connection.reconnect(this, "ARG" + i)
-            ) {
+            if (connection && !connection.reconnect(this, "ARG" + i)) {
               // Block no longer exists or has been attached elsewhere.
               delete this.quarkConnections_[quarkId];
             }

src/components/Blockly/msg/de/translations.js

@@ -264,10 +264,4 @@ export const TRANSLATIONS = {
   senseBox_watertemperature: "Wassertemperatur",
   senseBox_watertemperature_tooltip:
     "Das Wasserthermometer gibt Temperatur in Grad Celsius aus. Schließe den Sensor an einen der 6 Anschlüsse des One-Wire Adapters an und schließe dann den One-Wire Adapter an einen der 3 digital/analog Ports der senseBox an und wähle den Port im Block aus. Wenn du nur ein Thermometer am One-Wire Adapter angeschlossen hast, dann belasse den Index bei 0. Jedes weitere angeschlossene Thermometer kann entsprechend mit einem um 1 erhöhten Index angesprochen werden. Es kommt dabei nicht darauf an, an welchem Anschluss des Adapters die Thermometer angeschlossen werden.",
-  EMPTY_BACKPACK: "Rucksack leeren",
-  REMOVE_FROM_BACKPACK: "Aus Rucksack entfernen",
-  COPY_TO_BACKPACK: "In Rucksack kopieren",
-  COPY_ALL_TO_BACKPACK: "Alle Blöcke in Rucksack kopieren",
-  PASTE_ALL_FROM_BACKPACK: "Alle Blöcke aus Rucksack einfügen",
 };
-

src/components/Blockly/msg/de/ui.js

@@ -401,4 +401,11 @@ export const UI = {
   goToApp_text:
     "Der Code wurde erfolgreich kompiliert! Klicke den unteren Button um zur senseBox:connect App zu gelangen und die Übertragung des Sketches fertigzustellen!",
   goToApp_title: "Over-The-Air Übertragung",
+
+  // Backpack translations
+  EMPTY_BACKPACK: "Rucksack leeren",
+  REMOVE_FROM_BACKPACK: "Entfernen aus Rucksack",
+  COPY_TO_BACKPACK: "Kopieren in Rucksack",
+  COPY_ALL_TO_BACKPACK: "Alle Blöcke in Rucksack kopieren",
+  PASTE_ALL_FROM_BACKPACK: "Alle Blöcke aus Rucksack einfügen",
 };

src/components/Blockly/msg/en/translations.js

@@ -244,9 +244,4 @@ export const TRANSLATIONS = {
   senseBox_watertemperature: "Water Temperature",
   senseBox_watertemperature_tooltip:
     "The water thermometer outputs temperature in degrees Celsius. Connect the sensor to one of the 6 ports of the One-Wire adapter and then connect the One-Wire adapter to one of the 3 digital/analog ports of the senseBox and select the port in the block. If you only have one thermometer connected to the One-Wire adapter, then leave the index at 0. Each additional connected thermometer can be addressed with an index increased by 1. It does not matter at which port of the adapter the thermometers are connected.",
-  EMPTY_BACKPACK: "Empty Backpack",
-  REMOVE_FROM_BACKPACK: "Remove from Backpack",
-  COPY_TO_BACKPACK: "Copy to Backpack",
-  COPY_ALL_TO_BACKPACK: "Copy All to Backpack",
-  PASTE_ALL_FROM_BACKPACK: "Paste All from Backpack",
 };

src/components/Blockly/msg/en/ui.js

@@ -395,4 +395,11 @@ export const UI = {
   goToApp_text:
     "The code has been compiled successfully. Start with the transfer by clicking on the button below, redirecting you to the senseBox:connect App ! ",
   goToApp_title: "Over-The-Air Transfer",
+
+  // Backpack translations
+  EMPTY_BACKPACK: "Empty Backpack",
+  REMOVE_FROM_BACKPACK: "Remove from Backpack",
+  COPY_TO_BACKPACK: "Copy to Backpack",
+  COPY_ALL_TO_BACKPACK: "Copy All to Backpack",
+  PASTE_ALL_FROM_BACKPACK: "Paste All from Backpack",
 };