@eohjsc/react-native-smart-city 0.3.59 → 0.3.61

package/package.json

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

package/src/commons/Action/ItemQuickAction.js

@@ -14,6 +14,7 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus }) => {
   const [isOn, setIsOn] = useState(false);
 
   const sendRemoteCommand = useRemoteControl();
+  const [processing, setProcessing] = useState(false);
 
   useEffect(() => {
     if (!(sensor.quick_action?.config_id in configValues)) {
@@ -38,7 +39,11 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus }) => {
   }, [isOn, setStatus, sensor.quick_action]);
 
   const userId = useSCContextSelector((state) => state?.auth.account.user.id);
-  const onActionPress = useCallback(() => {
+  const onActionPress = useCallback(async () => {
+    if (processing) {
+      return;
+    }
+    setProcessing(true);
     let data = null;
     if (
       action?.allow_config_store_value_id === sensor?.quick_action?.config_id
@@ -56,7 +61,7 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus }) => {
       }
       data = JSON.stringify(data);
     }
-    sendRemoteCommand(sensor, action, data, userId);
+    await sendRemoteCommand(sensor, action, data, userId);
     setIsSendingCommand(true);
 
     if (!sensor.quick_action.will_auto_update_status) {
@@ -64,7 +69,8 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus }) => {
         setIsOn(action.id === sensor.quick_action.on_action.id);
       }, sensor.quick_action.interval);
     }
