@eohjsc/react-native-smart-city 0.3.93 → 0.3.95

package/src/screens/AddNewGateway/ConnectingDevice.js

@@ -81,6 +81,13 @@ const ConnectingDevice = ({
         if (found) {
           return { ...oldParams };
         }
+        if (data?.type === 'rejoin') {
+          return {
+            ...oldParams,
+            isRejoin: true,
+            sensorId: data?.sensor?.id,
+          };
+        }
         return oldParams;
       });
     },

package/src/screens/AddNewGateway/ConnectingWifiDevice.js

@@ -12,7 +12,7 @@ let isCallingAPI = false;
 
 const ConnectingWifiDevice = ({ route }) => {
   const t = useTranslations();
-  const { unit, subUnit, gateway, selectedWifi, qrData, addDeviceType } =
+  const { unit, subUnit, gateway, selectedWifi, qrData, addDeviceType, code } =
     route?.params || {};
   const { goBack } = useNavigation();
 
@@ -40,7 +40,8 @@ const ConnectingWifiDevice = ({ route }) => {
           const { success, problem, data } = await axiosPost(
             API.UNIT.CHIP_SCAN(unit?.id),
             {
-              imei: gateway?.imei,
+              code,
+              host: qrData?.host,
               secret: qrData?.secret,
               name: gateway?.model,
               station: subUnit?.id,
@@ -61,9 +62,10 @@ const ConnectingWifiDevice = ({ route }) => {
     },
     [
       unit?.id,
-      gateway?.imei,
-      gateway?.model,
+      code,
+      qrData?.host,
       qrData?.secret,
+      gateway?.model,
       subUnit?.id,
       selectedWifi.ssid,
       selectedWifi.password,

package/src/screens/AddNewGateway/ConnectingWifiGuide.js

@@ -124,7 +124,6 @@ const ConnectingWifiGuide = ({ route }) => {
         socket = dgram.createSocket({ type: 'udp4' });
         socket.bind(54321);
       }
-
       socket.on('message', (msg, rinfo) => {
         const data = JSON.parse(msg.toString());
         if (Object.prototype.hasOwnProperty.call(data, 'wifi')) {

package/src/screens/AddNewGateway/RenameNewDevices.js

@@ -21,7 +21,7 @@ const RenameNewDevices = memo(({ route }) => {
   const t = useTranslations();
   const { dispatch } = useNavigation();
 
-  const { unit, subUnit, chipId, sensorId, addDeviceType } =
+  const { unit, subUnit, chipId, sensorId, addDeviceType, isRejoin } =
     route?.params || {};
   const [selectedItem, setSelectedItem] = useState({});
   const [isCanRename, setIsCanRename] = useState(false);
@@ -268,7 +268,7 @@ const RenameNewDevices = memo(({ route }) => {
             size={20}
             style={styles.textStatus}
           >
-            {t('successfully_connected')}
+            {t(`successfully_${isRejoin ? 'rejoined' : 'connected'}`)}
           </Text>
           <Text size={14} color={Colors.Gray9}>
             {[unit?.name, subUnit?.name].filter(Boolean).join(' - ')}

package/src/screens/AddNewGateway/ScanWifiDeviceQR.js

@@ -9,7 +9,6 @@ const ScanWifiDeviceQR = memo(({ route }) => {
   const { unit, subUnit } = route?.params || {};
   const [isInvalidQrCode, setIsInvalidQrCode] = useState(false);
   const { navigate, goBack } = useNavigation();
-
   const onScan = useCallback(
     (body, setLoading) => {
       let data;
@@ -20,11 +19,7 @@ const ScanWifiDeviceQR = memo(({ route }) => {
         setLoading(false);
         return;
       }
-      if (data?.prefix !== 'robot') {
-        setIsInvalidQrCode(true);
-        setLoading(false);
-        return;
-      }
+
       navigate(Routes.ConnectingWifiGuide, {
         unit,
         subUnit,

package/src/screens/AddNewGateway/SelectDeviceType.js

@@ -14,13 +14,19 @@ import AddZigbeeDeviceIcon from '../../../assets/images/AddNewDevice/add-zigbee-
 import styles from './SelectDeviceTypeStyles';
 import AccessibilityLabel from '../../configs/AccessibilityLabel';
 import { DEVICE_TYPE } from '../../configs/Constants';
+import { useBackendPermission } from '../../utils/Permission/backend';
+import { axiosGet } from '../../utils/Apis/axios';
+import API from '../../configs/API';
+import { ToastBottomHelper } from '../../utils/Utils';
 
 const SelectDeviceGrid = ({ options, onSelect }) => {
   const [selectIndexes, setSelectIndexes] = useState();
   const onSelectOption = useCallback(
     (value) => () => {
+      if (onSelect(value) === false) {
+        return;
+      }
       setSelectIndexes(value);
-      onSelect(value);
     },
     [onSelect]
   );
@@ -51,17 +57,33 @@ const SelectDeviceGrid = ({ options, onSelect }) => {
   );
 };
 
+const getPermissionCode = (deviceType) => {
+  switch (deviceType) {
+    case 'gateway_qr':
+      return 'plug_and_play_gateway';
+    case 'wifi_device_qr':
+      return 'plug_and_play_wifi';
+    case 'modbus_device_qr':
+      return 'plug_and_play_modbus';
+    case 'zigbee':
+    default:
+      return 'plug_and_play_zigbee';
+  }
+};
+
 const SelectDeviceType = ({ route }) => {
   const t = useTranslations();
   const { unit, subUnit } = route?.params || {};
   const { navigate, goBack } = useNavigation();
+  const [unitCountSummary, setUnitCountSummary] = useState();
   const [addType, setAddType] = useState();
   const [selectedAddType, setSelectedAddType] = useState();
+  const permissions = useBackendPermission();
 
   const listDeviceType = useMemo(() => {
     const list = [
       {
-        id: 1,
+        id: 'gateway_qr',
         image: <AddGatewayIcon width={60} height={60} />,
         route: Routes.ScanGatewayQR,
         data: {
@@ -71,7 +93,7 @@ const SelectDeviceType = ({ route }) => {
         subtitle: t('central_controller'),
       },
       {
-        id: 2,
+        id: 'wifi_device_qr',
         image: <AddWifiDeviceIcon width={60} height={60} />,
         route: subUnit?.id
           ? Routes.ScanWifiDeviceQR
@@ -85,7 +107,7 @@ const SelectDeviceType = ({ route }) => {
         subtitle: t('device_connect_without_gateway'),
       },
       {
-        id: 3,
+        id: 'modbus_device_qr',
         image: <AddModbusDeviceIcon width={60} height={60} />,
         route: subUnit?.id ? Routes.ScanModbusQR : Routes.SelectDeviceSubUnit,
         data: {
@@ -97,7 +119,7 @@ const SelectDeviceType = ({ route }) => {
         subtitle: t('device_connect_directly_to_the_gateway'),
       },
       {
-        id: 4,
+        id: 'zigbee',
         image: <AddZigbeeDeviceIcon width={60} height={60} />,
         route: subUnit?.id
           ? Routes.ConnectRouterGuide
@@ -111,19 +133,43 @@ const SelectDeviceType = ({ route }) => {
         subtitle: t('device_connect_remotely_to_the_gateway'),
       },
     ];
-    if (!!subUnit?.id) {
+    if (subUnit?.id) {
       list.shift();
     }
     return list;
   }, [unit, t, subUnit]);
 
   const onRight = useCallback(() => {
-    if (selectedAddType?.route && selectedAddType?.data) {
-      navigate(selectedAddType?.route, selectedAddType?.data);
+    if (!selectedAddType?.route) {
+      return;
     }
+
+    navigate(selectedAddType?.route, selectedAddType?.data);
   }, [navigate, selectedAddType?.data, selectedAddType?.route]);
 
   const handleOnSelect = (itemSelect) => {
+    const needPermission = getPermissionCode(itemSelect);
+    if (!permissions?.[needPermission]) {
+      ToastBottomHelper.error(t(`no_permission_${needPermission}`));
+      return false;
+    }
+
+    if (['gateway_qr', 'wifi_device_qr'].includes(itemSelect)) {
+      if (permissions?.max_chips_per_unit <= unitCountSummary?.total_chips) {
+        ToastBottomHelper.error(t('reach_max_chips_per_unit'));
+        return false;
+      }
+    }
+
+    if (['wifi_device_qr', 'modbus_device_qr', 'zigbee'].includes(itemSelect)) {
+      if (
+        permissions?.max_configs_per_unit <= unitCountSummary?.total_configs
+      ) {
+        ToastBottomHelper.error(t('reach_max_configs_per_unit'));
+        return false;
+      }
+    }
+
     setAddType(itemSelect);
   };
 
@@ -131,6 +177,18 @@ const SelectDeviceType = ({ route }) => {
     setSelectedAddType(listDeviceType.find((item) => item.id === addType));
   }, [addType, listDeviceType]);
 
+  useEffect(() => {
+    const fetchCountSummary = async () => {
+      const { success, data } = await axiosGet(API.DEV_MODE.GATEWAY.COUNT(), {
+        unit: unit?.id,
+      });
+      if (success) {
+        setUnitCountSummary(data);
+      }
+    };
+    fetchCountSummary();
+  }, [unit?.id]);
+
   return (
     <View style={styles.container}>
       <HeaderCustom title={t('choose_type_of_device')} isShowSeparator />
@@ -141,7 +199,7 @@ const SelectDeviceType = ({ route }) => {
         leftTitle={t('cancel')}
         onLeftClick={goBack}
         rightTitle={t('text_next')}
-        rightDisabled={!addType}
+        rightDisabled={!unitCountSummary || !addType}
         onRightClick={onRight}
       />
     </View>

package/src/screens/AddNewGateway/ShareWifiPassword.js

@@ -1,4 +1,10 @@
-import React, { useCallback, useRef, useState, useEffect } from 'react';
+import React, {
+  useCallback,
+  useRef,
+  useState,
+  useEffect,
+  useMemo,
+} from 'react';
 import {
   Alert,
   TouchableOpacity,
@@ -9,6 +15,7 @@ import {
 import dgram from 'react-native-udp';
 import { useNavigation, useIsFocused } from '@react-navigation/native';
 import LottieView from 'lottie-react-native';
+import uuid from 'uuid';
 
 import { ToastBottomHelper } from '../../utils/Utils';
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -68,6 +75,10 @@ const ShareWifiPassword = ({ route }) => {
   const [isDisabled, setIsDisabled] = useState(false);
   const [dataGateway, setDataGateway] = useState({ gateway: [], error: '' });
 
+  const code = useMemo(() => {
+    return uuid.v4();
+  }, []);
+
   const hidePopupPassword = useCallback(() => {
     setIsShowPopupPassword(false);
   }, []);
@@ -80,7 +91,11 @@ const ShareWifiPassword = ({ route }) => {
         socket.send(
           JSON.stringify({
             type: 'connect',
-            data: { wifi: { ssid: selectedWifi, pass: selectedWifiPassword } },
+            data: {
+              token: code,
+              host: qrData?.host,
+              wifi: { ssid: selectedWifi, pass: selectedWifiPassword },
+            },
           }),
           undefined,
           undefined,
@@ -94,7 +109,7 @@ const ShareWifiPassword = ({ route }) => {
         }
       }, 1000);
     },
-    [selectedWifiPassword, selectedWifi]
+    [code, qrData?.host, selectedWifi, selectedWifiPassword]
   );
 
   const isWrongPassword = useRef(true);
@@ -197,6 +212,7 @@ const ShareWifiPassword = ({ route }) => {
                 password: selectedWifiPassword,
               },
               addDeviceType,
+              code,
             });
           }
         }, 800);
@@ -223,6 +239,7 @@ const ShareWifiPassword = ({ route }) => {
     t,
     wifiList,
     unit,
+    code,
   ]);
 
   return (

package/src/screens/AddNewGateway/__test__/ConnectingZigbeeDevice.test.js

@@ -121,4 +121,39 @@ describe('Test connecting modbus device', () => {
       sensorId: 1,
     });
   });
+
+  it('receive sensor from channel after rejoin zigbee', async () => {
+    mock.onPost().reply(200, {});
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const channels = getPusher().channels;
+    let channel;
+    for (const key in channels) {
+      if (key.indexOf('cache-') === 0) {
+        channel = channels[key];
+      }
+    }
+    await act(async () => {
+      await channel.trigger('progress', {
+        data: { sensor: { id: 1, name: 'sensor' }, type: 'rejoin' },
+      });
+    });
+    await act(async () => {
+      await channel.trigger('progress', { success: 1 });
+    });
+    expect(mockedNavigate).toHaveBeenCalledWith(Routes.RenameNewDevices, {
+      addDeviceType: undefined,
+      unit: {
+        id: 1,
+      },
+      subUnit: {
+        id: 2,
+        station: 'Station 2',
+      },
+      chipId: 3,
+      sensorId: 1,
+      isRejoin: true,
+    });
+  });
 });

package/src/screens/AddNewGateway/__test__/ScanWifiDeviceQR.test.js

@@ -5,7 +5,6 @@ import ScanWifiDeviceQR from '../ScanWifiDeviceQR';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import QRScan from '../../ScanChipQR/components/QRScan';
-import { getTranslate } from '../../../utils/I18n';
 import Routes from '../../../utils/Route';
 
 const mockedGoBack = jest.fn();
@@ -54,15 +53,6 @@ describe('test scan wifi device QR', () => {
     });
   };
 
-  it('on scan wrong QR code', async () => {
-    await scanQRCode({ imei: 'SAMSUNG-xxx' });
-    const instance = tree.root;
-    const bottomSheet = instance.findByProps({
-      title: getTranslate('en', 'invalid_qr_code'),
-    });
-    expect(bottomSheet.props.isVisible).toBe(true);
-  });
-
   it('on scan correct QR code', async () => {
     await scanQRCode({ prefix: 'robot', org_slug: 'eoh' }, jest.fn());
     expect(mockedNavigate).toHaveBeenCalled();

package/src/screens/AddNewGateway/__test__/SelectDeviceType.test.js

@@ -8,36 +8,30 @@ import Routes from '../../../utils/Route';
 import { TouchableOpacity } from 'react-native';
 import AccessibilityLabel from '../../../configs/AccessibilityLabel';
 import { ViewButtonBottom } from '../../../commons';
-
-const wrapComponent = (route) => (
-  <SCProvider initState={mockSCStore({})}>
+import { useNavigation } from '@react-navigation/native';
+import MockAdapter from 'axios-mock-adapter';
+import api from '../../../utils/Apis/axios';
+import API from '../../../configs/API';
+import { ToastBottomHelper } from '../../../utils/Utils';
+import { getTranslate } from '../../../utils/I18n';
+const wrapComponent = (route, storeData = {}) => (
+  <SCProvider initState={mockSCStore(storeData)}>
     <SelectDeviceType route={route} />
   </SCProvider>
 );
 
-const mockedNavigate = jest.fn();
-const mockedGoBack = jest.fn();
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-      goBack: mockedGoBack,
-    }),
-    useIsFocused: () => true,
-  };
-});
+const mock = new MockAdapter(api.axiosInstance);
 
 describe('Test select device type', () => {
   let tree;
   let route;
 
-  afterEach(() => {
-    mockedNavigate.mockClear();
-  });
+  const mockedNavigate = useNavigation().navigate;
+  const spyToastError = jest.spyOn(ToastBottomHelper, 'error');
 
   beforeEach(() => {
+    spyToastError.mockClear();
+    mockedNavigate.mockClear();
     route = {
       params: {
         unitId: 1,
@@ -81,9 +75,9 @@ describe('Test select device type', () => {
     expect(deviceTypeItems).toHaveLength(3);
   });
 
-  const selectDeviceType = async (index) => {
+  const selectDeviceType = async (index, storeData = {}) => {
     await act(async () => {
-      tree = await create(wrapComponent(route));
+      tree = await create(wrapComponent(route, storeData));
     });
     const instance = tree.root;
     const deviceTypeItems = instance.findAll(
@@ -99,24 +93,184 @@ describe('Test select device type', () => {
     await act(async () => {
       submitButton.props.onRightClick();
     });
-
-    expect(mockedNavigate).toBeCalled();
   };
 
   it('select modbus', async () => {
-    await selectDeviceType(0);
-    expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.ScanGatewayQR);
+    await selectDeviceType(2, {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              plug_and_play_modbus: true,
+            },
+          },
+        },
+      },
+    });
+    expect(mockedNavigate).toBeCalled();
+    expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.SelectDeviceSubUnit);
   });
+
   it('select zigbee', async () => {
-    await selectDeviceType(1);
+    await selectDeviceType(3, {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              plug_and_play_zigbee: true,
+            },
+          },
+        },
+      },
+    });
+    expect(mockedNavigate).toBeCalled();
     expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.SelectDeviceSubUnit);
   });
+
+  it('select zigbee reach limit', async () => {
+    mock.onGet(API.DEV_MODE.GATEWAY.COUNT()).reply(200, {
+      total_chips: 1,
+      total_configs: 1,
+    });
+    await selectDeviceType(3, {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              max_chips_per_unit: 1,
+              max_configs_per_unit: 1,
+              plug_and_play_zigbee: true,
+            },
+          },
+        },
+      },
+    });
+    expect(mockedNavigate).not.toBeCalled();
+    expect(spyToastError).toBeCalledWith(
+      getTranslate('en', 'reach_max_configs_per_unit')
+    );
+  });
+
   it('select gateway', async () => {
-    await selectDeviceType(2);
-    expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.SelectDeviceSubUnit);
+    await selectDeviceType(0, {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              plug_and_play_gateway: true,
+            },
+          },
+        },
+      },
+    });
+    expect(mockedNavigate).toBeCalled();
+    expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.ScanGatewayQR);
+  });
+
+  it('select gateway reach limit', async () => {
+    mock.onGet(API.DEV_MODE.GATEWAY.COUNT()).reply(200, {
+      total_chips: 1,
+      total_configs: 1,
+    });
+    await selectDeviceType(0, {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              max_chips_per_unit: 1,
+              plug_and_play_gateway: true,
+            },
+          },
+        },
+      },
+    });
+    expect(mockedNavigate).not.toBeCalled();
+    expect(spyToastError).toBeCalledWith(
+      getTranslate('en', 'reach_max_chips_per_unit')
+    );
+  });
+
+  it('select gateway without permission', async () => {
+    await selectDeviceType(0, {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              plug_and_play_gateway: false,
+            },
+          },
+        },
+      },
+    });
+    expect(spyToastError).toBeCalledWith(
+      getTranslate('en', 'no_permission_plug_and_play_gateway')
+    );
+  });
+
+  it('select zigbee without permission', async () => {
+    await selectDeviceType(3, {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              plug_and_play_zigbee: false,
+            },
+          },
+        },
+      },
+    });
+    expect(spyToastError).toBeCalledWith(
+      getTranslate('en', 'no_permission_plug_and_play_zigbee')
+    );
   });
