From 9ac98aa06d35e878e6f8a1d4a1763ac5c85a856b Mon Sep 17 00:00:00 2001 From: fbruc03 <65135023+fbruc03@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:20:15 +0100 Subject: [PATCH] change block data to json --- src/actions/workspaceActions.js | 1 + .../Blockly/blocks/sensebox-sensors.js | 22 +++++++++---------- src/components/SensorInfo.js | 15 ++++++------- src/components/TooltipViewer.js | 5 ++--- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/actions/workspaceActions.js b/src/actions/workspaceActions.js index bb04611..da44286 100644 --- a/src/actions/workspaceActions.js +++ b/src/actions/workspaceActions.js @@ -28,6 +28,7 @@ export const onChangeCode = () => (dispatch, getState) => { } else if (selectedBlock === null) { code.tooltip = Blockly.Msg.tooltip_hint code.helpurl = '' + code.data = null } diff --git a/src/components/Blockly/blocks/sensebox-sensors.js b/src/components/Blockly/blocks/sensebox-sensors.js index c06e321..f395547 100644 --- a/src/components/Blockly/blocks/sensebox-sensors.js +++ b/src/components/Blockly/blocks/sensebox-sensors.js @@ -26,7 +26,7 @@ Blockly.Blocks["sensebox_sensor_temp_hum"] = { this.setColour(getColour().sensebox); this.setTooltip(Blockly.Msg.senseBox_temp_hum_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_temp_hum_helpurl); - this.data = "hdc1080"; + this.data = {name: "hdc1080", connection: "I2C"}; }, }; @@ -52,7 +52,7 @@ Blockly.Blocks["sensebox_sensor_uv_light"] = { this.setColour(getColour().sensebox); this.setTooltip(Blockly.Msg.senseBox_uv_light_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_uv_light_helpurl); - this.data = "veml6070"; + this.data = {name: "veml6070"}; }, }; @@ -93,7 +93,7 @@ Blockly.Blocks["sensebox_sensor_bmx055_accelerometer"] = { this.setColour(getColour().sensebox); this.setTooltip(Blockly.Msg.senseBox_bmx055_accelerometer_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_bmx055_helpurl); - this.data = "bmx055"; + this.data = {name: "bmx055"}; }, }; @@ -125,7 +125,7 @@ Blockly.Blocks["sensebox_sensor_sds011"] = { this.setColour(getColour().sensebox); this.setTooltip(Blockly.Msg.senseBox_sds011_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_sds011_helpurl); - this.data = "sds011"; + this.data = {name: "sds011"}; }, }; @@ -159,7 +159,7 @@ Blockly.Blocks["sensebox_sensor_pressure"] = { this.setOutput(true, Types.DECIMAL.typeName); this.setTooltip(Blockly.Msg.senseBox_pressure_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_pressure_helpurl); - this.data = "bmp280"; + this.data = {name: "bmp280"}; this.getField("NAME").setValidator( function (val) { this.updateShape_(val === "Altitude"); @@ -206,7 +206,7 @@ Blockly.Blocks["sensebox_sensor_bme680_bsec"] = { this.setColour(getColour().sensebox); this.setTooltip(Blockly.Msg.senseBox_bme_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_bme680_helpurl); - this.data = "bme680"; + this.data = {name: "bme680"}; }, }; @@ -251,7 +251,7 @@ Blockly.Blocks["sensebox_sensor_ultrasonic_ranger"] = { this.setOutput(true, Types.NUMBER.typeName); this.setTooltip(Blockly.Msg.senseBox_ultrasonic_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_ultrasonic_helpurl); - this.data = "hc-sr04"; + this.data = {name: "hc-sr04"}; }, /** * Parse XML to restore the number of pins available. @@ -389,7 +389,7 @@ Blockly.Blocks["sensebox_scd30"] = { this.setColour(getColour().sensebox); this.setTooltip(Blockly.Msg.senseBox_scd_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_scd_helpurl); - this.data = "scd30"; + this.data = {name: "scd30"}; }, onchange: function (e) { var dropdown = this.getFieldValue("dropdown"); @@ -456,7 +456,7 @@ Blockly.Blocks["sensebox_sensor_truebner_smt50"] = { this.setOutput(true, Types.NUMBER.typeName); this.setTooltip(Blockly.Msg.senseBox_smt50_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_smt50_helpurl); - this.data = "smt50"; + this.data = {name: "smt50"}; }, }; @@ -479,7 +479,7 @@ Blockly.Blocks["sensebox_sensor_watertemperature"] = { .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port"); this.setOutput(true, Types.NUMBER.typeName); this.setTooltip(Blockly.Msg.senseBox_watertemperature_tip); - this.data = "ds18b20"; + this.data = {name: "ds18b20"}; }, }; @@ -552,7 +552,7 @@ Blockly.Blocks["sensebox_sensor_dps310"] = { this.setOutput(true, Types.DECIMAL.typeName); this.setTooltip(Blockly.Msg.senseBox_sensor_dps310_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_sensor_dps310_helpurl); - this.data = "dps310"; + this.data = {name: "dps310"}; this.getField("NAME").setValidator( function (val) { this.updateShape_(val === "Altitude"); diff --git a/src/components/SensorInfo.js b/src/components/SensorInfo.js index 8b5f42b..b66f5ff 100644 --- a/src/components/SensorInfo.js +++ b/src/components/SensorInfo.js @@ -16,36 +16,35 @@ export default function LabTabs() { setValue(newValue); }; - // get the description in the current language if no lang is give return english + // get the description in the current language if no lang is give return english or the first one function filterLanguage(options) { - console.log(options); + var lang; if (window.localStorage.getItem("locale")) { - var lang = window.localStorage.getItem("locale").split("_")[0]; + lang = window.localStorage.getItem("locale").split("_")[0]; } else { - var lang = "en"; + lang = "en"; } for (var i = 0; i < options.length; i++) { - console.log(options[i].languageCode, lang); if (options[i].languageCode === lang) { return options[i].text; } } return options[0].text; } - var currentStore = store.getState(); // ALL SENSOR DATA FROM WIKI var sensorData = currentStore.sensorwiki; // NAME OF SELECTED BLOCK - var sensorName = currentStore.workspace.code.data; + var sensorName = currentStore.workspace.code.data.name; // SEARCH ALL DATA FOR SELECTED BLOCK NAME var sensorInfo = sensorData.find(function (element) { return element.slug === sensorName; }); - console.log("SENSOR INFO: ", sensorInfo); if (sensorInfo) { sensorInfo.markdown = "# Markdown Test \n ## Markdown Test 2 \n ### Markdown Test 3"; + + // GET DESCRIPTION OF SELECTED BLOCK sensorInfo.details = `# ${sensorName.toUpperCase()} ${Blockly.Msg.sensorinfo_explanation} [${sensorName.toUpperCase()}](https://sensors.wiki/sensor/detail/${sensorName}) ## ${Blockly.Msg.sensorinfo_description} diff --git a/src/components/TooltipViewer.js b/src/components/TooltipViewer.js index c57e583..1d1225d 100644 --- a/src/components/TooltipViewer.js +++ b/src/components/TooltipViewer.js @@ -57,7 +57,6 @@ class TooltipViewer extends Component { {this.props.tooltip} - {store.getState().workspace.code.data ? ( - + ) : (null)} ); }