@eohjsc/react-native-smart-city 0.7.21 → 0.7.23

package/src/configs/API.js

@@ -90,6 +90,7 @@ const API = {
   CONFIG: {
     DISPLAY_HISTORY_V3: () => '/chip_manager/configs/value_history_v3/',
     DISPLAY_HISTORY_V4: () => '/chip_manager/configs/value_history_v4/',
+    DISPLAY_HISTORY_V5: () => '/chip_manager/configs/value_history_v5/',
   },
   AUTOMATE: {
     ACTION_ONE_TAP: (id) => `/property_manager/automate/${id}/action_one_tap/`,
@@ -109,12 +110,16 @@ const API = {
       `/property_manager/automate/${automateId}/update_script_notify/`,
     UPDATE_SCRIPT_ACTION: (automateId) =>
       `/property_manager/automate/${automateId}/update_script_action/`,
+    UPDATE_SCRIPT_TOGGLE: (automateId) =>
+      `/property_manager/automate/${automateId}/update_script_toggle/`,
     UPDATE_SCRIPT_EMAIL: (automateId) =>
       `/property_manager/automate/${automateId}/update_script_email/`,
     UPDATE_SCRIPT_SMS: (automateId) =>
       `/property_manager/automate/${automateId}/update_script_sms/`,
     ADD_SCRIPT_ACTION: (id) =>
       `/property_manager/automate/${id}/add_script_action/`,
+    ADD_SCRIPT_TOGGLE: (id) =>
+      `/property_manager/automate/${id}/add_script_toggle/`,
     ADD_SCRIPT_NOTIFY: (id) =>
       `/property_manager/automate/${id}/add_script_notify/`,
     ADD_SCRIPT_DELAY: (id) =>
@@ -125,6 +130,7 @@ const API = {
     FETCH_AUTOMATE: (automateId) =>
       `/property_manager/automate_v2/${automateId}/`,
     CREATE_AUTOMATE: () => '/property_manager/automate/',
+    CREATE_AUTOMATE_V2: () => '/property_manager/automate_v2/',
     UPDATE_AUTOMATE: (automateId) =>
       `/property_manager/automate/${automateId}/`,
     ENABLE_SCRIPT: (automateId) =>
@@ -158,6 +164,8 @@ const API = {
     UNITS: () => '/property_manager/sharing/units/',
     UNIT_PERMISSIONS: (id) =>
       `/property_manager/sharing/units/${id}/permissions/`,
+    UNIT_PERMISSIONS_v2: (id) =>
+      `/property_manager/sharing/units/${id}/permissions_v2/`,
     UNITS_MEMBERS: (id) => `/property_manager/sharing/units/${id}/members/`,
     UNITS_MEMBER_DETAIL: (id, shareId) =>
       `/property_manager/sharing/units/${id}/members/${shareId}/`,
@@ -165,6 +173,8 @@ const API = {
       `/property_manager/sharing/units/${unit_id}/member/${member_id}/information/`,
     UNIT_MEMBER_SHARE_DEVICE: (unit_id, member_id) =>
       `/property_manager/sharing/units/${unit_id}/member/${member_id}/shared_devices/`,
+    UNIT_MEMBER_SHARE_DEVICE_V2: (unit_id, member_id) =>
+      `/property_manager/sharing/units/${unit_id}/member/${member_id}/shared_devices_v2/`,
     SHARE: () => '/property_manager/sharing/share/',
     SHARE_V2: () => '/property_manager/sharing/share_v2/',
     SEARCH_USER_BY_PHONE: (phone) => `/accounts/search/phone/${phone}/`,

package/src/configs/AccessibilityLabel.js

@@ -306,6 +306,7 @@ export default {
   ONE_BUTTON: 'ONE_BUTTON',
   ON_BUTTON: 'ON_BUTTON',
   OFF_BUTTON: 'OFF_BUTTON',
+  TOGGLE_BUTTON: 'TOGGLE_BUTTON',
 
   //  Device Detail
   DEVICE_DETAIL_MEDIA_PLAYER: 'DEVICE_DETAIL_MEDIA_PLAYER',
@@ -452,7 +453,9 @@ export default {
     CHECK_BOX_CUSTOM: 'CHECK_BOX_CUSTOM',
     CHECK_BOX_CONFIG: 'CHECK_BOX_CONFIG',
     EXPAND_END_DEVICE: 'EXPAND_END_DEVICE',
-    CLICK_NAME_END_DEVICE: 'CLICK_NAME_END_DEVICE',
+    NAME_END_DEVICE: 'CLICK_NAME_END_DEVICE',
+    ICON_END_DEVICE: 'ICON_END_DEVICE',
+    ICON_CHECK: 'ICON_CHECK',
   },
 
   // Select subunit
@@ -608,6 +611,7 @@ export default {
   // OnOffSimpleAction
   ON_OFF_SIMPLE_ACTION_ON: 'ON_OFF_SIMPLE_ACTION_ON',
   ON_OFF_SIMPLE_ACTION_OFF: 'ON_OFF_SIMPLE_ACTION_OFF',
+  ON_OFF_SIMPLE_ACTION_TOGGLE: 'ON_OFF_SIMPLE_ACTION_TOGGLE',
 
   // Add New Device LG
   ADD_NEW_DEVICE_LG_ADD: 'ADD_NEW_DEVICE_LG_ADD',

package/src/configs/Images.js

@@ -27,4 +27,5 @@ export default {
   inforCode: require('../Images/DevMode/inforCode.png'),
   activeCurrentSensor: require('../Images/Common/Sunny.png'),
   unitDefaultBackground: require('../Images/Common/unit_default_background.png'),
+  defaultEndDeviceIcon: require('../Images/Common/default_end_device.png'),
 };

package/src/navigations/AddMemberStack.js

@@ -1,12 +1,12 @@
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import React, { memo } from 'react';
 
 import AddCommonSelectUnit from '../screens/AddCommon/SelectUnit';
 import Route from '../utils/Route';
-import { screenOptions } from './utils';
+import SelectShareDevice from '../screens/Sharing/SelectShareDevice';
 import SharingInviteMembers from '../screens/Sharing/SelectUser';
 import UpdateShareDevice from '../screens/Sharing/UpdateShareDevice';
-import SelectShareDevice from '../screens/Sharing/SelectShareDevice';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import { screenOptions } from './utils';
 
 const Stack = createNativeStackNavigator();
 

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

@@ -198,4 +198,14 @@ describe('Test Activity log', () => {
     const items = instance.findAllByType(ItemLog);
     expect(items).toHaveLength(0);
   });
+
+  it('render type null', async () => {
+    route.params.type = undefined;
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const items = instance.findAllByType(ItemLog);
+    expect(items).toHaveLength(0);
+  });
 });

package/src/screens/ActivityLog/hooks/index.js

@@ -120,7 +120,7 @@ export default ({ id, type, share, filterEnabled }) => {
 
   const fetchMembers = async () => {
     const api = apiMaps[type];
-    if (!filterEnabled?.user) {
+    if (!api?.memberUrl || !filterEnabled?.user) {
       return;
     }
     const { success, data } = await axiosGet(api.memberUrl(share?.id));

package/src/screens/AddCommon/SelectUnit.js

@@ -1,8 +1,9 @@
-import { useNavigation } from '@react-navigation/native';
-import { useTranslations } from '../../hooks/Common/useTranslations';
 import React, { useCallback, useEffect, useState } from 'react';
+
 import Routes from '../../utils/Route';
 import SelectUnit from '../../commons/SelectUnit';
+import { useNavigation } from '@react-navigation/native';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 
 const AddCommonSelectUnit = ({ route }) => {
   const t = useTranslations();

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

@@ -1,22 +1,22 @@
-import MockAdapter from 'axios-mock-adapter';
-import React from 'react';
-import { Alert } from 'react-native';
-import RNAndroidLocationEnabler from 'react-native-android-location-enabler';
-import RNP from 'react-native-permissions';
+import {
+  GEOLOCATION_ERROR,
+  OpenSetting,
+} from '../../../utils/Permission/common';
 import { act, create } from 'react-test-renderer';
 
-import { useNavigation } from '@react-navigation/native';
-import { RESULTS } from 'react-native-permissions';
 import { API } from '../../../configs';
 import { AccessibilityLabel } from '../../../configs/Constants';
+import AddLocationMaps from '../index';
+import { Alert } from 'react-native';
+import MockAdapter from 'axios-mock-adapter';
+import { RESULTS } from 'react-native-permissions';
+import RNAndroidLocationEnabler from 'react-native-android-location-enabler';
+import RNP from 'react-native-permissions';
+import React from 'react';
 import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
 import api from '../../../utils/Apis/axios';
-import {
-  GEOLOCATION_ERROR,
-  OpenSetting,
-} from '../../../utils/Permission/common';
-import AddLocationMaps from '../index';
+import { mockSCStore } from '../../../context/mockStore';
+import { useNavigation } from '@react-navigation/native';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>

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

@@ -1,14 +1,13 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback } from 'react';
 import { View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 
 import { useTranslations } from '../../../hooks/Common/useTranslations';
-import { axiosGet, axiosPost } from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
 import Routes from '../../../utils/Route';
 import NewActionWrapper from './NewActionWrapper';
 import moment from 'moment';
 import { ToastBottomHelper } from '../../../utils/Utils';
+import useAction from '../hooks/useAction';
 import RenderActionItem from './RenderActionItem';
 
 const ChooseAction = ({ route }) => {
@@ -18,24 +17,16 @@ const ChooseAction = ({ route }) => {
     unitId,
     device,
     automateId,
+    scriptItems,
     numberActionCanAdd,
     multiUnit = {},
   } = route.params;
-  const [data, setData] = useState([]);
-  const [actions, setActions] = useState([]);
 
-  const fetchData = useCallback(async () => {
-    const { success, data: automateData } = await axiosGet(
-      API.DEVICE.DISPLAY_ACTIONS(device.id)
-    );
-
-    if (success) {
-      setData(automateData);
-    }
-  }, [device.id]);
+  const { displayActions, saveActions, onSelectAction, onAddSubmit } =
+    useAction(device, scriptItems);
 
   const onSave = useCallback(async () => {
-    if (actions.length > numberActionCanAdd) {
+    if (saveActions.length > numberActionCanAdd) {
       ToastBottomHelper.error(
         `${t('you_can_only_add_more', { number: numberActionCanAdd })} ${t(
           numberActionCanAdd > 1 ? 'actions' : 'action'
@@ -45,18 +36,8 @@ const ChooseAction = ({ route }) => {
       );
       return;
     }
-    let list_action = [...actions];
-    list_action = list_action.map((item) => ({
-      action: item.action,
-      data: item.data,
-    }));
-    const { success } = await axiosPost(
-      API.AUTOMATE.ADD_SCRIPT_ACTION(automateId),
-      {
-        list_action,
-        unit: unitId || multiUnit.id,
-      }
-    );
+
+    const success = await onAddSubmit(automateId, unitId || multiUnit.id);
 
     success &&
       navigate({
@@ -65,50 +46,32 @@ const ChooseAction = ({ route }) => {
         params: { saveAt: moment().valueOf() },
       });
   }, [
-    actions,
     numberActionCanAdd,
     automateId,
+    saveActions.length,
     unitId,
     multiUnit.id,
+    onAddSubmit,
     navigate,
     t,
   ]);
 
-  const handleOnSelectAction = (action) => {
-    setActions((prevActions) => {
-      const index = prevActions.findIndex(
-        (item) => item.index === action.index
-      );
-      if (index !== -1) {
-        const newActions = [...prevActions];
-        newActions[index] = action;
-        return newActions;
-      } else {
-        return [...prevActions, action];
-      }
-    });
-  };
-
-  useEffect(() => {
-    fetchData();
-  }, [fetchData]);
-
   return (
     <NewActionWrapper
-      canNext={actions.length}
+      canNext={saveActions.length}
       onNext={onSave}
       nextTitle={t('save')}
       name={t('set_up {name}', { name: device?.name })}
     >
       <View>
-        {!!data?.length &&
-          data.map((item, index) => (
+        {!!displayActions?.length &&
+          displayActions.map((item, index) => (
             <RenderActionItem
               key={`action_item_${index}`}
               device={device}
               item={item}
               index={index}
-              handleOnSelectAction={handleOnSelectAction}
+              handleOnSelectAction={onSelectAction}
               t={t}
             />
           ))}
@@ -116,4 +79,5 @@ const ChooseAction = ({ route }) => {
     </NewActionWrapper>
   );
 };
+
 export default ChooseAction;

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

@@ -10,8 +10,9 @@ const SelectControlDevices = ({ route }) => {
   const t = useTranslations();
   const {
     unitId,
-    closeScreen,
     automateId,
+    closeScreen,
+    scriptItems,
     numberActionCanAdd,
     multiUnit = {},
   } = route.params || {};
@@ -54,13 +55,22 @@ const SelectControlDevices = ({ route }) => {
       navigate(Routes.ChooseAction, {
         unitId,
         automateId,
-        device: selectedDevice,
         closeScreen,
+        device: selectedDevice,
+        scriptItems,
         numberActionCanAdd,
         multiUnit,
       });
     },
-    [navigate, unitId, automateId, closeScreen, numberActionCanAdd, multiUnit]
+    [
+      navigate,
+      unitId,
+      automateId,
+      closeScreen,
+      scriptItems,
+      numberActionCanAdd,
+      multiUnit,
+    ]
   );
 
   if (loading) {

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

@@ -52,6 +52,10 @@ const SetupConfigCondition = () => {
   const { navigate } = useNavigation();
   const { params = {} } = useRoute();
   const { config, automate, closeScreen, unitId } = params;
+  const [conditionData, setConditionData] = useState({
+    type: AUTOMATE_TYPE.VALUE_CHANGE,
+    config: automate.config,
+  });
   const [selectedCondition, setSelectedCondition] = useState(undefined);
   const [customCondition, setCustomCondition] = useState(undefined);
   const [isShowModal, setIsShowModal] = useState(false);
@@ -86,67 +90,77 @@ const SetupConfigCondition = () => {
 
   const setupCustomCondition = () => {
     setSelectedCondition('custom');
-    automate.value = NaN;
+    setConditionData((prev) => ({
+      ...prev,
+      value: NaN,
+    }));
     setIsShowModal(true);
   };
 
-  const handleNavigate = useCallback(async () => {
-    if (!isCreateCondition && !isUpdateCondition) {
-      navigate(Routes.ValueChangeName, {
-        automate,
-        closeScreen,
-        unitId,
-      });
-      return;
-    }
-    const data = {
-      type: AUTOMATE_TYPE.VALUE_CHANGE,
-      condition: automate.condition,
-      config: automate.config,
-      value: automate.value,
-    };
-    const apiCall = isCreateCondition
-      ? await axiosPost(API.AUTOMATE.ADD_CONDITION(automate.id), data)
-      : await axiosPut(
-          API.AUTOMATE.UPDATE_CONDITION(automate.id, isUpdateCondition),
-          data
-        );
+  const handleNavigate = useCallback(
+    async (data) => {
+      if (!isCreateCondition && !isUpdateCondition) {
+        navigate(Routes.ValueChangeName, {
+          automate: {
+            ...automate,
+            conditions: [data],
+          },
+          closeScreen,
+          unitId,
+        });
+        return;
+      }
 
-    const { success } = apiCall;
-
-    if (success) {
-      ToastBottomHelper.success(
-        isCreateCondition
-          ? t('add_condition_success')
-          : t('edit_condition_success')
-      );
-      navigate({
-        name: Routes.ScriptDetail,
-        params: { preAutomate: automate },
-      });
-    }
-  }, [
-    automate,
-    closeScreen,
-    isCreateCondition,
-    isUpdateCondition,
-    navigate,
-    t,
-    unitId,
-  ]);
+      const apiCall = isCreateCondition
+        ? await axiosPost(API.AUTOMATE.ADD_CONDITION(automate.id), data)
+        : await axiosPut(
+            API.AUTOMATE.UPDATE_CONDITION(automate.id, isUpdateCondition),
+            data
+          );
+
+      const { success } = apiCall;
+
+      if (success) {
+        ToastBottomHelper.success(
+          isCreateCondition
+            ? t('add_condition_success')
+            : t('edit_condition_success')
+        );
+        navigate({
+          name: Routes.ScriptDetail,
+          params: { preAutomate: automate },
+        });
+      }
+    },
+    [
+      automate,
+      closeScreen,
+      isCreateCondition,
+      isUpdateCondition,
+      navigate,
+      t,
+      unitId,
+    ]
+  );
 
   const setupCondition = async (condition) => {
-    automate.condition = condition?.condition;
-    automate.value = condition?.value;
     setSelectedCondition(condition);
-    handleNavigate();
+    const data = {
+      ...conditionData,
+      condition: condition?.condition,
+      value: condition?.value,
+    };
+    handleNavigate(data);
   };
 
   const resetCustomizeCondition = useCallback(() => {
-    automate.condition = null;
-    automate.value = NaN;
+    setConditionData((prev) => ({
+      ...prev,
+      condition: null,
+      value: NaN,
+    }));
     setCustomCondition(undefined);
-  }, [automate]);
+  }, []);
 
   useFocusEffect(
     useCallback(() => {
@@ -197,7 +211,10 @@ const SetupConfigCondition = () => {
                 <GridItem
                   key={`GridItem${index}`}
                   onPress={() => {
-                    automate.condition = item.value;
+                    setConditionData((prev) => ({
+                      ...prev,
+                      condition: item.value,
+                    }));
                     setCustomCondition(item.value);
                   }}
                   selected={item.value === customCondition}
@@ -217,7 +234,10 @@ const SetupConfigCondition = () => {
               placeholder={t('value')}
               onChange={(value) => {
                 const floatValue = parseFloat(value.replace(',', '.'));
-                automate.value = floatValue;
+                setConditionData((prev) => ({
+                  ...prev,
+                  value: floatValue,
+                }));
               }}
               textInputStyle={styles.numberInput}
               wrapStyle={styles.wrapTextInput}
@@ -229,12 +249,12 @@ const SetupConfigCondition = () => {
             title={t('continue')}
             accessibilityLabel={AccessibilityLabel.BUTTON_CONTINUE}
             onPress={async () => {
-              if (isNaN(automate.value) || !automate.condition) {
+              if (isNaN(conditionData.value) || !conditionData.condition) {
                 ToastBottomHelper.error(t('please_enter_a_number'), '', 3000);
                 return;
               }
               setIsShowModal(false);
-              handleNavigate();
+              handleNavigate(conditionData);
             }}
             style={styles.buttonContinue}
             textSemiBold={false}