@eohjsc/react-native-smart-city 0.7.3-rc11 → 0.7.3-rc12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.7.3-rc11",
+  "version": "0.7.3-rc12",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/configs/Theme.js

@@ -86,7 +86,7 @@ export default StyleSheet.create({
     alignItems: 'center',
   },
   menuIcon: {
-    paddingLeft: 16,
+    paddingRight: 10,
     height: '100%',
     justifyContent: 'center',
   },

package/src/navigations/SharedStack.js

@@ -50,6 +50,8 @@ export default SharedStack;
 
 const styles = StyleSheet.create({
   btnMenu: {
+    paddingLeft: 0,
+    paddingRight: 10,
     paddingHorizontal: 16,
     height: '100%',
     justifyContent: 'center',

package/src/screens/Automate/AddNewAction/ChooseAction.js

@@ -14,7 +14,13 @@ import RenderActionItem from './RenderActionItem';
 const ChooseAction = ({ route }) => {
   const t = useTranslations();
   const { navigate } = useNavigation();
-  const { unitId, device, automateId, numberActionCanAdd } = route?.params;
+  const {
+    unitId,
+    device,
+    automateId,
+    numberActionCanAdd,
+    multiUnit = {},
+  } = route.params;
   const [data, setData] = useState([]);
   const [actions, setActions] = useState([]);
 
@@ -48,7 +54,7 @@ const ChooseAction = ({ route }) => {
       API.AUTOMATE.ADD_SCRIPT_ACTION(automateId),
       {
         list_action,
-        unit: unitId,
+        unit: unitId || multiUnit.id,
       }
     );
 
@@ -58,7 +64,15 @@ const ChooseAction = ({ route }) => {
         merge: true,
         params: { saveAt: moment().valueOf() },
       });
-  }, [actions, numberActionCanAdd, automateId, unitId, navigate, t]);
+  }, [
+    actions,
+    numberActionCanAdd,
+    automateId,
+    unitId,
+    multiUnit.id,
+    navigate,
+    t,
+  ]);
 
   const handleOnSelectAction = (action) => {
     setActions((prevActions) => {

package/src/screens/Automate/AddNewAction/ChooseConfig.js

@@ -1,17 +1,17 @@
+import { useNavigation } from '@react-navigation/native';
 import React, { useCallback, useEffect, useState } from 'react';
 import { View } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
 
-import { useTranslations } from '../../../hooks/Common/useTranslations';
+import GridItem from '../../../commons/Grid/GridItem';
 import Text from '../../../commons/Text';
-import { axiosGet } from '../../../utils/Apis/axios';
 import { API, Colors } from '../../../configs';
+import { AUTOMATE_TYPE } from '../../../configs/Constants';
+import { useTranslations } from '../../../hooks/Common/useTranslations';
+import { axiosGet } from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
-import styles from './Styles/SelectActionStyles';
 import { LoadingSelectAction } from './Components';
-import { AUTOMATE_TYPE } from '../../../configs/Constants';
 import NewActionWrapper from './NewActionWrapper';
-import GridItem from '../../../commons/Grid/GridItem';
+import styles from './Styles/SelectActionStyles';
 
 const ChooseConfig = ({ route }) => {
   const t = useTranslations();
@@ -44,6 +44,7 @@ const ChooseConfig = ({ route }) => {
         config,
         automate,
         closeScreen,
+        unitId: automate?.unit,
       });
     },
     [automate, closeScreen, navigate]

package/src/screens/Automate/AddNewAction/SelectControlDevices.js

@@ -8,8 +8,13 @@ import SelectDevices from './Components/SelectDevices';
 
 const SelectControlDevices = ({ route }) => {
   const t = useTranslations();
-  const { unitId, closeScreen, automateId, numberActionCanAdd } =
-    route?.params || {};
+  const {
+    unitId,
+    closeScreen,
+    automateId,
+    numberActionCanAdd,
+    multiUnit = {},
+  } = route.params || {};
 
   const [stations, setStations] = useState([]);
   const [listStation, setListStation] = useState([]);
@@ -19,22 +24,26 @@ const SelectControlDevices = ({ route }) => {
   const [loading, setLoading] = useState(true);
 
   const fetchDetails = useCallback(async () => {
-    await fetchWithCache(API.UNIT.DEVICE_CONTROL(unitId), {}, (response) => {
-      const { success, data } = response;
-      if (success) {
-        const newData = data.filter((item) => item.sensors.length > 0);
-        const listMenu = newData.map((item, index) => ({
-          text: item.name,
-          station: item,
-          index: index,
-        }));
-        setStations(newData);
-        setListMenuItem(listMenu);
-        setListStation(listMenu);
+    await fetchWithCache(
+      API.UNIT.DEVICE_CONTROL(unitId || multiUnit.id),
+      {},
+      (response) => {
+        const { success, data } = response;
+        if (success) {
+          const newData = data.filter((item) => item.sensors.length > 0);
+          const listMenu = newData.map((item, index) => ({
+            text: item.name,
+            station: item,
+            index: index,
+          }));
+          setStations(newData);
+          setListMenuItem(listMenu);
+          setListStation(listMenu);
+        }
       }
-    });
+    );
     setLoading(false);
-  }, [unitId]);
+  }, [multiUnit.id, unitId]);
 
   useEffect(() => {
     fetchDetails();
@@ -48,9 +57,10 @@ const SelectControlDevices = ({ route }) => {
         device: selectedDevice,
         closeScreen,
         numberActionCanAdd,
+        multiUnit,
       });
     },
-    [navigate, unitId, automateId, closeScreen, numberActionCanAdd]
+    [navigate, unitId, automateId, closeScreen, numberActionCanAdd, multiUnit]
   );
 
   if (loading) {

package/src/screens/Automate/AddNewAction/SelectMonitorDevices.js

@@ -1,16 +1,22 @@
-import React, { useCallback, useEffect, useState } from 'react';
 import { useNavigation } from '@react-navigation/native';
+import React, { useCallback, useEffect, useState } from 'react';
 
+import { API } from '../../../configs';
+import { AUTOMATE_TYPE } from '../../../configs/Constants';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { fetchWithCache } from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
 import Routes from '../../../utils/Route';
 import SelectDevices from './Components/SelectDevices';
-import { AUTOMATE_TYPE } from '../../../configs/Constants';
 
 const SelectMonitorDevices = ({ route }) => {
   const t = useTranslations();
-  const { automate = {}, isCreateNewAction, closeScreen } = route?.params || {};
+  const {
+    automate = {},
+    isCreateNewAction,
+    closeScreen,
+    multiUnit = {},
+  } = route.params || {};
+  const { type, unit, sensor_id } = automate;
 
   const [stations, setStations] = useState([]);
   const [listStation, setListStation] = useState([]);
@@ -22,11 +28,11 @@ const SelectMonitorDevices = ({ route }) => {
 
   const fetchDetails = useCallback(async () => {
     const configs = { params: {} };
-    if (automate?.type === AUTOMATE_TYPE.EVENT) {
+    if (type === AUTOMATE_TYPE.EVENT) {
       configs.params.type = 'event';
     }
     await fetchWithCache(
-      API.UNIT.DEVICE_SENSOR(automate?.unit),
+      API.UNIT.DEVICE_SENSOR(unit || multiUnit.id),
       configs,
       (response) => {
         const { success, data } = response;
@@ -46,17 +52,17 @@ const SelectMonitorDevices = ({ route }) => {
       }
     );
     setLoading(false);
-  }, [automate?.type, automate?.unit]);
+  }, [multiUnit.id, type, unit]);
 
   useEffect(() => {
-    if (!automate?.sensor_id) {
+    if (!sensor_id) {
       return;
     }
     let selectSensor = {};
     let found = false;
     for (let i = 0; i < stations.length; i++) {
       for (let j = 0; j < stations[i].sensors.length; j++) {
-        if (stations[i].sensors[j].id === automate.sensor_id) {
+        if (stations[i].sensors[j].id === sensor_id) {
           selectSensor = stations[i].sensors[j];
           found = true;
           break;
@@ -67,7 +73,7 @@ const SelectMonitorDevices = ({ route }) => {
       }
     }
     setDefaultSelectedDevice(selectSensor);
-  }, [automate?.sensor_id, stations]);
+  }, [sensor_id, stations]);
 
   useEffect(() => {
     fetchDetails();
@@ -86,6 +92,7 @@ const SelectMonitorDevices = ({ route }) => {
         stationName: stations[indexStation]?.name,
         isCreateNewAction,
         closeScreen,
+        unitId: automate?.unit,
       });
     },
     [navigate, automate, stations, isCreateNewAction, closeScreen]

package/src/screens/Automate/AddNewAction/SetupScriptDelay.js

@@ -40,7 +40,7 @@ const SetupScriptDelay = ({ route }) => {
         params: { saveAt: moment().valueOf() },
       });
     } else {
-      ToastBottomHelper.error(t('text_done'));
+      ToastBottomHelper.error(t('error_please_try_later'));
     }
   }, [automateId, navigate, delay, t]);
 

package/src/screens/Automate/AddNewAction/SetupScriptNotify.js

@@ -17,9 +17,9 @@ import moment from 'moment';
 const SetupScriptNotify = ({ route }) => {
   const t = useTranslations();
   const { goBack, navigate } = useNavigation();
-  const { automate = {}, unitId } = route?.params || {};
+  const { automate = {}, unitId, multiUnit } = route.params || {};
   const { id: automateId } = automate;
-  const [notify, setNotify] = useState({ unit: unitId });
+  const [notify, setNotify] = useState({ unit: unitId || multiUnit.id });
 
   const onChangeTitle = (value) => {
     setNotify((state) => ({
@@ -47,7 +47,7 @@ const SetupScriptNotify = ({ route }) => {
         params: { saveAt: moment().valueOf() },
       });
     } else {
-      ToastBottomHelper.error(t('text_done'));
+      ToastBottomHelper.error(t('error_please_try_later'));
     }
   }, [automateId, navigate, notify, t]);
 

package/src/screens/Automate/AddNewAction/__test__/SetupScriptNotify.test.js

@@ -69,6 +69,35 @@ describe('Test SetupScriptNotify', () => {
     expect(spyToast).toHaveBeenCalled();
   });
 
+  it('SetupScriptNotify onPress create script notify success with multi unit', async () => {
+    route.params.unitId = null;
+    route.params.multiUnit = { id: 1 };
+    const spyToast = jest.spyOn(ToastBottomHelper, 'success');
+    mock.onPost(API.AUTOMATE.ADD_SCRIPT_NOTIFY(1)).reply(200);
+    await act(async () => {
+      tree = await renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const inputs = instance.findAllByType(_TextInput);
+    expect(inputs).toHaveLength(2);
+
+    await act(async () => {
+      inputs[0].props.onChange('Title');
+    });
+    const touchable = instance.findAllByType(TouchableWithoutFeedback);
+    await act(async () => {
+      touchable[0].props.onPress();
+    });
+    await act(async () => {
+      inputs[1].props.onChange('Message');
+    });
+    const button = instance.findByType(BottomButtonView);
+    await act(async () => {
+      button.props.onPressMain();
+    });
+    expect(spyToast).toHaveBeenCalled();
+  });
+
   it('SetupScriptNotify onPress create script notify error', async () => {
     const spyToast = jest.spyOn(ToastBottomHelper, 'error');
     mock.onPost(API.AUTOMATE.ADD_SCRIPT_NOTIFY(1)).reply(400);

package/src/screens/Automate/AddNewAutoSmart/AddTypeSmart.js

@@ -7,16 +7,16 @@ import Text from '../../../commons/Text';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import Routes from '../../../utils/Route';
 import styles from './styles/AddNewAutoSmartStyles';
+import { AUTOMATE_TYPE } from '../../../configs/Constants';
 
 const AddTypeSmart = ({ smartTypes, route }) => {
   const t = useTranslations();
   const { navigate, goBack } = useNavigation();
   const { automate = {}, closeScreen } = route?.params || {};
+  const { id, unit, type } = automate;
 
   const [selectedIndex, setSelectedIndex] = useState(
-    automate?.id
-      ? smartTypes.findIndex((obj) => obj.type === automate.type)
-      : -1
+    id ? smartTypes.findIndex((obj) => obj.type === type) : -1
   );
 
   const handleOnContinue = useCallback(
@@ -27,18 +27,18 @@ const AddTypeSmart = ({ smartTypes, route }) => {
           ...automate,
           type: dataAutomate?.type,
         },
-        unitId: automate?.unit,
+        unitId: unit,
         closeScreen: closeScreen,
       };
 
-      if (!automate?.unit) {
+      if (!unit && dataAutomate.type !== AUTOMATE_TYPE.SCHEDULE) {
         navigate(Routes.SelectUnit, params);
         return;
       }
 
       navigate(dataAutomate.route, params);
     },
-    [smartTypes, automate, closeScreen, navigate]
+    [smartTypes, automate, unit, closeScreen, navigate]
   );
 
   const onSelectType = (index) => {
@@ -51,7 +51,7 @@ const AddTypeSmart = ({ smartTypes, route }) => {
       <HeaderCustom isShowClose onClose={goBack} />
       <View style={styles.container}>
         <Text semibold type={'H2'} style={styles.titleCreate}>
-          {automate?.id ? t('update_smart') : t('create_smart')}
+          {id ? t('update_smart') : t('create_smart')}
         </Text>
         <Text type={'Body'} style={styles.titleChoose}>
           {t('choose_the_automation_method_you_want')}

package/src/screens/Automate/ScriptDetail/Components/AddActionScript.js

@@ -40,6 +40,7 @@ const AddActionScript = memo(
               closeScreen: currentScreenName,
               numberActionCanAdd:
                 max_actions_per_automation - numberActionAdded,
+              routeName: unit ? null : Routes.SelectControlDevices,
             };
 
             navigate(
@@ -54,10 +55,17 @@ const AddActionScript = memo(
           image: <Notify />,
           onClick: () => {
             setIsVisible(false);
-            navigate(Routes.SetupScriptNotify, {
-              automate,
-              unitId: unit,
-            });
+            if (unit) {
+              navigate(Routes.SetupScriptNotify, {
+                automate,
+                unitId: unit,
+              });
+            } else {
+              navigate(Routes.SelectUnit, {
+                automate,
+                routeName: Routes.SetupScriptNotify,
+              });
+            }
           },
         },
         {

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

@@ -308,6 +308,8 @@ describe('Test ScriptDetail', () => {
         unitId: route.params.preAutomate.unit,
         automateId: route.params.preAutomate.id,
         numberActionCanAdd: 2,
+        closeScreen: undefined,
+        routeName: null,
       }
     );
     mockedNavigate.mockClear();

package/src/screens/SelectUnit/index.js

@@ -76,7 +76,7 @@ const SelectUnit = () => {
         isAutomateTab,
         isMultiUnits,
         routeName,
-        unit: selectedItem,
+        multiUnit: selectedItem,
         automateId,
         scriptName,
         oldType,

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

@@ -1320,6 +1320,8 @@ export default {
   smart_supplier: 'Nhà Cung Cấp Thông Minh',
   text_email_or_phone_number: 'Email hoặc Số điện thoại',
   enter_password: 'Mật khẩu',
+  you_need_to_enter_password:
+    'Bạn cần nhập mật khẩu để xác nhận yêu cầu của mình',
   connecting_smart_account: 'Đang kết nối tài khoản',
   warning_connecting_smart_account:
     'Đừng tắt thiết bị hoặc đóng ứng dụng này trong quá trình thiết lập. Quá trình thiết lập có thể mất vài ' +