+
+  it('select wifi without permission', async () => {
+    await selectDeviceType(1, {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              plug_and_play_wifi: false,
+            },
+          },
+        },
+      },
+    });
+    expect(spyToastError).toBeCalledWith(
+      getTranslate('en', 'no_permission_plug_and_play_wifi')
+    );
+  });
+
+  it('select modbus without permission', async () => {
+    await selectDeviceType(2, {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              plug_and_play_modbus: false,
+            },
+          },
+        },
+      },
+    });
+    expect(spyToastError).toBeCalledWith(
+      getTranslate('en', 'no_permission_plug_and_play_modbus')
+    );
+  });
+
   it('select wifi', async () => {
-    await selectDeviceType(3);
+    await selectDeviceType(1, {
+      auth: {
+        account: {
+          user: {
+            permissions: {
+              plug_and_play_wifi: true,
+            },
+          },
+        },
+      },
+    });
+    expect(mockedNavigate).toBeCalled();
     expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.SelectDeviceSubUnit);
   });
 });

package/src/screens/AllGateway/GatewayInfo/index.js

@@ -36,7 +36,7 @@ const GatewayInfo = () => {
     date_install = '',
     expired_at = '',
     firmware = {},
-    imei = '',
+    code = '',
     arduino_gateway = undefined,
     modbus_gateway = undefined,
     zigbee_gateway = undefined,
@@ -81,7 +81,7 @@ const GatewayInfo = () => {
       {
         id: 5,
         title: 'auth_token',
-        data: imei || '--',
+        data: code || '--',
       },
       {
         id: 7,
@@ -105,7 +105,7 @@ const GatewayInfo = () => {
       expired_at,
       firmware?.board,
       id,
-      imei,
+      code,
       wifi_ssid,
     ]
   );

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

@@ -172,7 +172,6 @@ const SetupConfigCondition = () => {
         style={styles.modal}
       >
         <View style={styles.modalContent}>
-          <Text type="H3">{t('select_condition')}</Text>
           {conditionOptions.map((option, index) => (
             <React.Fragment key={index}>
               <TouchableOpacity