Merge branch 'master' into ask-ai-in-scene

.github/workflows/docker-dev-build.yml

@@ -10,7 +10,7 @@ on:
       platforms:
         description: 'Docker platform to build'
         required: true
-        default: 'linux/amd64,linux/arm/v7,linux/arm64/v8'
+        default: 'linux/amd64,linux/arm64/v8'
 
 jobs:
   build-front:

.github/workflows/docker-release-build.yml

@@ -168,7 +168,7 @@ jobs:
         with:
           context: .
           file: ./docker/Dockerfile.buildx
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/amd64,linux/arm64/v8
           push: true
           pull: true
           tags: ${{ steps.docker_meta.outputs.tags }}

front/package.json

@@ -43,7 +43,7 @@
     "prettier": "^1.17.1"
   },
   "dependencies": {
-    "@gladysassistant/gladys-gateway-js": "4.16.2",
+    "@gladysassistant/gladys-gateway-js": "4.15.0",
     "@gladysassistant/theme-optimized": "^1.0.3",
     "@jaames/iro": "^5.5.2",
     "@yaireo/tagify": "4.5.0",

front/src/components/boxs/chart/EditChart.jsx

@@ -8,7 +8,7 @@ import get from 'get-value';
 import BaseEditBox from '../baseEditBox';
 import Chart from './Chart';
 import { getDeviceFeatureName } from '../../../utils/device';
-import { DeviceListWithDragAndDrop } from './DeviceListWithDragAndDrop';
+import { DeviceListWithDragAndDrop } from '../../drag-and-drop/DeviceListWithDragAndDrop';
 import { DEVICE_FEATURE_TYPES } from '../../../../../server/utils/constants';
 import withIntlAsProp from '../../../utils/withIntlAsProp';
 import { DEFAULT_COLORS, DEFAULT_COLORS_NAME } from './ApexChartComponent';
@@ -129,9 +129,8 @@ class EditChart extends Component {
 
   refreshDeviceFeaturesNames = () => {
     const newDeviceFeatureNames = this.state.selectedDeviceFeaturesOptions.map(o => {
-      return o.new_label !== undefined ? o.new_label : o.label;
+      return o.new_label !== undefined && o.new_label !== '' ? o.new_label : o.label;
     });
-
     const newDeviceFeature = this.state.selectedDeviceFeaturesOptions.map(o => {
       return o.value;
     });
@@ -213,7 +212,10 @@ class EditChart extends Component {
       }
     });
     await this.setState(newState);
-    this.refreshDeviceFeaturesNames();
+
+    if (name !== '') {
+      this.refreshDeviceFeaturesNames();
+    }
   };
 
   getSelectedDeviceFeaturesAndOptions = (devices, chartType = this.state.chart_type) => {
@@ -342,7 +344,7 @@ class EditChart extends Component {
       }
     });
     await this.setState(newStateWithoutElement);
-    this.refreshDeviceFeaturesNames();
+    await this.refreshDeviceFeaturesNames();
     this.refreshDeviceUnitAndChartType(this.state.selectedDeviceFeaturesOptions);
   };
 

front/src/components/boxs/chart/style.css

@@ -133,20 +133,4 @@
   padding-left: 1.5rem;
   padding-right: 1.5rem;
   text-align: justify;
-}
-.deviceListDragAndDrop {
-  cursor: 'pointer';
-  user-select: 'none';
-}
-
-.deviceListDragAndDropDragging {
-  opacity: 0.5;
-}
-
-.deviceListDragAndDropActive {
-  background-color: #ecf0f1;
-}
-
-.deviceListRemoveButton {
-  z-index: 0;
 }

front/src/components/boxs/device-in-room/EditDevices.jsx

@@ -5,7 +5,7 @@ import Select from 'react-select';
 import update from 'immutability-helper';
 import BaseEditBox from '../baseEditBox';
 import { getDeviceFeatureName } from '../../../utils/device';
-import { DeviceListWithDragAndDrop } from './DeviceListWithDragAndDrop';
+import { DeviceListWithDragAndDrop } from '../../drag-and-drop/DeviceListWithDragAndDrop';
 import withIntlAsProp from '../../../utils/withIntlAsProp';
 import SUPPORTED_FEATURE_TYPES from './SupportedFeatureTypes';
 
@@ -24,7 +24,7 @@ class EditDevices extends Component {
 
   refreshDeviceFeaturesNames = () => {
     const newDeviceFeatureNames = this.state.selectedDeviceFeaturesOptions.map(o => {
-      return o.new_label !== undefined ? o.new_label : o.label;
+      return o.new_label !== undefined && o.new_label !== '' ? o.new_label : o.label;
     });
     const newDeviceFeature = this.state.selectedDeviceFeaturesOptions.map(o => {
       return o.value;
@@ -62,7 +62,10 @@ class EditDevices extends Component {
       }
     });
     await this.setState(newState);
-    this.refreshDeviceFeaturesNames();
+
+    if (name !== '') {
+      this.refreshDeviceFeaturesNames();
+    }
   };
 
   getSelectedDeviceFeaturesAndOptions = devices => {