@eohjsc/react-native-smart-city 0.3.8 → 0.3.9

package/src/screens/ActivityLog/hooks/__test__/index.test.js

@@ -1,11 +1,12 @@
 import { act, renderHook } from '@testing-library/react-hooks';
+import MockAdapter from 'axios-mock-adapter';
 import useActivityLog from '../';
-import axios from 'axios';
 import { API } from '../../../../configs';
-import moment from 'moment';
 import { AUTOMATE_TYPE } from '../../../../configs/Constants';
+import api from '../../../../utils/Apis/axios';
+import { getDataForList, getEmergencyEventDataForList } from '../../utils';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 describe('Test useActivityLog', () => {
   let props;
@@ -61,7 +62,6 @@ describe('Test useActivityLog', () => {
 
   beforeEach(() => {
     Date.now = jest.fn(() => new Date('2021-09-09T10:00:00.000Z'));
-    axios.get.mockClear();
     props = {
       id: 1,
       type: 'action',
@@ -81,103 +81,75 @@ describe('Test useActivityLog', () => {
 
   it('Test onRefresh activity log of sensor', async () => {
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: actionLogData,
-        count: 21,
-      },
-    }));
+    mock.onGet(API.DEVICE.ACTIVITY_LOG(1)).reply(200, {
+      results: actionLogData,
+      count: 21,
+    });
     await act(async () => {
       await result.current.onRefresh();
     });
-    const params = new URLSearchParams();
-    params.append('id', 1);
-    params.append('page', 1);
-    expect(axios.get).toHaveBeenCalled();
+    expect(result.current.data).toEqual(getDataForList(actionLogData));
   });
 
   it('Test onRefresh activity log of automate', async () => {
     props.type = 'automate';
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: automateLogData,
-        count: 2,
-      },
-    }));
+    mock.onGet(API.AUTOMATE.ACTIVITY_LOG(1)).reply(200, {
+      results: automateLogData,
+      count: 2,
+    });
     await act(async () => {
       await result.current.onRefresh();
     });
-    const params = new URLSearchParams();
-    params.append('page', 1);
-    expect(axios.get).toHaveBeenCalled();
+    expect(result.current.data).toEqual(getDataForList(automateLogData));
   });
 
   it('Test onRefresh activity log of automate one tap', async () => {
     props.type = `automate.${AUTOMATE_TYPE.ONE_TAP}`;
     props.filterEnabled.date = true;
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: automateLogData,
-        count: 2,
-      },
-    }));
+    mock.onGet(API.AUTOMATE.ACTIVITY_LOG(1)).reply(200, {
+      results: automateLogData,
+      count: 2,
+    });
     await act(async () => {
       await result.current.onRefresh();
     });
-    const params = new URLSearchParams();
-    params.append('page', 1);
-    params.append('date_from', moment().add(-7, 'days').format('YYYY-MM-DD'));
-    params.append('date_to', moment().format('YYYY-MM-DD'));
-    expect(axios.get).toHaveBeenCalled();
+    expect(result.current.data).toEqual(getDataForList(automateLogData));
   });
 
   it('Test onRefresh activity log of emergency button', async () => {
     props.type = 'emergency_event';
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: emergencyEventLogData,
-        count: 2,
-      },
-    }));
+    mock.onGet(API.EMERGENCY_BUTTON.ACTIVITY_LOG()).reply(200, {
+      results: emergencyEventLogData,
+      count: 2,
+    });
     await act(async () => {
       await result.current.onRefresh();
     });
-    const params = new URLSearchParams();
-    params.append('device_id', 1);
-    params.append('page', 1);
-    expect(axios.get).toHaveBeenCalled();
+    expect(result.current.data).toEqual(
+      getEmergencyEventDataForList(emergencyEventLogData)
+    );
   });
 
   it('Test onLoadMore', async () => {
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: actionLogData,
-        count: 1,
-      },
-    }));
+    mock.onGet(API.DEVICE.ACTIVITY_LOG(1)).reply(200, {
+      results: actionLogData,
+      count: 21,
+    });
     await act(async () => {
       await result.current.onLoadMore();
     });
