@eohjsc/react-native-smart-city 0.3.37 → 0.3.38

package/package.json

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

package/src/commons/UnitSummary/ConfigHistoryChart/index.js

@@ -113,10 +113,13 @@ const ConfigHistoryChart = memo(({ configs }) => {
       let params = new URLSearchParams();
       let configuration = configs.filter((item) => item.id);
       configuration.map((item) => {
-        params.append('config', item.id);
+        params.append('configs', item.id);
       });
-      params.append('date_from', startDate / 1000);
-      params.append('date_to', endDate / 1000);
+      params.append(
+        'date_from',
+        moment(startDate).format('YYYY-MM-DD HH:mm:ss')
+      );
+      params.append('date_to', moment(endDate).format('YYYY-MM-DD HH:mm:ss'));
       const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY(), {
         params,
       });

package/src/configs/API.js

@@ -48,7 +48,7 @@ const API = {
     RENAME_DEVICES: (id) => `/chip_manager/chips/${id}/rename_devices/`,
     ZIGBEE: {
       ACCEPT_NEW_DEVICE: (id) =>
-        `/iot/modules/zigbee/chips/${id}/search_device/`,
+        `/iot/modules/zigbee/chips/${id}/device_permit_to_join/`,
     },
   },
   DEVICE: {

package/src/configs/AccessibilityLabel.js

@@ -217,6 +217,10 @@ export default {
   GO_DETAIL: 'GO_DETAIL',
   NAV_LIST: 'NAV_LIST',
 
+  // Unit summary
+  COMPONENT_NAME: 'COMPONENT_NAME',
+  WRAP_HEADER_SCROLL: 'WRAP_HEADER_SCROLL',
+
   // Automate
   AUTOMATE_SCRIPT_ACTION: 'AUTOMATE_SCRIPT_ACTION',
   AUTOMATE_SCRIPT_NAME: 'AUTOMATE_SCRIPT_NAME',
@@ -423,8 +427,8 @@ export default {
     MANAGE_UNIT_ALERT: 'MANAGE_UNIT_ALERT',
     SELECT_UNIT: 'SELECT_UNIT',
     BUTTON_ADD_AUTO_SMART: 'BUTTON_ADD_AUTO_SMART',
-    BUTTON_FINISH_SMART_ACCOUNT: 'BUTTON_FINISH_SMART_ACCOUNT',
     BUTTON_CONNECT_WIFI: 'BUTTON_CONNECT_WIFI',
+    BUTTON_BOTTOM_SMART_ACCOUNT: 'BUTTON_BOTTOM_SMART_ACCOUNT',
   },
 
   TERM_AND_POLICY_TITLE: 'TERM_AND_POLICY_TITLE',
@@ -629,6 +633,9 @@ export default {
   BUTTON_CANCEL_EDIT_ACTION_LIST: 'BUTTON_CANCEL_EDIT_ACTION_LIST',
   BUTTON_SAVE_EDIT_ACTION_LIST: 'BUTTON_SAVE_EDIT_ACTION_LIST',
   BUTTON_REMOVE_EDIT_ACTION_LIST: 'BUTTON_REMOVE_EDIT_ACTION_LIST',
+
+  //Notification
+  CUSTOM_TEXT: 'CUSTOM_TEXT',
   //ButtonWrapper
   BUTTON_WRAPPER: 'BUTTON_WRAPPER',
 };

package/src/configs/Constants.js

@@ -239,6 +239,15 @@ export const NOTIFICATION_TYPES = {
   NOTIFY_REMOVE_SUB_UNIT: 'NOTIFY_REMOVE_SUB_UNIT',
   NOTIFY_REMOVE_DEVICE: 'NOTIFY_REMOVE_DEVICE',
   NOTIFY_EMERGENCY: 'NOTIFY_EMERGENCY',
+  AIR_QUALITY: 'AIR_QUALITY',
+  TURBIDITY: 'TURBIDITY',
+  PH: 'PH',
+  CLO: 'CLO',
+  UV: 'UV',
+  SMOKE: 'SMOKE',
+  FIRE: 'FIRE',
+  SOS: 'SOS',
+  FILTER_WATER: 'FILTER_WATER',
 };
 
 export const ACTIVITY_LOG_TYPES = {
@@ -247,18 +256,6 @@ export const ACTIVITY_LOG_TYPES = {
   SCRIPT_UPDATED_BY: 'SCRIPT_UPDATED_BY',
 };
 
-export const SENSOR_TYPE = {
-  AIR_QUALITY: 'air_quality',
-  TURBIDITY: 'turbidity',
-  PH: 'ph',
-  CLO: 'clo',
-  UV: 'uv',
-  SMOKE: 'smoke',
-  FIRE: 'fire',
-  SOS: 'sos',
-  FILTER_WATER: 'filter_water',
-};
-
 export const EMERGENCY_TYPE = {
   CREATED: 'emergency',
   RESOLVE: 'resolved_emergency',

package/src/screens/AddCommon/SelectSubUnit.js

@@ -16,6 +16,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
     smart_account_id_from_backend,
     username,
     brand,
+    chipId,
   } = route?.params || {};
   const [title, setTitle] = useState('');
   const [subTitle, setSubTitle] = useState('');
@@ -49,6 +50,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
               smart_account_id_from_backend: smart_account_id_from_backend,
               username,
               brand,
+              chipId,
             },
           });
           break;
@@ -67,6 +69,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
       smart_account_id_from_backend,
       username,
       brand,
+      chipId,
     ]
   );
 

