@eohjsc/react-native-smart-city 0.3.31 → 0.3.34

package/src/screens/ScriptDetail/index.js

@@ -40,7 +40,7 @@ import {
   STATE_VALUE_SENSOR_TYPES,
 } from '../../configs/Constants';
 import { popAction } from '../../navigations/utils';
-import { TESTID } from '../../configs/Constants';
+import { AccessibilityLabel } from '../../configs/Constants';
 import useKeyboardAnimated from '../../hooks/Explore/useKeyboardAnimated';
 import { REPEAT_OPTIONS } from '../SetSchedule/components/RepeatOptionsPopup';
 import { useSCContextSelector } from '../../context';
@@ -302,7 +302,7 @@ const ScriptDetail = ({ route }) => {
           <TouchableOpacity
             onPress={onPressAddAction}
             style={[styles.rightItemAdd]}
-            testID={TESTID.BUTTON_ADD_SCRIPT_ACTION}
+            accessibilityLabel={AccessibilityLabel.BUTTON_ADD_SCRIPT_ACTION}
           >
             <Add />
             <Text type="H4" color={Colors.Gray8} style={styles.addAction}>
@@ -321,8 +321,7 @@ const ScriptDetail = ({ route }) => {
       <PreventDoubleTouch
         style={[styles.buttonStar, styles.headerButton]}
         onPress={onPressStar}
-        testID={TESTID.HEADER_SCRIPT_DETAIL_BUTTON_STAR}
-        accessibilityLabel={TESTID.HEADER_SCRIPT_DETAIL_BUTTON_STAR}
+        accessibilityLabel={AccessibilityLabel.HEADER_SCRIPT_DETAIL_BUTTON_STAR}
       >
         {isStarred ? (
           <IconFill name="star" size={25} color={Colors.Yellow6} />
@@ -363,17 +362,9 @@ const ScriptDetail = ({ route }) => {
   const isHaveScriptActions = data?.length > 0;
 
   const textCondition = useMemo(() => {
-    const {
-      condition,
-      config_name,
-      value,
-      repeat,
-      date_repeat,
-      time_repeat,
-      weekday_repeat,
-      sensor_type,
-    } = automate;
     if (type === AUTOMATE_TYPE.VALUE_CHANGE) {
+      const { condition, config_name, value, sensor_type } =
+        automate?.value_change;
       const stateConditionData = STATE_VALUE_SENSOR_TYPES.find(
         (i) => i.type === sensor_type
       );
@@ -389,6 +380,8 @@ const ScriptDetail = ({ route }) => {
       }
       return `${config_name} ${t(text)} ${isNumberValue ? value : ''}`;
     } else if (type === AUTOMATE_TYPE.SCHEDULE) {
+      const { repeat, time_repeat, date_repeat, weekday_repeat } =
+        automate?.schedule;
       const time =
         time_repeat?.length >= 8
           ? time_repeat.substring(0, time_repeat?.length - 3)
@@ -425,6 +418,21 @@ const ScriptDetail = ({ route }) => {
         const textWeekday = sortWeekday.map((item) => weekday[item]).join(', ');
         return `${textWeekday} ${t('at')} ${time}`;
       }
+    } else if (type === AUTOMATE_TYPE.EVENT) {
+      const { action, end_device_name, config_name, sensor_type, value } =
+        automate?.event;
+      let textEvent = '';
+      if (config_name) {
+        const stateConditionData = STATE_VALUE_SENSOR_TYPES.find(
+          (i) => i.type === sensor_type
+        );
+        textEvent = `${config_name} - ${t(
+          stateConditionData.stateValue[value]
+        )}`;
+      } else {
+        textEvent = `${end_device_name} - ${action}`;
+      }
+      return textEvent;
     }
     return null;
   }, [t, automate, type]);
@@ -451,7 +459,7 @@ const ScriptDetail = ({ route }) => {
             <TouchableOpacity
               onPress={handleScriptAction}
               style={styles.activeButton}
-              testID={TESTID.BUTTON_ACTIVATE_ONE_TAP}
+              accessibilityLabel={AccessibilityLabel.BUTTON_ACTIVATE_ONE_TAP}
             >
               <Image source={Images.activeButton} />
             </TouchableOpacity>
@@ -465,7 +473,9 @@ const ScriptDetail = ({ route }) => {
               <TouchableOpacity
                 onPress={onPressEdit}
                 style={styles.editButton}
-                testID={TESTID.BUTTON_EDIT_SCRIPT_ACTION}
+                accessibilityLabel={
+                  AccessibilityLabel.BUTTON_EDIT_SCRIPT_ACTION
+                }
               >
                 <Text type="Label" hilight>
                   {t('edit')}

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

@@ -7,7 +7,7 @@ import MockAdapter from 'axios-mock-adapter';
 import SelectUnit from '../';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { TESTID } from '../../../configs/Constants';
+import { AccessibilityLabel } from '../../../configs/Constants';
 import Routes from '../../../utils/Route';
 import api from '../../../utils/Apis/axios';
 import { API } from '../../../configs';
@@ -149,7 +149,7 @@ describe('Test Select unit screen', () => {
 
     const buttonContinue = instance.findAll(
       (el) =>
-        el.props.testID === TESTID.BOTTOM_VIEW_MAIN &&
+        el.props.accessibilityLabel === AccessibilityLabel.BOTTOM_VIEW_MAIN &&
         el.type === TouchableOpacity
     );
 
@@ -179,7 +179,8 @@ describe('Test Select unit screen', () => {
 
     const iconClose = instance.findAll(
       (el) =>
-        el.props.testID === TESTID.ICON_CLOSE && el.type === TouchableOpacity
+        el.props.accessibilityLabel === AccessibilityLabel.ICON_CLOSE &&
+        el.type === TouchableOpacity
     );
 
     expect(iconClose).toHaveLength(1);

package/src/screens/SelectUnit/index.js

@@ -12,7 +12,7 @@ import BottomButtonView from '../../commons/BottomButtonView';
 import { useNavigation, useRoute } from '@react-navigation/native';
 import { popAction } from '../../navigations/utils';
 import Routes from '../../utils/Route';
-import { TESTID } from '../../configs/Constants';
+import { AccessibilityLabel } from '../../configs/Constants';
 
 const SelectUnit = () => {
   const t = useTranslations();
@@ -100,7 +100,7 @@ const SelectUnit = () => {
         key={id}
         onPress={onPressItem(item)}
         style={styles.wrapItem}
-        testID={TESTID.ITEM_UNIT}
+        accessibilityLabel={AccessibilityLabel.ITEM_UNIT}
       >
         <View style={[styles.notSelected, isSelectedItem && styles.selected]}>
           {isSelectedItem && <View style={styles.childSelected} />}
@@ -131,7 +131,7 @@ const SelectUnit = () => {
       <TouchableOpacity
         style={styles.buttonClose}
         onPress={handleOnGoBackAndClose}
-        testID={TESTID.ICON_CLOSE}
+        accessibilityLabel={AccessibilityLabel.ICON_CLOSE}
       >
         <Icon name={'close'} size={24} color={Colors.Black} />
       </TouchableOpacity>

package/src/screens/SetSchedule/index.js

@@ -29,7 +29,7 @@ const SetSchedule = ({ route }) => {
     automate = {},
     scriptName,
     oldType,
-  } = route.params;
+  } = route?.params || {};
   const { navigate, dispatch, goBack } = useNavigation();
   const [repeat, setRepeat] = useState(automate.repeat || REPEAT_OPTIONS.ONCE);
 

package/src/screens/SharedUnit/__test__/ShareUnit.test.js

@@ -4,6 +4,12 @@ import SharedUnit from '../index';
 import Modal from 'react-native-modal';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { AccessibilityLabel } from '../../../configs/Constants';
+import MockAdapter from 'axios-mock-adapter';
+import api from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
+
+const mock = new MockAdapter(api.axiosInstance);
 
 const wrapComponent = () => (
   <SCProvider initState={mockSCStore({})}>
@@ -16,9 +22,11 @@ jest.mock('react-redux', () => ({
   useSelector: jest.fn(),
 }));
 
+const mockSetSharedUnits = jest.fn();
 jest.mock('react', () => ({
   ...jest.requireActual('react'),
   useLayoutEffect: jest.fn(),
+  useState: jest.fn((init) => [init, mockSetSharedUnits]),
 }));
 
 jest.mock('react-native-onesignal', () => {
@@ -37,4 +45,21 @@ describe('test SharedUnit', () => {
     const modalShareds = instance.findAllByType(Modal);
     expect(modalShareds[0]).not.toBeUndefined();
   });
+
+  test('render touch item filter', async () => {
+    mock.onGet(API.UNIT.FILTER_SHARED_UNITS()).reply(200, [{}]);
+
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const item = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel === AccessibilityLabel.FILTER_SHARING_ITEM
+    );
+    await act(async () => {
+      item[0].props.onPress();
+    });
+    expect(mockSetSharedUnits).toBeCalled();
+  });
 });

package/src/screens/SharedUnit/index.js

@@ -12,6 +12,7 @@ import {
   useBoolean,
   useBlockBackAndroid,
 } from '../../hooks/Common';
+import { AccessibilityLabel } from '../../configs/Constants';
 
 import styles from './styles';
 import TabHeader from './TabHeader';
@@ -185,6 +186,7 @@ const Shared = () => {
                     style={styles.row}
                     onPress={() => onFilter(item.filter, item.textFilter)}
                     key={`filter-${index}`}
+                    accessibilityLabel={`${AccessibilityLabel.FILTER_SHARING_ITEM}`}
                   >
                     <Text
                       style={

package/src/screens/Sharing/Components/{SensorItem.js → DeviceItem.js}

@@ -1,21 +1,28 @@
 import React, { memo, useEffect, useMemo, useState } from 'react';
-import { View, Text, LayoutAnimation, Platform, UIManager } from 'react-native';
+import {
+  View,
+  Text,
+  LayoutAnimation,
+  Platform,
+  UIManager,
+  TouchableOpacity,
+} from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { Colors } from '../../../configs';
-import styles from './Styles/SensorItemStyles';
+import styles from './Styles/DeviceItemStyles';
 import FImage from '../../../commons/FImage';
 import { TitleCheckBox } from '.';
 import { CheckBoxCustom } from '.';
-import { TESTID } from '../../../configs/Constants';
+import { AccessibilityLabel } from '../../../configs/Constants';
 
-const SensorItem = ({
+const DeviceItem = ({
   item = {},
   isRenderSeparated,
   onTickedChild,
-  onTickedSensor,
-  titleGroup,
-  activeItemId,
-  setActiveItemId,
+  onTickedDevice,
+  onTickedDeviceIcon,
+  isItemExpanded,
+  toggleItem,
   idGroup,
 }) => {
   const {
@@ -31,14 +38,12 @@ const SensorItem = ({
     ...read_configs.map((i) => ({ ...i, isConfig: true })),
   ]);
 
-  const expanded = activeItemId === id;
-
   const onPressItem = () => {
     if (dataConfig.length > 0) {
-      expanded ? setActiveItemId(-1) : setActiveItemId(id);
+      toggleItem();
       LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
     } else {
-      handleOnTickedSensor();
+      handleOnTickedDevice();
     }
   };
 
@@ -60,17 +65,22 @@ const SensorItem = ({
       );
   };
 
-  const handleOnTickedSensor = () => {
-    onTickedSensor && onTickedSensor(idGroup, id, !isChecked);
+  const isCheckedIcon = useMemo(() => {
+    return dataConfig.some((i) => i.isChecked);
+  }, [dataConfig]);
+
+  const handleOnTickedIcon = () => {
+    onTickedDeviceIcon && onTickedDeviceIcon(idGroup, id, isCheckedIcon);
+  };
+
+  const handleOnTickedDevice = () => {
+    onTickedDevice && onTickedDevice(idGroup, id, !isChecked);
   };
 
   useEffect(() => {
-    if (
-      Platform.OS === 'android' &&
-      UIManager.setLayoutAnimationEnabledExperimental
-    ) {
+    Platform.OS === 'android' &&
+      UIManager.setLayoutAnimationEnabledExperimental &&
       UIManager.setLayoutAnimationEnabledExperimental(true);
-    }
   }, []);
 
   const renderData = useMemo(() => {
@@ -94,27 +104,27 @@ const SensorItem = ({
 
   return (
     <View style={[styles.wrap, !isRenderSeparated && styles.isRenderSeparated]}>
-      <FImage
-        source={{ uri: icon_kit }}
-        style={styles.viewLeft}
-        tintColor={
-          dataConfig.some((i) => i.isChecked) ? Colors.Primary : Colors.Gray
-        }
-      />
+      <TouchableOpacity onPress={handleOnTickedIcon}>
+        <FImage
+          source={{ uri: icon_kit }}
+          style={styles.viewLeft}
+          tintColor={isCheckedIcon ? Colors.Primary : Colors.Gray}
+        />
+      </TouchableOpacity>
       <View style={styles.wrapRight}>
         <View style={styles.viewRight}>
           <Text
             numberOfLines={1}
             style={styles.text}
             onPress={onPressItem}
-            testID={TESTID.TEXT_SENSOR_ITEM}
+            accessibilityLabel={AccessibilityLabel.TEXT_SENSOR_ITEM}
           >
             {name}
           </Text>
           {dataConfig.length > 0 ? (
             <IconOutline
               onPress={onPressItem}
-              name={expanded ? 'up' : 'down'}
+              name={isItemExpanded ? 'up' : 'down'}
               size={20}
               color={Colors.Gray6}
             />
@@ -126,11 +136,11 @@ const SensorItem = ({
             />
           )}
         </View>
-        {expanded && <View style={styles.wrapExpand}>{renderData}</View>}
+        {isItemExpanded && <View style={styles.wrapExpand}>{renderData}</View>}
         {isRenderSeparated && <View style={styles.viewSeparated} />}
       </View>
     </View>
   );
 };
 
-export default memo(SensorItem);
+export default memo(DeviceItem);

package/src/screens/Sharing/Components/__test__/{SensorItem.test.js → DeviceItem.test.js}

@@ -3,9 +3,9 @@ import { create, act } from 'react-test-renderer';
 
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
-import SensorItem from '../SensorItem';
+import DeviceItem from '../DeviceItem';
 import { Text } from 'react-native';
-import { TESTID } from '../../../../configs/Constants';
+import { AccessibilityLabel } from '../../../../configs/Constants';
 
 jest.mock('react', () => {
   return {
@@ -14,21 +14,21 @@ jest.mock('react', () => {
   };
 });
 
-const mockOnTickedSensor = jest.fn();
+const mockOnTickedDevice = jest.fn();
 const mockOnTickedChild = jest.fn();
 const wrapComponent = (item) => (
   <SCProvider initState={mockSCStore({})}>
-    <SensorItem
+    <DeviceItem
       item={item}
       onTickedChild={mockOnTickedChild}
-      onTickedSensor={mockOnTickedSensor}
+      onTickedSensor={mockOnTickedDevice}
       activeItemId={item.id}
     />
   </SCProvider>
 );
 
-describe('test SensorItem', () => {
-  test('test SensorItem', () => {
+describe('test DeviceItem', () => {
+  test('test DeviceItem', () => {
     const item = {
       id: 1,
       name: 'abc',
@@ -43,7 +43,9 @@ describe('test SensorItem', () => {
     });
     const instance = tree.root;
     const onPressText = instance.find(
-      (el) => el.type === Text && el.props.testID === TESTID.TEXT_SENSOR_ITEM
+      (el) =>
+        el.type === Text &&
+        el.props.accessibilityLabel === AccessibilityLabel.TEXT_SENSOR_ITEM
     );
     expect(onPressText).toBeDefined();
     act(() => {

package/src/screens/Sharing/Components/index.js

@@ -1,5 +1,5 @@
 import CheckBoxCustom from './CheckBoxCustom';
 import TitleCheckBox from './TitleCheckBox';
-import SensorItem from './SensorItem';
+import DeviceItem from './DeviceItem';
 
-export { CheckBoxCustom, TitleCheckBox, SensorItem };
+export { CheckBoxCustom, TitleCheckBox, DeviceItem };

package/src/screens/Sharing/InfoMemberUnit.js

@@ -17,14 +17,15 @@ import OwnerSvg from '../../Images/Common/owner.svg';
 import styles from './Styles/inforMemberUnitStyles';
 import { useNavigation, useIsFocused } from '@react-navigation/native';
 import Routes from '../../utils/Route';
-import { TESTID } from '../../configs/Constants';
+import { AccessibilityLabel } from '../../configs/Constants';
 
 const InfoMemberUnit = memo(({ route }) => {
   const t = useTranslations();
-  const { member, unit } = route.params || {
-    member: {},
-    unit: {},
-  };
+  const { member, unit } = route?.params ||
+    {} || {
+      member: {},
+      unit: {},
+    };
   const { navigate } = useNavigation();
   const [isLoading, setIsLoading] = useState(true);
   const [memberInfo, setMemberInfo] = useState({});
@@ -236,7 +237,7 @@ const InfoMemberUnit = memo(({ route }) => {
                 <TouchableOpacity
                   style={styles.removeButton}
                   onPress={() => onPressRemoveUser(member)}
-                  testID={TESTID.REMOVE_MEMBER}
+                  accessibilityLabel={AccessibilityLabel.REMOVE_MEMBER}
                 >
                   <Text
                     type={'H4'}

package/src/screens/Sharing/MemberList.js

@@ -12,7 +12,7 @@ import { useIsOwnerOfUnit } from '../../hooks/Common';
 import AlertAction from '../../commons/AlertAction';
 
 import { useDataMember, useStateAlertAction } from './hooks';
-import { TESTID } from '../../configs/Constants';
+import { AccessibilityLabel } from '../../configs/Constants';
 import { useSCContextSelector } from '../../context';
 
 const MemberList = ({ route }) => {
@@ -20,7 +20,7 @@ const MemberList = ({ route }) => {
   const { navigate } = useNavigation();
   const isFocused = useIsFocused();
   const account = useSCContextSelector((state) => state.auth.account);
-  const { unitId, unit } = route.params;
+  const { unitId, unit } = route?.params || {};
   const { dataMembers, isRefresh, onRefresh, leaveUnit, loading } =
     useDataMember(unitId, unit?.user_id);
   const { isOwner } = useIsOwnerOfUnit(unit?.user_id);
@@ -54,7 +54,7 @@ const MemberList = ({ route }) => {
 
   const rightHeader = (
     <TouchableOpacity
-      testID={TESTID.MEMBER_LIST_RIGHT_HEADER_TOUCH}
+      accessibilityLabel={AccessibilityLabel.MEMBER_LIST_RIGHT_HEADER_TOUCH}
       onPress={onPressRightHeader}
       style={styles.rightHeader}
     >
@@ -78,7 +78,7 @@ const MemberList = ({ route }) => {
       >
         {!loading && (
           <SharingMembers
-            testID={TESTID.SHARING_MEMBER}
+            accessibilityLabel={AccessibilityLabel.SHARING_MEMBER}
             dataMember={dataMembers}
             unit={unit}
             ownerId={unit.user_id}