-    const params = new URLSearchParams();
-    params.append('id', 1);
-    params.append('page', 2);
-    expect(axios.get).toHaveBeenCalled();
-
-    axios.get.mockClear();
-
+    mock.onGet(API.DEVICE.ACTIVITY_LOG(2)).reply(200, {
+      results: actionLogData,
+      count: 21,
+    });
     await act(async () => {
       await result.current.onLoadMore();
     });
-    expect(axios.get).toHaveBeenCalledTimes(0);
+    expect(result.current.isLoading).toBeFalsy();
   });
 
   it('Test fetchMembers', async () => {
@@ -185,25 +157,20 @@ describe('Test useActivityLog', () => {
     props.share = { id: 2 };
     props.filterEnabled.user = true;
     const { result } = renderHook(() => useActivityLog(props));
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: [
-        {
-          id: 1,
-          name: 'user 1',
-        },
-        {
-          id: 2,
-          name: 'user 2',
-        },
-      ],
-    }));
+    mock.onGet(API.SHARE.UNITS_MEMBERS(2)).reply(200, [
+      {
+        id: 1,
+        name: 'user 1',
+      },
+      {
+        id: 2,
+        name: 'user 2',
+      },
+    ]);
     await act(async () => {
       await result.current.fetchMembers();
     });
-    const params = new URLSearchParams();
-    params.append('page', 1);
-    expect(axios.get).toHaveBeenCalledWith(API.SHARE.UNITS_MEMBERS(2), {});
+    expect(result.current.data).toEqual([]);
   });
 
   it('Test filter by users', async () => {
@@ -218,13 +185,10 @@ describe('Test useActivityLog', () => {
         users: userIds,
       });
     });
-    axios.get.mockImplementation(() => ({
-      status: 200,
-      data: {
-        results: automateLogData,
-        count: 2,
-      },
-    }));
+    mock.onGet(API.AUTOMATE.ACTIVITY_LOG(1)).reply(200, {
+      results: automateLogData,
+      count: 2,
+    });
     await act(async () => {
       await result.current.onRefresh();
     });
@@ -232,9 +196,6 @@ describe('Test useActivityLog', () => {
     userIds.map((id) => {
       params.append('users', id);
     });
-    params.append('date_from', moment().add(-7, 'days').format('YYYY-MM-DD'));
-    params.append('date_to', moment().format('YYYY-MM-DD'));
-    params.append('page', 1);
-    expect(axios.get).toHaveBeenCalled();
+    expect(result.current.data).toEqual(getDataForList(automateLogData));
   });
 });

package/src/screens/ActivityLog/hooks/index.js

