@eohjsc/react-native-smart-city 0.2.96 → 0.2.99

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -28,6 +28,7 @@ const SelectSensorDevices = memo(({ route }) => {
     isAutomateTab,
     isCreateNewAction,
     isMultiUnits,
+    oldType,
   } = route.params;
 
   const [listStation, setListStation] = useState([]);
@@ -37,6 +38,7 @@ const SelectSensorDevices = memo(({ route }) => {
   const [selectedDevice, setSelectedDevice] = useState();
   const { navigate, dispatch, goBack } = useNavigation();
   const isSelectSensor = title === AUTOMATE_SELECT.SELECT_SENSOR;
+  const [loading, setLoading] = useState(true);
 
   const onSnapToItem = useCallback(
     (item, index) => {
@@ -83,6 +85,7 @@ const SelectSensorDevices = memo(({ route }) => {
         }
       }
     );
+    setLoading(false);
   }, [automate.sensor_id, isSelectSensor, unit]);
 
   useEffect(() => {
@@ -135,7 +138,7 @@ const SelectSensorDevices = memo(({ route }) => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: type,
+        type: oldType,
         havePermission: true,
         unit,
         isMultiUnits,
@@ -162,6 +165,9 @@ const SelectSensorDevices = memo(({ route }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [route.params]
   );
+  if (loading) {
+    return null;
+  }
 
   return (
     <View style={styles.wrap}>
@@ -170,12 +176,13 @@ const SelectSensorDevices = memo(({ route }) => {
       <ScrollView
         style={styles.wrap}
         contentContainerStyle={styles.contentContainerStyle}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Text bold type="H2" style={styles.title}>
           {t(title)}
         </Text>
 
-        {listStation ? (
+        {listStation.length ? (
           <NavBar
             listStation={listStation}
             listMenuItem={listMenuItem}
@@ -211,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__/SelectSensorDevices.test.js

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import axios from 'axios';
 
@@ -25,12 +25,10 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-const mockSetState = jest.fn();
 jest.mock('react', () => {
   return {
     ...jest.requireActual('react'),
     memo: (x) => x,
-    useState: jest.fn((init) => [init, mockSetState]),
   };
 });
 
@@ -49,28 +47,27 @@ describe('Test SelectSensorDevices', () => {
       scriptName: 'scriptName test',
     },
   };
+  const response = {
+    status: 200,
+    success: true,
+    data: [
+      {
+        id: 1,
+        name: 'Device 1',
+        sensors: [
+          { id: 1, name: 'sensor' },
+          { id: 2, name: 'sensor' },
+        ],
+      },
+    ],
+  };
 
   beforeEach(() => {
     axios.get.mockClear();
     mockedNavigate.mockClear();
-    mockSetState.mockClear();
   });
 
   test('fetch Device success', async () => {
-    const response = {
-      status: 200,
-      success: true,
-      data: [
-        {
-          id: 1,
-          name: 'Device 1',
-          sensors: [
-            { id: 1, name: 'sensor' },
-            { id: 2, name: 'sensor' },
-          ],
-        },
-      ],
-    };
     axios.get.mockImplementation(async () => {
       return response;
     });
@@ -78,12 +75,17 @@ describe('Test SelectSensorDevices', () => {
     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(mockSetState).toHaveBeenCalledTimes(3);
+    expect(navBar.props.listStation).toHaveLength(1);
   });
 
   test('onPress continue', async () => {
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -97,23 +99,9 @@ describe('Test SelectSensorDevices', () => {
   });
 
   test('test onPressDevice', async () => {
-    const data = [
-      {
-        id: 1,
-        name: 'Device 1',
-        sensors: [
-          { id: 1, name: 'sensor' },
-          { id: 2, name: 'sensor' },
-        ],
-      },
-    ];
-    const mockSetSelectedDevice = jest.fn();
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [data, mockSetState]);
-    useState.mockImplementationOnce((init) => [false, mockSetSelectedDevice]);
-
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -124,67 +112,18 @@ describe('Test SelectSensorDevices', () => {
     act(() => {
       device[0].props.onPress({ id: 1, name: 'sensor' });
     });
-    expect(mockSetSelectedDevice).toHaveBeenCalledWith({
-      id: 1,
-      name: 'sensor',
-    });
-  });
-
-  test('test onPressDevice false', async () => {
-    const data = [
-      {
-        id: 1,
-        name: 'Device 1',
-        sensors: [
-          { id: 1, name: 'sensor' },
-          { id: 2, name: 'sensor' },
-        ],
-      },
-    ];
-    const mockSetSelectedDevice = jest.fn();
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [data, mockSetState]);
-    useState.mockImplementationOnce((init) => [
-      { id: 1, name: 'sensor' },
-      mockSetSelectedDevice,
-    ]);
-
-    await act(async () => {
-      tree = renderer.create(wrapComponent(route));
-    });
-    const instance = tree.root;
-    const device = instance.findAllByType(Device);
-    expect(device).toHaveLength(2);
+    expect(device[0].props.isSelectDevice).toEqual(true);
 
     act(() => {
       device[0].props.onPress({ id: 1, name: 'sensor' });
     });
-    expect(mockSetSelectedDevice).toHaveBeenCalledWith(false);
+    expect(device[0].props.isSelectDevice).toEqual(false);
   });
 
   test('test onSnapItem', async () => {
-    const data = [
-      {
-        id: 1,
-        name: 'Device 1',
-        sensors: [
-          { id: 1, name: 'sensor' },
-          { id: 2, name: 'sensor' },
-        ],
-      },
-    ];
-    const listMenu = data.map((item, index) => ({
-      text: item.name,
-      station: item,
-      index: index,
-    }));
-    const mockSetIndexStation = jest.fn();
-    useState.mockImplementationOnce((init) => [listMenu, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetIndexStation]);
-    useState.mockImplementationOnce((init) => [data, mockSetState]);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
@@ -195,10 +134,13 @@ describe('Test SelectSensorDevices', () => {
     act(() => {
       navBar.props.onSnapToItem({ id: 1, name: 'sensor' }, 0);
     });
-
-    expect(mockSetIndexStation).toBeCalledWith(0);
+    expect(navBar.props.indexStation).toEqual(0);
   });
+
   test('test onPressClose user already has an automateId', async () => {
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });

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/index.js

@@ -90,6 +90,7 @@ const AddNewDevice = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           <GroupCheckBox data={stations} onSelect={handleOnSelect} />

package/src/screens/AddNewGateway/PlugAndPlay/ConnectWifiWarning.js

@@ -26,7 +26,7 @@ import Routes from '../../../utils/Route';
 import { SCContext } from '../../../context';
 import { Action } from '../../../context/actionType';
 import { TESTID } from '../../../configs/Constants';
-import Connecting from '../../../commons/Connecting ';
+import Connecting from '../../../commons/Connecting';
 
 const isIos = Platform.OS === 'ios';
 const isAndroid = Platform.OS === 'android';

package/src/screens/AddNewGateway/PlugAndPlay/GatewayWifiList.js

@@ -224,7 +224,10 @@ const GatewayWifiList = memo(({ route }) => {
           {t('select_wifi')}
         </Text>
 
-        <ScrollView style={styles.listContainer}>
+        <ScrollView
+          style={styles.listContainer}
+          scrollIndicatorInsets={{ right: 1 }}
+        >
           {!!list_wifi.length &&
             list_wifi.map((item, index) => (
               <TouchableOpacity

package/src/screens/AddNewGateway/SelectGateway.js

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

package/src/screens/AddNewGateway/SetupGatewayWifi.js

@@ -147,6 +147,7 @@ const SetupGatewayWifi = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           <Text style={styles.textWifi} bold color={Colors.Primary}>

package/src/screens/AddNewGateway/index.js

@@ -75,6 +75,7 @@ const AddNewGateway = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           {!wifiName && (

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

@@ -165,7 +165,7 @@ describe('test AddNewOneTap', () => {
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
       id: 1,
       name: 'script test',
-      type: 'one_tap',
+      type: undefined,
       havePermission: true,
       unit: { id: 1 },
       isMultiUnits: false,

package/src/screens/AddNewOneTap/index.js

@@ -25,6 +25,7 @@ const AddNewOneTap = memo(({ route }) => {
     isMultiUnits,
     automateId,
     scriptName,
+    oldType,
   } = route.params;
   const t = useTranslations();
   const { navigate, dispatch, goBack } = useNavigation();
@@ -91,7 +92,7 @@ const AddNewOneTap = memo(({ route }) => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: type,
+        type: oldType,
         havePermission: true,
         unit,
         isMultiUnits,
@@ -120,7 +121,7 @@ const AddNewOneTap = memo(({ route }) => {
       }
     >
       <HeaderCustom isShowClose onClose={onClose} />
-      <ScrollView>
+      <ScrollView scrollIndicatorInsets={{ right: 1 }}>
         <Text
           testID={TESTID.ADD_NEW_DEVICE_ADD}
           semibold

package/src/screens/Automate/index.js

@@ -147,6 +147,7 @@ const Automate = () => {
             showsHorizontalScrollIndicator={false}
             contentContainerStyle={styles.contentContainerStyle2}
             ListFooterComponent={renderListFooterComponent(type, unit_id)}
+            scrollIndicatorInsets={{ right: 1 }}
           />
         </View>
       );
@@ -189,6 +190,7 @@ const Automate = () => {
         contentContainerStyle={styles.contentContainerStyle}
         refreshing={false}
         onRefresh={getAutomates}
+        scrollIndicatorInsets={{ right: 1 }}
       />
     </View>
   );

package/src/screens/Device/__test__/detail.test.js

@@ -192,6 +192,7 @@ describe('test DeviceDetail', () => {
         type: 'action',
       },
     ],
+    side_menu_items: [{ id: 1, order: 1, name: 'Setup generate passcode' }],
   };
   test('render DeviceDetail render SensorDisplayItem', async () => {
     const responseDisplay = {
@@ -227,10 +228,9 @@ describe('test DeviceDetail', () => {
     const instance = tree.root;
     expect(axios.get).toHaveBeenCalledTimes(4);
     expect(axios.get).toHaveBeenCalledWith(API.SENSOR.DISPLAY(1), {});
-    expect(axios.get).toHaveBeenCalledWith(
-      API.SENSOR.REMOTE_CONTROL_OPTIONS(1),
-      {}
-    );
+    expect(axios.get).toHaveBeenCalledWith(API.SENSOR.DISPLAY_VALUES_V2(1), {
+      params: new URLSearchParams(),
+    });
     const sensorDisplayItem = instance.findAll(
       (el) => el.props.testID === TESTID.SENSOR_DISPLAY_ITEM
     );

package/src/screens/Device/detail.js

@@ -12,7 +12,7 @@ import { get } from 'lodash';
 import { useSelector } from 'react-redux';
 import { IconFill, IconOutline } from '@ant-design/icons-react-native';
 import { Icon } from '@ant-design/react-native';
-
+import Routes from '../../utils/Route';
 import { useCountUp } from './hooks/useCountUp';
 import { getData as getLocalData } from '../../utils/Storage';
 import { API, Colors } from '../../configs';
@@ -35,7 +35,7 @@ import Text from '../../commons/Text';
 import { transformDatetime } from '../../utils/Converter/time';
 import { AlertAction, ButtonPopup, MenuActionMore } from '../../commons';
 import { TESTID } from '../../configs/Constants';
-import Routes from '../../utils/Route';
+
 import { usePopover } from '../../hooks/Common';
 import { useConfigGlobalState } from '../../iot/states';
 import { useNavigation } from '@react-navigation/native';
@@ -47,6 +47,7 @@ import { EmergencyCountdown } from './components/EmergencyCountdown';
 import { SensorConnectStatusViewHeader } from './components/SensorConnectStatusViewHeader';
 import { useDisconnectedDevice } from './hooks/useDisconnectedDevice';
 import { Card } from '../../commons/CardShadow';
+import PreventAccess from '../../commons/PreventAccess';
 
 const DeviceDetail = ({ route }) => {
   const t = useTranslations();
@@ -73,13 +74,15 @@ const DeviceDetail = ({ route }) => {
   const { isOwner } = useIsOwnerOfUnit(unit?.user_id);
   const [sensorName, setSensorName] = useState(sensor?.name);
   const [lockShowing, acquireLockShowing, releaseLockShowing] = useBoolean();
+  const [showPreventAccess, setShowPreventAccess, setHidePreventAccess] =
+    useBoolean(false);
   const [showWindDirection, setShowWindDirection] = useState(false);
   const [loading, setLoading] = useState({
     isConnected: true,
     displayTemplate: true,
   });
   const [serverDown, setServerDown] = useState(false);
-
+  const [sideMenu, setSideMenu] = useState([]);
   const isNetworkConnected = useSCContextSelector(
     (state) => state.app.isNetworkConnected
   );
@@ -142,7 +145,9 @@ const DeviceDetail = ({ route }) => {
   }, [currentUserId, unit]);
 
   const fetchUnitDetail = useCallback(async () => {
-    const { success, data } = await axiosGet(API.UNIT.UNIT_DETAIL(unitId));
+    const { success, data } = await axiosGet(API.UNIT.UNIT_DETAIL(unitId), {
+      headers: { 'Cache-Control': 'no-cache' },
+    });
     if (success) {
       setUnit(data);
     }
@@ -155,15 +160,17 @@ const DeviceDetail = ({ route }) => {
   }, [fetchUnitDetail, unitId, unitData]);
 
   const fetchSensorDetail = useCallback(async () => {
-    const { success, data } = await axiosGet(
+    const { success, data, resp_status } = await axiosGet(
       API.SENSOR.SENSOR_DETAIL(sensorId)
     );
     if (success) {
       setSensor(data);
       setSensorName(data.name);
       setStation(data.station);
+    } else if (resp_status === 404) {
+      setShowPreventAccess();
     }
-  }, [sensorId]);
+  }, [sensorId, setShowPreventAccess]);
 
   useEffect(() => {
     if (sensorId && !sensorData) {
@@ -184,6 +191,7 @@ const DeviceDetail = ({ route }) => {
       {},
       true
     );
+
     if (success) {
       setDisplay(data);
       setServerDown(false);
@@ -203,6 +211,9 @@ const DeviceDetail = ({ route }) => {
           }
         }
       }
+      if (data.side_menu_items.length) {
+        setSideMenu(data.side_menu_items);
+      }
     }
     setLoading((preState) => ({ ...preState, displayTemplate: false }));
 
@@ -298,6 +309,19 @@ const DeviceDetail = ({ route }) => {
         text: t('activity_log'),
       });
     }
+
+    sideMenu.forEach((el) => {
+      menuItems.push({
+        route: Routes.SideMenuDetail,
+        data: {
+          unit,
+          sensor,
+          side_menu: el,
+        },
+        text: el.name,
+      });
+    });
+
     menuItems.push({
       route: Routes.DeviceInfo,
       text: t('device_info'),
@@ -314,6 +338,13 @@ const DeviceDetail = ({ route }) => {
         text: t('auto_lock'),
       });
     }
+    menuItems.push({
+      route: Routes.SmartLockStack,
+      data: {
+        screen: Routes.SetupGeneratePasscode,
+      },
+      text: t('setup_generate_passcode'),
+    });
     if (isOwner && isShowSetUpSmartLock) {
       menuItems.push({
         route: Routes.SmartLockStack,
@@ -354,6 +385,7 @@ const DeviceDetail = ({ route }) => {
     sensor,
     unit,
     sensorName,
+    sideMenu,
     station,
     emergencyDeviceId,
     addToFavorites,
@@ -500,6 +532,7 @@ const DeviceDetail = ({ route }) => {
     return isFlag;
   }, [display]);
   // replace isConnected=True to see template
+
   const renderSensorConnected = () => {
     return (
       <SensorConnectStatusViewHeader
@@ -691,6 +724,11 @@ const DeviceDetail = ({ route }) => {
           unit={unit}
           station={sensor?.station}
         />
+        <PreventAccess
+          visible={showPreventAccess}
+          hidePreventAccess={setHidePreventAccess}
+          headerBodyText={'device'}
+        />
       </WrapHeaderScrollable>
       {isShowEmergencyResolve && (
         <BottomButtonView

package/src/screens/EmergencyContacts/EmergencyContactsSelectContacts.js

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { SafeAreaView, StyleSheet, View } from 'react-native';
+import { SafeAreaView, StyleSheet, View, Platform } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -71,7 +71,7 @@ export const EmergencyContactsSelectContacts = ({ route }) => {
   return (
     <SafeAreaView style={styles.container}>
       <WrapHeaderScrollable title={t('select_contacts')} loading={loading}>
-        <Section type={'border'}>
+        <Section type={'border'} style={styles.section}>
           {dataContact.map((contact, index) => (
             <RowUser
               key={contact.id.toString()}
@@ -116,6 +116,9 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.Gray2,
   },
+  section: {
+    marginTop: Platform.OS === 'ios' ? 40 : 0,
+  },
   buttonRemove: {
     height: 40,
     width: 40,

package/src/screens/EmergencyContacts/__test__/EmergencyContactList.test.js

@@ -2,6 +2,9 @@ import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import Routes from '../../../utils/Route';
+import axios from 'axios';
+import { API } from '../../../configs';
+
 import { AlertAction } from '../../../commons';
 import { EmergencyContactsList } from '../EmergencyContactsList';
 import { TESTID } from '../../../configs/Constants';
@@ -27,6 +30,8 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
+jest.mock('axios');
+
 describe('test EmergencyContactList', () => {
   let route;
 
@@ -37,6 +42,7 @@ describe('test EmergencyContactList', () => {
         group: 1,
       },
     };
+    axios.delete.mockClear();
   });
   let tree;
 
@@ -51,11 +57,19 @@ describe('test EmergencyContactList', () => {
     const instance = tree.root;
     const alertAction = instance.findByType(AlertAction);
 
+    const response = { status: 204 };
+    axios.delete.mockImplementation(async () => {
+      return response;
+    });
+
     act(() => {
       alertAction.props.rightButtonClick();
     });
 
     expect(alertAction.props.visible).toBe(false);
+    expect(axios.delete).toHaveBeenCalledWith(
+      API.EMERGENCY_BUTTON.REMOVE_CONTACTS()
+    );
   });
 
   test('onAddNew', async () => {