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

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

@@ -169,7 +169,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/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/__test__/SelectAction.test.js

@@ -1,18 +1,16 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
 
 import SelectAction from '../SelectAction';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import BottomButtonView from '../../../commons/BottomButtonView';
 import { TESTID } from '../../../configs/Constants';
-import ActionTemplate from '../../../commons/ActionTemplate';
-import NumberUpDownActionTemplate from '../../../commons/OneTapTemplate/NumberUpDownActionTemplate';
-import OptionsDropdownActionTemplate from '../../../commons/OneTapTemplate/OptionsDropdownActionTemplate';
-import StatesGridActionTemplate from '../../../commons/OneTapTemplate/StatesGridActionTemplate';
+import api from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockedNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
@@ -49,38 +47,21 @@ describe('Test SelectAction', () => {
     },
   };
 
-  beforeEach(() => {
-    axios.get.mockClear();
-  });
-
   test('test onSave have automateId', async () => {
-    const response = {
-      status: 200,
-      success: true,
-    };
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
+    mock.onPost(API.AUTOMATE.ADD_SCRIPT_ACTION(1)).reply(200);
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
-
     const bottomButton = instance.findByType(BottomButtonView);
     await act(async () => {
       bottomButton.props.onPressMain();
     });
-    expect(axios.post).toHaveBeenCalled();
     expect(mockedNavigate).toHaveBeenCalled();
   });
 
   test('test onSave fail not permission', async () => {
-    const response = {
-      status: 404,
-    };
-    axios.post.mockImplementation(async () => {
-      return response;
-    });
+    mock.onPost(API.AUTOMATE.ADD_SCRIPT_ACTION(1)).reply(404);
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
@@ -90,7 +71,7 @@ describe('Test SelectAction', () => {
     await act(async () => {
       bottomButton.props.onPressMain();
     });
-    expect(axios.post).toHaveBeenCalled();
+    expect(mockedNavigate).toHaveBeenCalled();
   });
 
   test('test fetchData', async () => {
@@ -103,13 +84,11 @@ describe('Test SelectAction', () => {
         { template: 'three_button_action_template' },
       ],
     };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.SENSOR.DISPLAY_ACTIONS(1)).reply(200, response.data);
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
-    expect(axios.get).toHaveBeenCalled();
+    expect(mockedNavigate).toHaveBeenCalled();
   });
 
   test('test RenderActionItem', async () => {
@@ -186,9 +165,7 @@ describe('Test SelectAction', () => {
         },
       ],
     };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.SENSOR.DISPLAY_ACTIONS(1)).reply(200, response.data);
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -196,64 +173,6 @@ describe('Test SelectAction', () => {
     const renderActionItem = instance.find(
       (el) => el.props.testID === TESTID.ACTION_ITEM
     );
-    const actionTemplate = instance.findByType(ActionTemplate);
-    const numberUpDownActionTemplate = instance.findByType(
-      NumberUpDownActionTemplate
-    );
-    const optionsDropdownActionTemplate = instance.findByType(
-      OptionsDropdownActionTemplate
-    );
-    const statesGridActionTemplate = instance.findByType(
-      StatesGridActionTemplate
-    );
-
     expect(renderActionItem.props.data.length).toBe(4);
-    expect(actionTemplate).toBeDefined();
-    expect(numberUpDownActionTemplate).toBeDefined();
-    expect(optionsDropdownActionTemplate).toBeDefined();
-    expect(statesGridActionTemplate).toBeDefined();
-  });
-
-  test('test onPress handleOnSelectAction', async () => {
-    const response = {
-      status: 200,
-      success: true,
-      data: [
-        {
-          title: '',
-          template: 'three_button_action_template',
-          configuration: {
-            action1: '94ae262d-46e3-42ff-9d10-516831ecc830',
-            action2: '94ae262d-46e3-42ff-9d10-516831ecc830',
-            action3: '94ae262d-46e3-42ff-9d10-516831ecc830',
-            icon1: 'up',
-            icon2: 'stop',
-            icon3: 'down',
-            text1: 'OPEN',
-            text2: 'STOP',
-            text3: 'CLOSE',
-            text_lock: 'Door lock',
-            is_display_lock: true,
-          },
-        },
-      ],
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
-    await act(async () => {
-      tree = await renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const actionTemplate = instance.findByType(ActionTemplate);
-    const bottomButton = instance.findByType(BottomButtonView);
-    act(() => {
-      actionTemplate.props.onSelectAction({
-        name: 'OPEN',
-        action: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        template: 'three_button_action_template',
-      });
-    });
-    expect(bottomButton.props.typeMain).toEqual('primary');
   });
 });

package/src/screens/AddNewAction/__test__/SelectSensorDevices.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 SelectSensorDevices from '../SelectSensorDevices';
 import { SCProvider } from '../../../context';
@@ -9,18 +9,22 @@ import Device from '../Device';
 import BottomButtonView from '../../../commons/BottomButtonView';
 import NavBar from '../../../commons/NavBar';
 import API from '../../../configs/API';
-import { TESTID } from '../../../configs/Constants';
+import { AUTOMATE_SELECT, TESTID } from '../../../configs/Constants';
 import { TouchableOpacity } from 'react-native';
 import Routes from '../../../utils/Route';
+import api from '../../../utils/Apis/axios';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockedNavigate = jest.fn();
+const mockedDispatch = jest.fn();
+
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
     useNavigation: () => ({
       navigate: mockedNavigate,
+      dispatch: mockedDispatch,
     }),
   };
 });
