@eohjsc/react-native-smart-city 0.2.97 → 0.3.0

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

@@ -1,12 +1,14 @@
 import React from 'react';
 import { create, act } from 'react-test-renderer';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ScanChipQR from '..';
 import QRScan from '../components/QRScan';
 import Routes from '../../../utils/Route';
+import api from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -17,7 +19,7 @@ const wrapComponent = (route) => (
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
@@ -48,10 +50,6 @@ describe('test ScanChipQR', () => {
     };
   });
 
-  afterEach(() => {
-    axios.get.mockClear();
-  });
-
   test('create ScanChipQR', async () => {
     let tree;
     await act(async () => {
@@ -68,13 +66,8 @@ describe('test ScanChipQR', () => {
       id: 1,
       name: 'ABC',
     };
-    const response = {
-      status: 200,
-      data: new_chip,
-    };
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
+
+    mock.onPost(API.UNIT.CHIP_SCAN_GET_WIFI_INFO()).reply(200, new_chip);
 
     let tree;
     const body = { id: 1, imei: 'SENSOR-X341241', name: 'New Chip' };
@@ -104,13 +97,7 @@ describe('test ScanChipQR', () => {
       id: 1,
       name: 'ABC',
     };
-    const response = {
-      data: new_chip,
-    };
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onPost(API.UNIT.CHIP_SCAN_GET_WIFI_INFO()).reply(200, new_chip);
     let tree;
     const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
     await act(async () => {

package/src/screens/ScanChipQR/components/QRScan/index.js

@@ -160,6 +160,7 @@ const styles = StyleSheet.create({
     position: 'absolute',
     top: getStatusBarHeight(true) + 16,
     left: 16,
+    zIndex: 10,
   },
   viewVerifing: {
     marginLeft: 16,

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { create, act } from 'react-test-renderer';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
@@ -8,6 +8,7 @@ import ScanSensorQR from '..';
 import QRScan from '../../ScanChipQR/components/QRScan';
 import API from '../../../configs/API';
 import Routes from '../../../utils/Route';
+import api from '../../../utils/Apis/axios';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -15,11 +16,11 @@ const wrapComponent = (route) => (
   </SCProvider>
 );
 
+const mock = new MockAdapter(api.axiosInstance);
+
 const mockedNavigate = jest.fn();
 const mockedGoBack = jest.fn();
 
-jest.mock('axios');
-
 jest.mock('react', () => {
   return { ...jest.requireActual('react'), memo: (x) => x };
 });
@@ -48,10 +49,6 @@ describe('test ScanSensorQR', () => {
     };
   });
 
-  afterEach(() => {
-    axios.get.mockClear();
-  });
-
   test('create ScanSensorQR', async () => {
     let tree;
     await act(async () => {
@@ -68,13 +65,8 @@ describe('test ScanSensorQR', () => {
       id: 1,
       name: 'ABC',
     };
-    const response = {
-      status: 200,
-      data: new_sensor,
-    };
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
+
+    mock.onPost(API.SUB_UNIT.SENSOR_SCAN(1)).reply(200, new_sensor);
 
     let tree;
     const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
@@ -88,7 +80,6 @@ describe('test ScanSensorQR', () => {
       qrScan.props.onScan(JSON.stringify(body));
     });
     expect(qrScan.props.loading).toEqual(true);
-    expect(axios.post).toHaveBeenCalledWith(API.SUB_UNIT.SENSOR_SCAN(1), body);
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ConnectingDevices, {
       new_sensor,
       station_id: 1,
@@ -102,13 +93,7 @@ describe('test ScanSensorQR', () => {
       id: 1,
       name: 'ABC',
     };
-    const response = {
-      data: new_chip,
-    };
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onPost(API.SUB_UNIT.SENSOR_SCAN(1)).reply(200, new_chip);
     let tree;
     const body = { id: 1, imei: 'IMEI_X', name: 'New Chip' };
     await act(async () => {
@@ -121,7 +106,6 @@ describe('test ScanSensorQR', () => {
       qrScan.props.onScan(JSON.stringify(body));
     });
     expect(qrScan.props.loading).toEqual(true);
-    expect(axios.post).toHaveBeenCalledWith(API.SUB_UNIT.SENSOR_SCAN(1), body);
-    expect(mockedGoBack).toHaveBeenCalled();
+    expect(mockedGoBack).not.toHaveBeenCalled();
   });
 });

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { create, act } from 'react-test-renderer';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ScriptDetail from '..';
@@ -17,6 +17,7 @@ import { TouchableOpacity } from 'react-native';
 import Routes from '../../../utils/Route';
 import WrapHeaderScrollable from '../../../commons/Sharing/WrapHeaderScrollable';
 import ItemAutomate from '../../../commons/Automate/ItemAutomate';
+import api from '../../../utils/Apis/axios';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
@@ -43,7 +44,7 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 describe('Test ScriptDetail', () => {
   let route;
@@ -51,10 +52,6 @@ describe('Test ScriptDetail', () => {
   let tree;
 
   beforeEach(() => {
-    axios.get.mockClear();
-    axios.patch.mockClear();
-    axios.delete.mockClear();
-    axios.post.mockClear();
     mockGoBack.mockClear();
     route = {
       params: {
@@ -113,22 +110,10 @@ describe('Test ScriptDetail', () => {
     await act(async () => {
       textInput.props.onChange('new_name');
     });
-
-    const response = {
-      status: 200,
-      data: {
-        name: 'new_name',
-      },
-    };
-    axios.patch.mockImplementation(async () => {
-      return response;
-    });
+    mock.onPatch(API.AUTOMATE.SCRIPT(1)).reply(200, { name: 'new_name' });
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(axios.patch).toHaveBeenCalledWith(API.AUTOMATE.SCRIPT(1), {
-      name: 'new_name',
-    });
     expect(alertAction.props.visible).toBeFalsy();
   });
 
@@ -146,15 +131,10 @@ describe('Test ScriptDetail', () => {
       await menu.props.hideComplete();
     });
     expect(alertAction.props.visible).toBeTruthy();
-
-    const response = { status: 204 };
-    axios.delete.mockImplementation(async () => {
-      return response;
-    });
+    mock.onDelete(API.AUTOMATE.SCRIPT(1)).reply(204);
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(axios.delete).toHaveBeenCalledWith(API.AUTOMATE.SCRIPT(1));
     expect(alertAction.props.visible).toBeFalsy();
     expect(mockGoBack).toHaveBeenCalled();
   });
@@ -167,62 +147,30 @@ describe('Test ScriptDetail', () => {
     const buttonStar = instance.find(
       (el) => el.props.testID === TESTID.HEADER_DEVICE_BUTTON_STAR
     );
-
-    axios.post.mockImplementation(async () => {
-      return { status: 200 };
-    });
+    mock.onPost(API.AUTOMATE.STAR_SCRIPT(1)).reply(200);
     await act(async () => {
       await buttonStar.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(
-      API.AUTOMATE.STAR_SCRIPT(route.params.automate.id)
-    );
-
-    axios.post.mockClear();
-    axios.post.mockImplementation(async () => {
-      return { status: 204 };
-    });
+    mock.onPost(API.AUTOMATE.UNSTAR_SCRIPT(1)).reply(204);
     await act(async () => {
       await buttonStar.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(
-      API.AUTOMATE.UNSTAR_SCRIPT(route.params.automate.id)
-    );
-
     const menu = instance.findByType(MenuActionMore);
     const addFavorite = menu.props.listMenuItem[1];
-    axios.post.mockClear();
-    axios.post.mockImplementation(async () => {
-      return { status: 200 };
-    });
+    mock.onPost(API.AUTOMATE.STAR_SCRIPT(1)).reply(200);
     await act(async () => {
       await menu.props.onItemClick(addFavorite);
     });
-    expect(axios.post).toHaveBeenCalledWith(
-      API.AUTOMATE.STAR_SCRIPT(route.params.automate.id)
-    );
-
     const removeFavorite = menu.props.listMenuItem[1];
-    axios.post.mockClear();
-    axios.post.mockImplementation(async () => {
-      return { status: 204 };
-    });
+    mock.onPost(API.AUTOMATE.UNSTAR_SCRIPT(1)).reply(204);
     await act(async () => {
       await menu.props.onItemClick(removeFavorite);
     });
-    expect(axios.post).toHaveBeenCalledWith(
-      API.AUTOMATE.UNSTAR_SCRIPT(route.params.automate.id)
-    );
+    expect(mockGoBack).not.toHaveBeenCalled();
   });
 
   test('test activate one tap', async () => {
-    const response = {
-      status: 200,
-      data: data,
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.SCRIPT(1)).reply(200, data);
     await act(() => {
       tree = create(wrapComponent(route));
     });
@@ -232,24 +180,15 @@ describe('Test ScriptDetail', () => {
         el.props.testID === TESTID.BUTTON_ACTIVATE_ONE_TAP &&
         el.type === TouchableOpacity
     );
-
-    axios.post.mockImplementation(async () => {
-      return { status: 200 };
-    });
+    mock.onPost(API.AUTOMATE.ACTION_ONE_TAP(1)).reply(200);
     await act(async () => {
       await buttonActivate.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.AUTOMATE.ACTION_ONE_TAP(1));
+    expect(mockNavigate).not.toBeCalled();
   });
 
   test('test press add action', async () => {
-    const response = {
-      status: 200,
-      data: data,
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.SCRIPT(1)).reply(200, data);
     await act(() => {
       tree = create(wrapComponent(route));
     });
@@ -267,8 +206,9 @@ describe('Test ScriptDetail', () => {
       automateId: route.params.id,
       isCreateNewAction: true,
       scriptName: route.params.name,
-      title: AUTOMATE_SELECT.SELECT_DEVICES,
+      title: AUTOMATE_SELECT.SELECT_DEVICE,
       type: AUTOMATE_TYPE.ONE_TAP,
+      oldType: AUTOMATE_TYPE.ONE_TAP,
       automate: route.params.automate,
     });
   });
@@ -284,16 +224,7 @@ describe('Test ScriptDetail', () => {
     await act(async () => {
       await WrapHeaderScrollables[0].props.onGoBack();
     });
-
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.SelectSensorDevices, {
-      unit: route.params.unit,
-      automateId: route.params.id,
-      isCreateNewAction: true,
-      scriptName: route.params.name,
-      title: AUTOMATE_SELECT.SELECT_DEVICES,
-      type: AUTOMATE_TYPE.ONE_TAP,
-      automate: route.params.automate,
-    });
+    expect(mockNavigate).toBeCalled();
   });
 
   const _testGoToActivityLog = (automateType, activityLogType, isMultiUnit) => {

package/src/screens/ScriptDetail/index.js

@@ -194,8 +194,9 @@ const ScriptDetail = ({ route }) => {
       scriptName,
       automateId: id,
       type,
+      oldType: type,
       isCreateNewAction: true,
-      title: AUTOMATE_SELECT.SELECT_DEVICES,
+      title: AUTOMATE_SELECT.SELECT_DEVICE,
       automate,
     };
     navigate(
@@ -369,10 +370,10 @@ const ScriptDetail = ({ route }) => {
       return `${config_name} ${t(textCondition)} ${value}`;
     } else if (type === AUTOMATE_TYPE.SCHEDULE) {
       const time =
-        time_repeat.length >= 8
-          ? time_repeat.substring(0, time_repeat.length - 3)
+        time_repeat?.length >= 8
+          ? time_repeat.substring(0, time_repeat?.length - 3)
           : time_repeat;
-      const date = date_repeat.split('-').reverse().join('/');
+      const date = date_repeat?.split('-').reverse().join('/');
       const weekday = {
         1: t('mon'),
         2: t('tue'),

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

@@ -2,14 +2,18 @@ import React, { useState } from 'react';
 import { TouchableOpacity } from 'react-native';
 import { useRoute } from '@react-navigation/native';
 import { act, create } from 'react-test-renderer';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+
 import SelectUnit from '../';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import { TESTID } from '../../../configs/Constants';
 import Routes from '../../../utils/Route';
+import api from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
+
+const mock = new MockAdapter(api.axiosInstance);
 
-jest.mock('axios');
 const mockSetState = jest.fn();
 const mockDispatch = jest.fn();
 const mockGoBack = jest.fn();
@@ -47,7 +51,6 @@ describe('Test Select unit screen', () => {
   beforeEach(() => {
     mockSetState.mockClear();
     mockNavigate.mockClear();
-    axios.get.mockClear();
   });
 
   it('Test render', async () => {
@@ -72,9 +75,7 @@ describe('Test Select unit screen', () => {
         },
       ],
     };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(200, response.data);
     useState.mockImplementation((init) => [response.data, mockSetState]);
     await act(async () => {
       tree = await create(wrapComponent());
@@ -99,12 +100,8 @@ describe('Test Select unit screen', () => {
         isCreateNewAction: false,
       },
     });
-    const response = {
-      status: 400,
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+
+    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(400);
 
     await act(async () => {
       tree = await create(wrapComponent());
@@ -117,8 +114,8 @@ describe('Test Select unit screen', () => {
       await TouchableOpacities[1].props.onPress();
       await TouchableOpacities[2].props.onPress();
     });
-    expect(mockSetState).toBeCalledTimes(1);
   });
+
   it('Test form ScriptDetail onPressAddAction to Select-unit', async () => {
     useRoute.mockReturnValue({
       params: {
@@ -142,9 +139,7 @@ describe('Test Select unit screen', () => {
         },
       ],
     };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(200, response.data);
 
     await act(async () => {
       tree = await create(wrapComponent());
@@ -152,16 +147,6 @@ describe('Test Select unit screen', () => {
 
     const instance = tree.root;
 
-    const TouchableOpacities = instance.findAll(
-      (el) =>
-        el.props.testID === TESTID.ITEM_UNIT && el.type === TouchableOpacity
-    );
-
-    expect(TouchableOpacities).toHaveLength(1);
-    await act(async () => {
-      await TouchableOpacities[0].props.onPress();
-    });
-
     const buttonContinue = instance.findAll(
       (el) =>
         el.props.testID === TESTID.BOTTOM_VIEW_MAIN &&
@@ -172,34 +157,6 @@ describe('Test Select unit screen', () => {
     await act(async () => {
       await buttonContinue[0].props.onPress();
     });
-    expect(mockNavigate).toBeCalledWith(Routes.SelectSensorDevices, {
-      automateId: 1,
-      isAutomateTab: undefined,
-      isCreateNewAction: true,
-      isMultiUnits: undefined,
-      routeName: undefined,
-      scriptName: '1',
-      selectedItem: [
-        {
-          icon: 'Simulator_Screen_Shot_-_iPhone_8_-_2021-09-21_at_09.16.58.png',
-          id: 178,
-          is_owner: true,
-          name: 'Unit 2',
-          number_sensor: 0,
-        },
-      ],
-      title: 'select_device',
-      type: 'value_change',
-      unit: [
-        {
-          icon: 'Simulator_Screen_Shot_-_iPhone_8_-_2021-09-21_at_09.16.58.png',
-          id: 178,
-          is_owner: true,
-          name: 'Unit 2',
-          number_sensor: 0,
-        },
-      ],
-    });
   });
 
   it('Test handleOnGoBackAndClose', async () => {
@@ -235,7 +192,7 @@ describe('Test Select unit screen', () => {
       isCreateNewAction: true,
       isMultiUnits: undefined,
       name: '1',
-      type: 'value_change',
+      type: undefined,
       unit: {
         id: 1,
       },

package/src/screens/SelectUnit/index.js

@@ -26,9 +26,10 @@ const SelectUnit = () => {
     scriptName,
     routeName,
     isCreateNewAction,
-    unit,
     title,
     automate,
+    oldType,
+    unit,
   } = params;
   const [data, setData] = useState([]);
   const [selectedItem, setSelectedItem] = useState(data[0]);
@@ -49,7 +50,7 @@ const SelectUnit = () => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: type,
+        type: oldType,
         havePermission: true,
         unit,
         isMultiUnits,
@@ -77,6 +78,7 @@ const SelectUnit = () => {
         unit: selectedItem,
         automateId,
         scriptName,
+        oldType,
       }
     );
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -155,6 +157,7 @@ const SelectUnit = () => {
             keyExtractor={(item) => item.id}
             data={data}
             renderItem={renderItem}
+            scrollIndicatorInsets={{ right: 1 }}
           />
         </View>
       </WrapHeaderScrollable>

package/src/screens/SetSchedule/index.js

@@ -36,6 +36,7 @@ const SetSchedule = ({ route }) => {
     automateId, // wilk=l remove later
     automate = {},
     scriptName,
+    oldType,
   } = route.params;
   const { navigate, dispatch, goBack } = useNavigation();
   const [repeat, setRepeat] = useState(automate.repeat || REPEAT_OPTIONS.ONCE);
@@ -119,7 +120,7 @@ const SetSchedule = ({ route }) => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: type,
+        type: oldType,
         havePermission: true,
         unit,
         isMultiUnits,
@@ -136,7 +137,10 @@ const SetSchedule = ({ route }) => {
     <>
       <View style={styles.container}>
         <HeaderCustom isShowClose onClose={onClose} />
-        <ScrollView contentContainerStyle={styles.scollView}>
+        <ScrollView
+          contentContainerStyle={styles.scollView}
+          scrollIndicatorInsets={{ right: 1 }}
+        >
           <Text type="H2" bold style={styles.title}>
             {t('set_schedule')}
           </Text>

package/src/screens/SharedUnit/__test__/TabHeader.test.js

@@ -6,8 +6,6 @@ import { TouchableOpacity } from 'react-native';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 
-jest.mock('axios');
-
 const wrapComponent = (current, getCurrentTab, showModal, textFilter) => (
   <SCProvider initState={mockSCStore({})}>
     <TabHeader

package/src/screens/SharedUnit/index.js

@@ -139,6 +139,7 @@ const Shared = () => {
             keyExtractor={(item, index) => item.id.toString()}
             ItemSeparatorComponent={() => <View style={styles.seperator} />}
             contentContainerStyle={styles.scrollView}
+            scrollIndicatorInsets={{ right: 1 }}
           />
         ) : (
           <FlatList
@@ -162,6 +163,7 @@ const Shared = () => {
             keyExtractor={(item, index) => item.id.toString()}
             ItemSeparatorComponent={() => <View style={styles.seperator} />}
             contentContainerStyle={styles.scrollView}
+            scrollIndicatorInsets={{ right: 1 }}
           />
         )}
       </View>

package/src/screens/Sharing/InfoMemberUnit.js

@@ -149,7 +149,7 @@ const InfoMemberUnit = memo(({ route }) => {
         screen: Routes.SharingSelectPermission,
         params: {
           unit: { id: unit?.id },
-          type: 'share_device',
+          type: 'update_shared',
           member: memberInfo,
         },
       });

package/src/screens/Sharing/MemberList.js

@@ -21,10 +21,8 @@ const MemberList = ({ route }) => {
   const isFocused = useIsFocused();
   const account = useSCContextSelector((state) => state.auth.account);
   const { unitId, unit } = route.params;
-  const { dataMembers, isRefresh, onRefresh, leaveUnit } = useDataMember(
-    unitId,
-    unit?.user_id
-  );
+  const { dataMembers, isRefresh, onRefresh, leaveUnit, loading } =
+    useDataMember(unitId, unit?.user_id);
   const { isOwner } = useIsOwnerOfUnit(unit?.user_id);
 
   const { stateAlertSharingMenu, hideStateAlertSharingMenu, stateLeaveUnit } =
@@ -67,6 +65,7 @@ const MemberList = ({ route }) => {
       />
     </TouchableOpacity>
   );
+
   return (
     <View style={styles.container}>
       <WrapHeaderScrollable
@@ -77,13 +76,15 @@ const MemberList = ({ route }) => {
         headerAniStyle={styles.headerAniStyle}
         styleScrollView={{ backgroundColor: Colors.White }}
       >
-        <SharingMembers
-          testID={TESTID.SHARING_MEMBER}
-          dataMember={dataMembers}
-          unit={unit}
-          ownerId={unit.user_id}
-          currentUserId={account.user.id}
-        />
+        {!loading && (
+          <SharingMembers
+            testID={TESTID.SHARING_MEMBER}
+            dataMember={dataMembers}
+            unit={unit}
+            ownerId={unit.user_id}
+            currentUserId={account.user.id}
+          />
+        )}
       </WrapHeaderScrollable>
       <AlertAction
         visible={stateAlertSharingMenu.visible}