@eohjsc/react-native-smart-city 0.7.37 → 0.7.38

package/package.json

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

package/src/commons/Unit/HeaderUnit/index.js

@@ -1,5 +1,5 @@
 import React, { memo, useCallback, useMemo, useRef } from 'react';
-import { StatusBar, StyleSheet, TouchableOpacity, View } from 'react-native';
+import { StyleSheet, TouchableOpacity, View } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
 import { useNavigation, useRoute } from '@react-navigation/native';

package/src/commons/WrapParallaxScrollView/index.js

@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { StatusBar, View, StyleSheet, RefreshControl } from 'react-native';
+import { View, StyleSheet, RefreshControl } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 
 import { Colors, Device, Images, SCConfig } from '../../configs';

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

@@ -43,7 +43,7 @@ const ChooseAction = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf() },
+        params: { saveAt: moment().valueOf(), automate: { id: automateId } },
       });
   }, [
     numberActionCanAdd,

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

@@ -37,12 +37,12 @@ const SetupScriptDelay = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf() },
+        params: { saveAt: moment().valueOf(), automate },
       });
     } else {
       ToastBottomHelper.error(t('error_please_try_later'));
     }
-  }, [automateId, navigate, delay, t]);
+  }, [automateId, navigate, delay, t, automate]);
 
   const canSave = useMemo(() => {
     const value = parseInt(delay, 10);

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

@@ -27,12 +27,12 @@ const SetupScriptReceiverEmail = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf() },
+        params: { saveAt: moment().valueOf(), automate },
       });
     } else {
       ToastBottomHelper.error(t('error_please_try_later'));
     }
-  }, [automateId, formData, listUser, navigate, t]);
+  }, [automate, automateId, formData, listUser, navigate, t]);
 
   const onLoadOption = useCallback(
     (item) => {

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

@@ -27,12 +27,12 @@ const SetupScriptReceiverNotify = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf() },
+        params: { saveAt: moment().valueOf(), automate },
       });
     } else {
       ToastBottomHelper.error(t('error_please_try_later'));
     }
-  }, [automateId, formData, listUser, navigate, t]);
+  }, [automate, automateId, formData, listUser, navigate, t]);
 
   const onLoadOption = useCallback(
     (item) => {

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

@@ -27,12 +27,12 @@ const SetupScriptReceiverSms = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf() },
+        params: { saveAt: moment().valueOf(), automate },
       });
     } else {
       ToastBottomHelper.error(t('error_please_try_later'));
     }
-  }, [automateId, formData, listUser, navigate, t]);
+  }, [automate, automateId, formData, listUser, navigate, t]);
 
   const onLoadOption = useCallback(
     (item) => {

package/src/screens/Automate/EditActionsList/UpdateReceiverEmailScript.js

@@ -54,7 +54,7 @@ const UpdateReceiverEmailScript = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf() },
+        params: { saveAt: moment().valueOf(), automate: { id: automateId } },
       });
     }
   }, [

package/src/screens/Automate/EditActionsList/UpdateReceiverSmsScript.js

@@ -53,7 +53,7 @@ const UpdateReceiverSmsScript = ({ route }) => {
       navigate({
         name: Routes.ScriptDetail,
         merge: true,
-        params: { saveAt: moment().valueOf() },
+        params: { saveAt: moment().valueOf(), automate: { id: automateId } },
       });
     }
   }, [

package/src/screens/Automate/EditActionsList/index.js

@@ -58,15 +58,16 @@ const EditActionsList = () => {
     [id, t]
   );
 
-  const onCancel = useCallback(() => {
+  const onGoBack = useCallback(() => {
     navigate({
       name: Routes.ScriptDetail,
       merge: true,
       params: {
         newActionsList: actionsList,
+        automate: { id: id },
       },
     });
-  }, [actionsList, navigate]);
+  }, [actionsList, navigate, id]);
 
   const onPressRemove = (item) => {
     setIsVisible(true);
@@ -478,7 +479,7 @@ const EditActionsList = () => {
 
   return (
     <GestureHandlerRootView style={styles.wrap}>
-      <HeaderCustom title={t('edit_actions_list')} onGoBack={onCancel} />
+      <HeaderCustom title={t('edit_actions_list')} onGoBack={onGoBack} />
       <View style={styles.wrapContent}>
         <Text type="Body" color={Colors.Gray8}>
           {t('des_edit_actions_list')}

package/src/screens/Automate/ScriptDetail/index.js

@@ -143,7 +143,7 @@ const ScriptDetail = ({ route }) => {
       const index = state.routes.findIndex((r) => r.name === closeScreen);
       let routes = [];
       if (!closeScreen) {
-        routes = state.routes;
+        routes = [...state.routes];
       } else if (index >= 0) {
         routes = state.routes.slice(0, index + 1);
       }
@@ -328,6 +328,8 @@ const ScriptDetail = ({ route }) => {
         name: closeScreen,
         merge: true,
       });
+    } else if (closeScreen === Routes.ScriptDetail) {
+      navigate(Routes.UnitDetail, { unitId: unit });
     } else {
       goBack();
     }

package/src/screens/Automate/index.js

@@ -25,7 +25,6 @@ import { axiosGet } from '../../utils/Apis/axios';
 import { useBackendPermission } from '../../utils/Permission/backend';
 import Routes from '../../utils/Route';
 import { keyExtractor, ToastBottomHelper } from '../../utils/Utils';
-import Loading from './Components/Loading';
 import styles from './Styles/indexStyles';
 
 const Automate = () => {