@eohjsc/react-native-smart-city 0.7.10 → 0.7.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.7.10",
+  "version": "0.7.12",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -155,7 +155,7 @@
     "react-native-geocoder": "^0.5.0",
     "react-native-gesture-handler": "^2.17.1",
     "react-native-get-location": "^2.0.0",
-    "react-native-image-crop-picker": "^0.41.4",
+    "react-native-image-crop-picker": "0.41.2",
     "react-native-image-resizer": "^1.4.5",
     "react-native-input-credit-card": "^0.5.5",
     "react-native-iphone-x-helper": "^1.2.1",

package/src/commons/ActionGroup/StatesGridActionTemplate.js

@@ -38,15 +38,11 @@ const GridItem = ({ item, doAction, sensor }) => {
 
   const doActionAndWatchConfig = useCallback(
     (actionData) => {
-      let data = { value: is_on_value };
+      let data = null;
       if (allow_config_store_value && config) {
-        data = {
-          config_id: config,
-          config_value: is_on_value,
-          value: is_on_value,
-        };
+        data = JSON.stringify({ config_id: config, config_value: is_on_value });
       }
-      doAction(actionData, JSON.stringify(data));
+      doAction(actionData, data);
       if (sensor?.is_managed_by_backend) {
         if (config && sensor.device_type === DEVICE_TYPE.LG_THINQ) {
           watchMultiConfigs([config]);

package/src/commons/ActionGroup/__test__/StatesGridActionTemplate.test.js

@@ -75,10 +75,7 @@ describe('Test StatesGridActionTemplate', () => {
     await act(async () => {
       await touchableOpacities[0].props.onPress();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(
-      mockActionData,
-      JSON.stringify({ value: 1 })
-    );
+    expect(mockDoAction).toHaveBeenCalledWith(mockActionData, null);
   });
 
   it('test trigger special action', async () => {
@@ -102,7 +99,7 @@ describe('Test StatesGridActionTemplate', () => {
     });
     expect(mockDoAction).toHaveBeenCalledWith(
       mockActionData,
-      JSON.stringify({ config_id: 1, config_value: 1, value: 1 })
+      JSON.stringify({ config_id: 1, config_value: 1 })
     );
   });
 });

package/src/commons/OneTapTemplate/StatesGridActionTemplate.js

@@ -16,14 +16,10 @@ const ActionItem = ({
   item,
 }) => {
   const handleSelectAction = useCallback(() => {
-    let actionData = { value: is_on_value };
+    let actionData = null;
     const { allow_config_store_value, config, is_on_value } = item;
     if (allow_config_store_value && config) {
-      actionData = {
-        config_id: config,
-        config_value: is_on_value,
-        value: is_on_value,
-      };
+      actionData = { config_id: config, config_value: is_on_value };
     }
     setActionName(item.text);
 

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

@@ -11,9 +11,9 @@ import { API, Colors } from '../../../configs';
 import { ToastBottomHelper } from '../../../utils/Utils';
 import Routes from '../../../utils/Route';
 import moment from 'moment';
-import { Image } from 'react-native-svg';
 import CheckBox from '@react-native-community/checkbox';
 import { useSCContextSelector } from '../../../context';
+import { Image } from 'react-native';
 
 const SetupScriptReceiverEmail = ({ route }) => {
   const t = useTranslations();

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

@@ -291,7 +291,7 @@ describe('Test ChooseAction', () => {
           },
           {
             action: '800ff454-4e2a-4a38-bad6-1bded728193e',
-            data: { config_id: config5, config_value: 1, value: 1 },
+            data: { config_id: config5, config_value: 1 },
           },
         ],
       })

package/src/screens/Automate/EditActionsList/UpdateReceiverEmailScript.js

@@ -11,9 +11,9 @@ import { API, Colors } from '../../../configs';
 import { ToastBottomHelper } from '../../../utils/Utils';
 import Routes from '../../../utils/Route';
 import moment from 'moment';
-import { Image } from 'react-native-svg';
 import CheckBox from '@react-native-community/checkbox';
 import { useSCContextSelector } from '../../../context';
+import { Image } from 'react-native';
 
 const UpdateReceiverEmailScript = ({ route }) => {
   const t = useTranslations();

package/src/screens/Automate/ScriptDetail/Styles/indexStyles.js

@@ -80,6 +80,16 @@ export default StyleSheet.create({
     height: 100,
     marginBottom: 16,
   },
+  rightItemAction: {
+    flex: 1,
+    borderColor: Colors.Gray4,
+    borderWidth: 1,
+    borderRadius: 4,
+    paddingVertical: 15,
+    paddingHorizontal: 16,
+    marginLeft: 4,
+    flexDirection: 'row',
+  },
   leftItem: {
     width: 41,
     height: '100%',

package/src/screens/Automate/ScriptDetail/index.js

@@ -311,7 +311,7 @@ const ScriptDetail = ({ route }) => {
 
           <View style={styles.row}>
             <Text type="H3" color={Colors.Gray9} semibold>
-              {t('active_list')}
+              {t('actions_list')}
             </Text>
             {data.length > 0 && !!can_edit && !!enableScript && (
               <TouchableOpacity
@@ -414,7 +414,7 @@ const Item = ({ item, index, enableScript, t }) => {
             {paddedIndex}
           </Text>
         </View>
-        <View style={styles.rightItem}>
+        <View style={styles.rightItemAction}>
           <IconComponent icon={sensor_icon_kit} style={styles.iconEndDevice} />
           <View style={styles.contentItem}>
             <View style={styles.titleItem}>

package/src/screens/SubUnit/ManageSubUnit.js

@@ -1,18 +1,19 @@
+import { Image, TouchableOpacity, View } from 'react-native';
 import React, { useEffect } from 'react';
-import { View, TouchableOpacity, Image } from 'react-native';
 import { useIsFocused, useNavigation } from '@react-navigation/native';
+
+import { AccessibilityLabel } from '../../configs/Constants';
 import { Colors } from '../../configs';
-import { useTranslations } from '../../hooks/Common/useTranslations';
-import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
-import Text from '../../commons/Text';
-import styles from './ManageSubUnitStyles';
 import { IconOutline } from '@ant-design/icons-react-native';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
-import Routes from '../../utils/Route';
 import NoSubUnitImage from '../../../assets/images/Illustrations.svg';
-import useManageSubUnit from './hooks/useManageSubUnit';
-import { AccessibilityLabel } from '../../configs/Constants';
+import Routes from '../../utils/Route';
 import { RowItem } from '../../commons/RowItem';
+import Text from '../../commons/Text';
+import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
+import styles from './ManageSubUnitStyles';
+import useManageSubUnit from './hooks/useManageSubUnit';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 
 const RightComponent = ({ onAddSubUnit, onRearrangeSubUnit }) => (
   <View style={styles.rightComponent}>
@@ -50,7 +51,9 @@ const StationList = ({ stations, onEditSubUnit }) => {
             />
           }
           text={item.name}
-          subtext={`${item.devices.length}  ${t('devices').toLowerCase()}`}
+          subtext={`${item.devices?.length || 0}  ${t(
+            'devices'
+          ).toLowerCase()}`}
           onPress={() => onEditSubUnit(item)}
           rightComponent={
             <IconOutline name="right" size={20} color={Colors.Gray6} />

package/src/screens/SubUnit/RearrageSubUnit.js

@@ -1,15 +1,16 @@
 import React, { useState } from 'react';
-import { View, TouchableOpacity } from 'react-native';
-import { isEqual } from 'lodash';
+import { TouchableOpacity, View } from 'react-native';
+
 import { API } from '../../configs';
-import { axiosPost } from '../../utils/Apis/axios';
-import styles from './RearrrageSubUnitStyle';
-import Text from '../../commons/Text';
 import FlatListDnD from '../../commons/FlatListDnD';
-import ViewButtonBottom from '../../commons/ViewButtonBottom';
 import { HeaderCustom } from '../../commons/Header';
 import Rearrange from '../../../assets/images/Rearrange.svg';
+import Text from '../../commons/Text';
 import { ToastBottomHelper } from '../../utils/Utils';
+import ViewButtonBottom from '../../commons/ViewButtonBottom';
+import { axiosPost } from '../../utils/Apis/axios';
+import { isEqual } from 'lodash';
+import styles from './RearrrageSubUnitStyle';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
@@ -55,7 +56,7 @@ const RearrangeSubUnit = ({ route }) => {
         >
           <Text style={styles.indexText}>{item.name}</Text>
           <Text style={styles.deviceText}>
-            {`${item.devices.length} ${t('devices').toLowerCase()}`}
+            {`${item.devices?.length || 0} ${t('devices').toLowerCase()}`}
           </Text>
         </View>
       </View>

package/src/screens/SubUnit/__test__/ManageSubUnit.test.js

@@ -1,17 +1,18 @@
-import React from 'react';
 import { ScrollView, TouchableOpacity } from 'react-native';
-import { create } from 'react-test-renderer';
-import { act } from '@testing-library/react-hooks';
-import ManageSubUnit from '../ManageSubUnit';
-import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
-import { RowItem } from '../../../commons/RowItem';
-import Routes from '../../../utils/Route';
+
+import API from '../../../configs/API';
 import { AccessibilityLabel } from '../../../configs/Constants';
+import ManageSubUnit from '../ManageSubUnit';
 import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
+import Routes from '../../../utils/Route';
+import { RowItem } from '../../../commons/RowItem';
+import { SCProvider } from '../../../context';
+import { act } from '@testing-library/react-hooks';
 import api from '../../../utils/Apis/axios';
+import { create } from 'react-test-renderer';
+import { mockSCStore } from '../../../context/mockStore';
 import { useNavigation } from '@react-navigation/native';
-import API from '../../../configs/API';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -58,6 +59,20 @@ describe('Test ManageSubUnit', () => {
       screen: Routes.EditSubUnit,
     });
   });
+
+  it('render ManageSubUnit station without device', async () => {
+    data = [{ id: 1, name: 'station' }];
+    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, { stations: data });
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const subUnitScrollViews = instance.findAllByType(ScrollView);
+    expect(subUnitScrollViews).toHaveLength(1);
+    const rowItem = instance.findAllByType(RowItem);
+    expect(rowItem).toHaveLength(1);
+  });
+
   it('ManageSubUnit add sub unit', async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));

package/src/screens/SubUnit/__test__/RearrangeSubUnit.test.js

@@ -1,16 +1,16 @@
-import React from 'react';
-import { create } from 'react-test-renderer';
-import { act } from '@testing-library/react-hooks';
 import { API } from '../../../configs';
-import { ViewButtonBottom } from '../../../commons';
+import DraggableFlatList from 'react-native-draggable-flatlist';
+import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
+import RearrageSubUnit from '../RearrageSubUnit';
 import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
+import { ToastBottomHelper } from '../../../utils/Utils';
+import { ViewButtonBottom } from '../../../commons';
+import { act } from '@testing-library/react-hooks';
 import api from '../../../utils/Apis/axios';
-import RearrageSubUnit from '../RearrageSubUnit';
-import MockAdapter from 'axios-mock-adapter';
+import { create } from 'react-test-renderer';
+import { mockSCStore } from '../../../context/mockStore';
 import { useNavigation } from '@react-navigation/native';
-import { ToastBottomHelper } from '../../../utils/Utils';
-import DraggableFlatList from 'react-native-draggable-flatlist';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -93,6 +93,16 @@ describe('Test RearrangeSubUnit', () => {
   });
 
   it('test call api error', async () => {
+    route = {
+      params: {
+        unit: { id: 1, name: 'unit 1' },
+        stations: [
+          { id: 1, name: 'station 1', devices: [{ id: 1, name: 'device 1' }] },
+          { id: 2, name: 'station 2' },
+        ],
+      },
+    };
+
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -106,7 +116,7 @@ describe('Test RearrangeSubUnit', () => {
     expect(flatListDnD.props.data).toEqual(route.params.stations);
 
     const swappedStations = [
-      { id: 2, name: 'station 2', devices: [{ id: 1, name: 'device 2' }] },
+      { id: 2, name: 'station 2' },
       { id: 1, name: 'station 1', devices: [{ id: 1, name: 'device 1' }] },
     ];
 

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

@@ -267,7 +267,6 @@ export default {
   setup_the_conditions: 'Setup the conditions',
   setup_the_schedule: 'Setup the Schedule',
   des_launch_one_tap: 'Quick button create at the dashboard',
-  active_list: 'Actions List',
   text_very_good_level: 'Very good',
   text_good_level: 'Good',
   text_moderate_level: 'Moderate',

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

@@ -50,7 +50,6 @@ export default {
   schedule: 'Lịch trình',
   event: 'Sự kiện',
   des_launch_one_tap: 'Tạo nút nhanh trên trang tổng quan',
-  active_list: 'Danh sách hành động',
   filtering: 'Đang sục rửa',
   insufficient_water_input: 'Thiếu nước đầu vào.',
   check_water_leak: 'Kiểm tra rò rỉ nước.',