@eohjsc/react-native-smart-city 0.3.11 → 0.3.14

package/index.js

@@ -17,6 +17,7 @@ import NotificationStack from './src/navigations/NotificationStack';
 import MyPinnedSharedUnit from './src/commons/Dashboard/MyPinnedSharedUnit';
 import MyUnit from './src/commons/Dashboard/MyUnit';
 import SharedUnit from './src/commons/Unit/SharedUnit';
+import { Action } from './src/context/actionType';
 
 export {
   AddSubUnitStack,
@@ -40,4 +41,5 @@ export {
   SharedUnit,
   MyUnit,
   SCWrapper,
+  Action,
 };

package/package.json

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

package/src/commons/Action/ItemQuickAction.js

@@ -7,7 +7,7 @@ import { useRemoteControl } from '../../hooks/IoT';
 import { useConfigGlobalState } from '../../iot/states';
 import IconComponent from '../IconComponent';
 
-const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus, unit }) => {
+const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus }) => {
   const [isSendingCommand, setIsSendingCommand] = useState(false);
   const [action, setAction] = useState(sensor.action);
   // eslint-disable-next-line no-unused-vars

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -47,6 +47,8 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
     const configValue = configValues[config];
     if (configValue !== null && configValue !== undefined) {
       setValue(configValue);
+    } else {
+      setValue(valueDefault);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(configValues)]);

package/src/commons/ActionGroup/__test__/NumberUpDownTemplate.test.js

@@ -326,7 +326,7 @@ describe('Test NumberUpDownActionTemplate', () => {
     });
     const instance = wrapper.root;
     const text = instance.findAllByType(ActivityIndicator);
