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

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import renderer, { 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,8 @@ import ListSmartAccount from '../SmartAccount';
 import { SmartAccountItem } from '../SmartAccountItem';
 import { AlertAction, MenuActionMore } from '../../../commons';
 import Routes from '../../../utils/Route';
+import api from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
 
 const wrapComponent = (route, navigation) => (
   <SCProvider initState={mockSCStore({})}>
@@ -15,6 +17,8 @@ const wrapComponent = (route, navigation) => (
   </SCProvider>
 );
 
+const mock = new MockAdapter(api.axiosInstance);
+
 const mockNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
   return {
@@ -33,7 +37,6 @@ jest.mock('react', () => {
   };
 });
 
-jest.mock('axios');
 describe('Test SmartAccount', () => {
   let tree;
   let route = {
@@ -42,7 +45,7 @@ describe('Test SmartAccount', () => {
     },
   };
   test('test render SmartAccount', async () => {
-    const reponse = {
+    const response = {
       status: 200,
       data: [
         {
@@ -65,7 +68,9 @@ describe('Test SmartAccount', () => {
         },
       ],
     };
-    axios.get.mockImplementationOnce(() => reponse);
+    mock
+      .onGet(API.SMART_ACCOUNT.LIST_SMART_ACCOUNT())
+      .reply(response.status, response.data);
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
@@ -74,13 +79,16 @@ describe('Test SmartAccount', () => {
     const smartAccountItem = instance.findAllByType(SmartAccountItem);
     expect(smartAccountItem.length).toEqual(3);
     act(() => {
-      smartAccountItem[0].props.gotoSmartAccountDetail(reponse.data[0]);
-      smartAccountItem[0].props.onShowMenuMore(reponse.data[0]);
+      smartAccountItem[0].props.gotoSmartAccountDetail(response.data[0]);
+      smartAccountItem[0].props.onShowMenuMore(response.data[0]);
     });
+    const alertAction = instance.findAllByType(AlertAction);
+    mock.onDelete(API.SMART_ACCOUNT.REMOVE_SMART_ACCOUNT(1)).reply(200);
+    await alertAction[0].props.leftButtonClick();
     expect(mockNavigate).toBeCalledWith(Routes.ListDeviceSmartAccount, {
-      username: reponse.data[0].username,
-      brand: reponse.data[0].brand,
-      smart_account_id: reponse.data[0].id,
+      username: response.data[0].username,
+      brand: response.data[0].brand,
+      smart_account_id: response.data[0].id,
       unit_id: route.params.unitId,
     });
   });

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

@@ -37,7 +37,6 @@ jest.mock('react', () => {
   };
 });
 
-jest.mock('axios');
 describe('Test SmartAccountItem', () => {
   let tree;
   test('test render SmartAccountItem', async () => {

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

@@ -0,0 +1,36 @@
+import React from 'react';
+import { SafeAreaView } from 'react-native';
+import { act, create } from 'react-test-renderer';
+import MyAllUnit from '../index';
+import { SCProvider } from '../../../../../context';
+import { mockSCStore } from '../../../../../context/mockStore';
+
+const wrapComponent = (route) => (
+  <SCProvider initState={mockSCStore({})}>
+    <MyAllUnit route={route} />
+  </SCProvider>
+);
+describe('Test MyAllUnit', () => {
+  let tree;
+  test('render MyAllUnit', async () => {
+    const route = {
+      params: {
+        myUnits: [
+          {
+            background: '',
+            name: '',
+            stations: [
+              { id: 1, name: 'station', sensors: [{ id: 1, name: 'sensor' }] },
+            ],
+          },
+        ],
+      },
+    };
+    act(() => {
+      tree = create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const safeAreaView = instance.findAllByType(SafeAreaView);
+    expect(safeAreaView).toHaveLength(1);
+  });
+});

package/src/screens/Unit/components/MyAllUnit/__test__/index.test.js

@@ -0,0 +1,54 @@
+import React from 'react';
+import { act, create } from 'react-test-renderer';
+import MyAllUnit from '../index';
+import Header from '../../Header';
+import { SCProvider } from '../../../../../context';
+import { mockSCStore } from '../../../../../context/mockStore';
+
+const wrapComponent = (props) => (
+  <SCProvider initState={mockSCStore({})}>
+    <MyAllUnit {...props} />
+  </SCProvider>
+);
+
+test('test MyAllUnit', () => {
+  let tree, props;
+  let mockGoBack = jest.fn();
+
+  props = {
+    route: {
+      params: {
+        myUnits: [
+          {
+            background: '',
+            name: 'name',
+            stations: [
+              {
+                name: 'station',
+                sensors: [
+                  {
+                    name: 'sensor',
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    },
+    navigation: {
+      goBack: mockGoBack,
+    },
+  };
+
+  act(() => {
+    tree = create(wrapComponent(props));
+  });
+
+  const instance = tree.root;
+  const header = instance.findByType(Header);
+  act(() => {
+    header.props.goBack();
+  });
+  expect(mockGoBack).toBeCalled();
+});

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

@@ -39,6 +39,7 @@ const SharedUnit = ({
   }, [renewItem, index, unit, item]);
   const addPinSharedUnit = useCallback(async () => {
     const { success } = await axiosPost(API.UNIT.PIN_UNIT(unit.id));
+
     if (success) {
       item.is_pin = true;
       renewItem(index);

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

@@ -2,15 +2,16 @@ import React from 'react';
 import { create, act } from 'react-test-renderer';
 import moment from 'moment';
 import { useNavigation } from '@react-navigation/native';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 import SharedUnit from '../SharedUnit';
 import { TESTID } from '../../../../configs/Constants';
 import { API } from '../../../../configs';
 import Routes from '../../../../utils/Route';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
+import api from '../../../../utils/Apis/axios';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockRenewItem = jest.fn();
 const wrapComponent = (item, navigation) => (
@@ -37,10 +38,6 @@ jest.mock('@react-navigation/native', () => {
 describe('Test SharedUnit', () => {
   let tree;
 
-  beforeEach(() => {
-    axios.post.mockClear();
-  });
-
   let unit = {
     background: '',
     icon: '',
@@ -60,14 +57,8 @@ describe('Test SharedUnit', () => {
 
   test('test create SharedUnit unit is not pin, not star', async () => {
     const navigation = useNavigation();
-    const response = {
-      status: 200,
-      success: true,
-    };
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onPost(API.UNIT.PIN_UNIT(3)).reply(200);
+    mock.onPost(API.UNIT.STAR_UNIT(3)).reply(200);
     await act(async () => {
       tree = await create(wrapComponent(item, navigation));
     });
@@ -85,41 +76,50 @@ describe('Test SharedUnit', () => {
         unitData: unit,
       },
     });
-
     const iconRemovePinSharedUnit = instance.findAll(
       (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT
     );
-    expect(iconRemovePinSharedUnit).toHaveLength(0);
-
     const iconAddPinSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_ADD_PIN_SHARED_UNIT
     );
     act(() => {
       iconAddPinSharedUnit.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.PIN_UNIT(3));
-
     const iconAddStarSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_ADD_STAR_SHARED_UNIT
     );
     act(() => {
       iconAddStarSharedUnit.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.STAR_UNIT(3));
+    expect(iconRemovePinSharedUnit).toHaveLength(0);
   });
 
   test('test create SharedUnit unit is pin, is star', async () => {
     const navigation = useNavigation();
     item.is_pin = true;
     item.is_star = true;
-    const response = {
-      status: 200,
-      success: true,
-    };
-    axios.post.mockImplementation(async () => {
-      return response;
+    await act(async () => {
+      tree = await create(wrapComponent(item, navigation));
     });
+    const instance = tree.root;
+    const iconRemovePinSharedUnit = instance.find(
+      (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT
+    );
+    mock.onPost(API.UNIT.UNPIN_UNIT(3)).reply(200);
+    await iconRemovePinSharedUnit.props.onPress();
 
+    const iconRemoveStarSharedUnit = instance.find(
+      (el) => el.props.testID === TESTID.ICON_REMOVE_STAR_SHARED_UNIT
+    );
+    mock.onPost(API.UNIT.UNSTAR_UNIT(3)).reply(200);
+    await iconRemoveStarSharedUnit.props.onPress();
+    expect(mockRenewItem).toBeCalled();
+  });
+
+  test('test create SharedUnit unit is pin, is star with call api failure', async () => {
+    const navigation = useNavigation();
+    item.is_pin = true;
+    item.is_star = true;
     await act(async () => {
       tree = await create(wrapComponent(item, navigation));
     });
@@ -127,17 +127,14 @@ describe('Test SharedUnit', () => {
     const iconRemovePinSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT
     );
-    act(() => {
-      iconRemovePinSharedUnit.props.onPress();
-    });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.UNPIN_UNIT(3));
+    mock.onPost(API.UNIT.UNPIN_UNIT(3)).reply(400);
+    await iconRemovePinSharedUnit.props.onPress();
 
     const iconRemoveStarSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_REMOVE_STAR_SHARED_UNIT
     );
-    act(() => {
-      iconRemoveStarSharedUnit.props.onPress();
-    });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.UNSTAR_UNIT(3));
+    mock.onPost(API.UNIT.UNSTAR_UNIT(3)).reply(200);
+    await iconRemoveStarSharedUnit.props.onPress();
+    expect(mockRenewItem).toBeCalled();
   });
 });

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

@@ -1,8 +1,9 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
+import MockAdapter from 'axios-mock-adapter';
+
 import Routes from '../../../utils/Route';
 import UnitSummary from '..';
-import axios from 'axios';
 import { API } from '../../../configs';
 import { RefreshControl } from 'react-native';
 import { TESTID } from '../../../configs/Constants';
@@ -16,8 +17,9 @@ import UvIndex from '../components/UvIndex';
 import WaterQuality from '../components/WaterQuality';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import api from '../../../utils/Apis/axios';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockedNavigate = jest.fn();
 
@@ -43,6 +45,7 @@ describe('Test UnitSummary', () => {
     Date.now = jest.fn(() => new Date('2021-01-24T12:00:00.000Z'));
     route = {
       params: {
+        unitId: 1,
         unitData: {
           id: 1,
         },
@@ -57,6 +60,7 @@ describe('Test UnitSummary', () => {
   let tree;
 
   test('onRefresh', async () => {
+    mock.onGet(API.UNIT.UNIT_SUMMARY_DETAIL(1, 1)).reply(200);
     act(() => {
       tree = create(wrapComponent(route));
     });
@@ -65,53 +69,56 @@ describe('Test UnitSummary', () => {
     act(() => {
       refreshControl.props.onRefresh();
     });
-    expect(axios.get).toHaveBeenCalled();
-    expect(axios.get).toHaveBeenCalledWith(
-      API.UNIT.UNIT_SUMMARY_DETAIL(1, 1),
-      {}
-    );
+    expect(refreshControl).toBeDefined();
   });
 
   test('render fetchSummaryDetail failed', async () => {
-    const response = {
-      status: 400,
-      data: {
-        data: {},
-      },
-    };
-    axios.get.mockImplementation(() => Promise.resolve(response));
-
+    mock.onGet(API.UNIT.UNIT_SUMMARY_DETAIL(1, 1)).reply(200, {});
     act(() => {
       tree = create(wrapComponent(route));
     });
-    expect(axios.get).toHaveBeenCalled();
-    expect(axios.get).toHaveBeenCalledWith(
-      API.UNIT.UNIT_SUMMARY_DETAIL(1, 1),
-      {}
-    );
+    const instance = tree.root;
+    const refreshControl = instance.findByType(RefreshControl);
+    expect(refreshControl).toBeDefined();
   });
 
   test('render fetchSummaryDetail success', async () => {
     jest.useFakeTimers();
-    const response = {
-      status: 200,
-      data: {
-        data: {},
+    mock.onGet(API.UNIT.UNIT_SUMMARY_DETAIL(1, 1)).reply(200);
+    act(() => {
+      tree = create(wrapComponent(route));
+    });
+    act(() => {
+      jest.runOnlyPendingTimers();
+    });
+    const instance = tree.root;
+    const refreshControl = instance.findByType(RefreshControl);
+    expect(refreshControl).toBeDefined();
+  });
+
+  test('render fetchUnitDetail success', async () => {
+    route = {
+      params: {
+        unitId: 1,
+        unitData: null,
+        summaryData: {
+          id: 1,
+          name: '',
+          screen: Routes.AirQuality,
+        },
       },
     };
-    axios.get.mockImplementation(() => Promise.resolve(response));
-
+    jest.useFakeTimers();
+    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, {});
     act(() => {
       tree = create(wrapComponent(route));
     });
     act(() => {
       jest.runOnlyPendingTimers();
     });
-    expect(axios.get).toHaveBeenCalled();
-    expect(axios.get).toHaveBeenCalledWith(
-      API.UNIT.UNIT_SUMMARY_DETAIL(1, 1),
-      {}
-    );
+    const instance = tree.root;
+    const refreshControl = instance.findByType(RefreshControl);
+    expect(refreshControl).toBeDefined();
   });
 
   let list_value = [

package/src/screens/UnitSummary/components/PowerConsumeHistoryChart/__test__/index.test.js

@@ -1,11 +1,14 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
+import MockAdapter from 'axios-mock-adapter';
+import moment from 'moment';
+
 import ConfigHistoryChart from '../';
 import { SCProvider } from '../../../../../context';
 import { mockSCStore } from '../../../../../context/mockStore';
 import HistoryChart from '../../../../../commons/Device/HistoryChart';
-import axios from 'axios';
-import moment from 'moment';
+import api from '../../../../../utils/Apis/axios';
+import { API } from '../../../../../configs';
 
 jest.mock('react', () => {
   return {
@@ -14,7 +17,7 @@ jest.mock('react', () => {
   };
 });
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const wrapComponent = (configs = []) => (
   <SCProvider initState={mockSCStore({})}>
@@ -48,7 +51,7 @@ describe('Test HistoryChart', () => {
         },
       ],
     };
-    axios.get.mockImplementation(async () => response);
+    mock.onGet(API.CONFIG.DISPLAY_HISTORY).reply(200, response.data);
     const configs = [{ id: 1 }];
     await act(async () => {
       tree = await create(wrapComponent(configs));

package/src/screens/UnitSummary/components/PowerConsumption/__test__/PowerConsumption.test.js

@@ -1,14 +1,17 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
+import MockAdapter from 'axios-mock-adapter';
+
 import { TESTID } from '../../../../../configs/Constants';
-import { Colors } from '../../../../../configs';
+import { API, Colors } from '../../../../../configs';
 import ListQualityIndicator from '../../../../../commons/Device/WaterQualitySensor/ListQualityIndicator';
-import axios from 'axios';
 import PowerConsumption from '../index';
 import { SCProvider } from '../../../../../context';
 import { mockSCStore } from '../../../../../context/mockStore';
+import api from '../../../../../utils/Apis/axios';
+import { Today } from '../../../../../commons';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const wrapComponent = (summaryDetail) => (
   <SCProvider initState={mockSCStore({})}>
@@ -86,15 +89,13 @@ describe('Test PowerConsumption', () => {
       },
     };
 
-    const response = {
-      status: 200,
-    };
-    axios.get.mockImplementation(async (url) => response);
-
+    mock.onGet(API.VALUE_CONSUME.DISPLAY_HISTORY()).reply(200);
     await act(async () => {
       tree = await renderer.create(wrapComponent(summaryDetail));
     });
-    expect(axios.get).toHaveBeenCalled();
+    const instance = tree.root;
+    const Todays = instance.findByType(Today);
+    expect(Todays).toBeDefined();
   });
 
   test('render with unsuccess fetch', async () => {
@@ -113,16 +114,13 @@ describe('Test PowerConsumption', () => {
         volt: 209,
       },
     };
-
-    const response = {
-      data: {},
-    };
-    axios.get.mockImplementation(async (url) => response);
-
+    mock.onGet(API.VALUE_CONSUME.DISPLAY_HISTORY()).reply(200, {});
     await act(async () => {
       tree = await renderer.create(wrapComponent(summaryDetail));
     });
-    expect(axios.get).toHaveBeenCalled();
+    const instance = tree.root;
+    const Todays = instance.findByType(Today);
+    expect(Todays).toBeDefined();
   });
 
   test('render without value', async () => {

package/src/screens/WaterQualityGuide/index.js

@@ -270,7 +270,7 @@ const WaterQualityGuide = memo(({ route }) => {
 
   return (
     <SafeAreaView style={styles.container}>
-      <ScrollView style={styles.container}>
+      <ScrollView style={styles.container} scrollIndicatorInsets={{ right: 1 }}>
         <View style={styles.wrapScroll}>
           {titles.map((item, index) => {
             const { title, des } = item;

package/src/utils/Apis/axios.js

@@ -1,8 +1,15 @@
-import axios from 'axios';
-import { deleteData, getData, storeData } from '../Storage';
+import { create } from 'apisauce';
+import { getData, storeData } from '../Storage';
 import { ToastBottomHelper } from '../Utils';
 import NetInfo from '@react-native-community/netinfo';
 
+const api = create({
+  headers: {
+    'Content-Type': 'application/json',
+  },
+  timeout: 30000,
+});
+
 export const replaceParams = (apiURL, params) => {
   let _result = apiURL;
   if (typeof params === 'object') {
@@ -16,7 +23,10 @@ export const replaceParams = (apiURL, params) => {
 const parseErrorResponse = async (error) => {
   let message;
   let data = {};
-  if (
+  if (!error.response && error.data) {
+    data = error.data.error || error.data.message;
+    message = data instanceof Array ? data[0] : data;
+  } else if (
     error.response &&
     error.response.data &&
     error.response.data instanceof Object
@@ -28,8 +38,11 @@ const parseErrorResponse = async (error) => {
     if (message instanceof Array) {
       message = message[0];
     }
+    if (message.message) {
+      message = message.message;
+    }
   } else {
-    message = error.message;
+    message = error.problem;
   }
 
   if (typeof message === 'string') {
@@ -83,25 +96,34 @@ export async function fetchWithCache(url, config = {}, updateMethod) {
 }
 
 export async function axiosGet(URL, config = {}, cache = false) {
-  const cacheKey = `@CACHE_REQUEST_${URL}`;
   let response;
   try {
-    response = await axios.get(URL, config);
+    response = await api.get(URL, config.params, config);
   } catch (error) {
     if (cache) {
-      // only network error or server error
-      if (!error.response || error.response.status >= 500) {
+      if (error.message === 'Network Error') {
+        return (
+          (await axiosCache(URL, 500)) || (await parseErrorResponse(error))
+        );
+      }
+      if (!error?.response || error?.response?.status >= 500) {
         return (
-          (await axiosCache(URL, error.response.status)) ||
+          (await axiosCache(URL, error?.response?.status)) ||
           (await parseErrorResponse(error))
         );
-      } else {
-        await deleteData(cacheKey);
       }
     }
     return await parseErrorResponse(error);
   }
-  const { data } = response;
+  const { data, problem } = response;
+  if (problem === 'NETWORK_ERROR') {
+    if (cache) {
+      return (
+        (await axiosCache(URL, 500)) || (await parseErrorResponse(response))
+      );
+    }
+    return await parseErrorResponse(response);
+  }
   if (response.status === 200) {
     if (cache) {
       await storeData(`@CACHE_REQUEST_${URL}`, JSON.stringify(data));
@@ -121,7 +143,7 @@ export async function axiosGet(URL, config = {}, cache = false) {
 async function axiosCall(method, ...args) {
   let response;
   try {
-    response = await axios[method](...args);
+    response = await api[method](...args);
   } catch (error) {
     return await parseErrorResponse(error);
   }
@@ -186,3 +208,5 @@ export function createFormData(data, list_file_field) {
 
   return formData;
 }
+
+export default api;

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

@@ -985,5 +985,6 @@
   "you_need_to_enter_password": "You need to enter password to perform this action",
   "note": "Note",
   "back": "Back",
+  "invaild_data": "Invaild data",
   "This {name} was removed!" : "This {name} was removed!"
 }

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

@@ -985,5 +985,6 @@
   "maxmium_contacts": "Địa chỉ liên hệ tối đa",
   "note": "Lưu ý ",
   "back": "Quay lại",
+  "invaild_data": "Dữ liệu không hợp lệ",
   "This {name} was removed!" : "{Name} này đã bị xóa!"
 }

package/src/utils/Route/index.js

@@ -136,6 +136,7 @@ const Routes = {
   SmartAccount: 'SmartAccount',
   SmartHomeDashboard: 'SmartHomeDashboard',
   SetupGeneratePasscode: 'SetupGeneratePasscode',
+  SideMenuDetail: 'SideMenuDetail',
   SelectDeviceType: 'SelectDeviceType',
   SelectBrand: 'SelectBrand',
   GroupButtonByType: 'GroupButtonByType',