From 43f8ab4332fbee03e410550a9024d3f0fee7e1e6 Mon Sep 17 00:00:00 2001 From: Sonja Happ Date: Wed, 19 Feb 2020 15:09:30 +0100 Subject: [PATCH] CI: remove some unused imports and functions; remove test stage --- .gitlab-ci.yml | 19 +++++++++---------- .../edit-widget-control-creator.js | 19 ------------------- src/widget/widgets/slider.js | 4 ++-- 3 files changed, 11 insertions(+), 31 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c234d5b..a7aaa62 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,6 @@ cache: stages: - build - - test - deploy build: @@ -32,15 +31,15 @@ build: tags: - docker -test: - stage: test - script: - - npm test - image: ${DOCKER_IMAGE_DEV} - dependencies: - - build - tags: - - docker +#test: +# stage: test +# script: +# - npm test +# image: ${DOCKER_IMAGE_DEV} +# dependencies: +# - build +# tags: +# - docker deploy:docker: stage: deploy diff --git a/src/widget/edit-widget/edit-widget-control-creator.js b/src/widget/edit-widget/edit-widget-control-creator.js index 5db44a9..36c70a8 100644 --- a/src/widget/edit-widget/edit-widget-control-creator.js +++ b/src/widget/edit-widget/edit-widget-control-creator.js @@ -26,7 +26,6 @@ import EditWidgetNumberControl from './edit-widget-number-control'; import EditWidgetColorControl from './edit-widget-color-control'; import EditWidgetTimeControl from './edit-widget-time-control'; import EditImageWidgetControl from './edit-widget-image-control'; -import EditWidgetSimulationControl from './edit-widget-simulation-control'; import EditWidgetSignalControl from './edit-widget-signal-control'; import EditWidgetSignalsControl from './edit-widget-signals-control'; import EditWidgetOrientation from './edit-widget-orientation'; @@ -56,9 +55,6 @@ export default function CreateControls(widgetType = null, widget = null, session ); break; case 'Value': - let valueBoundOnChange = (e) => { - handleChange([e, {target: {id: 'signal', value: 0}}]); - }; DialogControls.push( validateForm(id)} handleChange={e => handleChange(e)} />, validateForm(id)} signals={signals} handleChange={(e) => handleChange(e)} />, @@ -67,9 +63,6 @@ export default function CreateControls(widgetType = null, widget = null, session ); break; case 'Lamp': - let lampBoundOnChange = (e) => { - handleChange([e, {target: {id: 'signal', value: 0}}]); - }; DialogControls.push( validateForm(id)} signals={signals} handleChange={(e) => handleChange(e)} />, validateForm(id)} handleChange={e => handleChange(e)} />, @@ -100,9 +93,6 @@ export default function CreateControls(widgetType = null, widget = null, session ); break; case 'Gauge': - let gaugeBoundOnChange = (e) => { - handleChange([e, {target: {id: 'signal', value: ''}}]); - }; DialogControls.push( validateForm(id)} handleChange={e => handleChange(e)} />, validateForm(id)} signals={signals} handleChange={(e) => handleChange(e)} />, @@ -112,9 +102,6 @@ export default function CreateControls(widgetType = null, widget = null, session ); break; case 'PlotTable': - let plotTableBoundOnChange = (e) => { - handleChange([e, {target: {id: 'signalIDs', value: []}}]); - }; DialogControls.push( validateForm(id)} signals={signals} handleChange={(e) => handleChange(e)} />, handleChange(e)} />, @@ -135,9 +122,6 @@ export default function CreateControls(widgetType = null, widget = null, session ); break; case 'Button': - let buttonBoundOnChange = (e) => { - handleChange([e, {target: {id: 'signal', value: 0}}]); - }; DialogControls.push( handleChange(e)} validate={id => validateForm(id)} />, validateForm(id)} signals={signals} handleChange={(e) => handleChange(e)} />, @@ -173,9 +157,6 @@ export default function CreateControls(widgetType = null, widget = null, session break; case 'Input': - let inputBoundOnChange = (e) => { - handleChange([e, {target: {id: 'signal', value: 0}}]); - }; DialogControls.push( validateForm(id)} handleChange={e => handleChange(e)} />, validateForm(id)} signals={signals} handleChange={(e) => handleChange(e)} /> diff --git a/src/widget/widgets/slider.js b/src/widget/widgets/slider.js index e082c60..ac82ebc 100644 --- a/src/widget/widgets/slider.js +++ b/src/widget/widgets/slider.js @@ -45,6 +45,8 @@ class WidgetSlider extends Component { } static getDerivedStateFromProps(props, state){ + let returnState = {}; + if(props.widget.signalIDs.length === 0){ // set value to default @@ -56,8 +58,6 @@ class WidgetSlider extends Component { } - let returnState = {}; - // Update value if (props.widget.customProperties.default_value && state.value === undefined) { returnState["value"] = props.widget.customProperties.default_value;