@eohjsc/react-native-smart-city 0.3.3 → 0.3.6

package/src/commons/Sharing/WrapHeaderScrollable.js

@@ -13,6 +13,7 @@ import { isIphoneX } from 'react-native-iphone-x-helper';
 import { Colors, Theme } from '../../configs';
 import HeaderAni, { heightHeader } from '../../commons/HeaderAni';
 import Text from '../../commons/Text';
+import { TESTID } from '../../configs/Constants';
 
 const WrapHeaderScrollable = ({
   children,
@@ -59,6 +60,7 @@ const WrapHeaderScrollable = ({
         onLeft={onGoBack}
       />
       <Animated.ScrollView
+        testID={TESTID.ANIMATED_SCROLL}
         scrollEventThrottle={16}
         onScroll={Animated.event(
           [{ nativeEvent: { contentOffset: { y: animatedScrollYValue } } }],

package/src/commons/SubUnit/__test__/ShortDetail.test.js

@@ -151,7 +151,7 @@ describe('test ShortDetail Subunit', () => {
       (item) =>
         item.props.testID === TESTID.SUB_UNIT_DEVICES && item.type === View
     );
-    expect(itemDevice.length).toBe(1);
+    expect(itemDevice.length).toBe(0);
   });
 
   test('render ShortDetail add new device', async () => {

package/src/configs/Constants.js

@@ -75,6 +75,7 @@ export const DEVICE_TYPE = {
   LG_THINQ: 'LG_THINQ',
   HANET: 'HANET',
   ZIGBEE: 'ZIGBEE',
+  GOOGLE_HOME: 'GOOGLE_HOME',
 };
 
 const marginItem = 12;
@@ -288,6 +289,8 @@ export const TESTID = {
   SUB_UNIT_TEXT_DROPDOWN: 'SUB_UNIT_TEXT_DROPDOWN',
   SUB_UNIT_GO_DETAIL: 'SUB_UNIT_GO_DETAIL',
   VIEW_SUB_UNIT_AUTOMATE: 'VIEW_SUB_UNIT_AUTOMATE',
+  SUB_UNIT_NAME: 'SUB_UNIT_NAME',
+  ANIMATED_SCROLL: 'ANIMATED_SCROLL',
   ADD_SUB_UNIT: 'ADD_SUB_UNIT',
 
   // NavBar
@@ -392,6 +395,7 @@ export const TESTID = {
   ITEM_TEXT_ERROR: 'ITEM_TEXT_ERROR',
   SEARCH_BAR_INPUT: 'SEARCH_BAR_INPUT',
   GO_DETAIL: 'GO_DETAIL',
+  NAV_LIST: 'NAV_LIST',
 
   // Automate
   AUTOMATE_SCRIPT_ACTION: 'AUTOMATE_SCRIPT_ACTION',
@@ -447,8 +451,13 @@ export const TESTID = {
   ITEM_QUICK_ACTION_PRESS: 'ITEM_QUICK_ACTION_PRESS',
   TIME_COUNT_DOWN_TEXT: 'TIME_COUNT_DOWN_TEXT',
   ACTION_ITEM: 'ACTION_ITEM',
+
   // Sensor Item
   TEXT_SENSOR_ITEM: 'TEXT_SENSOR_ITEM',
+  SENSOR_NAME: 'SENSOR_NAME',
+  ON_OFF_BUTTON: 'ON_OFF_BUTTON',
+  SENSOR_STATUS: 'SENSOR_STATUS',
+  ICON_BACK: 'ICON_BACK',
 
   // DeviceInfo
   DEVICE_INFO_BATTERY: 'DEVICE_INFO_BATTERY',
@@ -564,6 +573,7 @@ export const TESTID = {
   ICON_ADD_STAR_SHARED_UNIT: 'ICON_ADD_STAR_SHARED_UNIT',
   TOUCH_SHARED_UNIT: 'TOUCH_SHARED_UNIT',
   SHARED_UNIT_OWN_BY: 'SHARED_UNIT_OWN_BY',
+  ICON_UNIT: 'ICON_UNIT',
 
   // Select subunit
 
@@ -809,3 +819,13 @@ export const SENSOR_TYPE = {
   SOS: 'sos',
   FILTER_WATER: 'filter_water',
 };
+
+export const PROBLEM_CODE = {
+  CLIENT_ERROR: 'CLIENT_ERROR',
+  SERVER_ERROR: 'SERVER_ERROR',
+  TIMEOUT_ERROR: 'TIMEOUT_ERROR',
+  CONNECTION_ERROR: 'CONNECTION_ERROR',
+  NETWORK_ERROR: 'NETWORK_ERROR',
+  UNKNOWN_ERROR: 'UNKNOWN_ERROR',
+  CANCEL_ERROR: 'CANCEL_ERROR',
+};

package/src/configs/SCConfig.js

@@ -107,11 +107,13 @@ export class SCConfig {
   static VCONNEX_REDIRECT_URI_APP = SCDefaultConfig.VCONNEX_REDIRECT_URI_APP;
   static pusherAppKey = SCDefaultConfig.pusherAppKey;
   static pusherAppCluste = SCDefaultConfig.pusherAppCluster;
+  static language = 'en';
 }
 
 export const initSCConfig = (config) => {
   api.setBaseURL(config.apiRoot ?? SCDefaultConfig.apiRoot);
   LocaleConfig.defaultLocale = config.language;
+  SCConfig.language = config.language ?? SCConfig.language;
   SCConfig.apiRoot = config.apiRoot ?? SCDefaultConfig.apiRoot;
   SCConfig.GOOGLE_MAP_API_KEY =
     config.GOOGLE_MAP_API_KEY ?? SCDefaultConfig.GOOGLE_MAP_API_KEY;

package/src/navigations/UnitStack.js

@@ -1,5 +1,5 @@
 import React, { memo, useContext, useEffect } from 'react';
-import { View, StyleSheet } from 'react-native';
+import { View } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { createStackNavigator } from '@react-navigation/stack';
 import { BleManager } from 'react-native-ble-plx';
@@ -52,10 +52,10 @@ import ConfirmUnitDeletion from '../screens/ConfirmUnitDeletion';
 import InfoMemberUnit from '../screens/Sharing/InfoMemberUnit';
 import EnterPassword from '../screens/EnterPassword';
 import { HanetCameraStack } from './HanetCameraStack';
-
 import { axiosGet } from '../utils/Apis/axios';
 import { API } from '../configs';
 import SideMenuDetail from '../screens/SideMenuDetail';
+import { styles } from './UnitStackStyles';
 
 const Stack = createStackNavigator();
 
@@ -173,12 +173,9 @@ export const UnitStack = memo((props) => {
         component={ChooseLocation}
         options={{
           headerShown: true,
-          headerTitleStyle: {
-            ...styles.headerLocation,
-          },
           headerTitle: () => (
             <View style={styles.headerLocation}>
-              <Text type="H3" color={Colors.Gray9} bold>
+              <Text color={Colors.Gray9} style={styles.headerTitle} bold>
                 {t('choose_on_map')}
               </Text>
 
@@ -406,17 +403,3 @@ export const UnitStack = memo((props) => {
     </Stack.Navigator>
   );
 });
-
-const styles = StyleSheet.create({
-  icLeft: {
-    marginLeft: Device.isIOS ? 8 : 0,
-  },
-  headerLocation: {
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  headerContent: {
-    textAlign: 'center',
-    paddingBottom: 8,
-  },
-});

package/src/navigations/UnitStackStyles.js

@@ -0,0 +1,21 @@
+import { StyleSheet } from 'react-native';
+import { Device } from '../configs';
+
+export const styles = StyleSheet.create({
+  icLeft: {
+    marginLeft: Device.isIOS ? 8 : 0,
+  },
+  headerLocation: {
+    alignItems: 'center',
+    justifyContent: 'center',
+    width: 290,
+  },
+  headerTitle: {
+    fontSize: 20,
+    lineHeight: 28,
+  },
+  headerContent: {
+    textAlign: 'center',
+    paddingBottom: 4,
+  },
+});

package/src/screens/AddNewDevice/__test__/AddNewDevice.test.js

@@ -53,6 +53,7 @@ describe('Test AddNewDevice', () => {
         unit_id: 1,
       },
     };
+    mock.resetHistory();
   });
 
   const getText = (instance, id) => {
@@ -103,7 +104,13 @@ describe('Test AddNewDevice', () => {
     });
     const instance = tree.root;
     const groupCheckBox = instance.findByType(GroupCheckBox);
-    expect(groupCheckBox.props.data).toEqual([]);
+    expect(groupCheckBox.props.data).toEqual([
+      {
+        id: 2,
+        name: 'Station name',
+        title: 'Station name',
+      },
+    ]);
   });
 
   test('ViewButtonBottom', async () => {

package/src/screens/AddNewDevice/__test__/ConnectingDevices.test.js

@@ -103,7 +103,7 @@ describe('Test ConnectingDevices', () => {
       await jest.runOnlyPendingTimers();
     });
     expect(setInterval).toHaveBeenCalled();
-    expect(mockedNavigate).not.toHaveBeenCalledWith(Routes.ConnectDevices, {
+    expect(mockedNavigate).toHaveBeenCalledWith(Routes.ConnectDevices, {
       new_sensor: { id: 1 },
     });
   });

package/src/screens/AddNewGateway/PlugAndPlay/GatewayWifiList.js

@@ -28,8 +28,6 @@ import WifiManager from 'react-native-wifi-reborn';
 import { useNavigation } from '@react-navigation/native';
 import { TESTID } from '../../../configs/Constants';
 
-const isIos = Platform.OS === 'ios';
-
 const GatewayWifiList = memo(({ route }) => {
   const {
     list_wifi,
@@ -72,41 +70,46 @@ const GatewayWifiList = memo(({ route }) => {
       if (Object.prototype.hasOwnProperty.call(data, 'gateway')) {
         const checkWifiInterval = setInterval(() => {
           // eslint-disable-next-line promise/prefer-await-to-then
-          WifiManager.getCurrentWifiSSID().then((ssid) => {
-            if (ssid !== wifi_ssid) {
-              const IsRobot = devicePrefixName === 'ROBOT';
-              if (IsRobot) {
-                setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
-                navigate(Routes.AddDeviceStack, {
-                  screen: Routes.AddCommonSelectSubUnit,
-                  params: {
-                    scan_sensor_data: scan_sensor_data,
-                    addType: 'AddDeviceNewFlow',
-                    gateway: data?.gateway,
-                    unit_id: unit_id,
-                    devicePrefixName: devicePrefixName,
-                    wifi_ssid: wifi_ssid,
-                    wifi_pass: wifi_pass,
-                  },
-                });
-                clearInterval(checkWifiInterval);
-              } else {
-                setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
-                navigate(Routes.AddDeviceStack, {
-                  screen: Routes.ConnectingProcess,
-                  params: {
-                    unit_id: unit_id,
-                    unit_name: unit_name,
-                    scan_sensor_data: scan_sensor_data,
-                    gateway: data?.gateway,
-                    devicePrefixName: devicePrefixName,
-                    chip_id: chip_id,
-                  },
-                });
-                clearInterval(checkWifiInterval);
+          WifiManager.getCurrentWifiSSID().then(
+            (ssid) => {
+              if (ssid !== wifi_ssid) {
+                const IsRobot = devicePrefixName === 'ROBOT';
+                if (IsRobot) {
+                  setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
+                  navigate(Routes.AddDeviceStack, {
+                    screen: Routes.AddCommonSelectSubUnit,
+                    params: {
+                      scan_sensor_data: scan_sensor_data,
+                      addType: 'AddDeviceNewFlow',
+                      gateway: data?.gateway,
+                      unit_id: unit_id,
+                      devicePrefixName: devicePrefixName,
+                      wifi_ssid: wifi_ssid,
+                      wifi_pass: wifi_pass,
+                    },
+                  });
+                  clearInterval(checkWifiInterval);
+                } else {
+                  setAction(Action.IS_CONNECT_WIFI_GATEWAY, false);
+                  navigate(Routes.AddDeviceStack, {
+                    screen: Routes.ConnectingProcess,
+                    params: {
+                      unit_id: unit_id,
+                      unit_name: unit_name,
+                      scan_sensor_data: scan_sensor_data,
+                      gateway: data?.gateway,
+                      devicePrefixName: devicePrefixName,
+                      chip_id: chip_id,
+                    },
+                  });
+                  clearInterval(checkWifiInterval);
+                }
               }
+            },
+            () => {
+              ToastBottomHelper.error('Cannot get current SSID!');
             }
-          });
+          );
         }, 3000);
       }
     },
@@ -151,7 +154,7 @@ const GatewayWifiList = memo(({ route }) => {
 
   const connectWifi = useCallback(async () => {
     if (!isConnectWifiGateway) {
-      if (isIos) {
+      if (Platform.OS === 'ios') {
         sendConnect(0);
         setAction(Action.IS_CONNECT_WIFI_GATEWAY, true);
         setIsSendWifi(true);

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

@@ -1,25 +1,32 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
 import GatewayWifiList from '../GatewayWifiList';
-import { Text, ScrollView, TouchableOpacity } from 'react-native';
+import { Text, ScrollView, TouchableOpacity, Platform } from 'react-native';
 import { getTranslate } from '../../../../utils/I18n';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
 import TextInputPassword from '../../../../commons/Form/TextInputPassword';
 import { TESTID } from '../../../../configs/Constants';
+import WifiManager from 'react-native-wifi-reborn';
+import { useNavigation } from '@react-navigation/native';
+import Routes from '../../../../utils/Route';
 
-const wrapComponent = (route) => (
-  <SCProvider initState={mockSCStore({})}>
+const wrapComponent = (route, state = {}) => (
+  <SCProvider initState={{ ...mockSCStore({}), ...state }}>
     <GatewayWifiList route={route} />
   </SCProvider>
 );
 
 describe('Test GatewayWifiList', () => {
   let tree;
+  const socket = {
+    on: jest.fn(),
+    send: jest.fn(),
+  };
   let route = {
     params: {
       list_wifi: [{ ssid: 'eoh@io' }, { ssid: 'eoh@ras.io' }],
-      socket: { send: jest.fn() },
+      socket: socket,
     },
   };
 
@@ -33,6 +40,7 @@ describe('Test GatewayWifiList', () => {
     expect(texts[1].props.children).toEqual(getTranslate('en', 'set_network'));
     expect(texts[3].props.children).toEqual('eoh@io');
   });
+
   test('onPress wifi', async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -46,6 +54,7 @@ describe('Test GatewayWifiList', () => {
       await touchableOpacity[1].props.onPress();
     });
   });
+
   test('onChange TextInputPassword', async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -60,15 +69,60 @@ describe('Test GatewayWifiList', () => {
     const ButtonPopup = instance.find(
       (el) => el.props.testID === TESTID.GATEWAY_WIFI_LIST.BUTTON_POPUP
     );
-    await act(() => {
-      ButtonPopup.props.onPressMain();
+    await act(async () => {
+      await ButtonPopup.props.onPressMain();
     });
-    await act(() => {
-      ButtonPopup.props.onPressSecondary();
+    await act(async () => {
+      await ButtonPopup.props.onPressSecondary();
     });
-    await act(() => {
-      ButtonPopup.props.onClose();
+    await act(async () => {
+      await ButtonPopup.props.onClose();
     });
     expect(ButtonPopup).toBeDefined();
   });
+
+  test('on device is connected to wifi and mobile re-connect to internet', async () => {
+    jest.useFakeTimers();
+    Platform.OS = 'android';
+
+    await act(async () => {
+      tree = await create(wrapComponent(route, {}));
+    });
+
+    const instance = tree.root;
+    const ButtonPopup = instance.find(
+      (el) => el.props.testID === TESTID.GATEWAY_WIFI_LIST.BUTTON_POPUP
+    );
+    await act(async () => {
+      await ButtonPopup.props.onPressMain();
+    });
+    expect(socket.on).toBeCalled();
+    expect(socket.send).toBeCalled();
+
+    const mockWifiThen = jest.fn();
+    WifiManager.getCurrentWifiSSID.mockImplementation(() => ({
+      then: mockWifiThen,
+    }));
+
+    // receive message
+    await act(async () => {
+      await socket.on.mock.calls[0][1](
+        JSON.stringify({
+          gateway: true,
+        })
+      );
+    });
+    jest.runOnlyPendingTimers();
+
+    expect(WifiManager.getCurrentWifiSSID).toBeCalled();
+    expect(mockWifiThen).toBeCalled();
+
+    // get ssid success
+    act(() => {
+      mockWifiThen.mock.calls[0][0]('new-ssid');
+    });
+    const { navigate } = useNavigation();
+    expect(navigate).toBeCalled();
+    expect(navigate.mock.calls[0][0]).toEqual(Routes.AddDeviceStack);
+  });
 });

package/src/screens/Device/EditDevice/index.js

@@ -104,20 +104,22 @@ const EditDevice = memo(() => {
             />
           </View>
         </TouchableOpacity>
-        <TouchableOpacity
-          style={styles.removeButton}
-          onPress={onShowDelete(sensor?.name)}
-          testID={TESTID.DEVICE_SHOW_REMOVE}
-        >
-          <Text
-            type={'H4'}
-            semibold
-            color={Colors.Red}
-            style={styles.removeBorderBottom}
+        {!stateAlertAction.visible && (
+          <TouchableOpacity
+            style={styles.removeButton}
+            onPress={onShowDelete(sensor?.name)}
+            testID={TESTID.DEVICE_SHOW_REMOVE}
           >
-            {t('remove_device')}
-          </Text>
-        </TouchableOpacity>
+            <Text
+              type={'H4'}
+              semibold
+              color={Colors.Red}
+              style={styles.removeBorderBottom}
+            >
+              {t('remove_device')}
+            </Text>
+          </TouchableOpacity>
+        )}
       </View>
       <AlertAction
         visible={stateAlertAction.visible}

package/src/screens/SubUnit/AddSubUnit.js

@@ -25,11 +25,12 @@ import { ToastBottomHelper } from '../../utils/Utils';
 import { TESTID } from '../../configs/Constants';
 import styles from './AddSubUnitStyles';
 import useKeyboardShow from '../../hooks/Common/useKeyboardShow';
+import { replace } from '../../navigations/utils';
 
 const AddSubUnit = ({ route }) => {
   const t = useTranslations();
   const { dismissKeyboard } = useKeyboardShow();
-  const { navigate, goBack } = useNavigation();
+  const { navigate, goBack, dispatch } = useNavigation();
   const { unit, addType, isAddUnit, location = '' } = route?.params;
   const [roomName, setRoomName] = useState('');
   const [wallpaper, setWallpaper] = useState('');
@@ -62,13 +63,15 @@ const AddSubUnit = ({ route }) => {
           }
         );
         if (success) {
-          navigate(Routes.UnitStack, {
-            screen: Routes.UnitDetail,
-            params: {
-              unitId: data?.id,
-              routeName: Routes.DashboardStack,
-            },
-          });
+          dispatch(
+            replace(Routes.UnitStack, {
+              screen: Routes.UnitDetail,
+              params: {
+                unitId: data?.id,
+                routeName: Routes.DashboardStack,
+              },
+            })
+          );
           cleanData();
         } else {
           awaitCreate.current = false;
@@ -98,15 +101,17 @@ const AddSubUnit = ({ route }) => {
             });
             return;
           }
-          navigate(Routes.UnitStack, {
-            screen: Routes.UnitDetail,
-            params: {
-              unitId: unit.id,
-              unitData: unit,
-              isAddSubUnit: true,
-              routeName: Routes.DashboardStack,
-            },
-          });
+          dispatch(
+            replace(Routes.UnitStack, {
+              screen: Routes.UnitDetail,
+              params: {
+                unitId: unit.id,
+                unitData: unit,
+                isAddSubUnit: true,
+                routeName: Routes.DashboardStack,
+              },
+            })
+          );
           cleanData();
         } else {
           awaitCreate.current = false;
@@ -123,6 +128,7 @@ const AddSubUnit = ({ route }) => {
     t,
     unit,
     addType,
+    dispatch,
     goBack,
     route.params,
   ]);

package/src/screens/SubUnit/EditSubUnit.js

@@ -228,20 +228,22 @@ const EditSubUnit = ({ route }) => {
             setImageUrl={setImageUrl}
             optionsCapture={options}
           />
-          <TouchableOpacity
-            testID={TESTID.MANAGE_SUB_UNIT_REMOVE_BUTTON}
-            onPress={onPressRemove}
-            style={styles.removeButton}
-          >
-            <Text
-              type={'H4'}
-              semibold
-              color={Colors.Red}
-              style={styles.removeText}
+          {!showEdit && (
+            <TouchableOpacity
+              testID={TESTID.MANAGE_SUB_UNIT_REMOVE_BUTTON}
+              onPress={onPressRemove}
+              style={styles.removeButton}
             >
-              {t('remove_sub_unit')}
-            </Text>
-          </TouchableOpacity>
+              <Text
+                type={'H4'}
+                semibold
+                color={Colors.Red}
+                style={styles.removeText}
+              >
+                {t('remove_sub_unit')}
+              </Text>
+            </TouchableOpacity>
+          )}
         </View>
       </View>
       <ModalCustom

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

@@ -36,13 +36,20 @@ jest.mock('react-redux', () => {
   };
 });
 
+const mockNavigationDispatch = jest.fn();
+const mockReplace = jest.fn();
+
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
     useNavigation: () => ({
       navigate: mockedNavigate,
       goBack: mockedGoBack,
+      dispatch: mockNavigationDispatch,
     }),
+    StackActions: {
+      replace: () => mockReplace,
+    },
   };
 });
 
@@ -63,6 +70,7 @@ describe('Test AddSubUnit', () => {
   afterEach(() => {
     mockedDispatch.mockClear();
     mockedNavigate.mockClear();
+    mockNavigationDispatch.mockClear();
     Toast.show.mockClear();
   });
   let tree;
@@ -150,15 +158,6 @@ describe('Test AddSubUnit', () => {
     await act(async () => {
       await viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).not.toHaveBeenCalledWith(Routes.UnitStack, {
-      screen: Routes.UnitDetail,
-      params: {
-        unitId: route.params.unit.id,
-        unitData: route.params.unit,
-        routeName: 'DashboardStack',
-        isAddSubUnit: true,
-      },
-    });
     expect(Toast.show).toHaveBeenCalledWith({
       type: 'error',
       position: 'bottom',
@@ -186,13 +185,6 @@ describe('Test AddSubUnit', () => {
   });
 
   test('test create Unit', async () => {
-    const response = {
-      success: true,
-      status: 200,
-      data: {
-        id: 2,
-      },
-    };
     route.params = {
       ...route.params,
       location: 'Unit address',
@@ -211,13 +203,7 @@ describe('Test AddSubUnit', () => {
     await act(async () => {
       await viewButtonBottom.props.onRightClick();
     });
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
-      screen: Routes.UnitDetail,
-      params: {
-        unitId: response.data.id,
-        routeName: Routes.DashboardStack,
-      },
-    });
+    expect(mockNavigationDispatch).toBeCalledWith(mockReplace);
   });
 
   test('test choose Location', async () => {

package/src/screens/SyncLGDevice/__test__/AddLGDevice.test.js

@@ -53,6 +53,7 @@ describe('Test Add LG Device', () => {
         backend_url: 'https://doamin.com',
       },
     };
+    mock.resetHistory();
   });
 
   const getText = (instance, id) => {
@@ -105,7 +106,13 @@ describe('Test Add LG Device', () => {
     });
     const instance = tree.root;
     const groupCheckBox = instance.findByType(GroupCheckBox);
-    expect(groupCheckBox.props.data).toEqual([]);
+    expect(groupCheckBox.props.data).toEqual([
+      {
+        id: 2,
+        name: 'Station name',
+        title: 'Station name',
+      },
+    ]);
   });
 
   test('ViewButtonBottom', async () => {