@@ -45,6 +49,9 @@ describe('Test SelectSensorDevices', () => {
       unit: { id: 1, name: 'Unit test' },
       automateId: 1,
       scriptName: 'scriptName test',
+      automate: {
+        sensor_id: 1,
+      },
     },
   };
   const response = {
@@ -63,29 +70,21 @@ describe('Test SelectSensorDevices', () => {
   };
 
   beforeEach(() => {
-    axios.get.mockClear();
     mockedNavigate.mockClear();
   });
 
   test('fetch Device success', async () => {
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response.data);
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const navBar = instance.findByType(NavBar);
-
-    expect(axios.get).toHaveBeenCalledWith(API.UNIT.DEVICE_CONTROL(1), {});
     expect(navBar.props.listStation).toHaveLength(1);
   });
 
   test('onPress continue', async () => {
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response.data);
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -99,9 +98,7 @@ describe('Test SelectSensorDevices', () => {
   });
 
   test('test onPressDevice', async () => {
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response.data);
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -113,7 +110,6 @@ describe('Test SelectSensorDevices', () => {
       device[0].props.onPress({ id: 1, name: 'sensor' });
     });
     expect(device[0].props.isSelectDevice).toEqual(true);
-
     act(() => {
       device[0].props.onPress({ id: 1, name: 'sensor' });
     });
@@ -121,16 +117,12 @@ describe('Test SelectSensorDevices', () => {
   });
 
   test('test onSnapItem', async () => {
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
-
+    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response.data);
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const navBar = instance.findByType(NavBar);
-
     act(() => {
       navBar.props.onSnapToItem({ id: 1, name: 'sensor' }, 0);
     });
@@ -138,9 +130,7 @@ describe('Test SelectSensorDevices', () => {
   });
 
   test('test onPressClose user already has an automateId', async () => {
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.UNIT.DEVICE_CONTROL(1)).reply(200, response.data);
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -154,7 +144,6 @@ describe('Test SelectSensorDevices', () => {
     await act(async () => {
       iconClose[0].props.onPress();
     });
-
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
       havePermission: true,
       id: 1,
@@ -166,4 +155,29 @@ describe('Test SelectSensorDevices', () => {
       unit: { id: 1, name: 'Unit test' },
     });
   });
+
+  test('test onPressClose user already has not an automateId', async () => {
+    mock.onGet(API.UNIT.DEVICE_SENSOR(1)).reply(200, response.data);
+    const new_route = {
+      ...route,
+      params: {
+        ...route.params,
+        automateId: null,
+        title: AUTOMATE_SELECT.SELECT_SENSOR,
+      },
+    };
+    await act(async () => {
+      tree = renderer.create(wrapComponent(new_route));
+    });
+    const instance = tree.root;
+    const iconClose = instance.findAll(
+      (el) =>
+        el.props.testID === TESTID.ICON_CLOSE && el.type === TouchableOpacity
+    );
+    expect(iconClose).toHaveLength(1);
+    await act(async () => {
+      iconClose[0].props.onPress();
+    });
+    expect(mockedDispatch).toBeCalled();
+  });
 });

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

@@ -69,12 +69,13 @@ describe('test AddNewAutoSmart', () => {
       automate: {},
       automateId: undefined,
       title: 'select_sensor',
-      type: 'value_change',
+      oldType: 'value_change',
       scriptName: undefined,
       unit: { id: 1 },
       isAutomateTab: undefined,
       isMultiUnits: undefined,
       routeName: 'SelectSensorDevices',
+      type: 'value_change',
     });
   });
 
@@ -102,6 +103,7 @@ describe('test AddNewAutoSmart', () => {
       automate: {},
       automateId: undefined,
       type: 'schedule',
+      oldType: 'value_change',
       routeName: 'SetSchedule',
       scriptName: undefined,
       unit: route.params.unit,

package/src/screens/AddNewAutoSmart/index.js

@@ -25,6 +25,7 @@ const AddNewAutoSmart = memo(({ route }) => {
     automate = {},
     scriptName,
   } = route.params;
+
   const typeAutoSmart = {
     [AUTOMATE_TYPE.AUTOMATE]: [
       {
@@ -96,6 +97,7 @@ const AddNewAutoSmart = memo(({ route }) => {
       routeName: dataAutomate?.route,
       automate,
       scriptName,
+      oldType: type,
     };
 
     if (
@@ -107,14 +109,15 @@ const AddNewAutoSmart = memo(({ route }) => {
       navigate(dataAutomate.route, params);
     }
   }, [
-    navigate,
-    selectedIndex,
     data,
+    selectedIndex,
     unit,
     isAutomateTab,
     isMultiUnits,
     automate,
     scriptName,
+    type,
+    navigate,
   ]);
 
   const handleSelectIndex = (index) => {

package/src/screens/AddNewDevice/ConnectingDevices.js

@@ -12,12 +12,12 @@ import Routes from '../../utils/Route';
 const ConnectingDevices = memo(({ route }) => {
   const t = useTranslations();
   const { navigate } = useNavigation();
-  const { new_sensor } = route.params;
+  const { new_sensor } = route.params || {};
 
   useEffect(() => {
     const checkSensorConnected = setInterval(async () => {
       const { success } = await axiosGet(
-        API.SENSOR.CHECK_CONNECTION(new_sensor.id),
+        API.SENSOR.CHECK_CONNECTION(new_sensor?.id),
         {},
         true
       );
@@ -26,7 +26,7 @@ const ConnectingDevices = memo(({ route }) => {
       }
     }, 3000);
     return () => clearInterval(checkSensorConnected);
-  }, [navigate, new_sensor.id, route.params]);
+  }, [navigate, new_sensor?.id, route.params]);
 
   return (
     <View style={styles.wrap}>