-    expect(text).toHaveLength(1);
+    expect(text).toHaveLength(0);
   });
   test('action up sensor device type is GOOGLE_HOME', async () => {
     const mockDoAction = jest.fn();

package/src/commons/ActionGroup/__test__/index.test.js

@@ -363,7 +363,7 @@ describe('Test ActionGroup', () => {
     });
     const instance = wrapper.root;
     const activity = instance.findAllByType(ActivityIndicator);
-    expect(activity.length).toEqual(1);
+    expect(activity.length).toEqual(0);
   });
 
   test('render ActionGroup StatesGridActionTemplate', async () => {

package/src/commons/Device/HistoryChart.js

@@ -234,7 +234,7 @@ const HistoryChart = memo(
         )}
         <DateTimePickerModal
           isVisible={eventPicker.showModalStart}
-          date={eventPicker.startTime.valueOf()}
+          date={eventPicker.startTime?._d}
           mode={formatType || 'datetime'}
           onConfirm={onConfirmStart}
           onCancel={onCancel}
@@ -244,7 +244,7 @@ const HistoryChart = memo(
         />
         <DateTimePickerModal
           isVisible={eventPicker.showModalEnd}
-          date={eventPicker.endTime.valueOf()}
+          date={eventPicker.endTime?._d}
           mode={formatType || 'datetime'}
           onConfirm={onConfirmEnd}
           onCancel={onCancel}

package/src/commons/Device/ItemDevice.js

@@ -82,7 +82,7 @@ const ItemDevice = memo(
     const textConnected = isConnected
       ? t('connected')
       : isConnecting
-      ? ''
+      ? t('connecting')
       : t('disconnected');
 
     return (
@@ -98,7 +98,7 @@ const ItemDevice = memo(
             <TouchableOpacity onPress={goToSensorDisplay}>
               <IconComponent icon={sensor.icon} iconKit={sensor.icon_kit} />
             </TouchableOpacity>
-            <ItemQuickAction sensor={sensor} unit={unit} />
+            {!isConnecting && <ItemQuickAction sensor={sensor} unit={unit} />}
           </View>
           <TouchableOpacity onPress={goToSensorDisplay}>
             <Text

package/src/commons/OneTapTemplate/NumberUpDownActionTemplate.js

@@ -19,16 +19,20 @@ const NumberUpDownActionTemplate = memo(({ data, onSelectAction }) => {
   const { configuration, template, title } = data;
   const { config, text_format, min_value, max_value, action } = configuration;
   const [configValues] = useConfigGlobalState('configValues');
-  const [value, setValue] = useState((config && configValues[config]) || 28);
+  const [value, setValue] = useState();
   const [actionName, setActionName] = useState(null);
+  const valueDefault = 28;
 
   useEffect(() => {
     if (!config) {
+      setValue(valueDefault);
       return;
     }
     const configValue = configValues[config];
     if (configValue !== null && configValue !== undefined) {
       setValue(configValue);
+    } else {
+      setValue(valueDefault);
     }
   }, [configValues, config]);
 

package/src/configs/SCConfig.js

@@ -112,7 +112,7 @@ export class SCConfig {
 
 export const initSCConfig = (config) => {
   api.setBaseURL(config.apiRoot ?? SCDefaultConfig.apiRoot);
-  LocaleConfig.defaultLocale = config.language;
+  LocaleConfig.defaultLocale = config.language ?? SCConfig.language;
   SCConfig.language = config.language ?? SCConfig.language;
   SCConfig.apiRoot = config.apiRoot ?? SCDefaultConfig.apiRoot;
   SCConfig.GOOGLE_MAP_API_KEY =

package/src/context/actionType.ts

@@ -21,6 +21,7 @@ export const Action = {
   SET_GOOGLE_HOME_CONNECTIONS: 'SET_GOOGLE_HOME_CONNECTIONS',
   CHANGE_GOOGLE_HOME_CONN_STATE: 'CHANGE_GOOGLE_HOME_CONN_STATE',
   UPDATE_VALUE_EVALUATIONS: 'UPDATE_VALUE_EVALUATIONS',
+  ON_RECEIVE_NOTIFICATION: 'ON_RECEIVE_NOTIFICATION',
 };
 
 export type AuthData = {
@@ -77,6 +78,7 @@ export type AppType = {
   isBluetoothEnabled: boolean;
   isNetworkConnected: boolean;
   camera_opened: any[];
+  notificationData: any;
 };
 
 export type IoTType = {

package/src/context/reducer.ts

@@ -59,6 +59,7 @@ export const initialState = {
     isBluetoothEnabled: false,
     isNetworkConnected: false,
     camera_opened: [],
+    notificationData: null,
   },
   iot: {
     googlehome: {
@@ -318,6 +319,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
         ),
       };
 
+    case Action.ON_RECEIVE_NOTIFICATION:
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          notificationData: payload,
+        },
+      };
+
     default:
       return currentState;
   }

package/src/hooks/useReceiveNotifications.js

@@ -1,26 +1,20 @@
-import { useEffect, useState, useCallback } from 'react';
-import OneSignal from 'react-native-onesignal';
+import { useEffect, useState } from 'react';
+import { useSCContextSelector } from '../context';
 
 const useReceiveNotifications = (callBack) => {
-  const [dataNofitication, setDataNofitication] = useState(null);
-
-  const onReceived = useCallback((data) => {
-    const { additionalData } = data;
-    setDataNofitication(additionalData);
-  }, []);
+  const [dataNotification, setDataNotification] = useState(null);
+  const notificationData = useSCContextSelector(
+    (state) => state.app.notificationData
+  );
 
   useEffect(() => {
-    OneSignal.setNotificationWillShowInForegroundHandler(
-      (notifReceivedEvent) => {
-        let notif = notifReceivedEvent.getNotification();
-        setTimeout(() => notifReceivedEvent.complete(notif), 0);
-        onReceived(notif);
-        callBack && callBack();
-      }
-    );
-  }, [callBack, onReceived]);
+    if (notificationData) {
+      setDataNotification(notificationData);
+      callBack && callBack();
+    }
+  }, [callBack, notificationData]);
 
-  return { dataNofitication };
+  return { dataNotification };
 };
 
 export default useReceiveNotifications;

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

@@ -1,5 +1,7 @@
 import React from 'react';
 import { create, act } from 'react-test-renderer';
+import Toast from 'react-native-toast-message';
+
 import MockAdapter from 'axios-mock-adapter';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
@@ -117,6 +119,30 @@ describe('Test ScriptDetail', () => {
     expect(alertAction.props.visible).toBeFalsy();
   });
 
+  test('test rename script failed', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const menu = instance.findByType(MenuActionMore);
+    const alertAction = instance.findByType(AlertAction);
+    const rename = menu.props.listMenuItem[0];
+
+    await act(async () => {
+      await menu.props.onItemClick(rename);
+      await menu.props.hideComplete();
+    });
+    expect(menu.props.isVisible).toBeFalsy();
+    expect(alertAction.props.visible).toBeTruthy();
+
+    mock.onPatch(API.AUTOMATE.SCRIPT(1)).reply(500, { name: 'new_name' });
+    await act(async () => {
+      await alertAction.props.rightButtonClick();
+    });
+    expect(alertAction.props.visible).toBeFalsy();
+    expect(Toast.show).toHaveBeenCalled();
+  });
+
   test('test delete script', async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));

package/src/screens/ScriptDetail/index.js

@@ -99,9 +99,14 @@ const ScriptDetail = ({ route }) => {
         name: inputName,
       }
     );
-    success && setScriptName(script.name);
+    if (success) {
+      setScriptName(script.name);
+      ToastBottomHelper.success(t('rename_successfully'));
+    } else {
+      ToastBottomHelper.error(t('rename_failed'));
+    }
     hideAlertAction();
-  }, [id, inputName, hideAlertAction]);
+  }, [id, inputName, hideAlertAction, t]);
 
   const deleteScript = useCallback(async () => {
     hideAlertAction();
@@ -113,12 +118,16 @@ const ScriptDetail = ({ route }) => {
       } else {
         goBack();
       }
+      ToastBottomHelper.success(t('removed_successfully'));
+    } else {
+      ToastBottomHelper.error(t('remove_failed'));
     }
   }, [
     hideAlertAction,
     id,
     isCreateScriptSuccess,
     isCreateNewAction,
+    t,
     dispatch,
     isAutomateTab,
     goBack,

package/src/screens/Unit/Detail.js

@@ -189,7 +189,7 @@ const UnitDetail = ({ route }) => {
     });
 
     return () => {
-      subscription.remove();
+      subscription?.remove();
     };
   }, [fetchDetails]);
 

package/src/screens/Unit/Summaries.js

@@ -69,7 +69,7 @@ const Summaries = memo(({ unit }) => {
     });
 
     return () => {
-      subscription.remove();
+      subscription?.remove();
     };
   }, [fetchUnitSummary]);
 

package/src/screens/UnitSummary/components/RunningDevices/index.js

@@ -19,7 +19,9 @@ const RunningDevices = memo(({ unit, summaryDetail }) => {
           await connectGoogleHome(unit.remote_control_options.googlehome))();
       }
     }
-  }, [connectGoogleHome, unit]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [unit]);
+
   return (
     <View style={styles.container}>
       {!!devices &&