-  }, [sensor, action, userId, sendRemoteCommand]);
+    setProcessing(false);
+  }, [processing, action, sensor, sendRemoteCommand, userId]);
 
   if (!action) {
     return <View />;

package/src/configs/API.js

@@ -209,11 +209,10 @@ const API = {
   // NOTE: DEV MODE
   DEV_MODE: {
     DASHBOARD: {
-      DETAIL: (id) =>
-        `/property_manager/iot_dashboard/dev_mode/templates/${id}/`,
-      GET_TEMPLATES: '/property_manager/iot_dashboard/dev_mode/templates/',
+      DETAIL: (id) => `/property_manager/iot_dashboard/dev_mode/units/${id}/`,
+      GET_TEMPLATES: '/property_manager/iot_dashboard/dev_mode/units/',
       GET_WIDGETS: (templateId) =>
-        `/property_manager/iot_dashboard/dev_mode/templates/${templateId}/widgets/`,
+        `/property_manager/iot_dashboard/dev_mode/units/${templateId}/widgets/`,
     },
     GATEWAY: {
       LIST: () => '/chip_manager/developer_mode_chips/',

package/src/hooks/IoT/__test__/useRemoteControl.test.js

@@ -9,6 +9,7 @@ import { sendCommandOverHomeAssistant } from '../../../iot/RemoteControl/HomeAss
 import { sendCommandOverInternet } from '../../../iot/RemoteControl/Internet';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { ToastBottomHelper } from '../../../utils/Utils';
 
 jest.mock('../../../iot/RemoteControl/Bluetooth');
 jest.mock('../../../iot/RemoteControl/HomeAssistant');
@@ -112,6 +113,47 @@ describe('Test useRemoteControl', () => {
     expect(sendCommandOverHomeAssistant).not.toBeCalled();
   });
 
+  const testCommandViaBluetooth = async (
+    command_prefer_over_bluetooth,
+    command_prefer_over_internet
+  ) => {
+    action.command_prefer_over_bluetooth = command_prefer_over_bluetooth;
+    action.command_prefer_over_internet = command_prefer_over_internet;
+    action.is_only_bluetooth = true;
+    const spyToastError = jest.spyOn(ToastBottomHelper, 'error');
+
+    const { result: sendRemoteCommand } = renderHook(() => useRemoteControl(), {
+      wrapper,
+    });
+
+    sendCommandOverBluetooth.mockImplementation(() => {
+      throw SEND_COMMAND_OVER_BLUETOOTH_FAIL;
+    });
+    sendCommandOverInternet.mockImplementation(async () => true);
+    await act(async () => {
+      await sendRemoteCommand.current(sensor, action, data, userId);
+    });
+    expect(sendCommandOverBluetooth).toBeCalledWith(
+      sensor,
+      action,
+      data,
+      userId
+    );
+    expect(sendCommandOverInternet).not.toBeCalled();
+    expect(sendCommandOverHomeAssistant).not.toBeCalled();
+    expect(spyToastError).toBeCalled();
+  };
+
+  // eslint-disable-next-line max-len
+  it('test send remote command via bluetooth failed then not send via internet, action is only bluetooth, not prefer internet', async () => {
+    testCommandViaBluetooth(true, false);
+  });
+
+  // eslint-disable-next-line max-len
+  it('test send remote command via bluetooth failed then not send via internet, action is only bluetooth, prefer internet', async () => {
+    testCommandViaBluetooth(false, true);
+  });
+
   it('test send remote command via bluetooth failed throw unhandled error', async () => {
     const { result: sendRemoteCommand } = renderHook(() => useRemoteControl(), {
       wrapper,

package/src/hooks/IoT/useRemoteControl.js

@@ -8,6 +8,7 @@ import {
 } from '../../iot/RemoteControl/Bluetooth';
 import { ToastBottomHelper } from '../../utils/Utils';
 import { t } from 'i18n-js';
+import NetInfo from '@react-native-community/netinfo';
 
 const useRemoteControl = () => {
   const homeAssistantConnections = useSCContextSelector(
@@ -29,20 +30,38 @@ const useRemoteControl = () => {
         try {
           return await sendCommandOverBluetooth(device, action, data, userId);
         } catch (err) {
-          if (err === SEND_COMMAND_OVER_BLUETOOTH_FAIL) {
-            result = await sendCommandOverInternet(
-              device,
-              action,
-              data,
-              'bluetooth'
-            );
-            return result;
+          const netState = await NetInfo.fetch();
+          if (netState.isConnected) {
+            result = false;
+
+            if (err === SEND_COMMAND_OVER_BLUETOOTH_FAIL) {
+              // Checking only bluetooth: not force internet
+              if (!action.is_only_bluetooth) {
+                result = await sendCommandOverInternet(
+                  device,
+                  action,
+                  data,
+                  'bluetooth'
+                );
+              }
+              return result;
+            } else {
+              throw err;
+            }
           } else {
-            throw err;
+            return false;
           }
         }
       }
 
+      // Checking only bluetooth: not other options
+      if (action.is_only_bluetooth) {
+        ToastBottomHelper.error(
+          t('this_command_is_just_support_bluetooth_only')
+        );
+        return result;
+      }
+
       if (action.command_prefer_over_internet) {
         return await sendCommandOverInternet(
           device,

package/src/iot/RemoteControl/Bluetooth.js

@@ -140,7 +140,7 @@ export const sendDataOverBluetooth = async (
   let connectedDevice = null;
   let fullDataDevice = null;
   let result = true;
-  const responseTime = 2000;
+
   try {
     connectedDevice = await device.connect();
     fullDataDevice =
@@ -148,15 +148,15 @@ export const sendDataOverBluetooth = async (
     await fullDataDevice.monitorCharacteristicForService(
       BLE.BLE_REMOTE_SERVICE_UUID,
       BLE.BLE_REMOTE_CHARACTERISTIC_UUID_TX,
-      (error, characteristic) => {
+      async (error, characteristic) => {
         const notify = error ? '' : base64.decode(characteristic.value);
         if (notify === BLE.BLE_RESPONSE_OK) {
           ToastBottomHelper.success(
             t('control_device_via_bluetooth_successfully')
           );
           if (!keepConnect) {
-            bleManager.cancelTransaction(BLE.BLE_LISTER_RESPONSE_CONTROL);
-            device.cancelConnection();
+            await bleManager.cancelTransaction(BLE.BLE_LISTER_RESPONSE_CONTROL);
+            await bleManager.cancelDeviceConnection(device.id);
           }
         } else if (notify === BLE.BLE_RESPONSE_FAILED) {
           ToastBottomHelper.error(t('control_device_via_bluetooth_failed'));
@@ -179,10 +179,6 @@ export const sendDataOverBluetooth = async (
     return result;
   }
 
-  const timeout = setTimeout(() => {
-    device.cancelConnection();
-    clearTimeout(timeout);
-  }, responseTime);
   return result;
 };
 

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

@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useState } from 'react';
 import { View } from 'react-native';
 import ActionGroup from '../../../commons/ActionGroup';
 import { CardDevMode } from '../../../commons/DevMode';
@@ -46,23 +46,29 @@ export const SensorDisplayItem = ({
   const { isEditingTemplate } = useSCContextSelector((state) => state.devMode);
 
   const sendRemoteCommand = useRemoteControl();
+  const [processing, setProcessing] = useState(false);
 
   const doAction = useCallback(
-    (action, data) => {
-      sendRemoteCommand(
+    async (action, data) => {
+      if (processing) {
+        return;
+      }
+      setProcessing(true);
+      await sendRemoteCommand(
         isEditingTemplate ? action?.end_device : sensor,
         action,
         data,
         userId
       );
+      setProcessing(false);
     },
-    [isEditingTemplate, sensor, sendRemoteCommand, userId]
+    [processing, sendRemoteCommand, isEditingTemplate, sensor, userId]
   );
 
   if (type === 'compass') {
     setShowWindDirection && setShowWindDirection(true);
   }
-  switch (item.type) {
+  switch (item.template) {
     case 'camera':
       return (
         <CardDevMode title={t('camera')} id={idTemplate} isWrap>

package/src/screens/Template/__test__/EditTemplate.test.js

@@ -41,7 +41,7 @@ describe('Test EditTemplate', () => {
   const data = [
     {
       id: 1,
-      type: 'camera',
+      template: 'camera',
       configuration: {
         uri: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4',
       },

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

@@ -3,6 +3,7 @@ import React from 'react';
 import { FlatList, TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import Template from '..';
+import { Search } from '../../../commons/DevMode';
 import { API } from '../../../configs';
 import api from '../../../utils/Apis/axios';
 
@@ -39,4 +40,47 @@ describe('Test Template screen', () => {
     await TouchableOpacities[0].props.onPress();
     expect(mockNavigate).toBeCalled();
   });
+
+  it('Test onSearch', async () => {
+    mock.onGet(API.DEV_MODE.DASHBOARD.GET_TEMPLATES).reply(200, [
+      {
+        id: 1,
+        name: 'Template1',
+        description: 'test',
+      },
+      {
+        id: 1,
+        name: 'Template2',
+        description: 'test2',
+      },
+    ]);
+    await act(async () => {
+      tree = await create(<Template />);
+    });
+    const instance = tree.root;
+    const search = instance.findByType(Search);
+    await act(async () => {
+      await search.props.onSearch('Template1');
+    });
+    const flatList = instance.findByType(FlatList);
+    expect(flatList.props.data).toEqual([
+      { description: 'test', id: 1, name: 'Template1' },
+    ]);
+
+    await act(async () => {
+      await search.props.onSearch('');
+    });
+    expect(flatList.props.data).toEqual([
+      {
+        id: 1,
+        name: 'Template1',
+        description: 'test',
+      },
+      {
+        id: 1,
+        name: 'Template2',
+        description: 'test2',
+      },
+    ]);
+  });
 });

package/src/screens/Template/detail.js

@@ -184,7 +184,7 @@ const TemplateDetail = () => {
         return;
       }
 
-      const _data = _item?.configuration?.configs.map((config) => {
+      const _data = (_item?.configuration?.configs || []).map((config) => {
         const configValue = configValues[config.id]?.value;
         if ([null, undefined, NaN].includes(configValue)) {
           return;

package/src/screens/Template/index.js

@@ -22,6 +22,7 @@ const Template = () => {
   const [data, setData] = useState([]);
   const { navigate } = useNavigation();
   const isFocused = useIsFocused();
+  const [isRefreshing, setIsRefreshing] = useState(false);
 
   const onSearch = useCallback((value) => {
     if (value === '') {
@@ -42,6 +43,7 @@ const Template = () => {
   );
 
   const getTemplates = useCallback(async () => {
+    setIsRefreshing(true);
     const { success, data: dataDashboard } = await axiosGet(
       API.DEV_MODE.DASHBOARD.GET_TEMPLATES
     );
@@ -49,6 +51,7 @@ const Template = () => {
       setData(dataDashboard || []);
       arrTemplates = dataDashboard;
     }
+    setIsRefreshing(false);
   }, []);
 
   const renderListEmptyComponent = useMemo(() => {
@@ -84,6 +87,9 @@ const Template = () => {
           extraData={data}
           ListEmptyComponent={renderListEmptyComponent}
           numColumns={2}
+          showsVerticalScrollIndicator={false}
+          refreshing={isRefreshing}
+          onRefresh={getTemplates}
         />
       </View>
     </TouchableWithoutFeedback>

package/src/utils/Apis/axios.js

@@ -75,7 +75,6 @@ const parseErrorResponse = async (error) => {
     if (message?.message) {
       message = message.message;
     }
-    message = `${firstKey}: ${message}`;
   } else {
     message = error.data || error.problem;
   }

package/src/utils/I18n/translations/en.json

@@ -1106,5 +1106,6 @@
   "text_alert_modal_popup_ct": "It’s a critical action and cannot be undone.",
   "text_understand_modal_popup_ct": "I fully understand that this action is critical and will lead to data loss.",
   "cannot_find_device_wifi": "Cannot find Device's Wifi",
+  "this_command_is_just_support_bluetooth_only": "This command is just support bluetooth only",
   "photo_request_permission_des": "To select photo from gallery, please unlock access photo permission"
 }

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

@@ -1105,5 +1105,6 @@
   "text_working_hard": "Chúng tôi đang làm việc chăm chỉ để làm cho điều này hoạt động",
   "photo_request_permission": "Quyền yêu cầu ảnh",
   "cannot_find_device_wifi": "Không thể tìm thấy Wifi của thiết bị",
+  "this_command_is_just_support_bluetooth_only": "Lệnh gửi này chỉ hỗ trợ bluetooth",
   "photo_request_permission_des": "Để chọn ảnh từ thư viện, vui lòng mở khóa quyền truy cập ảnh"
 }