@eohjsc/react-native-smart-city 0.3.71 → 0.3.73

package/src/screens/AddNewGateway/ConnectingWifiGuide.js

@@ -18,6 +18,7 @@ import AccessibilityLabel from '../../configs/AccessibilityLabel';
 import LoadingCircle from '../../Images/Common/loading-circle.json';
 import FullLoading from '../../commons/FullLoading';
 import { useWifiManage } from './hooks/useWifiManage';
+import { SCConfig } from '../../configs';
 
 let intervalSend = null;
 let socket;
@@ -196,7 +197,9 @@ const ConnectingWifiGuide = ({ route }) => {
           <>
             <View style={styles.guideContent}>
               <InteractSmartphoneIcon width={94} height={94} />
-              <Text style={styles.txtContent}>{t('connect_wifi_asking')}</Text>
+              <Text style={styles.txtContent}>
+                {t('connect_wifi_asking', { appName: SCConfig.appName })}
+              </Text>
             </View>
             <BottomButtonView
               style={styles.bottomButtonView}

package/src/screens/AddNewGateway/PlugAndPlay/__test__/ConnectRouterGuide.test.js

@@ -41,7 +41,6 @@ describe('Test ConnectRouterGuide', () => {
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(8);
     expect(texts[1].props.children).toEqual(
       getTranslate('en', 'connect_to_router')
     );

package/src/screens/AddNewGateway/PlugAndPlay/__test__/FirstWarning.test.js

@@ -41,7 +41,6 @@ describe('Test FirstWarning', () => {
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(10);
     expect(texts[1].props.children).toEqual(
       getTranslate('en', 'warning_beta_test_feature')
     );

package/src/screens/AddNewGateway/PlugAndPlay/__test__/ZigbeeDeviceConnectGuide.test.js

@@ -41,7 +41,6 @@ describe('Test ZigbeeDeviceConnectGuide', () => {
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(8);
     expect(texts[1].props.children).toEqual(
       getTranslate('en', 'turn_on_device_to_connect')
     );

package/src/screens/AddNewGateway/SetupGatewayWifiStyles.js

@@ -66,7 +66,7 @@ export default StyleSheet.create({
     backgroundColor: Colors.White,
     borderRadius: 10,
   },
-  maskOutter: {
+  maskOuter: {
     position: 'absolute',
     top: 0,
     left: 0,
@@ -75,7 +75,7 @@ export default StyleSheet.create({
     alignItems: 'center',
     justifyContent: 'space-around',
   },
-  viewVerifing: {
+  viewVerifying: {
     marginLeft: 16,
     height: 54,
     width: Device.screenWidth - 32,

package/src/screens/AddNewGateway/__test__/ShareWifiPassword.test.js

@@ -9,10 +9,10 @@ import ShareWifiPassword from '../ShareWifiPassword';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ButtonPopup from '../../../commons/ButtonPopup';
-import TextInputPassword from '../../../commons/Form/TextInputPassword';
 import Routes from '../../../utils/Route';
 import { AccessibilityLabel } from '../../../configs/Constants';
 import { HeaderCustom } from '../../../commons/Header';
+import { flushPromises } from '../../AllGateway/test-utils';
 
 const mockedGoBack = jest.fn();
 const mockedNavigate = jest.fn();
@@ -45,15 +45,22 @@ describe('test share wifi password', () => {
   });
 
   it('render share wifi', async () => {
+    jest.useFakeTimers();
     const route = { params: {} };
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
+    await flushPromises();
+    await act(async () => {
+      jest.runOnlyPendingTimers();
+    });
 
     const instance = tree.root;
     const popups = instance.findAllByType(ButtonPopup);
     expect(popups).toHaveLength(1);
-    const passwordFields = instance.findAllByType(TextInputPassword);
+    expect(popups[0].props.visible).toBeFalsy();
+
+    const passwordFields = instance.findAllByType(ButtonPopup);
     expect(passwordFields).toHaveLength(1);
   });
 
@@ -74,7 +81,9 @@ describe('test share wifi password', () => {
     await act(async () => {
       await popup.props.onPressMain();
     });
-    jest.runOnlyPendingTimers();
+    await act(async () => {
+      jest.runOnlyPendingTimers();
+    });
 
     expect(socket.send).toBeCalled();
     expect(socket.on).toBeCalled();
@@ -120,7 +129,9 @@ describe('test share wifi password', () => {
     await act(async () => {
       await popup.props.onPressMain();
     });
-    jest.runOnlyPendingTimers();
+    await act(async () => {
+      jest.runOnlyPendingTimers();
+    });
 
     expect(socket.on).toBeCalled();
     expect(socket.on.mock.calls[0][0]).toEqual('message');
@@ -147,7 +158,9 @@ describe('test share wifi password', () => {
     WifiManager.getCurrentWifiSSID.mockImplementationOnce(
       async () => 'other-random-name'
     );
-    jest.runOnlyPendingTimers(); // check SSID interval
+    await act(async () => {
+      jest.runOnlyPendingTimers();
+    });
     await new Promise(jest.requireActual('timers').setImmediate);
     expect(mockedNavigate).toBeCalled();
     expect(mockedNavigate.mock.calls[0][0]).toEqual(
@@ -155,7 +168,6 @@ describe('test share wifi password', () => {
     );
   });
   it('render list wifi onPress item and cancel popup item', async () => {
-    jest.runOnlyPendingTimers();
     jest.useFakeTimers();
     Platform.OS = 'android';
     const route = {
@@ -217,7 +229,10 @@ describe('test share wifi password', () => {
     await act(async () => {
       await buttonPopup.props.onPressMain();
     });
-    jest.runOnlyPendingTimers();
+
+    await act(async () => {
+      jest.runOnlyPendingTimers();
+    });
     await act(async () => {
       await headerCustom.props.onGoBack();
     });

package/src/screens/AllCamera/__test__/index.test.js

@@ -4,7 +4,7 @@ import AllCamera from '..';
 import { act, create } from 'react-test-renderer';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import Carousel from 'react-native-snap-carousel';
+import Carousel from 'react-native-new-snap-carousel';
 
 const arrCameras = [
   {

package/src/screens/AllCamera/index.js

@@ -8,7 +8,7 @@ import React, {
 import { View, Text, TouchableOpacity, Platform, Image } from 'react-native';
 import { useRoute, useNavigation } from '@react-navigation/native';
 import { chunk } from 'lodash';
-import Carousel from 'react-native-snap-carousel';
+import Carousel from 'react-native-new-snap-carousel';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import { Images, Colors } from '../../configs';

package/src/screens/AllGateway/DetailConfigActionInternal/__test__/index.test.js

@@ -48,6 +48,7 @@ describe('Test DetailConfigActionInternal', () => {
           pin_number: 0,
           pin_mode: 1,
         },
+        board: 'stm32',
       },
     });
     await act(async () => {
@@ -70,6 +71,7 @@ describe('Test DetailConfigActionInternal', () => {
           pin_number: 0,
           pin_mode: 1,
         },
+        board: 'stm32',
       },
     });
     await act(async () => {
@@ -92,6 +94,7 @@ describe('Test DetailConfigActionInternal', () => {
           pin: 'boolean',
           default_value: 0,
         },
+        board: 'stm32',
       },
     });
     await act(async () => {
@@ -101,4 +104,83 @@ describe('Test DetailConfigActionInternal', () => {
     const detailConfigAction = instance?.findAllByType(DetailConfigAction);
     expect(detailConfigAction).toHaveLength(1);
   });
+  it('test render DetailConfigActionInternal isAction isInternal wrong board', async () => {
+    useRoute.mockReturnValue({
+      params: {
+        isConfigRead: false,
+        isConfigWrite: false,
+        isAction: true,
+        isChildAction: false,
+        isInternal: true,
+        itemActionConfig: {
+          id: 1,
+          action: { name: 'config1' },
+          pin: 'boolean',
+          default_value: 0,
+        },
+        board: 'stm322132',
+        writeConfigPins: [],
+      },
+    });
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const detailConfigAction = instance?.findAllByType(DetailConfigAction);
+    expect(detailConfigAction[0].props?.listData[1]?.title).toEqual(
+      'pin_number'
+    );
+    expect(detailConfigAction[0].props?.listData[1]?.data).toEqual([]);
+  });
+  it('test render DetailConfigActionInternal isAction isInternal', async () => {
+    useRoute.mockReturnValue({
+      params: {
+        isConfigRead: false,
+        isConfigWrite: false,
+        isAction: true,
+        isChildAction: false,
+        isInternal: true,
+        itemActionConfig: {
+          id: 1,
+          action: { name: 'config1' },
+          pin: 'boolean',
+          default_value: 0,
+        },
+        board: 'stm32',
+        writeConfigPins: [
+          {
+            config: {
+              is_read: false,
+              is_write: true,
+              name: 'config1',
+            },
+            id: 1,
+            pin_mode: 'output',
+            pin_number: 0,
+            value_type: 'boolean',
+          },
+          {
+            config: {
+              is_read: true,
+              is_write: true,
+              name: 'config2',
+            },
+            id: 2,
+            pin_mode: 'output',
+            pin_number: 0,
+            value_type: 'integer',
+          },
+        ],
+      },
+    });
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const detailConfigAction = instance?.findAllByType(DetailConfigAction);
+    expect(detailConfigAction[0].props?.listData[1]?.title).toEqual(
+      'pin_number'
+    );
+    expect(detailConfigAction[0].props?.listData[1]?.data).toEqual('0');
+  });
 });

package/src/screens/AllGateway/DetailConfigActionInternal/index.js

@@ -1,9 +1,11 @@
-import React, { memo, useMemo } from 'react';
+import React, { memo, useMemo, useCallback } from 'react';
 import { View } from 'react-native';
 import { useRoute } from '@react-navigation/native';
 
 import styles from './styles';
 import DetailConfigAction from '../components/DetailConfigAction';
+import { PIN_MAPPING, PIN_MODE_MAPPING } from '../../../utils/Utils';
+import { INTERNAL_DEVICE } from '../../../configs/IOPinConstants';
 
 const DetailConfigActionInternal = () => {
   const { params = {} } = useRoute();
@@ -13,8 +15,72 @@ const DetailConfigActionInternal = () => {
     isConfigRead,
     isConfigWrite,
     isAction,
+    isInternal,
+    writeConfigPins,
+    board,
   } = params;
 
+  const readOrWrite = isConfigRead ? 'read' : 'write';
+
+  const formatWritePIN = useMemo(() => {
+    if (!Object.values(INTERNAL_DEVICE)?.includes(board)) {
+      return [];
+    }
+    const writePin = PIN_MAPPING[board].write;
+    let writePins = writeConfigPins?.map((el) => el.pin_number)?.toString();
+
+    writePins = writePin.boolean
+      .concat(writePin.integer)
+      .filter((el) => writePins?.includes(el.key));
+
+    let writeConfigPinsUsed = [];
+    for (let i = 0; i < writeConfigPins?.length; i++) {
+      let temp = writePins?.find(
+        (el) => el.key === writeConfigPins[i]?.pin_number?.toString()
+      );
+      writeConfigPinsUsed.push({
+        key: writeConfigPins[i]?.id,
+        value: temp?.value,
+      });
+    }
+    return writeConfigPinsUsed?.find((el) => el.key === itemActionConfig?.pin)
+      ?.value;
+  }, [board, itemActionConfig?.pin, writeConfigPins]);
+
+  const listPINs = useCallback(() => {
+    return PIN_MAPPING[board][readOrWrite][itemActionConfig?.value_type];
+  }, [board, itemActionConfig, readOrWrite]);
+
+  const formatPIN = useCallback(() => {
+    const listPins = listPINs();
+    const pin = listPins?.find(
+      (el) => el?.key === itemActionConfig?.pin_number.toString()
+    );
+    return pin?.value;
+  }, [itemActionConfig, listPINs]);
+
+  const listPINModes = useCallback(() => {
+    return PIN_MODE_MAPPING[readOrWrite][itemActionConfig?.value_type];
+  }, [itemActionConfig, readOrWrite]);
+
+  const formatPinMode = useCallback(() => {
+    const listPinModes = listPINModes();
+    let pinMode = '';
+    if (
+      isConfigRead &&
+      itemActionConfig?.pin_mode === 'output' &&
+      itemActionConfig?.config?.is_read &&
+      itemActionConfig?.config?.is_write
+    ) {
+      pinMode = 'input';
+    } else {
+      pinMode = itemActionConfig?.pin_mode;
+    }
+
+    const pin_mode = listPinModes.find((el) => el?.key === pinMode);
+    return pin_mode?.value;
+  }, [isConfigRead, itemActionConfig, listPINModes]);
+
   const listData = useMemo(() => {
     if (isConfigRead || isConfigWrite) {
       return [
@@ -36,12 +102,12 @@ const DetailConfigActionInternal = () => {
         {
           id: 3,
           title: 'pin',
-          data: itemActionConfig?.pin_number || '0',
+          data: formatPIN() || '0',
         },
         {
           id: 4,
           title: 'pin_mode',
-          data: itemActionConfig?.pin_mode || '--',
+          data: formatPinMode() || '--',
         },
       ];
     }
@@ -55,7 +121,7 @@ const DetailConfigActionInternal = () => {
         {
           id: 2,
           title: 'pin_number',
-          data: itemActionConfig?.pin || '0',
+          data: (isInternal ? formatWritePIN : itemActionConfig?.pin) || '0',
         },
         {
           id: 3,
@@ -65,7 +131,20 @@ const DetailConfigActionInternal = () => {
       ];
     }
     return [];
-  }, [isAction, isConfigRead, isConfigWrite, itemActionConfig]);
+  }, [
+    formatPIN,
+    formatPinMode,
+    formatWritePIN,
+    isAction,
+    isConfigRead,
+    isConfigWrite,
+    isInternal,
+    itemActionConfig?.action?.name,
+    itemActionConfig?.config?.name,
+    itemActionConfig?.pin,
+    itemActionConfig?.value,
+    itemActionConfig?.value_type,
+  ]);
 
   const title = useMemo(
     () =>

package/src/screens/AllGateway/DetailConfigActionModbus/index.js

@@ -4,11 +4,13 @@ import { useRoute, useNavigation } from '@react-navigation/native';
 
 import DetailConfigAction from '../components/DetailConfigAction';
 import DetailActionModbus from '../components/DetailActionModbus';
+import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { calculateLength, calculateStartAddress } from '../utils';
 import Routes from '../../../utils/Route';
 import styles from './styles';
 
 const DetailConfigActionModbus = () => {
+  const t = useTranslations();
   const { params = {} } = useRoute();
   const { navigate } = useNavigation();
   const {
@@ -46,7 +48,7 @@ const DetailConfigActionModbus = () => {
       },
       {
         id: 2,
-        title: 'Sa',
+        title: t('data_address'),
         data: sa,
       },
       {
@@ -55,7 +57,7 @@ const DetailConfigActionModbus = () => {
         data: len,
       },
     ],
-    [itemActionConfig?.func, len, sa]
+    [itemActionConfig?.func, len, sa, t]
   );
 
   const listConfigWrite = useMemo(
@@ -67,7 +69,7 @@ const DetailConfigActionModbus = () => {
       },
       {
         id: 2,
-        title: 'Sa',
+        title: t('data_address'),
         data: sa,
       },
       {
@@ -81,7 +83,7 @@ const DetailConfigActionModbus = () => {
         data: itemActionConfig?.ex || '--',
       },
     ],
-    [itemActionConfig?.ex, itemActionConfig?.func, len, sa]
+    [itemActionConfig?.ex, itemActionConfig?.func, len, sa, t]
   );
 
   const listAction = useMemo(

package/src/screens/AllGateway/DeviceInternalDetail/__test__/index.test.js

@@ -18,6 +18,7 @@ import { API } from '../../../../configs';
 import { PERMISSION_TYPE } from '../../../../configs/Constants';
 import Detail from '../../components/Detail';
 import ModalPopupCT from '../../../../commons/ModalPopupCT';
+import { fetchGatewayCT, flushPromises } from '../../test-utils';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -64,6 +65,25 @@ const headerCustomOnPressMore = async (instance) => {
   });
 };
 
+const renderDetail = async (listActions) => {
+  let tree;
+  mock.onGet(API.DEV_MODE.ARDUINO.ACTION(1, 1)).reply(200, listActions);
+  await act(async () => {
+    tree = await create(wrapComponent());
+  });
+  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: 2 },
+    });
+  });
+  await flushPromises();
+  return { detail, tabPaneCT };
+};
+
 describe('Test DeviceInternalDetail', () => {
   let tree;
   const listConfigReads = [
@@ -114,8 +134,6 @@ describe('Test DeviceInternalDetail', () => {
         isInternal: true,
       },
     });
-  });
-  afterEach(() => {
     mock.reset();
     mock.resetHistory();
     mockNavigate.mockClear();
@@ -143,7 +161,7 @@ describe('Test DeviceInternalDetail', () => {
     });
     const instance = tree.root;
     const detail = instance?.findByType(Detail);
-    headerCustomOnPressMore(detail);
+    await headerCustomOnPressMore(detail);
     const menuActionMore = detail?.findAllByType(MenuActionMore);
     expect(menuActionMore[0].props.isVisible).toEqual(true);
     await act(async () => {
@@ -162,17 +180,18 @@ describe('Test DeviceInternalDetail', () => {
     });
     const instance = tree.root;
     const detail = instance?.findByType(Detail);
-    headerCustomOnPressMore(detail);
+    await headerCustomOnPressMore(detail);
     const menuActionMore = detail?.findByType(MenuActionMore);
     expect(menuActionMore.props.isVisible).toEqual(true);
     await act(async () => {
       menuActionMore.props.listMenuItem[1].doAction();
     });
     const modal = instance.findByType(ModalPopupCT);
+
+    mock.onDelete(API.DEV_MODE.ARDUINO.DEVICE_DETAIL(1, 1)).reply(200);
     await act(async () => {
       await modal.props.onPressConfirm();
     });
-    mock.onDelete(API.DEV_MODE.ARDUINO.DEVICE_DETAIL(1, 1)).reply(200);
     expect(mockPop).toBeCalledWith(1);
     expect(Toast.show).toBeCalledWith({
       position: 'bottom',
@@ -228,19 +247,7 @@ describe('Test DeviceInternalDetail', () => {
   });
 
   it('test render DeviceInternalDetail onPress TabPanel action', async () => {
-    mock.onGet(API.DEV_MODE.ARDUINO.ACTION(1, 1)).reply(200, listActions);
-    await act(async () => {
-      tree = await create(wrapComponent());
-    });
-    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: 2 },
-      });
-    });
+    const { tabPaneCT } = await renderDetail(listActions);
     expect(tabPaneCT.props.listTabs[2].data).toEqual([
       {
         id: 1,
@@ -271,7 +278,7 @@ describe('Test DeviceInternalDetail', () => {
     await act(async () => {
       await detail.props.onPressRow(1);
     });
-    expect(mockNavigate).toBeCalledWith(Routes.DetailConfigActionInterval, {
+    expect(mockNavigate).toBeCalledWith(Routes.DetailConfigActionInternal, {
       device: {
         id: 1,
         name: 'abc',
@@ -280,6 +287,32 @@ describe('Test DeviceInternalDetail', () => {
       isConfigRead: false,
       isConfigWrite: true,
       itemActionConfig: 1,
+      isInternal: true,
+      board: undefined,
+      writeConfigPins: [
+        {
+          config: {
+            is_read: false,
+            is_write: true,
+            name: 'config1',
+          },
+          id: 1,
+          pin_mode: 'output',
+          pin_number: 0,
+          value_type: 'boolean',
+        },
+        {
+          config: {
+            is_read: true,
+            is_write: true,
+            name: 'config2',
+          },
+          id: 2,
+          pin_mode: 'output',
+          pin_number: 0,
+          value_type: 'integer',
+        },
+      ],
     });
   });
 
@@ -290,19 +323,11 @@ describe('Test DeviceInternalDetail', () => {
     await act(async () => {
       tree = await create(wrapComponent());
     });
-    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 },
-      });
-    });
+    const { detail } = await fetchGatewayCT(tree);
     await act(async () => {
       await detail.props.onPressRow(1);
     });
-    expect(mockNavigate).toBeCalledWith(Routes.DetailConfigActionInterval, {
+    expect(mockNavigate).toBeCalledWith(Routes.DetailConfigActionInternal, {
       device: {
         id: 1,
         name: 'abc',
@@ -311,27 +336,18 @@ describe('Test DeviceInternalDetail', () => {
       isConfigRead: true,
       isConfigWrite: false,
       itemActionConfig: 1,
+      board: undefined,
+      isInternal: true,
+      writeConfigPins: [],
     });
   });
 
   it('test render DeviceInternalDetail onPress TabPanel action onPressRow', async () => {
-    mock.onGet(API.DEV_MODE.ARDUINO.ACTION(1, 1)).reply(200, listActions);
-    await act(async () => {
-      tree = await create(wrapComponent());
-    });
-    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: 2 },
-      });
-    });
+    const { detail } = await renderDetail(listActions);
     await act(async () => {
       await detail.props.onPressRow(1);
     });
-    expect(mockNavigate).toBeCalledWith(Routes.DetailConfigActionInterval, {
+    expect(mockNavigate).toBeCalledWith(Routes.DetailConfigActionInternal, {
       device: {
         id: 1,
         name: 'abc',
@@ -340,6 +356,9 @@ describe('Test DeviceInternalDetail', () => {
       isConfigRead: false,
       isConfigWrite: false,
       itemActionConfig: 1,
+      board: undefined,
+      isInternal: true,
+      writeConfigPins: undefined,
     });
   });
 
@@ -364,20 +383,7 @@ describe('Test DeviceInternalDetail', () => {
   });
 
   it('test render DeviceInternalDetail onPress TabPanel action onRefresh', async () => {
-    mock.onGet(API.DEV_MODE.ARDUINO.ACTION(1, 1)).reply(200, listActions);
-
-    await act(async () => {
-      tree = await create(wrapComponent());
-    });
-    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: 2 },
-      });
-    });
+    const { detail, tabPaneCT } = await renderDetail(listActions);
     await act(async () => {
       await detail.props.onRefresh();
     });