package/src/screens/AddNewGateway/ConnectingWifiDevice.js

@@ -8,7 +8,8 @@ import ConnectingDevice from './ConnectingDevice';
 
 const ConnectingWifiDevice = ({ route }) => {
   const t = useTranslations();
-  const { unitId, stationId, gateway, selectedWifi } = route?.params || {};
+  const { unitId, stationId, gateway, selectedWifi, qrData } =
+    route?.params || {};
   const [chipId, setChipId] = useState(null);
   const { goBack } = useNavigation();
 
@@ -30,7 +31,7 @@ const ConnectingWifiDevice = ({ route }) => {
         API.UNIT.CHIP_SCAN(unitId),
         {
           imei: gateway?.imei,
-          qr_code: gateway?.imei, // Todo Bang remove after backend deploy
+          secret: qrData?.secret,
           name: gateway?.model,
           station: stationId,
           wifi_ssid: selectedWifi.ssid, // for storing
@@ -46,6 +47,7 @@ const ConnectingWifiDevice = ({ route }) => {
       setChipId(data.id);
     },
     [
+      qrData,
       gateway,
       addingWifiDeviceFail,
       unitId,

package/src/screens/AddNewGateway/ConnectingWifiGuide.js

@@ -23,13 +23,14 @@ import AccessibilityLabel from '../../configs/AccessibilityLabel';
 
 const ConnectingWifiGuide = ({ route }) => {
   const t = useTranslations();
-  const { prefix, qrData, unitId, stationId } = route?.params || {};
+  const { qrData, unitId, stationId } = route?.params || {};
   const { navigate, goBack } = useNavigation();
   const [wifiList, setWifiList] = useState([]);
   const [currentState, setCurrentState] = useState(0);
 
   const connectToDeviceWifi = useCallback(async () => {
-    const wifiPrefix = `eoh.${prefix.toLowerCase()}.`;
+    const prefix = `${qrData.org_slug}.${qrData.prefix}`;
+    const wifiPrefix = `${prefix.toLowerCase()}.`;
     const buttons = [
       {
         text: t('cancel'),
@@ -50,7 +51,7 @@ const ConnectingWifiGuide = ({ route }) => {
         return;
       }
       const wifi = _.find(phoneWifiList, function (x) {
-        return x.SSID.indexOf(`eoh.${prefix.toLowerCase()}.`) === 0;
+        return x.SSID.indexOf(wifiPrefix) === 0;
       });
 
       if (!wifi) {
@@ -118,7 +119,7 @@ const ConnectingWifiGuide = ({ route }) => {
         undefined
       );
     }, 5000); // workaround, todo Bang continue research
-  }, [goBack, prefix, t]);
+  }, [goBack, qrData, t]);
 
   useEffect(() => {
     if (wifiList.length) {

package/src/screens/AddNewGateway/ScanWifiDeviceQR.js

@@ -20,9 +20,7 @@ const ScanWifiDeviceQR = memo(({ route }) => {
         setLoading(false);
         return;
       }
-      const devicePrefixName = data?.imei?.split('-')[0];
-      // todo Bang change QR format
-      if (['ROBOT'].indexOf(devicePrefixName) === -1) {
+      if (!data?.prefix || !data?.org_slug) {
         setIsInvalidQrCode(true);
         setLoading(false);
         return;
@@ -30,7 +28,6 @@ const ScanWifiDeviceQR = memo(({ route }) => {
       navigate(Routes.ConnectingWifiGuide, {
         unitId,
         stationId,
-        prefix: devicePrefixName,
         qrData: data,
       });
       setLoading(true);

package/src/screens/AddNewGateway/ShareWifiPassword.js

@@ -42,7 +42,7 @@ const WifiItem = ({ item, setIsShowPopupPassword, setSelectedWifi }) => {
 };
 
 const ShareWifiPassword = ({ route }) => {
-  const { wifiList, unitId, stationId } = route?.params || {};
+  const { wifiList, unitId, stationId, qrData } = route?.params || {};
   const t = useTranslations();
   const navigation = useNavigation();
 
@@ -98,6 +98,7 @@ const ShareWifiPassword = ({ route }) => {
             unitId,
             stationId: stationId,
             gateway: gatewayInfo,
+            qrData: qrData,
             selectedWifi: {
               ssid: selectedWifi,
               password: selectedWifiPassword,
@@ -108,7 +109,7 @@ const ShareWifiPassword = ({ route }) => {
 
       return true;
     },
-    [navigation, selectedWifi, selectedWifiPassword, stationId, unitId]
+    [navigation, qrData, selectedWifi, selectedWifiPassword, stationId, unitId]
   );
 
   const onPasswordReady = useCallback(async () => {
@@ -188,6 +189,7 @@ const ShareWifiPassword = ({ route }) => {
             value={selectedWifiPassword}
             textInputStyle={styles.input}
             selectionColor={Colors.Primary}
+            autoFocus
           />
         </>
       </ButtonPopup>

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

@@ -46,6 +46,7 @@ describe('Test connecting wifi device', () => {
         unitId: 1,
         stationId: 2,
         gateway: {},
+        qrData: {},
         selectedWifi: {},
       },
     };

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

@@ -44,6 +44,7 @@ const ConnectWifiActionButton = async (instance) => {
 
 describe('test share wifi password', () => {
   let tree;
+  const routeParams = { qrData: { prefix: 'robot', org_slug: 'eoh' } };
 
   beforeEach(() => {
     const socket = dgram.createSocket({});
@@ -68,7 +69,7 @@ describe('test share wifi password', () => {
 
   it('auto connect to wifi prefix on ios', async () => {
     Platform.OS = 'ios';
-    const route = { params: { prefix: 'robot' } };
+    const route = { params: routeParams };
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
@@ -85,7 +86,7 @@ describe('test share wifi password', () => {
 
   it('fail connect to wifi prefix on ios', async () => {
     Platform.OS = 'ios';
-    const route = { params: { prefix: 'robot' } };
+    const route = { params: routeParams };
     WifiManager.connectToProtectedSSIDPrefix.mockImplementationOnce(
       async () => {
         throw 'Cannot connect to protected prefix SSID';
@@ -101,7 +102,7 @@ describe('test share wifi password', () => {
 
   it('auto connect to wifi android', async () => {
     Platform.OS = 'android';
-    const route = { params: { prefix: 'robot' } };
+    const route = { params: routeParams };
     WifiManager.loadWifiList.mockImplementationOnce(async () => [
       { SSID: 'random-name' },
       { SSID: 'eoh.lite.xxx' },
@@ -122,7 +123,7 @@ describe('test share wifi password', () => {
 
   it('fail connect to wifi android', async () => {
     Platform.OS = 'android';
-    const route = { params: { prefix: 'robot' } };
+    const route = { params: routeParams };
     WifiManager.reScanAndLoadWifiList.mockImplementationOnce(async () => [
       { SSID: 'random-name' },
       { SSID: 'eoh.lite.xxx' },
@@ -142,7 +143,7 @@ describe('test share wifi password', () => {
 
   it('fail load wifi list android', async () => {
     Platform.OS = 'android';
-    const route = { params: { prefix: 'robot' } };
+    const route = { params: routeParams };
     WifiManager.reScanAndLoadWifiList.mockImplementationOnce(async () => {
       throw 'Cannot load wifi list to wifi';
     });
@@ -158,7 +159,7 @@ describe('test share wifi password', () => {
   it('request wifi list from device', async () => {
     jest.useFakeTimers();
     Platform.OS = 'android';
-    const route = { params: { prefix: 'robot' } };
+    const route = { params: routeParams };
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });
@@ -173,7 +174,11 @@ describe('test share wifi password', () => {
   it('got wifi list from device', async () => {
     Platform.OS = 'android';
     const route = {
-      params: { prefix: 'robot', qrData: 'abc123', unitId: 1, stationId: 1 },
+      params: {
+        qrData: { org_slug: 'eoh', prefix: 'robot' },
+        unitId: 1,
+        stationId: 1,
+      },
     };
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
@@ -198,7 +203,7 @@ describe('test share wifi password', () => {
       unitId: 1,
       stationId: 1,
       wifiList: [{ ssid: 'wifi 1' }, { ssid: 'wifi.2' }],
-      qrData: 'abc123',
+      qrData: { org_slug: 'eoh', prefix: 'robot' },
     });
 
     // expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.ShareWifiPassword);
@@ -206,7 +211,7 @@ describe('test share wifi password', () => {
 
   it('got error while request wifi list from device', async () => {
     Platform.OS = 'android';
-    const route = { params: { prefix: 'robot' } };
+    const route = { params: routeParams };
     await act(async () => {
       tree = await renderer.create(wrapComponent(route));
     });

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

@@ -1,6 +1,8 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
 import MockAdapter from 'axios-mock-adapter';
+import { getPusher } from '../../../utils/Pusher';
+import Routes from '../../../utils/Route';
 import ConnectingZigbeeDevice from '../ConnectingZigbeeDevice';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
@@ -36,7 +38,8 @@ describe('Test connecting modbus device', () => {
   let tree;
   let route;
 
-  afterEach(() => {
+  beforeEach(() => {
+    getPusher().resetMock();
     mockedNavigate.mockClear();
   });
 
@@ -59,4 +62,29 @@ describe('Test connecting modbus device', () => {
     expect(instance.findAllByType(Processing)).toHaveLength(1);
     expect(mock.history.post).toHaveLength(1);
   });
+
+  it('receive sensor-id from channel then rename sensor-id', async () => {
+    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: { sensorId: 1 } });
+    });
+    await act(async () => {
+      await channel.trigger('progress', { success: 1 });
+    });
+    expect(mockedNavigate).toHaveBeenCalledWith(Routes.RenameNewDevices, {
+      unitId: 1,
+      stationId: 2,
+      chipId: 3,
+      sensorId: 1,
+    });
+  });
 });

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

@@ -64,7 +64,7 @@ describe('test scan wifi device QR', () => {
   });
 
   it('on scan correct QR code', async () => {
-    await scanQRCode({ imei: 'ROBOT-xxx' }, jest.fn());
+    await scanQRCode({ prefix: 'robot', org_slug: 'eoh' }, jest.fn());
     expect(mockedNavigate).toHaveBeenCalled();
     expect(mockedNavigate.mock.calls[0][0]).toEqual(Routes.ConnectingWifiGuide);
   });

package/src/screens/Notification/__test__/NotificationItem.test.js

@@ -6,14 +6,11 @@ import MockAdapter from 'axios-mock-adapter';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import NotificationItem from '../components/NotificationItem';
-import {
-  NOTIFICATION_TYPES,
-  SENSOR_TYPE,
-  EMERGENCY_TYPE,
-} from '../../../configs/Constants';
+import { NOTIFICATION_TYPES, EMERGENCY_TYPE } from '../../../configs/Constants';
 import Routes from '../../../utils/Route';
 import { API } from '../../../configs';
 import api from '../../../utils/Apis/axios';
+import { AccessibilityLabel } from '../../../configs/Constants';
 
 const wrapComponent = (item) => (
   <SCProvider initState={mockSCStore({})}>
@@ -132,17 +129,16 @@ describe('test NotificationItem', () => {
   }
 
   const listSensorType = [
-    SENSOR_TYPE.AIR_QUALITY,
-    SENSOR_TYPE.TURBIDITY,
-    SENSOR_TYPE.PH,
-    SENSOR_TYPE.CLO,
-    SENSOR_TYPE.UV,
+    NOTIFICATION_TYPES.AIR_QUALITY,
+    NOTIFICATION_TYPES.TURBIDITY,
+    NOTIFICATION_TYPES.PH,
+    NOTIFICATION_TYPES.CLO,
+    NOTIFICATION_TYPES.UV,
   ];
-  for (const sensorType of listSensorType) {
-    test(`create ItemNotification NOTIFY_INDICATOR sensor_type ${sensorType}`, async () => {
-      item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
+  for (const content_code of listSensorType) {
+    test(`create ItemNotification ${content_code}`, async () => {
+      item.content_code = content_code;
       item.params = {
-        sensor_type: sensorType,
         unit_id: 5,
         summary_id: 11,
       };
@@ -164,32 +160,16 @@ describe('test NotificationItem', () => {
     });
   }
 
-  it('test case NOTIFY_INDICATOR no sensor_type', async () => {
-    item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
-    item.params = {
-      sensor_type: null,
-      unit_id: 5,
-      summary_id: 11,
-    };
-    await act(async () => {
-      tree = await create(wrapComponent(item));
-    });
-    const instance = tree.root;
-    const button = instance.findAllByType(TouchableOpacity);
-    expect(button).toHaveLength(0);
-  });
-
   const listSensorType2 = [
-    SENSOR_TYPE.SMOKE,
-    SENSOR_TYPE.FIRE,
-    SENSOR_TYPE.SOS,
-    SENSOR_TYPE.FILTER_WATER,
+    NOTIFICATION_TYPES.SMOKE,
+    NOTIFICATION_TYPES.FIRE,
+    NOTIFICATION_TYPES.SOS,
+    NOTIFICATION_TYPES.FILTER_WATER,
   ];
-  for (const sensorType of listSensorType2) {
-    test(`create ItemNotification NOTIFY_INDICATOR sensor_type ${sensorType}`, async () => {
-      item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
+  for (const content_code of listSensorType2) {
+    test(`create ItemNotification ${content_code}`, async () => {
+      item.content_code = content_code;
       item.params = {
-        sensor_type: sensorType,
         unit_id: 70,
         sensor_id: 394,
       };
@@ -212,10 +192,9 @@ describe('test NotificationItem', () => {
     });
   }
 
-  it('test onClick Item Notify', async () => {
-    item.content_code = NOTIFICATION_TYPES.NOTIFY_INDICATOR;
+  test('test onClick Item Notify', async () => {
+    item.content_code = NOTIFICATION_TYPES.AIR_QUALITY;
     item.params = {
-      sensor_type: 'air_quality',
       unit_id: 5,
       summary_id: 11,
     };
@@ -314,4 +293,29 @@ describe('test NotificationItem', () => {
     const button = instance.findAllByType(TouchableOpacity);
     expect(button).toHaveLength(0);
   });
+
+  test('test case NOTIFY_REMOVE_UNIT to unit_onwer', async () => {
+    item.content_code = NOTIFICATION_TYPES.NOTIFY_REMOVE_UNIT;
+    item.params = {
+      unit_id: 1,
+      unit_owner_name: 'EoH owner',
+      unit_name: 'EoH',
+    };
+    await act(async () => {
+      tree = await create(wrapComponent(item));
+    });
+    const instance = tree.root;
+    const customText = instance.findByProps({
+      accessibilityLabel: AccessibilityLabel.CUSTOM_TEXT,
+    });
+    expect(customText.props.children[0].props.children).toEqual('Unit ');
+    expect(customText.props.children[1].props.children).toEqual('EoH');
+    expect(customText.props.children[2].props.children).toEqual(
+      ' has been removed by '
+    );
+    expect(customText.props.children[3].props.children).toEqual('EoH owner');
+    expect(customText.props.children[4].props.children).toEqual(
+      '. You cannot access to this unit anymore.'
+    );
+  });
 });