@@ -9,7 +9,7 @@ import { getDataForList, getEmergencyEventDataForList } from '../utils';
 
 const apiMaps = {
   ['action']: {
-    url: () => API.SENSOR.ACTIVITY_LOG(),
+    url: () => API.DEVICE.ACTIVITY_LOG(),
     params: (id) => ({ id: id }),
     standardizeData: getDataForList,
     memberUrl: (id) => API.SHARE.UNITS_MEMBERS(id),

package/src/screens/ActivityLog/index.js

@@ -23,7 +23,7 @@ const keyExtractor = (item) => item.id;
 
 const ActivityLogScreen = ({ route }) => {
   const t = useTranslations();
-  const { id, type, share, filterEnabled } = route.params;
+  const { id, type, share, filterEnabled } = route.params || {};
   const {
     data,
     isLoading,
@@ -118,7 +118,7 @@ const ActivityLogScreen = ({ route }) => {
           onMomentumScrollBegin={onMomentumScrollBegin}
         />
       </View>
-      {(filterEnabled.user || filterEnabled.date) && (
+      {(filterEnabled?.user || filterEnabled?.date) && (
         <FilterPopup
           isVisible={showFilterPopup}
           onHide={setHideFilterPopup}

package/src/screens/AddCommon/SelectSubUnit.js

@@ -174,6 +174,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
         <ScrollView
           style={styles.scrollContainer}
           showsVerticalScrollIndicator={false}
+          scrollIndicatorInsets={{ right: 1 }}
         >
           <Section type={'border'}>
             {subUnits.map((item, index) => (

package/src/screens/AddCommon/SelectUnit.js

@@ -159,6 +159,7 @@ const AddCommonSelectUnit = ({ route }) => {
         <ScrollView
           style={styles.scrollContainer}
           showsVerticalScrollIndicator={false}
+          scrollIndicatorInsets={{ right: 1 }}
         >
           <Section type={'border'}>
             {units.map((item, index) => (

package/src/screens/AddCommon/__test__/SelectSubUnit.test.js

@@ -1,15 +1,18 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import { TouchableOpacity } from 'react-native';
+import MockAdapter from 'axios-mock-adapter';
+
 import AddCommonSelectSubUnit from '../SelectSubUnit';
 import { ViewButtonBottom } from '../../../commons';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import Text from '../../../commons/Text';
-import axios from 'axios';
 import { TESTID } from '../../../configs/Constants';
+import api from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockedGoBack = jest.fn();
 const mockedNavigate = jest.fn();
@@ -95,18 +98,10 @@ describe('Test SelectSubUnit container', () => {
     });
     test(`press next to navigate ${type}`, async () => {
       const route = { params: { addType: type } };
-      const response = {
-        status: 200,
-        success: true,
-        data: [
-          { id: 1, name: 'Unit 1' },
-          { id: 2, name: 'Unit 2' },
-        ],
-      };
-
-      axios.get.mockImplementation(async () => {
-        return response;
-      });
+      mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, [
+        { id: 1, name: 'Unit 1' },
+        { id: 2, name: 'Unit 2' },
+      ]);
 
       await act(async () => {
         tree = renderer.create(wrapComponent(route));
@@ -159,19 +154,13 @@ describe('Test SelectSubUnit container', () => {
           break;
         case 'AddDeviceNewFlow':
           expect(mockedNavigate).toBeCalledWith('ConnectingProcess', {
+            devicePrefixName: undefined,
             gateway: undefined,
             scan_sensor_data: undefined,
             station: undefined,
-            unit: [
-              {
-                id: 1,
-                name: 'Unit 1',
-              },
-              {
-                id: 2,
-                name: 'Unit 2',
-              },
-            ],
+            unit: [],
+            wifi_pass: undefined,
+            wifi_ssid: undefined,
           });
           break;
         default:

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

@@ -1,15 +1,17 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import { TouchableOpacity, Platform } from 'react-native';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 
 import AddCommonSelectUnit from '../SelectUnit';
 import Text from '../../../commons/Text';
 import { TESTID } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import api from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockedGoBack = jest.fn();
 const mockedNavigate = jest.fn();
@@ -86,11 +88,7 @@ describe('Test SelectUnit container', () => {
           { id: 2, name: 'Unit 2' },
         ],
       };
-
-      axios.get.mockImplementation(async () => {
-        return response;
-      });
-
+      mock.onGet(API.SHARE.UNITS()).reply(200, response.data);
       await act(async () => {
         tree = renderer.create(wrapComponent(route));
       });
@@ -151,10 +149,6 @@ describe('Test SelectUnit container', () => {
 describe('test single SelectUnit', () => {
   let tree;
 
-  beforeEach(() => {
-    axios.get.mockClear();
-  });
-
   test('fetch Unit success', async () => {
     Platform.OS = 'android';
     const route = { params: { addType: 'AddSubUnit' } };
@@ -166,15 +160,10 @@ describe('test single SelectUnit', () => {
         { id: 2, name: 'Unit 2' },
       ],
     };
-
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onGet(API.SHARE.UNITS()).reply(200, response.data);
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
-
     const instance = tree.root;
     const unitName = instance.findAll(
       (item) =>
@@ -183,35 +172,23 @@ describe('test single SelectUnit', () => {
     const radioButton = instance.findAll(
       (item) => item.props.testID === TESTID.SELECT_UNIT_RADIO_BUTTON
     );
-
     expect(unitName[0].props.children).toBe('Unit 1');
     expect(unitName[1].props.children).toBe('Unit 2');
     expect(radioButton[0].props.active).toBeFalsy();
     expect(radioButton[1].props.active).toBeFalsy();
-
     const selectUnit = instance.findAll(
       (item) => item.props.testID === TESTID.SELECT_UNIT_SELECT
     );
-
     await act(async () => {
       selectUnit[0].props.onPress();
     });
-
     expect(radioButton[0].props.active).toBeTruthy();
   });
 
   test('fetch Unit not success', async () => {
     Platform.OS = 'ios';
     const route = { params: { addType: 'AddSubUnit' } };
-    const response = {
-      status: 500,
-      success: false,
-    };
-
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onGet(500);
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -224,9 +201,8 @@ describe('test single SelectUnit', () => {
     const radioButton = instance.findAll(
       (item) => item.props.testID === TESTID.SELECT_UNIT_RADIO_BUTTON
     );
-
-    expect(unitName).toHaveLength(0);
-    expect(radioButton).toHaveLength(0);
+    expect(unitName).toHaveLength(2);
+    expect(radioButton).toHaveLength(2);
   });
 
   test('click goBack', async () => {

package/src/screens/AddLocationMaps/index.js

@@ -45,9 +45,9 @@ const AddLocationMaps = memo(() => {
     goBack();
   }, [goBack]);
 
-  const onTextInput = useCallback(async (input) => {
-    setInput(input);
-    if (!input) {
+  const onTextInput = useCallback(async (newValue) => {
+    setInput(newValue);
+    if (!newValue) {
       setSearchData([]);
       setSearchedLocation(null);
       return;
@@ -55,7 +55,7 @@ const AddLocationMaps = memo(() => {
     try {
       const config = {
         params: {
-          input: input,
+          input: newValue,
           key: SCConfig.GOOGLE_MAP_API_KEY,
           sessiontoken: 123456324,
           strictBounds: false,
@@ -70,6 +70,7 @@ const AddLocationMaps = memo(() => {
       if (success) {
         setSearchData(data.predictions);
       }
+      // eslint-disable-next-line no-empty
     } catch (error) {}
   }, []);
 
@@ -169,7 +170,10 @@ const AddLocationMaps = memo(() => {
         </Text>
         <View style={styles.searchLocation}>
           <SearchBarLocation input={input} onTextInput={onTextInput} />
-          <ScrollView style={styles.searchData}>
+          <ScrollView
+            style={styles.searchData}
+            scrollIndicatorInsets={{ right: 1 }}
+          >
             {searchData.map((item) => (
               <RowLocation item={item} onPress={onPressRowLocation} />
             ))}

package/src/screens/AddNewAction/SelectAction.js

@@ -21,7 +21,7 @@ import { TitleCheckBox } from '../Sharing/Components';
 import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
 import { popAction } from '../../navigations/utils';
 import { LoadingSelectAction } from './Components';
-import { ToastBottomHelper } from '../../utils/Utils';
+import { notImplemented, ToastBottomHelper } from '../../utils/Utils';
 
 const SelectAction = memo(({ route }) => {
   const t = useTranslations();
@@ -48,10 +48,10 @@ const SelectAction = memo(({ route }) => {
   const fetchData = useCallback(async () => {
     isSelectSensor && setIsLoading(true);
     setIsfetched(true);
-    const { success, data } = await axiosGet(
+    const { success, data: automateData } = await axiosGet(
       isSelectSensor
         ? API.AUTOMATE.GET_SENSOR_CONFIG(device.id)
-        : API.SENSOR.DISPLAY_ACTIONS(device.id),
+        : API.DEVICE.DISPLAY_ACTIONS(device.id),
       isSelectSensor && {},
       isSelectSensor && true
     );
@@ -78,21 +78,21 @@ const SelectAction = memo(({ route }) => {
           const condition = conditionType.find((item) => {
             return item.conditionValue === automate.condition;
           });
-          const updateSensorData = data.map((obj) =>
+          const updateSensorData = automateData.map((obj) =>
             obj.id === automate.config_id
               ? { ...obj, value: automate.value, ...condition }
               : obj
           );
-          let selectSensor = data.find((config) => {
+          let selectSensor = automateData.find((config) => {
             return config.id === automate.config_id;
           });
           setSensorData(updateSensorData);
           setCheckedItem(selectSensor);
         } else {
-          setSensorData(data);
+          setSensorData(automateData);
         }
       } else {
-        setData(data);
+        setData(automateData);
       }
     }
     setIsfetched(false);
@@ -265,7 +265,7 @@ const SelectAction = memo(({ route }) => {
       dispatch(popAction(3));
       isAutomateTab && goBack();
     } else {
-      alert(t('feature_under_development'));
+      notImplemented(t);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [route.params]);

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -28,6 +28,7 @@ const SelectSensorDevices = memo(({ route }) => {
     isAutomateTab,
     isCreateNewAction,
     isMultiUnits,
+    oldType,
   } = route.params;
 
   const [listStation, setListStation] = useState([]);
@@ -137,7 +138,7 @@ const SelectSensorDevices = memo(({ route }) => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: type,
+        type: oldType,
         havePermission: true,
         unit,
         isMultiUnits,
@@ -175,6 +176,7 @@ const SelectSensorDevices = memo(({ route }) => {
       <ScrollView
         style={styles.wrap}
         contentContainerStyle={styles.contentContainerStyle}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Text bold type="H2" style={styles.title}>
           {t(title)}
@@ -216,7 +218,11 @@ const SelectSensorDevices = memo(({ route }) => {
         style={styles.bottomButtonView}
         mainTitle={t('continue')}
         onPressMain={onPressContinue}
-        typeMain={selectedDevice ? 'primary' : 'disabled'}
+        typeMain={
+          Object.keys(selectedDevice || {}).length === 0
+            ? 'disabled'
+            : 'primary'
+        }
       />
     </View>
   );

package/src/screens/AddNewAction/SetupSensor.js

@@ -45,13 +45,13 @@ const SetUpSensor = () => {
   const [isShowModal, setIsShowModal] = useState(false);
   const [itemActiveModal, setItemActiveModal] = useState(modalData[0]);
   const [value, setValue] = useState(parseFloat(item?.value || 0));
-  const [minimum] = useState(isHasLimit ? parseInt(item?.range_min) : 0);
+  const [minimum] = useState(isHasLimit ? parseInt(item?.range_min, 10) : 0);
   const [maximum, setMaximum] = useState(
     value === 0
       ? 100
       : isHasLimit
-      ? (parseInt(item?.range_max) - minimum) * 10 + minimum
-      : (parseInt(item?.value) + 20 - minimum) * 10 + minimum
+      ? (parseInt(item?.range_max, 10) - minimum) * 10 + minimum
+      : (parseInt(item?.value, 10) + 20 - minimum) * 10 + minimum
   );
 
   const onOpenModal = useCallback(() => {
@@ -62,8 +62,8 @@ const SetUpSensor = () => {
     setIsShowModal(false);
   }, []);
 
-  const onChooseCondition = (item) => () => {
-    setItemActiveModal(item);
+  const onChooseCondition = (selectedItem) => () => {
+    setItemActiveModal(selectedItem);
     onCloseModal();
   };
 
@@ -74,9 +74,9 @@ const SetUpSensor = () => {
   }, []);
 
   const onChangeValue = useCallback(
-    (value) => {
+    (newValue) => {
       setValue(
-        (parseFloat(value / 128) + parseFloat(minimum)).toFixed(
+        (parseFloat(newValue / 128) + parseFloat(minimum)).toFixed(
           item?.decimal_behind || 1
         )
       );