@eohjsc/react-native-smart-city 0.3.2 → 0.3.5

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/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 () => {

package/src/screens/Unit/SelectAddress.js

@@ -4,6 +4,7 @@ import MapView, { Marker, Circle, PROVIDER_GOOGLE } from 'react-native-maps';
 import { useNavigation } from '@react-navigation/native';
 import { IconOutline, IconFill } from '@ant-design/icons-react-native';
 import { check, RESULTS } from 'react-native-permissions';
+import { openPromptEnableLocation } from '../../utils/Setting/Location';
 
 import BottomButtonView from '../../commons/BottomButtonView';
 import SearchBarLocation from '../../commons/SearchLocation';
@@ -151,9 +152,14 @@ const SelectAddress = memo(({ route }) => {
               t('location_rationale_title'),
               t('location_require_message')
             );
+        } else if (error.code === GEOLOCATION_ERROR.POSITION_UNAVAILABLE) {
+          const locationEnabaled = await openPromptEnableLocation();
+          process.env.NODE_ENV !== 'test' &&
+            locationEnabaled &&
+            getCurrentPosition();
         }
       }
-      // { enableHighAccuracy: true, timeout: 20000, maximumAge: 1000 } enable on emulator
+      // { enableHighAccuracy: true, timeout: 20000, maximumAge: 1000 } // enable on emulator
     );
   }, [t]);
 

package/src/screens/Unit/Station/index.js

@@ -1,5 +1,6 @@
 import React, { memo, useEffect, useRef, useState } from 'react';
 import { View, Text, TouchableOpacity, FlatList } from 'react-native';
+import { TESTID } from '../../../configs/Constants';
 import styles from './StationStyles';
 
 const Station = ({ listStation = [], onSnapToItem, indexStation }) => {
@@ -23,6 +24,7 @@ const Station = ({ listStation = [], onSnapToItem, indexStation }) => {
         key={index}
         style={styles.wrapTitle}
         onPress={handleOnSnapToItem(item, index)}
+        testID={`${TESTID.SUB_UNIT_NAME}-${item?.station?.id}`}
       >
         <Text
           style={[styles.title, index === indexStation && styles.titleActive]}
@@ -71,6 +73,7 @@ const Station = ({ listStation = [], onSnapToItem, indexStation }) => {
         renderItem={renderItem}
         showsHorizontalScrollIndicator={false}
         scrollIndicatorInsets={{ right: 1 }}
+        testID={TESTID.NAV_LIST}
       />
     </View>
   );

package/src/screens/Unit/__test__/SelectAddress.test.js

@@ -1,7 +1,9 @@
 import React from 'react';
+import { Alert } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import MockAdapter from 'axios-mock-adapter';
 import RNP from 'react-native-permissions';
+import RNAndroidLocationEnabler from 'react-native-android-location-enabler';
 
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
@@ -62,6 +64,13 @@ jest.mock('react-native-maps', () => {
   };
 });
 
+jest.mock('react-native-android-location-enabler', () => {
+  return {
+    ...jest.requireActual('react-native-android-location-enabler'),
+    promptForEnableLocationIfNeeded: jest.fn(),
+  };
+});
+
 jest.mock('../../../utils/Permission/common');
 
 const position = {
@@ -82,11 +91,12 @@ jest.mock('react-native-permissions', () => {
 });
 
 describe('Test SelectAddress', () => {
-  let tree;
-  let route;
+  let tree, route, Platform;
   const mockUpdateLocation = jest.fn();
 
   beforeAll(() => {
+    Platform = require('react-native').Platform;
+    RNAndroidLocationEnabler.promptForEnableLocationIfNeeded.mockClear();
     RNP.check.mockClear();
     route = {
       params: {
@@ -209,7 +219,74 @@ describe('Test SelectAddress', () => {
     OpenSetting.mockClear();
   });
 
-  test('test get current failed error not handle', async () => {
+  test('test get current location failed location not enabled android', async () => {
+    Platform.OS = 'android';
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const button = instance.find(
+      (el) => el.props.testID === TESTID.BUTTON_YOUR_LOCATION
+    );
+
+    global.navigator.geolocation = {
+      getCurrentPosition: (onSuccess, onError, options) => {
+        onError({ code: GEOLOCATION_ERROR.POSITION_UNAVAILABLE });
+      },
+    };
+
+    // cancel
+    RNAndroidLocationEnabler.promptForEnableLocationIfNeeded.mockImplementationOnce(
+      async () => {
+        throw new Error();
+      }
+    );
+    await act(async () => {
+      await button.props.onPress();
+    });
+    expect(
+      RNAndroidLocationEnabler.promptForEnableLocationIfNeeded
+    ).toBeCalled();
+
+    RNAndroidLocationEnabler.promptForEnableLocationIfNeeded.mockClear();
+
+    // enabled
+    RNAndroidLocationEnabler.promptForEnableLocationIfNeeded.mockImplementationOnce(
+      async () => true
+    );
+    await act(async () => {
+      await button.props.onPress();
+    });
+    expect(
+      RNAndroidLocationEnabler.promptForEnableLocationIfNeeded
+    ).toBeCalled();
+  });
+
+  test('test get current location failed location not enabled ios', async () => {
+    Platform.OS = 'ios';
+    jest.spyOn(Alert, 'alert');
+
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const button = instance.find(
+      (el) => el.props.testID === TESTID.BUTTON_YOUR_LOCATION
+    );
+
+    global.navigator.geolocation = {
+      getCurrentPosition: (onSuccess, onError, options) => {
+        onError({ code: GEOLOCATION_ERROR.POSITION_UNAVAILABLE });
+      },
+    };
+
+    await act(async () => {
+      await button.props.onPress();
+    });
+    // expect AlertAsync is called
+  });
+
+  test('test get current location failed error not handle', async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));
     });

package/src/screens/Unit/components/MyUnitDevice/index.js

@@ -1,12 +1,12 @@
 import React, { useState, useCallback } from 'react';
-import { Image, StyleSheet, View, TouchableOpacity } from 'react-native';
+import { StyleSheet, View, TouchableOpacity } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 
 import ItemQuickAction from '../../../../commons/Action/ItemQuickAction';
 import Text from '../../../../commons/Text';
 import Routes from '../../../../utils/Route';
-
-import { Colors, Images } from '../../../../configs';
+import { Colors } from '../../../../configs';
+import FImage from '../../../../commons/FImage';
 
 const MyUnitDevice = ({ sensor, unit }) => {
   const [status, setStatus] = useState(sensor.status);
@@ -26,7 +26,7 @@ const MyUnitDevice = ({ sensor, unit }) => {
     <View style={styles.item}>
       <TouchableOpacity style={styles.flex1} onPress={goToSensorDisplay}>
         <View style={styles.rowCenter}>
-          <Image style={styles.image} source={Images.mainDoor} />
+          <FImage style={styles.image} source={{ uri: sensor?.icon_kit }} />
           <View style={styles.marginTop3}>
             <Text semibold style={styles.nameDevice}>
               {sensor.name}

package/src/screens/Unit/components/__test__/MyUnitDevice.test.js

@@ -43,7 +43,7 @@ describe('Test MyUnitDevice', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(11);
+    expect(Views).toHaveLength(12);
 
     const touches = instance.findAllByType(TouchableOpacity);
     expect(touches).toHaveLength(1);
@@ -60,6 +60,6 @@ describe('Test MyUnitDevice', () => {
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
-    expect(Views).toHaveLength(11);
+    expect(Views).toHaveLength(12);
   });
 });

package/src/utils/Apis/axios.js

@@ -2,6 +2,9 @@ import { create } from 'apisauce';
 import { getData, storeData } from '../Storage';
 import { ToastBottomHelper } from '../Utils';
 import NetInfo from '@react-native-community/netinfo';
+import { PROBLEM_CODE } from '../../configs/Constants';
+import { getTranslate } from '../I18n';
+import { SCConfig } from '../../configs';
 
 const api = create({
   headers: {
@@ -39,6 +42,11 @@ const parseErrorResponse = async (error) => {
       }
     }
     if (!hideError) {
+      switch (error.problem) {
+        case PROBLEM_CODE.SERVER_ERROR:
+          message = getTranslate(SCConfig.language, 'server_error');
+          break;
+      }
       ToastBottomHelper.error(message);
     }
   }
@@ -102,7 +110,7 @@ export async function axiosGet(URL, config = {}, cache = false) {
     return await parseErrorResponse(error);
   }
   const { data, problem } = response;
-  if (problem === 'NETWORK_ERROR') {
+  if (problem) {
     if (cache) {
       return (
         (await axiosCache(URL, 500)) || (await parseErrorResponse(response))

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

@@ -989,5 +989,7 @@
   "This {name} was removed!" : "This {name} was removed!",
   "camera_request_permission": "Camera request permission",
   "camera_request_permission_des": "To use camera, please unlock camera permission",
-  "location_require_message": "EoH needs your location permission to get current location."
+  "location_require_message": "EoH needs your location permission to get current location.",
+  "turn_on_location_service": "Turn on location service for your phone",
+  "turn_on_location_service_des": "To continue, let your device turn on location by turning on location service in Settings"
 }

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

@@ -990,5 +990,7 @@
   "location_perm_denied": "Ứng dụng không cho phép truy cập vị trí.",
   "camera_request_permission": "Quyền yêu cầu máy ảnh",
   "camera_request_permission_des": "Để sử dụng máy ảnh, vui lòng mở khóa quyền đối với máy ảnh",
-  "location_require_message": "Eoh cần quyền truy cập vị trí của bạn để lấy vị trí hiện tại."
+  "location_require_message": "Eoh cần quyền truy cập vị trí của bạn để lấy vị trí hiện tại.",
+  "turn_on_location_service": "Bật dịch vụ vị trí cho điện thoại của bạn",
+  "turn_on_location_service_des": "Để tiếp tục, bật dịch vụ vị trí cho điện thoại của bạn trong Cài Đặt"
 }

package/src/utils/Setting/Location.js

@@ -0,0 +1,30 @@
+import { Platform } from 'react-native';
+import RNAndroidLocationEnabler from 'react-native-android-location-enabler';
+import AlertAsync from 'react-native-alert-async';
+import t from '../../hooks/Common/useTranslations';
+
+export const openPromptEnableLocation = async () => {
+  if (Platform.OS === 'android') {
+    try {
+      await RNAndroidLocationEnabler.promptForEnableLocationIfNeeded({
+        interval: 10000,
+        fastInterval: 5000,
+      });
+      return true;
+    } catch (err) {
+      return false;
+    }
+  } else {
+    await AlertAsync(
+      t('turn_on_location_service'),
+      t('turn_on_location_service_des'),
+      [
+        {
+          text: t('ok'),
+          onPress: () => {},
+        },
+      ]
+    );
+    return false;
+  }
+};

package/src/utils/__test__/Utils.test.js

@@ -0,0 +1,12 @@
+import { validateEmail, formatMoney } from '../Utils';
+
+describe('Test utils', () => {
+  test('test validateEmail', () => {
+    const result = validateEmail('eoh.2020@gmail.com');
+    expect(result).toEqual(true);
+  });
+  test('test formatMoney', () => {
+    const result = formatMoney(10000);
+    expect(result).toEqual('10.000 đ');
+  });
+});

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

@@ -1,60 +0,0 @@
-import React from 'react';
-import { TouchableOpacity } from 'react-native';
-import { act, create } from 'react-test-renderer';
-import Text from '../../../commons/Text';
-import { watchMultiConfigs } from '../../../iot/Monitor';
-import NumberUpDownActionTemplate from '../NumberUpDownActionTemplate';
-
-jest.mock('../../../iot/Monitor');
-
-jest.mock('../../../iot/states', () => ({
-  useConfigGlobalState: () => [{ 5: null }, null],
-}));
-
-describe('Test NumberUpDownActionTemplate', () => {
-  const action_data = {
-    color: '#00979D',
-    command_prefer_over_bluetooth: true,
-    command_prefer_over_googlehome: false,
-    command_prefer_over_internet: false,
-    googlehome_actions: [],
-    icon: 'caret-up',
-    id: 20,
-    key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
-  };
-
-  let actionGroup;
-  let wrapper;
-
-  beforeEach(() => {
-    watchMultiConfigs.mockClear();
-    actionGroup = {
-      configuration: {
-        config: 5,
-        action_data,
-        min_value: 16,
-        max_value: 30,
-        text_format: '{number} *C',
-      },
-    };
-  });
-
-  test('render template', async () => {
-    const mockDoAction = jest.fn();
-    await act(async () => {
-      wrapper = await create(
-        <NumberUpDownActionTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{ is_managed_by_backend: true }}
-        />
-      );
-    });
-    const instance = wrapper.root;
-    const text = instance.findByType(Text);
-    expect(text.props.children).toEqual('28 *C');
-
-    const touchs = instance.findAllByType(TouchableOpacity);
-    expect(touchs).toHaveLength(2);
-  });
-});