@eohjsc/react-native-smart-city 0.2.59 → 0.2.63

package/src/iot/RemoteControl/index.js

@@ -10,18 +10,24 @@ import { sendCommandOverLGThinq } from './LG';
 
 export const sendRemoteCommand = async (sensor, action, data) => {
   // No action, raise not authorized
+  let result = false;
   if (!action) {
     ToastBottomHelper.error(
       t('your_account_has_not_been_authorized_to_control')
     );
-    return;
+    return result;
   }
   if (action.command_prefer_over_bluetooth) {
     try {
-      await sendCommandOverBluetooth(sensor, action, data);
+      result = await sendCommandOverBluetooth(sensor, action, data);
     } catch (err) {
       if (err === SEND_COMMAND_OVER_BLUETOOTH_FAIL) {
-        await sendCommandOverInternet(sensor, action, data, 'bluetooth');
+        result = await sendCommandOverInternet(
+          sensor,
+          action,
+          data,
+          'bluetooth'
+        );
       } else {
         throw err;
       }
@@ -29,14 +35,15 @@ export const sendRemoteCommand = async (sensor, action, data) => {
   }
 
   if (action.command_prefer_over_internet) {
-    await sendCommandOverInternet(sensor, action, data, 'internet');
+    result = await sendCommandOverInternet(sensor, action, data, 'internet');
   }
 
   if (action.command_prefer_over_googlehome) {
-    await sendCommandOverGoogleHome(sensor, action, data);
+    result = await sendCommandOverGoogleHome(sensor, action, data);
   }
 
   if (action.command_prefer_over_lg) {
-    await sendCommandOverLGThinq(sensor, action, data);
+    result = await sendCommandOverLGThinq(sensor, action, data);
   }
+  return result;
 };

package/src/navigations/SharedStack.js

@@ -1,7 +1,7 @@
 import React, { memo } from 'react';
 import { createStackNavigator } from '@react-navigation/stack';
 import { TouchableOpacity, StyleSheet } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
+import { useNavigation, useRoute } from '@react-navigation/native';
 import { Icon } from '@ant-design/react-native';
 import { useTranslations } from '../hooks/Common/useTranslations';
 
@@ -13,6 +13,7 @@ const Stack = createStackNavigator();
 const SharedStack = memo(() => {
   const t = useTranslations();
   const navigation = useNavigation();
+  const { params } = useRoute();
   return (
     <Stack.Navigator>
       <Stack.Screen
@@ -20,14 +21,15 @@ const SharedStack = memo(() => {
         component={Shared}
         options={{
           title: t('text_shared_with_me'),
-          headerLeft: () => (
-            <TouchableOpacity
-              style={styles.btnMenu}
-              onPress={() => navigation.toggleDrawer()}
-            >
-              <Icon name={'menu'} color={Colors.Black} />
-            </TouchableOpacity>
-          ),
+          headerLeft: () =>
+            params?.isMainSource && (
+              <TouchableOpacity
+                style={styles.btnMenu}
+                onPress={() => navigation.toggleDrawer()}
+              >
+                <Icon name={'menu'} color={Colors.Black} />
+              </TouchableOpacity>
+            ),
           headerTitleAlign: 'left',
           headerStyle: {
             backgroundColor: Colors.Gray2,

package/src/navigations/UnitStack.js

@@ -31,6 +31,7 @@ import AddNewAutoSmart from '../screens/AddNewAutoSmart';
 import PlaybackCamera from '../screens/PlayBackCamera';
 import AllCamera from '../screens/AllCamera';
 import ManageAccessScreen from '../screens/ManageAccess';
+import MoveToAnotherSubUnit from '../screens/MoveToAnotherSubUnit';
 import GuestInfo from '../screens/GuestInfo';
 import ScriptDetail from '../screens/ScriptDetail';
 import EditActionsList from '../screens/EditActionsList';
@@ -41,6 +42,8 @@ import SelectAction from '../screens/AddNewAction/SelectAction';
 import EditSubUnit from '../screens/SubUnit/EditSubUnit';
 import SetUpSensor from '../screens/AddNewAction/SetupSensor';
 import EditDevice from '../screens/Device/EditDevice/index';
+import EmergencySetting from '../screens/EmergencySetting';
+import ConfirmUnitDeletion from '../screens/ConfirmUnitDeletion';
 
 const Stack = createStackNavigator();
 
@@ -156,7 +159,7 @@ export const UnitStack = memo((props) => {
         component={DeviceDetail}
         options={{
           headerShown: false,
-          animationEnabled: false,
+          animationEnabled: Platform.OS === 'ios',
         }}
       />
       <Stack.Screen
@@ -170,7 +173,7 @@ export const UnitStack = memo((props) => {
         name={Route.TDSGuide}
         component={TDSGuide}
         options={{
-          title: t('tds_infomation'),
+          title: t('tds_information'),
         }}
       />
       <Stack.Screen
@@ -229,6 +232,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.MoveToAnotherSubUnit}
+        component={MoveToAnotherSubUnit}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.GuestInfo}
         component={GuestInfo}
@@ -291,6 +301,20 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.EmergencySetting}
+        component={EmergencySetting}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.ConfirmUnitDeletion}
+        component={ConfirmUnitDeletion}
+        options={{
+          headerShown: false,
+        }}
+      />
     </Stack.Navigator>
   );
 });

package/src/screens/ActivityLog/ItemLog.js

@@ -29,14 +29,14 @@ const DetailLog = ({ item }) => {
           {item.action_name
             ? `${item.action_name} ${t('by')} `
             : `${t('activated_by')} `}
-          <Text style={styles.name}>{item.name || item.params?.username}</Text>
+          <Text style={styles.name}>{item.name || item.username}</Text>
         </Text>
       );
     case ACTIVITY_LOG_TYPES.SCRIPT_UPDATED_BY:
       return (
         <Text style={styles.text}>
           {`${t('script_updated_by')} `}
-          <Text style={styles.name}>{item.name || item.params?.username}</Text>
+          <Text style={styles.name}>{item.name || item.username}</Text>
         </Text>
       );
     default:
@@ -45,7 +45,7 @@ const DetailLog = ({ item }) => {
           {item.action_name
             ? `${item.action_name} ${t('by')} `
             : `${t('activated_by')} `}
-          <Text style={styles.name}>{item.name || item.params?.username}</Text>
+          <Text style={styles.name}>{item.name || item.username}</Text>
         </Text>
       );
   }

package/src/screens/ActivityLog/__test__/ItemLog.test.js

@@ -46,6 +46,7 @@ test('test ItemLog one tap', () => {
       params: {
         username: 'username',
       },
+      username: 'username',
       created_at: '2021-07-02T15:48:24.917932Z',
     },
     type: `automate.${AUTOMATE_TYPE.ONE_TAP}`,
@@ -68,6 +69,7 @@ test('test ItemLog script update', () => {
       params: {
         username: 'username',
       },
+      username: 'username',
       created_at: '2021-07-02T15:48:24.917932Z',
     },
     type: 'automate',
@@ -79,7 +81,7 @@ test('test ItemLog script update', () => {
   });
   const instance = tree.root;
   const texts = instance.findAllByType(Text);
-  expect(texts[2].props.children).toBe(props.item.params.username);
+  expect(texts[2].props.children).toBe(props.item.username);
 });
 
 test('test ItemLog no content_code', () => {
@@ -91,6 +93,7 @@ test('test ItemLog no content_code', () => {
       },
       created_at: '2021-07-02T15:48:24.917932Z',
     },
+    username: 'username',
     type: 'action',
     length: 2,
     index: 1,
@@ -100,7 +103,7 @@ test('test ItemLog no content_code', () => {
   });
   const instance = tree.root;
   const texts = instance.findAllByType(Text);
-  expect(texts[2].props.children).toBe(props.item.params.username);
+  expect(texts[2].props.children).toBe(props.item.username);
 });
 
 describe('test ItemLog emergency event', () => {

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

@@ -12,6 +12,7 @@ const apiMaps = {
     url: () => API.SENSOR.ACTIVITY_LOG(),
     params: (id) => ({ id: id }),
     standardizeData: getDataForList,
+    memberUrl: (id) => API.SHARE.UNITS_MEMBERS(id),
   },
   ['emergency_event']: {
     url: () => API.EMERGENCY_BUTTON.ACTIVITY_LOG(),
@@ -58,7 +59,7 @@ export default ({ id, type, share, filterEnabled }) => {
     if (page === 1) {
       setIsRefreshing(true);
     } else {
-      if (!isCanLoadMore) {
+      if (!isCanLoadMore || isLoading) {
         return;
       }
       setIsLoading(true);

package/src/screens/ActivityLog/index.js

@@ -66,7 +66,6 @@ const ActivityLogScreen = ({ route }) => {
       {getTitleFromTime(data[0].created_at, new Date())}
     </Text>
   );
-
   useEffect(() => {
     onRefresh();
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/src/screens/AddLocationMaps/index.js

@@ -24,6 +24,8 @@ const initialRegion = {
 const DEFAULT_LATITUDE = 10.7974046; // EoH center
 const DEFAULT_LONGITUDE = 106.7035663;
 
+navigator.geolocation = require('@react-native-community/geolocation');
+
 const AddLocationMaps = memo(() => {
   const t = useTranslations();
   const { goBack, navigate } = useNavigation();
@@ -135,7 +137,7 @@ const AddLocationMaps = memo(() => {
         }
       },
       (error) => {},
-      { enableHighAccuracy: true, timeout: 20000, maximumAge: 1000 }
+      {}
     );
   }, []);
 
@@ -231,7 +233,7 @@ const AddLocationMaps = memo(() => {
                     latitude: searchedLocation.latitude,
                     longitude: searchedLocation.longitude,
                   }}
-                  radius={1000}
+                  radius={300}
                   fillColor={Colors.BlueTransparent5}
                   strokeColor={Colors.Blue10}
                 />

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -55,7 +55,8 @@ const SelectSensorDevices = memo(({ route }) => {
       (response) => {
         const { success, data } = response;
         if (success) {
-          const listMenu = data.map((item, index) => ({
+          const newData = data.filter((item) => item.sensors.length > 0);
+          const listMenu = newData.map((item, index) => ({
             text: item.name,
             station: item,
             index: index,
@@ -63,7 +64,7 @@ const SelectSensorDevices = memo(({ route }) => {
           if (isSelectSensor) {
             if (automate.sensor_id) {
               let selectSensor = {};
-              data.map((item) => {
+              newData.map((item) => {
                 item.sensors.map((sensor) => {
                   if (sensor.id === automate.sensor_id) {
                     selectSensor = sensor;
@@ -76,9 +77,9 @@ const SelectSensorDevices = memo(({ route }) => {
               setSelectedDevice(selectSensor);
             }
           }
-          setStation(data);
+          setStation(newData);
           setListMenuItem(listMenu);
-          setListStation(listMenu.concat([{ text: '' }]));
+          setListStation(listMenu);
         }
       }
     );
@@ -174,13 +175,19 @@ const SelectSensorDevices = memo(({ route }) => {
           {t(title)}
         </Text>
 
-        <NavBar
-          listStation={listStation}
-          listMenuItem={listMenuItem}
-          onSnapToItem={onSnapToItem}
-          indexStation={indexStation}
-          style={styles.navbar}
-        />
+        {!!listStation.length > 0 ? (
+          <NavBar
+            listStation={listStation}
+            listMenuItem={listMenuItem}
+            onSnapToItem={onSnapToItem}
+            indexStation={indexStation}
+            style={styles.navbar}
+          />
+        ) : (
+          <View style={styles.noneData}>
+            <Text center>{t('text_sub_unit_not_have_device')}</Text>
+          </View>
+        )}
 
         <View style={styles.boxDevices}>
           {station[indexStation]?.sensors &&

package/src/screens/AddNewAction/Styles/SelectSensorDevicesStyles.js

@@ -1,6 +1,6 @@
 import { StyleSheet } from 'react-native';
 import { getBottomSpace } from 'react-native-iphone-x-helper';
-import { Colors } from '../../../configs';
+import { Colors, Constants } from '../../../configs';
 
 export default StyleSheet.create({
   wrap: {
@@ -33,4 +33,8 @@ export default StyleSheet.create({
     borderColor: Colors.ShadownTransparent,
     borderTopWidth: 1,
   },
+  noneData: {
+    paddingHorizontal: 16,
+    marginTop: Constants.height * 0.3,
+  },
 });

package/src/screens/AddNewAction/__test__/SelectSensorDevices.test.js

@@ -175,8 +175,13 @@ describe('Test SelectSensorDevices', () => {
         ],
       },
     ];
+    const listMenu = data.map((item, index) => ({
+      text: item.name,
+      station: item,
+      index: index,
+    }));
     const mockSetIndexStation = jest.fn();
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
+    useState.mockImplementationOnce((init) => [listMenu, mockSetState]);
     useState.mockImplementationOnce((init) => [init, mockSetState]);
     useState.mockImplementationOnce((init) => [init, mockSetIndexStation]);
     useState.mockImplementationOnce((init) => [data, mockSetState]);

package/src/screens/Automate/MultiUnits.js

@@ -26,8 +26,11 @@ const MultiUnits = () => {
   const { params = {} } = useRoute();
   const { isMultiUnits = false, unitName = '', unit, isOwner } = params;
   const [data, setData] = useState([]);
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const tabName = useMemo(() => [t('smart'), t('automation')], []);
+  const tabName = useMemo(
+    () => [t(AUTOMATE_TYPE.SCENARIO), t(AUTOMATE_TYPE.AUTOMATION)],
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
   const [tabActive, setTabActive] = useState(tabName[0]);
 
   const getData = useCallback(
@@ -72,7 +75,7 @@ const MultiUnits = () => {
       screen: Routes.AddNewAutoSmart,
       params: {
         type:
-          tabActive === t('smart')
+          tabActive === t(AUTOMATE_TYPE.SCENARIO)
             ? AUTOMATE_TYPE.ONE_TAP_ONLY
             : AUTOMATE_TYPE.VALUE_CHANGE,
         unit: { id: unit?.id },
@@ -109,7 +112,7 @@ const MultiUnits = () => {
 
   const renderContent = useMemo(() => {
     const listItems = data.filter((item) =>
-      tabActive === t('smart')
+      tabActive === t(AUTOMATE_TYPE.SCENARIO)
         ? item?.type === AUTOMATE_TYPE.ONE_TAP
         : item?.type !== AUTOMATE_TYPE.ONE_TAP
     );

package/src/screens/Automate/__test__/MultiUnits.test.js

@@ -201,7 +201,7 @@ describe('Test MultiUnits', () => {
     });
     useState.mockImplementationOnce(() => [response.data, mockSetState]);
     useState.mockImplementationOnce(() => [
-      getTranslate('en', 'smart'),
+      getTranslate('en', 'Scenario'),
       mockSetState,
     ]);
     await act(() => {

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

@@ -70,6 +70,18 @@ describe('Test Automate', () => {
                 icon_kit: undefined,
               },
             },
+            {
+              id: 2,
+              user: 2,
+              type: 'one_tap',
+              activate_at: '2021-09-17T05:30:00Z',
+              script: {
+                id: 1,
+                name: 'script2',
+                icon: undefined,
+                icon_kit: undefined,
+              },
+            },
           ],
         },
       ],

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

@@ -0,0 +1,61 @@
+import React from 'react';
+import renderer, { act } from 'react-test-renderer';
+import axios from 'axios';
+
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+import ConfirmUnitDeletion from '../index';
+import _TextInput from '../../../commons/Form/TextInput';
+
+const wrapComponent = (route, navigation) => (
+  <SCProvider initState={mockSCStore({})}>
+    <ConfirmUnitDeletion route={route} />
+  </SCProvider>
+);
+
+const mockedNavigate = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  return {
+    ...jest.requireActual('@react-navigation/native'),
+    useNavigation: () => ({
+      goBack: mockedNavigate,
+    }),
+  };
+});
+
+jest.mock('react', () => {
+  return {
+    ...jest.requireActual('react'),
+    memo: (x) => x,
+  };
+});
+
+jest.mock('axios');
+describe('Test ConfirmUnitDeletion', () => {
+  let tree;
+  let route;
+
+  beforeAll(() => {
+    axios.get.mockClear();
+    route = {
+      params: {
+        unit: {
+          id: 10,
+        },
+      },
+    };
+  });
+
+  test('test render ConfirmUnitDeletion', async () => {
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+
+    const textInput = instance.findByType(_TextInput);
+    await act(async () => {
+      textInput.props.onChange('new_name');
+    });
+  });
+});

package/src/screens/ConfirmUnitDeletion/index.js

@@ -0,0 +1,64 @@
+import React, { useCallback, useState } from 'react';
+import { View } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+
+import { useTranslations } from '../../hooks/Common/useTranslations';
+import styles from './styles';
+import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
+import Text from '../../commons/Text';
+import { API, Colors } from '../../configs';
+import _TextInput from '../../commons/Form/TextInput';
+import { Button } from '../../commons';
+import Routes from '../../utils/Route';
+import { axiosDelete } from '../../utils/Apis/axios';
+import { ToastBottomHelper } from '../../utils/Utils';
+
+const ConfirmUnitDeletion = ({ route }) => {
+  const t = useTranslations();
+  const { unit } = route.params;
+  const navigation = useNavigation();
+  const [confirm, setConfrim] = useState('');
+  const [errorText, setErrorText] = useState();
+
+  const onChangePassword = useCallback((value) => {
+    setConfrim(value);
+  }, []);
+
+  const onSendPress = useCallback(async () => {
+    if (confirm === 'YES') {
+      const { success } = await axiosDelete(API.UNIT.MANAGE_UNIT(unit.id));
+      if (success) {
+        navigation.navigate(Routes.Dashboard);
+        ToastBottomHelper.success(t('unit_deleted_successfully'));
+      }
+    } else {
+      setErrorText(t('please_enter_correct'));
+    }
+  }, [confirm, navigation, t, unit.id]);
+
+  return (
+    <WrapHeaderScrollable
+      styleScrollView={styles.scrollView}
+      headerAniStyle={styles.headerAniStyle}
+    >
+      <Text semibold style={styles.txtForgot}>
+        {t('confirmation')}
+      </Text>
+      <Text type="H4" color={Colors.Gray9} style={styles.txtForgotHint}>
+        {t('enter_yes_to_perform')}
+      </Text>
+      <_TextInput
+        placeholder={t('text_password')}
+        onChange={onChangePassword}
+        errorText={errorText}
+        wrapStyle={styles.noMarginTop}
+        textInputStyle={styles.textInput}
+      />
+      <View style={styles.buttonWrap}>
+        <Button type="auth" title={t('done')} onPress={onSendPress} />
+      </View>
+    </WrapHeaderScrollable>
+  );
+};
+
+export default ConfirmUnitDeletion;

package/src/screens/ConfirmUnitDeletion/styles.js

@@ -0,0 +1,37 @@
+import { StyleSheet } from 'react-native';
+import { Colors } from '../../configs';
+
+export default StyleSheet.create({
+  scrollView: {
+    backgroundColor: Colors.White,
+  },
+  headerAniStyle: { borderBottomWidth: 0 },
+  txtForgot: {
+    color: Colors.Black,
+    fontSize: 24,
+    marginLeft: 16,
+    marginTop: 0,
+    fontWeight: 'bold',
+  },
+  txtForgotHint: {
+    marginLeft: 16,
+    marginTop: 30,
+  },
+  noMarginTop: {
+    margin: 16,
+    backgroundColor: Colors.White,
+  },
+  textInput: {
+    marginTop: 0,
+    borderWidth: 0,
+    borderBottomWidth: 1,
+    borderBottomColor: Colors.Gray4,
+    paddingLeft: 0,
+    backgroundColor: Colors.White,
+  },
+  buttonWrap: {
+    flexDirection: 'row',
+    marginTop: 24,
+    marginHorizontal: 16,
+  },
+});

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

@@ -812,9 +812,10 @@ describe('test DeviceDetail', () => {
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ActivityLog, {
       id: route.params.sensor.id,
       type: 'action',
+      share: route.params.unit,
       filterEnabled: {
-        date: false,
-        user: false,
+        date: true,
+        user: Boolean(route.params.unit.id),
       },
     });
   });