@eohjsc/react-native-smart-city 0.5.4-rc9 → 0.5.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.5.4-rc9",
+  "version": "0.5.5",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -171,7 +171,6 @@
     "react-native-geocoder": "^0.5.0",
     "react-native-gesture-handler": "^1.7.0",
     "react-native-get-location": "^2.0.0",
-    "react-native-highcharts2": "^1.2.0",
     "react-native-image-crop-picker": "^0.37.2",
     "react-native-image-resizer": "^1.4.5",
     "react-native-input-credit-card": "^0.5.5",
@@ -195,7 +194,7 @@
     "react-native-safe-area-context": "^3.1.1",
     "react-native-screens": "^2.9.0",
     "react-native-super-grid": "^4.0.3",
-    "react-native-svg": "13.9.0",
+    "react-native-svg": "^12.1.0",
     "react-native-toast-message": "^2.1.1",
     "react-native-udp": "4.1.3",
     "react-native-version-check": "^3.4.2",

package/src/commons/Grid/GridItemStyles.js

@@ -1,9 +1,5 @@
 import { StyleSheet } from 'react-native';
-import { Constants, Colors } from '../../configs';
-
-const marginItem = 12;
-const marginHorizontal = 16;
-const widthItem = (Constants.width - marginHorizontal * 2 - marginItem) / 2;
+import { Colors } from '../../configs';
 
 export default StyleSheet.create({
   container: {
@@ -17,7 +13,7 @@ export default StyleSheet.create({
     shadowOpacity: 0.1,
     shadowRadius: 3,
     elevation: 4,
-    width: widthItem,
+    width: '100%',
     backgroundColor: Colors.White,
     justifyContent: 'space-between',
     marginBottom: 16,

package/src/screens/Automate/AddNewAction/SetupConfigCondition.js

@@ -17,10 +17,11 @@ import Routes from '../../../utils/Route';
 import ModalCustom from '../../../commons/Modal/ModalCustom';
 import { ToastBottomHelper } from '../../../utils/Utils';
 
-const valueEvaluationToOptions = (valueEvaluation) => {
+const valueEvaluationToOptions = (valueEvaluation, config, t) => {
   if (valueEvaluation.template === 'range') {
     return valueEvaluation.configuration.ranges.map((range, index) => ({
-      title: range.evaluate?.text,
+      // eslint-disable-next-line max-len
+      title: `${range.evaluate?.text} (${range.start} ${range.start_condition} "${config.name}" ${range.end_condition} ${range.end})`,
       condition: 'value_evaluation',
       value: [valueEvaluation.id, index],
     }));
@@ -28,12 +29,12 @@ const valueEvaluationToOptions = (valueEvaluation) => {
   if (valueEvaluation.template === 'boolean') {
     return [
       {
-        title: valueEvaluation.configuration?.off?.text,
+        title: `${valueEvaluation.configuration?.off?.text}  ("${config.name}" = 0)`,
         condition: 'value_evaluation',
         value: [valueEvaluation.id, 0],
       },
       {
-        title: valueEvaluation.configuration?.on?.text,
+        title: `${valueEvaluation.configuration?.on?.text}  ("${config.name}" = 1)`,
         condition: 'value_evaluation',
         value: [valueEvaluation.id, 1],
       },
@@ -69,14 +70,13 @@ const SetupConfigCondition = () => {
     if (config?.value_evaluations?.length) {
       const options = [];
       config.value_evaluations.forEach((valueEvaluation) => {
-        options.push(...valueEvaluationToOptions(valueEvaluation));
+        options.push(...valueEvaluationToOptions(valueEvaluation, config, t));
       });
       return options;
     }
 
     return [];
-  }, [config?.value_evaluations]);
-
+  }, [config, t]);
   const setupCustomCondition = () => {
     setSelectedCondition('custom');
     setIsShowModal(true);
@@ -117,7 +117,7 @@ const SetupConfigCondition = () => {
             setupCustomCondition('custom');
           }}
         >
-          <Text type="Body">{t('customize...')}</Text>
+          <Text type="Body">{t('customize')}</Text>
         </GridItem>
       </View>
       <ModalCustom
@@ -126,7 +126,9 @@ const SetupConfigCondition = () => {
         style={styles.modal}
       >
         <View style={styles.modalContent}>
-          <Text type="Body">{t('when_value_is')}</Text>
+          <Text type="Body">
+            {t('when_value_is', { config_name: config.name })}
+          </Text>
           <List renderHeader={t('condition')}>
             {normalConditions.map((item) => {
               return (
@@ -147,9 +149,10 @@ const SetupConfigCondition = () => {
             <InputItem
               keyboardType="decimal-pad"
               type="number"
-              maxLength={8}
+              maxLength={10}
               onChange={(value) => {
-                automate.value = parseFloat(value);
+                const floatValue = parseFloat(value.replace(',', '.'));
+                automate.value = floatValue;
               }}
               style={styles.numberInput}
             />

package/src/screens/Automate/AddNewAction/__test__/SetupConfigCondition.test.js

@@ -57,6 +57,7 @@ describe('Test SetupConfigCondition', () => {
       params: {
         config: {
           id: 1,
+          name: 'config name',
           decimal_behind: 0,
           title: 'is below (<)',
           sensor_type: 'air_quality',
@@ -67,16 +68,28 @@ describe('Test SetupConfigCondition', () => {
               configuration: {
                 ranges: [
                   {
+                    end: 1,
+                    end_condition: '<',
+                    start: 2,
+                    start_condition: '>=',
                     evaluate: {
                       text: 'Case 1',
                     },
                   },
                   {
+                    end: 1,
+                    end_condition: '<',
+                    start: 2,
+                    start_condition: '>=',
                     evaluate: {
                       text: 'Case 2',
                     },
                   },
                   {
+                    end: 1,
+                    end_condition: '<',
+                    start: 2,
+                    start_condition: '>=',
                     evaluate: {
                       text: 'Case 3',
                     },
@@ -108,9 +121,15 @@ describe('Test SetupConfigCondition', () => {
 
     const gridItems = instance.findAllByType(GridItem);
 
-    expect(gridItems[0].findByType(Text).props.children).toEqual('Case 1');
-    expect(gridItems[1].findByType(Text).props.children).toEqual('Case 2');
-    expect(gridItems[2].findByType(Text).props.children).toEqual('Case 3');
+    expect(gridItems[0].findByType(Text).props.children).toEqual(
+      'Case 1 (2 >= "config name" < 1)'
+    );
+    expect(gridItems[1].findByType(Text).props.children).toEqual(
+      'Case 2 (2 >= "config name" < 1)'
+    );
+    expect(gridItems[2].findByType(Text).props.children).toEqual(
+      'Case 3 (2 >= "config name" < 1)'
+    );
   });
 
   it('render boolean value evaluation', async () => {
@@ -118,6 +137,7 @@ describe('Test SetupConfigCondition', () => {
       params: {
         config: {
           id: 1,
+          name: 'config name',
           title: 'is below (<)',
           sensor_type: 'air_quality',
           value_evaluations: [BOOLEAN_VALUE_EVALUATION_CONFIGURATION],
@@ -132,10 +152,14 @@ describe('Test SetupConfigCondition', () => {
 
     const gridItems = instance.findAllByType(GridItem);
     expect(gridItems).toHaveLength(3);
-    expect(gridItems[0].findByType(Text).props.children).toEqual('Case Off');
-    expect(gridItems[1].findByType(Text).props.children).toEqual('Case On');
+    expect(gridItems[0].findByType(Text).props.children).toEqual(
+      'Case Off  ("config name" = 0)'
+    );
+    expect(gridItems[1].findByType(Text).props.children).toEqual(
+      'Case On  ("config name" = 1)'
+    );
     expect(gridItems[2].findByType(Text).props.children).toEqual(
-      'Customize...'
+      'Customize conditions'
     );
   });
 
@@ -145,6 +169,7 @@ describe('Test SetupConfigCondition', () => {
         automate: {},
         config: {
           id: 1,
+          name: 'config name',
           title: 'is below (<)',
           sensor_type: 'air_quality',
           value_evaluations: [BOOLEAN_VALUE_EVALUATION_CONFIGURATION],
@@ -178,6 +203,7 @@ describe('Test SetupConfigCondition', () => {
         automate: {},
         config: {
           id: 1,
+          name: 'config name',
           title: 'is below (<)',
         },
       },
@@ -229,8 +255,9 @@ describe('Test SetupConfigCondition', () => {
   const testConditionValue = async (value, message) => {
     useRoute.mockReturnValue({
       params: {
-        item: {
+        config: {
           id: 1,
+          name: 'config name',
           decimal_behind: 0,
           title: 'is below (<)',
           sensor_type: 'air_quality',

package/src/screens/Sharing/SelectShareDevice.js

@@ -222,9 +222,8 @@ const SelectShareDevice = ({ route }) => {
         }
       }
     }
-
+    setLoading(false);
     if (read_permissions.length === 0 && control_permissions.length === 0) {
-      setLoading(false);
       Alert.alert('', t('choose_at_least_one'));
       return;
     }

package/src/utils/I18n/translations/en.js

@@ -1466,9 +1466,9 @@ export default {
   bellow_widget_is_wrongly_configured: 'Bellow widget is wrongly configured',
   widget_have_not_been_shared:
     '{widget} widget have not been shared. Please contact the owner',
-  'customize...': 'Customize...',
+  customize: 'Customize conditions',
   uri_invalid: 'URI invalid',
-  when_value_is: 'When value is',
+  when_value_is: 'Activates when "{config_name}" value is',
   template_not_supported: 'Widget "{template}" not yet supported',
   invited_user: 'Invited user {user}',
   enter_value: 'Enter value',

package/src/utils/I18n/translations/vi.js

@@ -1476,9 +1476,9 @@ export default {
   bellow_widget_is_wrongly_configured: 'Tiện ích bên dưới được cấu hình sai',
   widget_have_not_been_shared:
     'Tiện ích {widget} chưa được chia sẽ. Vui lòng liên hệ với chủ sở hữu',
-  'customize...': 'Tùy chỉnh...',
+  customize: 'Tùy chỉnh điều kiện',
   uri_invalid: 'URI không hợp lệ',
-  when_value_is: 'Khi giá trị là',
+  when_value_is: 'Kích hoạt khi giá trị "{config_name}"',
   template_not_supported: 'Tiện ích "{template}" chưa được hỗ trợ',
   invited_user: 'Đã mời người dùng {user}',
   enter_value: 'Nhập giá trị',