@eohjsc/react-native-smart-city 0.3.4 → 0.3.7

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TouchableOpacity, Switch } from 'react-native';
+import { TouchableOpacity, Switch, ActivityIndicator } from 'react-native';
 import renderer, { act } from 'react-test-renderer';
 import DateTimePickerModal from 'react-native-modal-datetime-picker';
 import moment from 'moment';
@@ -344,7 +344,7 @@ describe('Test ActionGroup', () => {
     expect(mockDoAction).toHaveBeenCalledTimes(1);
   });
 
-  test('render ActionGroup NumberUpDownActionTemplate', async () => {
+  test('render ActionGroup NumberUpDownActionTemplate watch config value null', async () => {
     const mockDoAction = jest.fn();
     const actionGroup = {
       template: 'NumberUpDownActionTemplate',
@@ -362,11 +362,8 @@ describe('Test ActionGroup', () => {
       );
     });
     const instance = wrapper.root;
-    const text = instance.findAllByType(Text);
-    expect(text[0].props.children).toEqual('28 *C');
-
-    const touchs = instance.findAllByType(TouchableOpacity);
-    expect(touchs).toHaveLength(2);
+    const activity = instance.findAllByType(ActivityIndicator);
+    expect(activity.length).toEqual(1);
   });
 
   test('render ActionGroup StatesGridActionTemplate', async () => {
@@ -464,139 +461,4 @@ describe('Test ActionGroup', () => {
       moment('2021-09-09T10:00:00.000Z').valueOf()
     );
   });
-
-  test('render OnOffSmartLock', async () => {
-    Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
-    const actionGroup = {
-      template: 'OnOffSmartLockActionTemplate',
-      title: 'Timer',
-      configuration: {
-        action_off_data: jest.fn(),
-        action_on_data: jest.fn(),
-      },
-    };
-    const mockDoAction = jest.fn();
-    await act(() => {
-      wrapper = renderer.create(
-        wrapComponent(actionGroup, mockDoAction, sensor)
-      );
-    });
-    const instance = wrapper.root;
-    const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(5);
-  });
-
-  test('render OptionsDropdownActionTemplate', async () => {
-    Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
-    const actionGroup = {
-      template: 'OptionsDropdownActionTemplate',
-      title: 'Timer',
-      configuration: {
-        action_data: jest.fn(),
-        options: [],
-        icon_kit_data: 'icon_kit_data',
-        icon: '',
-        icon_outlined: 'icon_outlined',
-      },
-    };
-    const mockDoAction = jest.fn();
-    await act(() => {
-      wrapper = renderer.create(
-        wrapComponent(actionGroup, mockDoAction, sensor)
-      );
-    });
-    const instance = wrapper.root;
-    const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(7);
-  });
-
-  test('render CurtainButtonTemplate', async () => {
-    Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
-    const actionGroup = {
-      template: 'curtain_action_template',
-      title: 'Timer',
-      configuration: {},
-    };
-    const mockDoAction = jest.fn();
-    await act(() => {
-      wrapper = renderer.create(
-        wrapComponent(actionGroup, mockDoAction, sensor)
-      );
-    });
-    const instance = wrapper.root;
-    const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(2);
-  });
-
-  test('render SmartTiviActionTemplate', async () => {
-    Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
-    const actionGroup = {
-      template: 'SmartTiviActionTemplate',
-      title: 'Timer',
-      configuration: {},
-    };
-    const mockDoAction = jest.fn();
-    await act(() => {
-      wrapper = renderer.create(
-        wrapComponent(actionGroup, mockDoAction, sensor)
-      );
-    });
-    const instance = wrapper.root;
-    const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(4);
-  });
-
-  test('render ColorPickerTemplate', async () => {
-    Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
-    const actionGroup = {
-      template: 'color_picker_template',
-      title: 'Timer',
-      configuration: {},
-    };
-    const mockDoAction = jest.fn();
-    await act(() => {
-      wrapper = renderer.create(
-        wrapComponent(actionGroup, mockDoAction, sensor)
-      );
-    });
-    const instance = wrapper.root;
-    const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(2);
-  });
-
-  test('render SliderRangeTemplate', async () => {
-    Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
-    const actionGroup = {
-      template: 'slider_range_template',
-      title: 'Timer',
-      configuration: {},
-    };
-    const mockDoAction = jest.fn();
-    await act(() => {
-      wrapper = renderer.create(
-        wrapComponent(actionGroup, mockDoAction, sensor)
-      );
-    });
-    const instance = wrapper.root;
-    const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(4);
-  });
-
-  test('render TwoButtonTemplate', async () => {
-    Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
-    const actionGroup = {
-      template: 'two_button_action_template',
-      title: 'Timer',
-      configuration: {},
-    };
-    const mockDoAction = jest.fn();
-    await act(() => {
-      wrapper = renderer.create(
-        wrapComponent(actionGroup, mockDoAction, sensor)
-      );
-    });
-    const instance = wrapper.root;
-    const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(5);
-  });
 });

package/src/commons/Auth/AccountList.js

@@ -5,7 +5,7 @@ import AccountItem from './AccountItem';
 
 const AccountList = ({ accounts }) => {
   return (
-    <ScrollView scrollIndicatorInsets={{ right: 1 }}>
+    <ScrollView>
       {accounts.map((account) => (
         <AccountItem key={account.id || account.name} account={account} />
       ))}

package/src/commons/Automate/ItemAutomate.js

@@ -35,7 +35,9 @@ const ItemAutomate = ({
       style={[styles.wrap, isSelected && styles.active]}
     >
       <View style={styles.row}>
-        <View style={styles.wrapIcon}>{!!Icon && <Icon />}</View>
+        <View style={styles.wrapIcon}>
+          <Icon />
+        </View>
         <View style={styles.wrapTitle}>
           <Text type="H4" bold>
             {t(item?.title)}

package/src/commons/Connecting/__test__/Connecting.test.js

@@ -5,19 +5,13 @@ import Text from '../../Text';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 
-const wrapComponent = (route, isLoading, isConnect, isPercentConnect) => (
+const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
-    <Connecting
-      route={route}
-      isLoading={isLoading}
-      isConnect={isConnect}
-      isPercentConnect={isPercentConnect}
-    />
+    <Connecting route={route} />
   </SCProvider>
 );
 describe('Test Connecting', () => {
   let tree;
-
   test('create Connecting', () => {
     act(() => {
       tree = renderer.create(wrapComponent());
@@ -26,15 +20,4 @@ describe('Test Connecting', () => {
     const text = instance.findAllByType(Text);
     expect(text).toHaveLength(4);
   });
-
-  test('isLoading = true', () => {
-    jest.useFakeTimers();
-    act(() => {
-      tree = renderer.create(wrapComponent({}, true));
-    });
-    jest.runAllTimers();
-    const instance = tree.root;
-    const text = instance.findAllByType(Text);
-    expect(text).toHaveLength(4);
-  });
 });

package/src/commons/ConnectingProcess/DeviceItem/DeviceItem.js

@@ -2,17 +2,13 @@ import React, { memo } from 'react';
 import { View } from 'react-native';
 import styles from './DeviceItemStyles';
 import FImage from '../../FImage';
-import _TextInput from '../../Form/TextInput';
+import Text from '../../Text';
 
-const DeviceItem = memo(({ icon, name, setNewName }) => {
+const DeviceItem = memo(({ icon, name }) => {
   return (
     <View style={styles.container}>
       {!!icon && <FImage source={{ uri: icon }} style={styles.iconSensor} />}
-      <_TextInput
-        value={name}
-        textInputStyle={styles.textItem}
-        onChange={setNewName}
-      />
+      <Text style={styles.textItem}>{name}</Text>
     </View>
   );
 });

package/src/commons/ConnectingProcess/DeviceItem/DeviceItemStyles.js

@@ -1,14 +1,23 @@
 import { StyleSheet } from 'react-native';
-import { Colors } from '../../../configs';
+import { Constants, Colors } from '../../../configs';
+
+const marginItem = 12;
+const marginHorizontal = 5;
+const widthItem = (Constants.width - marginHorizontal * 2 - marginItem) / 2;
+const heightItem = (widthItem / 166) * 60;
 
 export default StyleSheet.create({
   container: {
+    paddingHorizontal: 15,
     borderRadius: 10,
     width: 250,
+    height: heightItem,
     borderWidth: 1,
     borderColor: Colors.Gray4,
     backgroundColor: Colors.White,
     justifyContent: 'center',
+    alignItems: 'center',
+    marginBottom: 16,
     flexDirection: 'row',
     shadowColor: Colors.Shadow,
     shadowOffset: {
@@ -27,13 +36,7 @@ export default StyleSheet.create({
     resizeMode: 'contain',
   },
   textItem: {
-    borderWidth: 0,
-    borderBottomWidth: 1,
-    borderBottomColor: Colors.Primary,
-    textAlign: 'center',
-    marginTop: -10,
-    padding: 5,
+    marginLeft: 15,
     fontSize: 16,
-    height: 50,
   },
 });

package/src/commons/ConnectingProcess/__test__/Connecting.test.js

@@ -1,35 +1,18 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-
 import ConnectingProcess from '../index';
 import { SafeAreaView } from 'react-native';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <ConnectingProcess route={route} />
   </SCProvider>
 );
-
-const mock = new MockAdapter(api.axiosInstance);
-
 describe('Test ConnectingProcess', () => {
   let tree;
-
-  test('render without params', () => {
-    act(() => {
-      tree = renderer.create(wrapComponent({}));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = SENSOR call api success', async () => {
+  test('create ConnectingProcess', () => {
     const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
     const devicePrefixName = 'SENSOR';
     const gateway = { id: 1, name: 'gateway' };
@@ -37,124 +20,8 @@ describe('Test ConnectingProcess', () => {
     const route = {
       params: { scan_sensor_data, gateway, station, devicePrefixName },
     };
-    mock.onPost(API.SUB_UNIT.SENSOR_SCAN(1)).reply(200);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = SENSOR call api fail', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'SENSOR';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: { scan_sensor_data, gateway, station, devicePrefixName },
-    };
-    mock.onPost(API.SUB_UNIT.SENSOR_SCAN(1)).reply(400);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = ROBOT call api success', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'ROBOT';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: {
-        scan_sensor_data,
-        gateway,
-        station,
-        devicePrefixName,
-        unit_id: 1,
-        unit: {
-          id: 1,
-        },
-      },
-    };
-    mock.onPost(API.UNIT.CHIP_SCAN(1)).reply(200);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = ROBOT call api fail', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'ROBOT';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: {
-        scan_sensor_data,
-        gateway,
-        station,
-        devicePrefixName,
-        unit_id: 1,
-        unit: {
-          id: 1,
-        },
-      },
-    };
-    mock.onPost(API.UNIT.CHIP_SCAN(1)).reply(400);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = LITE call api success', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'LITE';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: {
-        scan_sensor_data,
-        gateway,
-        station,
-        devicePrefixName,
-        unit_id: 1,
-      },
-    };
-    mock.onPost(API.UNIT.ADD_GATEWAY(1)).reply(200);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const safeAreaView = instance.findAllByType(SafeAreaView);
-    expect(safeAreaView).toHaveLength(1);
-  });
-
-  test('create ConnectingProcess with devicePrefixName = LITE call api fail', async () => {
-    const scan_sensor_data = { imei: 'SENSOR-afasdfas' };
-    const devicePrefixName = 'LITE';
-    const gateway = { id: 1, name: 'gateway' };
-    const station = { id: 1, icon_kit: 'a', name: 'station' };
-    const route = {
-      params: {
-        scan_sensor_data,
-        gateway,
-        station,
-        devicePrefixName,
-        unit_id: 1,
-      },
-    };
-    mock.onPost(API.UNIT.ADD_GATEWAY(1)).reply(400);
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
+    act(() => {
+      tree = renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const safeAreaView = instance.findAllByType(SafeAreaView);

package/src/commons/ConnectingProcess/__test__/DeviceItem.test.js

@@ -2,8 +2,7 @@ import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import DeviceItem from '../DeviceItem/DeviceItem';
 import FImage from '../../FImage';
-import _TextInput from '../../Form/TextInput';
-
+import Text from '../../Text';
 describe('Test DeviceItem button', () => {
   let tree;
   test('create DeviceItem button', () => {
@@ -12,7 +11,7 @@ describe('Test DeviceItem button', () => {
     });
     const instance = tree.root;
     const image = instance.findAllByType(FImage);
-    const text = instance.findAllByType(_TextInput);
+    const text = instance.findAllByType(Text);
     expect(image).toHaveLength(0);
     expect(text).toHaveLength(1);
   });

package/src/commons/ConnectingProcess/index.js

@@ -6,13 +6,12 @@ import { useNavigation } from '@react-navigation/native';
 import ImageSuccessfully from '../../Images/Common/SuccessfullyConnected.svg';
 
 import Text from '../Text';
-import { axiosPatch, axiosPost } from '../../utils/Apis/axios';
+import { axiosPost } from '../../utils/Apis/axios';
 import { API, Colors } from '../../configs';
 import styles from './styles';
 import DeviceItem from './DeviceItem/DeviceItem';
 import Connecting from '../Connecting';
 import { useSCContextSelector } from '../../context';
-import { ToastBottomHelper } from '../../utils/Utils';
 
 const ConnectingProcess = ({ route }) => {
   const { navigate, goBack } = useNavigation();
@@ -28,31 +27,29 @@ const ConnectingProcess = ({ route }) => {
     devicePrefixName,
     wifi_ssid,
     wifi_pass,
-  } = route.params || {};
+    chip_id,
+  } = route.params;
   const [isLoading, setIsLoading] = useState(true);
   const [sensor, setSensor] = useState(null);
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
-  const [newName, setNewName] = useState('');
 
   const ConnectingDevice = useCallback(async () => {
     setIsLoading(true);
     switch (devicePrefixName) {
-      case 'SENSOR': {
-        const body = { imei: scan_sensor_data?.imei, chip: gateway?.id };
-        const { success, data } = await axiosPost(
-          API.SUB_UNIT.SENSOR_SCAN(station.id),
-          body
-        );
-        if (success) {
-          setSensor(data);
-          setNewName(data?.name);
-        } else {
-          ToastBottomHelper.error(JSON.stringify(data));
-          goBack();
+      case 'SENSOR':
+        {
+          const body = { imei: scan_sensor_data?.imei, chip: gateway?.id };
+          const { success, data } = await axiosPost(
+            API.SUB_UNIT.SENSOR_SCAN(station.id),
+            body
+          );
+          if (success) {
+            setSensor(data);
+          } else {
+            goBack();
+          }
         }
-
         break;
-      }
       case 'ROBOT': {
         const { success, data } = await axiosPost(API.UNIT.CHIP_SCAN(unit.id), {
           imei: gateway?.imei,
@@ -65,26 +62,20 @@ const ConnectingProcess = ({ route }) => {
         });
         if (success) {
           setSensor(data);
-          setNewName(data?.name);
         } else {
-          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
         break;
       }
       case 'LITE': {
-        const { success, data } = await axiosPost(
-          API.UNIT.ADD_GATEWAY(unit_id),
-          {
-            imei: gateway?.imei,
-            chip_name: gateway?.model,
-          }
-        );
+        const { success } = await axiosPost(API.UNIT.ADD_GATEWAY(unit_id), {
+          chip: chip_id,
+          imei: gateway?.imei,
+          chip_name: gateway?.model,
+        });
         if (success) {
           setSensor({ name: gateway?.model });
-          setNewName(gateway?.model);
         } else {
-          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
         break;
@@ -104,6 +95,7 @@ const ConnectingProcess = ({ route }) => {
     wifi_pass,
     user?.phone_number,
     unit_id,
+    chip_id,
   ]);
 
   const ConnectingSuccess = useCallback(() => {
@@ -118,46 +110,12 @@ const ConnectingProcess = ({ route }) => {
             station?.name !== undefined ? '- ' + station?.name : ''
           }`}
         </Text>
-        <DeviceItem
-          icon={sensor?.icon_kit}
-          name={newName}
-          setNewName={setNewName}
-        />
+        <DeviceItem icon={sensor?.icon_kit} name={sensor?.name} />
       </View>
     );
-  }, [newName, sensor?.icon_kit, station?.name, t, unit?.name, unit_name]);
-
-  const handleDone = useCallback(async () => {
-    let result, message;
-    switch (devicePrefixName) {
-      case 'SENSOR': {
-        const { success, data } = await axiosPatch(
-          API.SENSOR.SENSOR_DETAIL(sensor?.id),
-          {
-            name: newName,
-          }
-        );
-        result = success;
-        message = data;
-        break;
-      }
-      case 'ROBOT':
-      case 'LITE': {
-        const { success, data } = await axiosPatch(
-          API.CHIP.CHIP_DETAIL(sensor?.id),
-          {
-            name: newName,
-          }
-        );
-        result = success;
-        message = data;
-        break;
-      }
-    }
+  }, [sensor?.icon_kit, sensor?.name, station?.name, t, unit?.name, unit_name]);
 
-    if (!result) {
-      ToastBottomHelper.error(JSON.stringify(message));
-    }
+  const handleDone = useCallback(() => {
     navigate(Routes.UnitStack, {
       screen: Routes.UnitDetail,
       params: {
@@ -167,15 +125,7 @@ const ConnectingProcess = ({ route }) => {
         stationId: station?.id,
       },
     });
-  }, [
-    devicePrefixName,
-    navigate,
-    newName,
-    sensor?.id,
-    station?.id,
-    unit,
-    unit_id,
-  ]);
+  }, [navigate, station?.id, unit, unit_id]);
 
   useEffect(() => {
     ConnectingDevice();