@eohjsc/react-native-smart-city 0.3.61 → 0.3.63

package/src/screens/{Gateway → AllGateway}/DeviceZigbeeDetail/index.js

@@ -22,13 +22,14 @@ const DeviceZigbeeDetail = () => {
   const {
     selectedIndex,
     setSelectedIndex,
-    setDataModalPopupCT,
     dataModalPopupCT,
     fetchActionConfigDevice,
     deleteDeviceDetail,
     detailDeviceZigbee,
     setRefresh,
     refresh,
+    saveDataModalPopupCT,
+    hideModalPopupCT,
   } = useGateway();
 
   const listTabs = useMemo(
@@ -48,8 +49,7 @@ const DeviceZigbeeDetail = () => {
   );
 
   const handleDeleteDevice = useCallback(() => {
-    setDataModalPopupCT((prev) => ({
-      ...prev,
+    saveDataModalPopupCT({
       title: `${t('delete_device', { name: device?.sensor?.name })}`,
       subTitle: t('message_delete_device'),
       type: 'device',
@@ -58,27 +58,19 @@ const DeviceZigbeeDetail = () => {
       isShowAlert: false,
       isChecked: false,
       onPressConfirm: () => {
-        setDataModalPopupCT((prevData) => ({
-          ...prevData,
-          isVisible: false,
-          isChecked: false,
-        }));
-        deleteDeviceDetail(gatewayId, device?.id, isZigbee, false);
+        hideModalPopupCT();
+        deleteDeviceDetail(gatewayId, device?.id, false, isZigbee, false);
       },
-      onPressCancel: () =>
-        setDataModalPopupCT((prevData) => ({
-          ...prevData,
-          isVisible: false,
-          isChecked: false,
-        })),
-    }));
+      onPressCancel: () => hideModalPopupCT(),
+    });
   }, [
     deleteDeviceDetail,
     device?.id,
     device?.sensor?.name,
     gatewayId,
     isZigbee,
-    setDataModalPopupCT,
+    saveDataModalPopupCT,
+    hideModalPopupCT,
   ]);
 
   const listMenuItem = useMemo(() => {

package/src/screens/{Gateway → AllGateway}/GatewayDetail/__test__/index.test.js

@@ -66,11 +66,22 @@ const headerCustomOnPressMore = async (instance) => {
 
 describe('Test GatewayDetail', () => {
   let tree;
+
+  const onChangeTab = async (tabPaneCT, index) => {
+    const segmentedControl = tabPaneCT.findByType(SegmentedControl);
+    await act(async () => {
+      await segmentedControl.props.onChange({
+        nativeEvent: { selectedSegmentIndex: index },
+      });
+    });
+  };
+
   beforeEach(() => {
     useRoute.mockReturnValue({
       params: {
         item: {
           id: 1,
+          arduino_gateway: 1,
           modbus_gateway: 1,
           zigbee_gateway: 1,
         },
@@ -156,9 +167,9 @@ describe('Test GatewayDetail', () => {
     expect(mockPop).toBeCalledWith(1);
   });
 
-  it('test render GatewayDetail onPress TabPanel zigbee', async () => {
+  it('test render GatewayDetail onPress TabPanel internal', async () => {
     mock
-      .onGet(API.DEV_MODE.ZIGBEE.DEVICE(1))
+      .onGet(API.DEV_MODE.ARDUINO.DEVICE(1))
       .reply(200, [{ id: 1, name: 'device 1' }]);
     await act(async () => {
       tree = await create(wrapComponent());
@@ -166,16 +177,28 @@ describe('Test GatewayDetail', () => {
     const instance = tree.root;
     const detail = instance?.findByType(Detail);
     const tabPaneCT = detail.findByType(TabPaneCT);
-    const segmentedControl = tabPaneCT.findByType(SegmentedControl);
+    await onChangeTab(tabPaneCT, 0);
+    expect(tabPaneCT.props.listTabs[0].data).toEqual([
+      { id: 1, name: 'device 1' },
+    ]);
+    expect(tabPaneCT.props.listTabs[0].title).toEqual(DEVICE_TYPE.INTERNAL);
+  });
+
+  it('test render GatewayDetail onPress TabPanel zigbee', async () => {
+    mock
+      .onGet(API.DEV_MODE.ZIGBEE.DEVICE(1))
+      .reply(200, [{ id: 1, name: 'device 1' }]);
     await act(async () => {
-      await segmentedControl.props.onChange({
-        nativeEvent: { selectedSegmentIndex: 0 },
-      });
+      tree = await create(wrapComponent());
     });
-    expect(tabPaneCT.props.listTabs[0].data).toEqual([
+    const instance = tree.root;
+    const detail = instance?.findByType(Detail);
+    const tabPaneCT = detail.findByType(TabPaneCT);
+    await onChangeTab(tabPaneCT, 1);
+    expect(tabPaneCT.props.listTabs[1].data).toEqual([
       { id: 1, name: 'device 1' },
     ]);
-    expect(tabPaneCT.props.listTabs[0].title).toEqual(DEVICE_TYPE.ZIGBEE);
+    expect(tabPaneCT.props.listTabs[1].title).toEqual(DEVICE_TYPE.ZIGBEE);
   });
 
   it('test render GatewayDetail onPress TabPanel modbus', async () => {
@@ -188,16 +211,35 @@ describe('Test GatewayDetail', () => {
     const instance = tree.root;
     const detail = instance?.findByType(Detail);
     const tabPaneCT = detail.findByType(TabPaneCT);
-    const segmentedControl = tabPaneCT.findByType(SegmentedControl);
-    await act(async () => {
-      await segmentedControl.props.onChange({
-        nativeEvent: { selectedSegmentIndex: 1 },
-      });
-    });
-    expect(tabPaneCT.props.listTabs[1].data).toEqual([
+    await onChangeTab(tabPaneCT, 2);
+    expect(tabPaneCT.props.listTabs[2].data).toEqual([
       { id: 1, name: 'device 1' },
     ]);
-    expect(tabPaneCT.props.listTabs[1].title).toEqual(DEVICE_TYPE.MODBUS);
+    expect(tabPaneCT.props.listTabs[2].title).toEqual(DEVICE_TYPE.MODBUS);
+  });
+
+  it('test render GatewayDetail onPress TabPanel internal onPressRow', async () => {
+    mock
+      .onGet(API.DEV_MODE.ARDUINO.DEVICE(1))
+      .reply(200, [{ id: 1, name: 'device 1' }]);
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const detail = instance?.findByType(Detail);
+    const tabPaneCT = detail.findByType(TabPaneCT);
+    await onChangeTab(tabPaneCT, 0);
+
+    await act(async () => {
+      await detail.props.onPressRow(1);
+    });
+    expect(mockNavigate).toBeCalledWith(Routes.DeviceInternalDetail, {
+      device: 1,
+      gatewayId: 1,
+      isInternal: true,
+      isModbus: false,
+      isZigbee: false,
+    });
   });
 
   it('test render GatewayDetail onPress TabPanel zigbee onPressRow', async () => {
@@ -209,12 +251,15 @@ describe('Test GatewayDetail', () => {
     });
     const instance = tree.root;
     const detail = instance?.findByType(Detail);
+    const tabPaneCT = detail.findByType(TabPaneCT);
+    await onChangeTab(tabPaneCT, 1);
     await act(async () => {
       await detail.props.onPressRow(1);
     });
     expect(mockNavigate).toBeCalledWith(Routes.DeviceZigbeeDetail, {
       device: 1,
       gatewayId: 1,
+      isInternal: false,
       isModbus: false,
       isZigbee: true,
     });
@@ -230,18 +275,15 @@ describe('Test GatewayDetail', () => {
     const instance = tree.root;
     const detail = instance?.findByType(Detail);
     const tabPaneCT = detail.findByType(TabPaneCT);
-    const segmentedControl = tabPaneCT.findByType(SegmentedControl);
-    await act(async () => {
-      await segmentedControl.props.onChange({
-        nativeEvent: { selectedSegmentIndex: 1 },
-      });
-    });
+    await onChangeTab(tabPaneCT, 2);
+
     await act(async () => {
       await detail.props.onPressRow(1);
     });
     expect(mockNavigate).toBeCalledWith(Routes.DeviceModbusDetail, {
       device: 1,
       gatewayId: 1,
+      isInternal: false,
       isModbus: true,
       isZigbee: false,
     });
@@ -257,24 +299,21 @@ describe('Test GatewayDetail', () => {
     const instance = tree.root;
     const detail = instance?.findByType(Detail);
     const tabPaneCT = detail.findByType(TabPaneCT);
-    const segmentedControl = tabPaneCT.findByType(SegmentedControl);
-    await act(async () => {
-      await segmentedControl.props.onChange({
-        nativeEvent: { selectedSegmentIndex: -1 },
-      });
-    });
+    await onChangeTab(tabPaneCT, -1);
+
     await act(async () => {
       await detail.props.onPressRow(1);
     });
     expect(mockNavigate).toBeCalledWith('', {
       device: 1,
       gatewayId: null,
+      isInternal: false,
       isModbus: false,
       isZigbee: false,
     });
   });
 
-  it('test render GatewayDetail onPress TabPanel modbus onRefresh', async () => {
+  it('test render GatewayDetail onPress TabPanel zigbee onRefresh', async () => {
     mock
       .onGet(API.DEV_MODE.ZIGBEE.DEVICE(1))
       .reply(200, [{ id: 1, name: 'device 1' }]);
@@ -284,12 +323,13 @@ describe('Test GatewayDetail', () => {
     const instance = tree.root;
     const detail = instance?.findByType(Detail);
     const tabPaneCT = detail.findByType(TabPaneCT);
+    await onChangeTab(tabPaneCT, 1);
     await act(async () => {
       await detail.props.onRefresh();
     });
-    expect(tabPaneCT.props.listTabs[0].data).toEqual([
+    expect(tabPaneCT.props.listTabs[1].data).toEqual([
       { id: 1, name: 'device 1' },
     ]);
-    expect(tabPaneCT.props.listTabs[0].title).toEqual(DEVICE_TYPE.ZIGBEE);
+    expect(tabPaneCT.props.listTabs[1].title).toEqual(DEVICE_TYPE.ZIGBEE);
   });
 });

package/src/screens/{Gateway → AllGateway}/GatewayDetail/index.js

@@ -23,34 +23,39 @@ const GatewayDetail = () => {
     selectedIndex,
     setSelectedIndex,
     dataModalPopupCT,
-    setDataModalPopupCT,
     fetchDevicesGateway,
     deleteGatewayDetail,
     rebootGatewayDetail,
     setRefresh,
     refresh,
     gatewayDevices,
+    saveDataModalPopupCT,
+    hideModalPopupCT,
   } = useGateway();
 
   const listTabs = useMemo(
     () => [
       {
         id: 1,
+        title: DEVICE_TYPE.INTERNAL,
+        data: gatewayDevices?.internal,
+      },
+      {
+        id: 2,
         title: DEVICE_TYPE.ZIGBEE,
         data: gatewayDevices?.zigbee,
       },
       {
-        id: 2,
+        id: 3,
         title: DEVICE_TYPE.MODBUS,
         data: gatewayDevices?.modbus,
       },
     ],
-    [gatewayDevices?.modbus, gatewayDevices?.zigbee]
+    [gatewayDevices?.internal, gatewayDevices?.modbus, gatewayDevices?.zigbee]
   );
 
   const handleRebootGateway = useCallback(() => {
-    setDataModalPopupCT((prev) => ({
-      ...prev,
+    saveDataModalPopupCT({
       title: `${t('reboot')} ${item?.name} gateway`,
       subTitle: t('message_reboot_gateway'),
       type: 'reboot',
@@ -59,48 +64,41 @@ const GatewayDetail = () => {
       isShowAlert: false,
       isChecked: false,
       onPressConfirm: () => {
-        setDataModalPopupCT((prevData) => ({
-          ...prevData,
-          isVisible: false,
-          isChecked: false,
-        }));
+        hideModalPopupCT();
         rebootGatewayDetail(item?.id);
       },
-      onPressCancel: () =>
-        setDataModalPopupCT((prevData) => ({
-          ...prevData,
-          isVisible: false,
-          isChecked: false,
-        })),
-    }));
-  }, [item?.id, item?.name, rebootGatewayDetail, setDataModalPopupCT]);
+      onPressCancel: () => hideModalPopupCT(),
+    });
+  }, [
+    item?.id,
+    item?.name,
+    rebootGatewayDetail,
+    saveDataModalPopupCT,
+    hideModalPopupCT,
+  ]);
 
   const handleDeleteGateway = useCallback(() => {
-    setDataModalPopupCT((prev) => ({
-      ...prev,
+    saveDataModalPopupCT({
       title: `${t('delete')} ${item?.name} gateway`,
       subTitle: t('message_delete_gateway'),
       type: 'delete',
       isVisible: true,
-      isChecked: false,
       isShowUnderstand: true,
       isShowAlert: true,
+      isChecked: false,
       onPressConfirm: () => {
-        setDataModalPopupCT((prevData) => ({
-          ...prevData,
-          isVisible: false,
-          isChecked: false,
-        }));
+        hideModalPopupCT();
         deleteGatewayDetail(item?.id);
       },
-      onPressCancel: () =>
-        setDataModalPopupCT((prevData) => ({
-          ...prevData,
-          isVisible: false,
-          isChecked: false,
-        })),
-    }));
-  }, [deleteGatewayDetail, item?.id, item?.name, setDataModalPopupCT]);
+      onPressCancel: () => hideModalPopupCT(),
+    });
+  }, [
+    deleteGatewayDetail,
+    item?.id,
+    item?.name,
+    saveDataModalPopupCT,
+    hideModalPopupCT,
+  ]);
 
   const listMenuItem = useMemo(() => {
     const RouteGatewayInformation = {
@@ -133,6 +131,10 @@ const GatewayDetail = () => {
     navigate,
   ]);
 
+  const isInternal = useMemo(() => {
+    return listTabs[selectedIndex]?.title === DEVICE_TYPE.INTERNAL;
+  }, [listTabs, selectedIndex]);
+
   const isModbus = useMemo(() => {
     return listTabs[selectedIndex]?.title === DEVICE_TYPE.MODBUS;
   }, [listTabs, selectedIndex]);
@@ -142,34 +144,45 @@ const GatewayDetail = () => {
   }, [listTabs, selectedIndex]);
 
   const gatewayId = useMemo(() => {
-    return isModbus
+    return isInternal
+      ? item?.arduino_gateway
+      : isModbus
       ? item?.modbus_gateway
       : isZigbee
       ? item?.zigbee_gateway
       : null;
-  }, [isModbus, isZigbee, item?.modbus_gateway, item?.zigbee_gateway]);
+  }, [isInternal, isModbus, isZigbee, item]);
 
   useEffect(() => {
     if (isFocused) {
-      fetchDevicesGateway(gatewayId, isModbus, isZigbee);
+      fetchDevicesGateway(gatewayId, isInternal, isModbus, isZigbee);
     }
-  }, [fetchDevicesGateway, gatewayId, isModbus, isZigbee, isFocused]);
+  }, [
+    fetchDevicesGateway,
+    gatewayId,
+    isInternal,
+    isModbus,
+    isZigbee,
+    isFocused,
+  ]);
 
   const onPressRow = useCallback(
     (device) => {
       navigate(
-        (isZigbee && Routes.DeviceZigbeeDetail) ||
+        (isInternal && Routes.DeviceInternalDetail) ||
+          (isZigbee && Routes.DeviceZigbeeDetail) ||
           (isModbus && Routes.DeviceModbusDetail) ||
           '',
         {
           device: device,
           gatewayId,
+          isInternal,
           isZigbee,
           isModbus,
         }
       );
     },
-    [isModbus, isZigbee, gatewayId, navigate]
+    [isModbus, isZigbee, gatewayId, isInternal, navigate]
   );
 
   const title = useMemo(() => {
@@ -178,9 +191,16 @@ const GatewayDetail = () => {
 
   const onRefresh = useCallback(() => {
     setRefresh(true);
-    fetchDevicesGateway(gatewayId, isModbus, isZigbee);
+    fetchDevicesGateway(gatewayId, isInternal, isModbus, isZigbee);
     setRefresh(false);
-  }, [fetchDevicesGateway, isModbus, isZigbee, gatewayId, setRefresh]);
+  }, [
+    fetchDevicesGateway,
+    isModbus,
+    isInternal,
+    isZigbee,
+    gatewayId,
+    setRefresh,
+  ]);
 
   return (
     <View style={styles.wrap}>

package/src/screens/AllGateway/GatewayDetail/styles.js

@@ -0,0 +1,12 @@
+import { StyleSheet } from 'react-native';
+import { Colors } from '../../../configs';
+
+export default StyleSheet.create({
+  wrap: {
+    flex: 1,
+    backgroundColor: Colors.White,
+  },
+  textColorRed: {
+    color: Colors.Red,
+  },
+});

package/src/screens/{Gateway → AllGateway}/GatewayInfo/index.js

@@ -24,8 +24,9 @@ const GatewayInfo = () => {
     fetchDataDetailGateway,
     gatewayDetail,
     deleteGatewayDetail,
-    setDataModalPopupCT,
     dataModalPopupCT,
+    saveDataModalPopupCT,
+    hideModalPopupCT,
   } = useGateway();
 
   const {
@@ -92,31 +93,27 @@ const GatewayInfo = () => {
   );
 
   const handleDeleteGateway = useCallback(() => {
-    setDataModalPopupCT((prev) => ({
-      ...prev,
+    saveDataModalPopupCT({
       title: `${t('delete')} ${gatewayName} gateway`,
-      subTitle: t('message_reboot_gateway'),
+      subTitle: t('message_delete_gateway'),
       type: 'delete',
       isVisible: true,
       isShowUnderstand: true,
       isShowAlert: true,
       isChecked: false,
       onPressConfirm: () => {
-        setDataModalPopupCT((prevData) => ({
-          ...prevData,
-          isVisible: false,
-          isChecked: false,
-        }));
+        hideModalPopupCT();
         deleteGatewayDetail(chipId, 2);
       },
-      onPressCancel: () =>
-        setDataModalPopupCT((prevData) => ({
-          ...prevData,
-          isVisible: false,
-          isChecked: false,
-        })),
-    }));
-  }, [chipId, deleteGatewayDetail, gatewayName, setDataModalPopupCT]);
+      onPressCancel: () => hideModalPopupCT(),
+    });
+  }, [
+    chipId,
+    deleteGatewayDetail,
+    gatewayName,
+    saveDataModalPopupCT,
+    hideModalPopupCT,
+  ]);
 
   const handleConnectionMethods = useCallback(() => {
     navigate(Routes.GatewayConnectionMethods);

package/src/screens/AllGateway/GatewayInfo/styles.js

@@ -0,0 +1,12 @@
+import { StyleSheet } from 'react-native';
+import { Colors } from '../../../configs';
+
+export default StyleSheet.create({
+  wrap: {
+    flex: 1,
+    backgroundColor: Colors.White,
+  },
+  buttonBack: {
+    marginRight: 12,
+  },
+});

package/src/screens/{Gateway → AllGateway}/__test__/index.test.js

@@ -65,8 +65,14 @@ describe('Test Gateway screen', () => {
     await act(async () => {
       await gatewayItems[0].props.onPress();
     });
-    expect(mockNavigate).toBeCalledWith(Routes.GatewayDetail, {
-      item: { id: 1, name: 'device 1' },
+    expect(mockNavigate).toBeCalledWith(Routes.AllGatewayStack, {
+      params: {
+        item: {
+          id: 1,
+          name: 'device 1',
+        },
+      },
+      screen: 'GatewayDetail',
     });
   });
 

package/src/screens/{Gateway → AllGateway}/hooks/__test__/index.test.js

@@ -51,13 +51,26 @@ describe('Test useGateway', () => {
     expect(hook.result.current.gateways).toEqual([{ id: 1, name: 'chip 1' }]);
   });
 
+  it('test useGateway fetchDevicesGateway isInterval', async () => {
+    mock
+      .onGet(API.DEV_MODE.ARDUINO.DEVICE(1))
+      .reply(200, [{ id: 1, name: 'device 1' }]);
+    await act(async () => {
+      await hook.result.current.fetchDevicesGateway(1, true, false, false);
+    });
+
+    expect(hook.result.current.gatewayDevices?.internal).toEqual([
+      { id: 1, name: 'device 1' },
+    ]);
+  });
+
   it('test useGateway fetchDevicesGateway isModbus', async () => {
     mock
       .onGet(API.DEV_MODE.MODBUS.DEVICE(1))
       .reply(200, [{ id: 1, name: 'device 1' }]);
 
     await act(async () => {
-      await hook.result.current.fetchDevicesGateway(1, true, false);
+      await hook.result.current.fetchDevicesGateway(1, false, true, false);
     });
     expect(hook.result.current.gatewayDevices?.modbus).toEqual([
       { id: 1, name: 'device 1' },
@@ -70,7 +83,7 @@ describe('Test useGateway', () => {
       .reply(200, [{ id: 1, name: 'device 1' }]);
 
     await act(async () => {
-      await hook.result.current.fetchDevicesGateway(1, false, true);
+      await hook.result.current.fetchDevicesGateway(1, false, false, true);
     });
     expect(hook.result.current.gatewayDevices?.zigbee).toEqual([
       { id: 1, name: 'device 1' },