@eohjsc/react-native-smart-city 0.2.81 → 0.2.84

package/src/screens/AddNewAction/SelectAction.js

@@ -148,38 +148,56 @@ const SelectAction = memo(({ route }) => {
     checkedItem,
     t,
   ]);
-
   const onSave = useCallback(async () => {
     if (isSelectSensor) {
       await checkConditionToContinue();
     } else {
-      let list_action = [...actions];
-      list_action = list_action.map((item) => ({
-        action: item.action,
-        data: item.data,
-      }));
-      const { success } = await axiosPost(
-        API.AUTOMATE.ADD_SCRIPT_ACTION(automateId),
-        {
-          list_action,
-          unit: unit.id,
+      if (automateId) {
+        let list_action = [...actions];
+        list_action = list_action.map((item) => ({
+          action: item.action,
+          data: item.data,
+        }));
+        const { success } = await axiosPost(
+          API.AUTOMATE.ADD_SCRIPT_ACTION(automateId),
+          {
+            list_action,
+            unit: unit.id,
+          }
+        );
+        if (!success) {
+          ToastBottomHelper.error(t('not_permission'));
         }
-      );
-      if (!success) {
-        ToastBottomHelper.error(t('not_permission'));
+        navigate(Routes.ScriptDetail, {
+          id: automateId,
+          name: scriptName,
+          havePermission: true,
+          unit,
+          saveAt: moment().valueOf(),
+          type: type,
+          isAutomateTab,
+          isCreateNewAction,
+          isMultiUnits,
+          automate,
+        });
+      } else {
+        navigate(Routes.AddNewOneTap, {
+          automateData: {
+            action: actions[0].action,
+          },
+          type,
+          unit,
+          isAutomateTab,
+          isSelectSensor,
+          isMultiUnits,
+          automateId,
+          automate: {
+            ...automate,
+            action: actions[0].action,
+          },
+          scriptName,
+        });
       }
-      navigate(Routes.ScriptDetail, {
-        id: automateId,
-        name: scriptName,
-        havePermission: true,
-        unit,
-        saveAt: moment().valueOf(),
-        type: type,
-        isAutomateTab,
-        isCreateNewAction,
-        isMultiUnits,
-        automate,
-      });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
@@ -284,14 +302,14 @@ const SelectAction = memo(({ route }) => {
     () => (
       <BottomButtonView
         style={styles.bottomButtonView}
-        mainTitle={t(isSelectSensor ? 'continue' : 'save')}
+        mainTitle={t(automateId ? 'save' : 'continue')}
         onPressMain={onSave}
         typeMain={
           actions.length > 0 || !!checkedItem?.id ? 'primary' : 'disabled'
         }
       />
     ),
-    [onSave, actions, checkedItem, isSelectSensor, t]
+    [t, automateId, onSave, actions.length, checkedItem?.id]
   );
 
   useEffect(() => {

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

@@ -3,7 +3,7 @@ import { act, create } from 'react-test-renderer';
 import AddNewAutoSmart from '..';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { TESTID } from '../../../configs/Constants';
+import { AUTOMATE_TYPE, TESTID } from '../../../configs/Constants';
 import ItemAutomate from '../../../commons/Automate/ItemAutomate';
 import Routes from '../../../utils/Route';
 
@@ -34,7 +34,7 @@ describe('test AddNewAutoSmart', () => {
   let tree;
   let route = {
     params: {
-      type: 'value_change',
+      type: AUTOMATE_TYPE.VALUE_CHANGE,
       unit: { id: 1 },
     },
   };
@@ -49,7 +49,7 @@ describe('test AddNewAutoSmart', () => {
     });
     const instance = tree.root;
     const items = instance.findAllByType(ItemAutomate);
-    expect(items).toHaveLength(2);
+    expect(items).toHaveLength(3);
 
     await act(async () => {
       await items[0].props.onPress();

package/src/screens/AddNewAutoSmart/index.js

@@ -42,6 +42,13 @@ const AddNewAutoSmart = memo(({ route }) => {
         type: AUTOMATE_TYPE.SCHEDULE,
         route: Routes.SetSchedule,
       },
+      {
+        type: AUTOMATE_TYPE.EVENT,
+        route: Routes.SelectSensorDevices,
+        data: {
+          title: AUTOMATE_SELECT.SELECT_DEVICE,
+        },
+      },
     ],
     [AUTOMATE_TYPE.VALUE_CHANGE]: [
       {
@@ -55,6 +62,13 @@ const AddNewAutoSmart = memo(({ route }) => {
         type: AUTOMATE_TYPE.SCHEDULE,
         route: Routes.SetSchedule,
       },
+      {
+        type: AUTOMATE_TYPE.EVENT,
+        route: Routes.SelectSensorDevices,
+        data: {
+          title: AUTOMATE_SELECT.SELECT_DEVICE,
+        },
+      },
     ],
     [AUTOMATE_TYPE.ONE_TAP_ONLY]: [
       {
@@ -84,7 +98,10 @@ const AddNewAutoSmart = memo(({ route }) => {
       scriptName,
     };
 
-    if (dataAutomate.type === AUTOMATE_TYPE.VALUE_CHANGE && isMultiUnits) {
+    if (
+      (dataAutomate.type === AUTOMATE_TYPE.VALUE_CHANGE && isMultiUnits) ||
+      (dataAutomate.type === AUTOMATE_TYPE.EVENT && isMultiUnits)
+    ) {
       navigate(Routes.SelectUnit, params);
     } else {
       navigate(dataAutomate.route, params);

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

@@ -60,7 +60,7 @@ const ConnectWifiWarning = memo(({ route }) => {
         undefined
       );
     });
-    socket.on('message', function (msg, rinfo) {
+    socket.on('message', (msg, rinfo) => {
       const data = JSON.parse(msg.toString());
       if (data.hasOwnProperty('wifi')) {
         navigate(Routes.GatewayWifiList, {
@@ -71,27 +71,36 @@ const ConnectWifiWarning = memo(({ route }) => {
         });
       }
       if (data.hasOwnProperty('gateway')) {
-        navigate(Routes.Dashboard);
-        ToastBottomHelper.success(t('completed'));
+        const checkWifiInterval = setInterval(() => {
+          // eslint-disable-next-line promise/prefer-await-to-then
+          WifiManager.getCurrentWifiSSID().then(async (ssid) => {
+            if (ssid !== wifi_ssid) {
+              const { success } = await axiosPost(
+                API.UNIT.ADD_GATEWAY(unit_id),
+                {
+                  chip: chip_id,
+                  imei: data.gateway.imei,
+                  chip_name: data.gateway.model,
+                }
+              );
+              if (success) {
+                navigate(Routes.Dashboard);
+                ToastBottomHelper.success(t('add_gateway_success'));
+                clearInterval(checkWifiInterval);
+              }
+            }
+          });
+        }, 3000);
       }
     });
     socket.on('error', () => {
       ToastBottomHelper.error(t('server_error'));
       goBack();
     });
-    return () => {
-      socket.close();
-    };
   };
 
   const handleConnectWifiGateway = async () => {
     setIsLoading(true);
-    const { success } = await axiosPost(API.UNIT.ADD_GATEWAY(unit_id), {
-      chip: chip_id,
-    });
-    if (success) {
-      ToastBottomHelper.success(t('add_gateway_success'));
-    }
     // eslint-disable-next-line promise/prefer-await-to-then
     WifiManager.connectToProtectedSSID(wifi_ssid, wifi_pass, false).then(
       () => {

package/src/screens/AllCamera/index.js

@@ -1,4 +1,10 @@
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import { View, Text, TouchableOpacity, Platform, Image } from 'react-native';
 import { useRoute, useNavigation } from '@react-navigation/native';
 import { chunk } from 'lodash';
@@ -28,36 +34,51 @@ const AllCamera = () => {
   const [isFullScreen, setIsFullScreen] = useState(false);
   const [dataFullScreen, setDataFullScreen] = useState();
 
-  const handleFullScreen = (data) => {
-    setIsFullScreen(!isFullScreen);
-    setDataFullScreen(data);
-  };
+  const handleFullScreen = useCallback(
+    (data) => {
+      setIsFullScreen(!isFullScreen);
+      setDataFullScreen(data);
+    },
+    [isFullScreen]
+  );
 
-  const onPressAmount = (value) => () => {
-    setAmount(value);
-    value === 1 && setActiveCamera(arrCameras[0]);
-    const dataTemp = [...arrCameras];
-    setData(value === 1 ? dataTemp : chunk(dataTemp, value));
-  };
+  const onPressAmount = useCallback(
+    (value) => () => {
+      setAmount(value);
+      value === 1 && setActiveCamera(arrCameras[0]);
+      const dataTemp = [...arrCameras];
+      setData(value === 1 ? dataTemp : chunk(dataTemp, value));
+      setCurrentPage(1);
+    },
+    [arrCameras]
+  );
 
-  const onPressNext = () =>
+  const onPressNext = useCallback(() => {
     currentPage !== data.length && carouselRef?.current?.snapToNext();
+  }, [currentPage, data.length]);
 
-  const onPressPrev = () =>
+  const onPressPrev = useCallback(() => {
     currentPage !== 1 && carouselRef?.current?.snapToPrev();
+  }, [currentPage]);
 
-  const onSnapToItem = (index) => {
-    setActiveCamera(data[index]);
-    setCurrentPage(index + 1);
-  };
+  const onSnapToItem = useCallback(
+    (index) => {
+      setActiveCamera(data[index]);
+      setCurrentPage(index + 1);
+    },
+    [data]
+  );
 
   const onClose = () => {
     setIsFullScreen(false);
   };
 
-  const goToPlayBack = (item, thumbnail) => () => {
-    navigate(Routes.PlaybackCamera, { item, thumbnail });
-  };
+  const goToPlayBack = useCallback(
+    (item, thumbnail) => () => {
+      navigate(Routes.PlaybackCamera, { item, thumbnail });
+    },
+    [navigate]
+  );
 
   const CameraItem = ({ item, width, height }) => {
     return (
@@ -82,7 +103,7 @@ const AllCamera = () => {
     );
   };
 
-  const renderItem = ({ item, index }) => {
+  const renderItem = ({ item }) => {
     return (
       <View style={styles.wrapItem}>
         {amount === 1 ? (
@@ -93,13 +114,13 @@ const AllCamera = () => {
               <CameraItem
                 key={item?.id}
                 item={item[0]}
-                width={188}
+                width={Constants.width / 2}
                 height={112}
               />
               <CameraItem
                 key={item?.id}
                 item={item[1]}
-                width={188}
+                width={Constants.width / 2}
                 height={112}
               />
             </View>
@@ -107,13 +128,13 @@ const AllCamera = () => {
               <CameraItem
                 key={item?.id}
                 item={item[2]}
-                width={188}
+                width={Constants.width / 2}
                 height={112}
               />
               <CameraItem
                 key={item?.id}
                 item={item[3]}
-                width={188}
+                width={Constants.width / 2}
                 height={112}
               />
             </View>
@@ -138,19 +159,23 @@ const AllCamera = () => {
 
   const renderCarousel = useMemo(() => {
     return (
-      <Carousel
-        ref={carouselRef}
-        data={data}
-        renderItem={renderItem}
-        sliderWidth={Constants.width}
-        itemWidth={Constants.width}
-        inactiveSlideScale={1}
-        onSnapToItem={onSnapToItem}
-        inactiveSlideOpacity={1}
-        extraData={data}
-        loop={false}
-        isForceIndex={Platform.OS === 'android'}
-      />
+      <View style={styles.wrapCarousel}>
+        <Carousel
+          ref={carouselRef}
+          data={data}
+          renderItem={renderItem}
+          sliderWidth={Constants.width}
+          itemWidth={Constants.width}
+          inactiveSlideScale={1}
+          onSnapToItem={onSnapToItem}
+          inactiveSlideOpacity={1}
+          extraData={data}
+          loop={false}
+          lockScrollWhileSnapping
+          isForceIndex={Platform.OS === 'android'}
+          removeClippedSubviews={false}
+        />
+      </View>
     );
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [data]);
@@ -182,6 +207,17 @@ const AllCamera = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [amount]);
 
+  const renderName = useMemo(
+    () => (
+      <Text style={styles.cameraName}>
+        {amount === 1
+          ? activeCamera?.configuration?.name
+          : `${currentPage}/${data.length}`}
+      </Text>
+    ),
+    [activeCamera?.configuration?.name, amount, currentPage, data.length]
+  );
+
   useEffect(() => {
     const to = setTimeout(() => {
       carouselRef?.current?.snapToItem();
@@ -203,16 +239,12 @@ const AllCamera = () => {
             <TouchableOpacity style={styles.buttonNext} onPress={onPressPrev}>
               <Image source={Images.arrowLeft} />
             </TouchableOpacity>
-            <Text numberOfLines={1} style={styles.cameraName}>
-              {amount === 1
-                ? activeCamera?.configuration?.name
-                : `${currentPage}/${data.length}`}
-            </Text>
+            {renderName}
             <TouchableOpacity style={styles.buttonNext} onPress={onPressNext}>
               <Image source={Images.arrowLeft} style={styles.arrowRight} />
             </TouchableOpacity>
           </View>
-          <View style={styles.wrapCarousel}>{renderCarousel}</View>
+          {renderCarousel}
           {renderAmount}
         </View>
       </View>

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

@@ -90,7 +90,7 @@ describe('Test EditDevice', () => {
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(axios.patch).toHaveBeenCalledWith(API.SENSOR.RENAME_SENSOR(1), {
+    expect(axios.patch).toHaveBeenCalledWith(API.SENSOR.SENSOR_DETAIL(1), {
       name: 'new_name',
     });
     expect(alertAction.props.visible).toBeFalsy();
@@ -119,7 +119,7 @@ describe('Test EditDevice', () => {
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(axios.delete).toHaveBeenCalledWith(API.SENSOR.REMOVE_SENSOR(1));
+    expect(axios.delete).toHaveBeenCalledWith(API.SENSOR.SENSOR_DETAIL(1));
     expect(alertAction.props.visible).toBeFalsy();
     expect(mockPop).toHaveBeenCalled();
   });

package/src/screens/Device/EditDevice/index.js

@@ -29,7 +29,7 @@ const EditDevice = memo(() => {
     useEditDevice();
   const renameSensor = useCallback(async () => {
     const { success, data } = await axiosPatch(
-      API.SENSOR.RENAME_SENSOR(sensor?.id),
+      API.SENSOR.SENSOR_DETAIL(sensor?.id),
       {
         name: inputName,
       }
@@ -53,7 +53,7 @@ const EditDevice = memo(() => {
 
   const deleteSensor = useCallback(async () => {
     hideAlertAction();
-    const { success } = await axiosDelete(API.SENSOR.REMOVE_SENSOR(sensor?.id));
+    const { success } = await axiosDelete(API.SENSOR.SENSOR_DETAIL(sensor?.id));
 
     if (success) {
       navigation.pop(2);

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

@@ -93,7 +93,7 @@ describe('test DeviceDetail', () => {
   beforeEach(() => {
     route = {
       params: {
-        unit: {
+        unitData: {
           id: 1,
           name: 'Unit name',
           address: '298 Dien Bien Phu',
@@ -105,10 +105,11 @@ describe('test DeviceDetail', () => {
           id: 2,
           name: 'Station name',
         },
-        sensor: {
+        sensorData: {
           id: 1,
           is_managed_by_backend: true,
           station: { id: 2, name: 'Station name' },
+          name: 'Sensor name',
         },
         title: 'Button',
       },
@@ -252,7 +253,9 @@ describe('test DeviceDetail', () => {
     });
     expect(axios.post).toHaveBeenCalledWith(API.SENSOR.QUICK_ACTION(1), {
       key: responseDisplay.data.items[1].configuration.configuration.action1,
+      data: null,
       source: 'internet',
+      action_name: undefined,
     });
 
     const button2 = instance.find(
@@ -263,7 +266,9 @@ describe('test DeviceDetail', () => {
     });
     expect(axios.post).toHaveBeenCalledWith(API.SENSOR.QUICK_ACTION(1), {
       key: responseDisplay.data.items[1].configuration.configuration.action2,
+      data: null,
       source: 'internet',
+      action_name: undefined,
     });
 
     const button3 = instance.find(
@@ -274,7 +279,9 @@ describe('test DeviceDetail', () => {
     });
     expect(axios.post).toHaveBeenCalledWith(API.SENSOR.QUICK_ACTION(1), {
       key: responseDisplay.data.items[1].configuration.configuration.action3,
+      data: null,
       source: 'internet',
+      action_name: undefined,
     });
   });
 
@@ -628,7 +635,7 @@ describe('test DeviceDetail', () => {
   });
 
   test('not fetch value if not managed by backend', async () => {
-    route.params.sensor.is_managed_by_backend = false;
+    route.params.sensorData.is_managed_by_backend = false;
 
     await act(async () => {
       tree = await create(wrapComponent(account, route));
@@ -638,7 +645,7 @@ describe('test DeviceDetail', () => {
   });
 
   test('render CurrentRainSensor but is other device', async () => {
-    route.params.sensor.is_other_device = true;
+    route.params.sensorData.is_other_device = true;
     route.params.isGGHomeConnected = true;
 
     const responseDisplay = {
@@ -708,9 +715,9 @@ describe('test DeviceDetail', () => {
   });
 
   test('Add device to Favourites', async () => {
-    const unit_id = route.params.unit.id;
+    const unit_id = route.params.unitData.id;
     const station_id = route.params.station.id;
-    const sensor = route.params.sensor;
+    const sensor = route.params.sensorData;
     sensor.is_favourite = false;
 
     await act(async () => {
@@ -736,9 +743,9 @@ describe('test DeviceDetail', () => {
   });
 
   test('Remove device from Favourites', async () => {
-    const unit_id = route.params.unit.id;
+    const unit_id = route.params.unitData.id;
     const station_id = route.params.station.id;
-    const sensor = route.params.sensor;
+    const sensor = route.params.sensorData;
     sensor.is_favourite = true;
 
     await act(async () => {
@@ -810,12 +817,12 @@ describe('test DeviceDetail', () => {
       await menu.props.onItemClick(gotoActivityLog);
     });
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ActivityLog, {
-      id: route.params.sensor.id,
+      id: route.params.sensorData.id,
       type: 'action',
-      share: route.params.unit,
+      share: route.params.unitData,
       filterEnabled: {
         date: true,
-        user: Boolean(route.params.unit.id),
+        user: Boolean(route.params.unitData.id),
       },
     });
   });

package/src/screens/Device/components/SensorConnectStatusViewHeader.js

@@ -3,7 +3,7 @@ import { ConnectedViewHeader, DisconnectedView } from '../../../commons/Device';
 import { DEVICE_TYPE } from '../../../configs/Constants';
 
 export const SensorConnectStatusViewHeader = (props) => {
-  if (!!props.sensor && !props.sensor.is_other_device) {
+  if (!!props.sensor && !props.sensor?.is_other_device) {
     if (props.connected) {
       return (
         <>
@@ -31,7 +31,7 @@ export const SensorConnectStatusViewHeader = (props) => {
       return <DisconnectedView sensor={props.sensor} />;
     }
   } else {
-    if (props.sensor.device_type === DEVICE_TYPE.LG_THINQ) {
+    if (props.sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
       return (
         <>
           <ConnectedViewHeader lastUpdated={props.lastUpdated} />

package/src/screens/Device/components/SensorDisplayItem.js

@@ -40,8 +40,8 @@ export const SensorDisplayItem = ({
   const t = useTranslations();
   const userId = useSCContextSelector((state) => state.auth.account.user.id);
   const doAction = useCallback(
-    (action, data) => {
-      sendRemoteCommand(sensor, action, data, userId);
+    (action, data, actionName) => {
+      sendRemoteCommand(sensor, action, data, userId, actionName);
     },
     [sensor, userId]
   );