@eohjsc/react-native-smart-city 0.2.45 → 0.2.46

package/package.json

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

package/src/commons/SubUnit/OneTap/ItemOneTap.js

@@ -20,7 +20,7 @@ import { useGetIdUser } from '../../../hooks/Common';
 import { AUTOMATE_TYPE, TESTID } from '../../../configs/Constants';
 
 const ItemOneTap = memo(
-  ({ isOwner, automate, unit, wrapSyles, onPressItem }) => {
+  ({ isOwner, automate = {}, unit, wrapSyles, onPressItem }) => {
     const { navigate } = useNavigation();
     const {
       id,
@@ -54,6 +54,7 @@ const ItemOneTap = memo(
     const goToDetail = useCallback(() => {
       navigate(Routes.ScriptDetail, {
         id,
+        automate,
         name: script?.name,
         type: type,
         havePermission: isOwner || user === idUser,
@@ -61,6 +62,7 @@ const ItemOneTap = memo(
         textCondition,
       });
     }, [
+      automate,
       isOwner,
       user,
       idUser,

package/src/commons/SubUnit/OneTap/__test__/SubUnitAutomate.test.js

@@ -100,6 +100,7 @@ describe('test Item', () => {
       type: 'one_tap',
       unit: undefined,
       textCondition: null,
+      automate: data.automates[0],
     });
 
     const handleScriptAction = instance.findAll(
@@ -196,6 +197,7 @@ describe('test Item', () => {
       type: 'value_change',
       unit: undefined,
       textCondition: 'Temperature higher than 29',
+      automate: data.automates[0],
     });
   });
   test('render SubUnitAutomate script schedule', async () => {

package/src/commons/SubUnit/ShortDetail.js

@@ -80,7 +80,7 @@ const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
       ? 'add_to_favorites'
       : station?.name === SubUnitName.scenario
       ? 'add_script'
-      : 'add_new_device'
+      : 'add_new'
   );
 
   return (

package/src/configs/Constants.js

@@ -100,6 +100,12 @@ export const AUTOMATE_SELECT = {
   SELECT_SENSOR: 'select_sensor',
 };
 
+export const CONDITION_TYPES = {
+  IS: 'IS',
+  IS_BELOW: 'IS_BELOW',
+  IS_ABOVE: 'IS_ABOVE',
+};
+
 export const AUTOMATES = {
   one_tap: {
     value: AUTOMATE_TYPE.ONE_TAP,
@@ -580,4 +586,5 @@ export const NOTIFICATION_TYPES = {
   STOP_VIOLATION_FREE_PARKING_ZONE: 'STOP_VIOLATION_FREE_PARKING_ZONE',
   PARKING_COMPLETED_DUE_TO_CAR_LEAVE: 'PARKING_COMPLETED_DUE_TO_CAR_LEAVE',
   NOTIFY_INVITE_MEMBER: 'NOTIFY_INVITE_MEMBER',
+  REMINDER: 'REMINDER',
 };

package/src/configs/Images.js

@@ -6,4 +6,5 @@ export default {
   fullscreen: require('../Images/Common/fullscreen.png'),
   file: require('../Images/Common/file.png'),
   activeButton: require('../Images/Common/ActiveButton.png'),
+  logo: require('../Images/Common/logo.png'),
 };

package/src/screens/AddNewAction/SelectAction.js

@@ -12,7 +12,7 @@ import OptionsDropdownActionTemplate from '../../commons/OneTapTemplate/OptionsD
 import StatesGridActionTemplate from '../../commons/OneTapTemplate/StatesGridActionTemplate';
 import { axiosGet, axiosPost } from '../../utils/Apis/axios';
 import { API, Images } from '../../configs';
-import { TESTID } from '../../configs/Constants';
+import { CONDITION_TYPES, TESTID } from '../../configs/Constants';
 import Routes from '../../utils/Route';
 import styles from './Styles/SelectActionStyles';
 import moment from 'moment';
@@ -30,6 +30,7 @@ const SelectAction = memo(({ route }) => {
     unit,
     device,
     automateId,
+    automate = {},
     scriptName,
     isSelectSensor = false,
     type,
@@ -42,9 +43,11 @@ const SelectAction = memo(({ route }) => {
   const [sensorData, setSensorData] = useState([]);
   const [checkedItem, setCheckedItem] = useState({});
   const [isLoading, setIsLoading] = useState(false);
+  const [isfetched, setIsfetched] = useState(true);
 
   const fetchData = useCallback(async () => {
     isSelectSensor && setIsLoading(true);
+    setIsfetched(true);
     const { success, data } = await axiosGet(
       isSelectSensor
         ? API.AUTOMATE.GET_SENSOR_CONFIG(device.id)
@@ -53,13 +56,51 @@ const SelectAction = memo(({ route }) => {
       isSelectSensor && true
     );
     if (success) {
-      isSelectSensor ? setSensorData(data) : setData(data);
+      if (isSelectSensor) {
+        if (automate?.config_id) {
+          const conditionType = [
+            {
+              title: `${t('is_below')} (<)`,
+              type: CONDITION_TYPES.IS_BELOW,
+              conditionValue: '<',
+            },
+            {
+              title: `${t('is')} (=)`,
+              type: CONDITION_TYPES.IS,
+              conditionValue: '=',
+            },
+            {
+              title: `${t('is_above')} (>)`,
+              type: CONDITION_TYPES.IS_ABOVE,
+              conditionValue: '>',
+            },
+          ];
+          const condition = conditionType.find((item) => {
+            return item.conditionValue === automate.condition;
+          });
+          const updateSensorData = data.map((obj) =>
+            obj.id === automate.config_id
+              ? { ...obj, value: automate.value, ...condition }
+              : obj
+          );
+          let selectSensor = data.find((config) => {
+            return config.id === automate.config_id;
+          });
+          setSensorData(updateSensorData);
+          setCheckedItem(selectSensor);
+        } else {
+          setSensorData(data);
+        }
+      } else {
+        setData(data);
+      }
     }
+    setIsfetched(false);
     const to = setTimeout(() => {
       setIsLoading(false);
       clearTimeout(to);
     }, 1000);
-  }, [device.id, isSelectSensor]);
+  }, [automate, device.id, isSelectSensor, t]);
 
   const checkConditionToContinue = useCallback(() => {
     const itemTemp = sensorData?.find((i) => i.id === checkedItem?.id);
@@ -76,6 +117,13 @@ const SelectAction = memo(({ route }) => {
         isSelectSensor,
         isMultiUnits,
         automateId,
+        automate: {
+          ...automate,
+          condition: itemTemp?.conditionValue || '<',
+          value: itemTemp?.value,
+          config_id: itemTemp?.id,
+          config_name: itemTemp?.name,
+        },
         scriptName,
       });
     } else {
@@ -302,7 +350,7 @@ const SelectAction = memo(({ route }) => {
             testID={TESTID.ACTION_ITEM}
           />
         )}
-        {data?.length === 0 && (
+        {data?.length === 0 && sensorData?.length === 0 && !isfetched && (
           <View style={styles.noneData}>
             <Text center>
               {t('you_do_not_have_the_device_or_have_share_control_device')}

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -21,6 +21,7 @@ const SelectSensorDevices = memo(({ route }) => {
   const {
     unit,
     automateId,
+    automate = {},
     title = AUTOMATE_SELECT.SELECT_DEVICE,
     type,
     scriptName,
@@ -59,13 +60,29 @@ const SelectSensorDevices = memo(({ route }) => {
             station: item,
             index: index,
           }));
+          if (isSelectSensor) {
+            if (automate.sensor_id) {
+              let selectSensor = {};
+              data.map((item) => {
+                item.sensors.map((sensor) => {
+                  if (sensor.id === automate.sensor_id) {
+                    selectSensor = sensor;
+                    return;
+                  } else if (selectSensor) {
+                    return;
+                  }
+                });
+              });
+              setSelectedDevice(selectSensor);
+            }
+          }
           setStation(data);
           setListMenuItem(listMenu);
           setListStation(listMenu.concat([{ text: '' }]));
         }
       }
     );
-  }, [isSelectSensor, unit.id]);
+  }, [automate.sensor_id, isSelectSensor, unit]);
 
   useEffect(() => {
     fetchDetails();
@@ -84,6 +101,10 @@ const SelectSensorDevices = memo(({ route }) => {
       unit,
       device: selectedDevice,
       automateId: automateId,
+      automate: {
+        ...automate,
+        sensor_id: selectedDevice?.id ? selectedDevice.id : automate.sensor_id,
+      },
       stationName: station[indexStation]?.name,
       isSelectSensor,
       type,
@@ -93,18 +114,19 @@ const SelectSensorDevices = memo(({ route }) => {
       isMultiUnits,
     });
   }, [
+    navigate,
+    unit,
     selectedDevice,
     automateId,
+    automate,
     station,
     indexStation,
-    navigate,
-    unit,
-    type,
     isSelectSensor,
+    type,
     scriptName,
-    isMultiUnits,
     isAutomateTab,
     isCreateNewAction,
+    isMultiUnits,
   ]);
 
   const onPressClose = useCallback(() => {

package/src/screens/AddNewAction/SetupSensor.js

@@ -13,12 +13,7 @@ import BottomButtonView from '../../commons/BottomButtonView';
 import { HorizontalPicker } from '../../commons';
 import { popAction } from '../../navigations/utils';
 import { useStatusBarPreview } from '../../hooks/Common/useStatusBar';
-
-const CONDITION_TYPES = {
-  IS: 'IS',
-  IS_BELOW: 'IS_BELOW',
-  IS_ABOVE: 'IS_ABOVE',
-};
+import { CONDITION_TYPES } from '../../configs/Constants';
 
 const SetUpSensor = () => {
   const t = useTranslations();

package/src/screens/AddNewAutoSmart/__test__/AddNewAutoSmart.test.js

@@ -39,6 +39,10 @@ describe('test AddNewAutoSmart', () => {
     },
   };
 
+  beforeEach(() => {
+    mockNavigate.mockClear();
+  });
+
   test('AddNewAutoSmart select sensor device', async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -62,8 +66,11 @@ describe('test AddNewAutoSmart', () => {
     });
 
     expect(mockNavigate).toBeCalledWith(Routes.SelectSensorDevices, {
+      automate: {},
+      automateId: undefined,
       title: 'select_sensor',
       type: 'value_change',
+      scriptName: undefined,
       unit: { id: 1 },
       isAutomateTab: undefined,
       isMultiUnits: undefined,
@@ -92,11 +99,14 @@ describe('test AddNewAutoSmart', () => {
       await bottomButton.props.onPress();
     });
     expect(mockNavigate).toHaveBeenCalledWith(Routes.SetSchedule, {
+      automate: {},
+      automateId: undefined,
       type: 'schedule',
+      routeName: 'SetSchedule',
+      scriptName: undefined,
       unit: route.params.unit,
       isAutomateTab: undefined,
       isMultiUnits: undefined,
-      routeName: 'SetSchedule',
     });
   });
 });

package/src/screens/AddNewAutoSmart/index.js

@@ -17,8 +17,14 @@ import Routes from '../../utils/Route';
 const AddNewAutoSmart = memo(({ route }) => {
   const t = useTranslations();
   const { navigate, goBack } = useNavigation();
-  const { type, unit, isAutomateTab, isMultiUnits, automateId, scriptName } =
-    route.params;
+  const {
+    type,
+    unit,
+    isAutomateTab,
+    isMultiUnits,
+    automate = {},
+    scriptName,
+  } = route.params;
   const typeAutoSmart = {
     [AUTOMATE_TYPE.AUTOMATE]: [
       {
@@ -57,26 +63,31 @@ const AddNewAutoSmart = memo(({ route }) => {
       },
     ],
   };
-  const [data] = useState(typeAutoSmart[type]);
-  const [selectedIndex, setSelectedIndex] = useState(-1);
+  const [data] = useState(
+    automate?.id ? typeAutoSmart[AUTOMATE_TYPE.AUTOMATE] : typeAutoSmart[type]
+  );
+  const [selectedIndex, setSelectedIndex] = useState(
+    automate?.id ? data.findIndex((obj) => obj.type === type) : -1
+  );
 
   const handleOnContinue = useCallback(() => {
-    const automate = data[selectedIndex];
+    const dataAutomate = data[selectedIndex];
     const params = {
-      type: automate?.type,
+      type: dataAutomate?.type,
       unit: unit,
-      ...(automate?.data || {}),
+      ...(dataAutomate?.data || {}),
       isAutomateTab,
       isMultiUnits,
-      routeName: automate?.route,
-      automateId,
+      automateId: automate?.id,
+      routeName: dataAutomate?.route,
+      automate,
       scriptName,
     };
 
-    if (automate.type === AUTOMATE_TYPE.VALUE_CHANGE && isMultiUnits) {
+    if (dataAutomate.type === AUTOMATE_TYPE.VALUE_CHANGE && isMultiUnits) {
       navigate(Routes.SelectUnit, params);
     } else {
-      navigate(automate.route, params);
+      navigate(dataAutomate.route, params);
     }
   }, [
     navigate,
@@ -85,7 +96,7 @@ const AddNewAutoSmart = memo(({ route }) => {
     unit,
     isAutomateTab,
     isMultiUnits,
-    automateId,
+    automate,
     scriptName,
   ]);
 
@@ -107,7 +118,7 @@ const AddNewAutoSmart = memo(({ route }) => {
       <HeaderCustom isShowClose onClose={onClose} />
       <View style={styles.container}>
         <Text semibold type={'H2'} style={styles.titleCreate}>
-          {automateId ? t('update_smart') : t('create_smart')}
+          {automate?.id ? t('update_smart') : t('create_smart')}
         </Text>
         <Text type={'Body'} style={styles.titleChoose}>
           {t('choose_the_automation_method_you_want')}

package/src/screens/AddNewOneTap/__test__/AddNewOneTap.test.js

@@ -52,7 +52,12 @@ describe('test AddNewOneTap', () => {
   test('create AddNewOneTap success', async () => {
     Platform.OS = 'ios';
     let route = {
-      params: { type: 'one_tap', unit: { id: 1 } },
+      params: {
+        type: 'one_tap',
+        unit: { id: 1 },
+        isMultiUnits: false,
+        isAutomateTab: false,
+      },
     };
 
     const response = {
@@ -103,6 +108,9 @@ describe('test AddNewOneTap', () => {
         id: 1,
       },
       isCreateScriptSuccess: true,
+      automate: {},
+      isAutomateTab: false,
+      isMultiUnits: false,
     });
   });
   test('create AddNewOneTap fail', async () => {

package/src/screens/AddNewOneTap/index.js

@@ -20,6 +20,7 @@ const AddNewOneTap = memo(({ route }) => {
     type,
     unit,
     automateData = {},
+    automate = {},
     isAutomateTab,
     isMultiUnits,
     automateId,
@@ -45,6 +46,7 @@ const AddNewOneTap = memo(({ route }) => {
         id: data.id,
         name: name,
         type: type,
+        automate,
         havePermission: true,
         isCreateScriptSuccess: true,
         isAutomateTab: automateId ? false : isAutomateTab,
@@ -60,6 +62,7 @@ const AddNewOneTap = memo(({ route }) => {
     name,
     automateData,
     automateId,
+    automate,
     navigate,
     isAutomateTab,
     t,

package/src/screens/Automate/MultiUnits.js

@@ -17,7 +17,6 @@ import ItemOneTap from '../../commons/SubUnit/OneTap/ItemOneTap';
 import Routes from '../../utils/Route';
 import { useGetIdUser } from '../../hooks/Common';
 import ItemAddNew from '../../commons/Device/ItemAddNew';
-import { REPEAT_OPTIONS } from '../SetSchedule/components/RepeatOptionsPopup';
 
 const MultiUnits = () => {
   const t = useTranslations();
@@ -53,55 +52,6 @@ const MultiUnits = () => {
     setTabActive(tab);
   };
 
-  const textCondition = useCallback(
-    (item) => {
-      const {
-        type,
-        condition,
-        config,
-        value,
-        repeat,
-        date_repeat,
-        time_repeat,
-        weekday_repeat,
-      } = item;
-
-      if (type === AUTOMATE_TYPE.VALUE_CHANGE) {
-        let _condition;
-        if (condition === '>') {
-          _condition = 'higher_than';
-        } else if (condition === '<') {
-          _condition = 'lower_than';
-        } else if (condition === '=') {
-          _condition = 'equal';
-        }
-        return `${config} ${t(_condition)} ${value}`;
-      } else if (type === AUTOMATE_TYPE.SCHEDULE) {
-        const time = time_repeat.substring(0, time_repeat.length - 3);
-        const date = date_repeat.split('-').reverse().join('/');
-        const weekday = {
-          0: 'Mon',
-          1: 'Tue',
-          2: 'Wed',
-          3: 'Thu',
-          4: 'Fri',
-          5: 'Sat',
-          6: 'Sun',
-        };
-
-        if (repeat === REPEAT_OPTIONS.ONCE) {
-          return `${time} ${date}`;
-        } else if (repeat === REPEAT_OPTIONS.EVERYDAY) {
-          return `${t('every_day_at', { time })}`;
-        } else if (repeat === REPEAT_OPTIONS.EVERYWEEK) {
-          return weekday_repeat.map((item) => weekday[item]).join(', ');
-        }
-      }
-      return null;
-    },
-    [t]
-  );
-
   const onPressItem = (item) => () => {
     navigate(Routes.UnitStack, {
       screen: Routes.ScriptDetail,
@@ -112,7 +62,7 @@ const MultiUnits = () => {
         havePermission: idUser === item?.user,
         unit,
         isMultiUnits,
-        textCondition: textCondition(item),
+        automate: item,
       },
     });
   };
@@ -125,8 +75,9 @@ const MultiUnits = () => {
           tabActive === t('Scenario')
             ? AUTOMATE_TYPE.ONE_TAP_ONLY
             : AUTOMATE_TYPE.VALUE_CHANGE,
+        unit: { id: unit?.id },
         isAutomateTab: true,
-        isMultiUnits: true,
+        isMultiUnits,
       },
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps