@eohjsc/react-native-smart-city 0.3.6 → 0.3.7

package/src/screens/ScriptDetail/index.js

@@ -179,10 +179,8 @@ const ScriptDetail = ({ route }) => {
   }, []);
 
   const getScriptDetail = useCallback(async () => {
-    const { success, data: automateData } = await axiosGet(
-      API.AUTOMATE.SCRIPT(id)
-    );
-    success && setData(automateData?.script_actions || []);
+    const { success, data } = await axiosGet(API.AUTOMATE.SCRIPT(id));
+    success && setData(data?.script_actions || []);
   }, [id]);
 
   const onPressEdit = useCallback(() => {
@@ -191,19 +189,18 @@ const ScriptDetail = ({ route }) => {
   }, [data]);
 
   const onPressAddAction = useCallback(() => {
-    const navParams = {
+    const params = {
       unit,
       scriptName,
       automateId: id,
       type,
-      oldType: type,
       isCreateNewAction: true,
-      title: AUTOMATE_SELECT.SELECT_DEVICE,
+      title: AUTOMATE_SELECT.SELECT_DEVICES,
       automate,
     };
     navigate(
       isMultiUnits ? Routes.SelectUnit : Routes.SelectSensorDevices,
-      navParams
+      params
     );
   }, [unit, scriptName, id, type, navigate, isMultiUnits, automate]);
 
@@ -361,21 +358,21 @@ const ScriptDetail = ({ route }) => {
       weekday_repeat,
     } = automate;
     if (type === AUTOMATE_TYPE.VALUE_CHANGE) {
-      let text;
+      let textCondition;
       if (condition === '>') {
-        text = 'higher_than';
+        textCondition = 'higher_than';
       } else if (condition === '<') {
-        text = 'lower_than';
+        textCondition = 'lower_than';
       } else if (condition === '=') {
-        text = 'equal';
+        textCondition = 'equal';
       }
-      return `${config_name} ${t(text)} ${value}`;
+      return `${config_name} ${t(textCondition)} ${value}`;
     } else if (type === AUTOMATE_TYPE.SCHEDULE) {
       const time =
-        time_repeat?.length >= 8
-          ? time_repeat.substring(0, time_repeat?.length - 3)
+        time_repeat.length >= 8
+          ? time_repeat.substring(0, time_repeat.length - 3)
           : time_repeat;
-      const date = date_repeat?.split('-').reverse().join('/');
+      const date = date_repeat.split('-').reverse().join('/');
       const weekday = {
         1: t('mon'),
         2: t('tue'),
@@ -392,9 +389,7 @@ const ScriptDetail = ({ route }) => {
         return `${t('every_day_at', { time })}`;
       } else if (repeat === REPEAT_OPTIONS.EVERYWEEK) {
         //sort 0 is last number, exp: [1,3,5,0]
-        const newWeekdayRepeat = weekday_repeat.map((item) =>
-          parseInt(item, 10)
-        );
+        const newWeekdayRepeat = weekday_repeat.map((item) => parseInt(item));
         const sortWeekday = newWeekdayRepeat.sort((a, b) => {
           if (a !== 0 && b === 0) {
             return -1;

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

@@ -2,18 +2,14 @@ import React, { useState } from 'react';
 import { TouchableOpacity } from 'react-native';
 import { useRoute } from '@react-navigation/native';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
-
+import axios from 'axios';
 import SelectUnit from '../';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import { TESTID } from '../../../configs/Constants';
 import Routes from '../../../utils/Route';
-import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
-
-const mock = new MockAdapter(api.axiosInstance);
 
+jest.mock('axios');
 const mockSetState = jest.fn();
 const mockDispatch = jest.fn();
 const mockGoBack = jest.fn();
@@ -51,6 +47,7 @@ describe('Test Select unit screen', () => {
   beforeEach(() => {
     mockSetState.mockClear();
     mockNavigate.mockClear();
+    axios.get.mockClear();
   });
 
   it('Test render', async () => {
@@ -75,7 +72,9 @@ describe('Test Select unit screen', () => {
         },
       ],
     };
-    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     useState.mockImplementation((init) => [response.data, mockSetState]);
     await act(async () => {
       tree = await create(wrapComponent());
@@ -100,8 +99,12 @@ describe('Test Select unit screen', () => {
         isCreateNewAction: false,
       },
     });
-
-    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(400);
+    const response = {
+      status: 400,
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     await act(async () => {
       tree = await create(wrapComponent());
@@ -114,8 +117,8 @@ describe('Test Select unit screen', () => {
       await TouchableOpacities[1].props.onPress();
       await TouchableOpacities[2].props.onPress();
     });
+    expect(mockSetState).toBeCalledTimes(1);
   });
-
   it('Test form ScriptDetail onPressAddAction to Select-unit', async () => {
     useRoute.mockReturnValue({
       params: {
@@ -139,7 +142,9 @@ describe('Test Select unit screen', () => {
         },
       ],
     };
-    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(200, response.data);
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
 
     await act(async () => {
       tree = await create(wrapComponent());
@@ -147,6 +152,16 @@ describe('Test Select unit screen', () => {
 
     const instance = tree.root;
 
+    const TouchableOpacities = instance.findAll(
+      (el) =>
+        el.props.testID === TESTID.ITEM_UNIT && el.type === TouchableOpacity
+    );
+
+    expect(TouchableOpacities).toHaveLength(1);
+    await act(async () => {
+      await TouchableOpacities[0].props.onPress();
+    });
+
     const buttonContinue = instance.findAll(
       (el) =>
         el.props.testID === TESTID.BOTTOM_VIEW_MAIN &&
@@ -157,6 +172,34 @@ describe('Test Select unit screen', () => {
     await act(async () => {
       await buttonContinue[0].props.onPress();
     });
+    expect(mockNavigate).toBeCalledWith(Routes.SelectSensorDevices, {
+      automateId: 1,
+      isAutomateTab: undefined,
+      isCreateNewAction: true,
+      isMultiUnits: undefined,
+      routeName: undefined,
+      scriptName: '1',
+      selectedItem: [
+        {
+          icon: 'Simulator_Screen_Shot_-_iPhone_8_-_2021-09-21_at_09.16.58.png',
+          id: 178,
+          is_owner: true,
+          name: 'Unit 2',
+          number_sensor: 0,
+        },
+      ],
+      title: 'select_device',
+      type: 'value_change',
+      unit: [
+        {
+          icon: 'Simulator_Screen_Shot_-_iPhone_8_-_2021-09-21_at_09.16.58.png',
+          id: 178,
+          is_owner: true,
+          name: 'Unit 2',
+          number_sensor: 0,
+        },
+      ],
+    });
   });
 
   it('Test handleOnGoBackAndClose', async () => {
@@ -192,7 +235,7 @@ describe('Test Select unit screen', () => {
       isCreateNewAction: true,
       isMultiUnits: undefined,
       name: '1',
-      type: undefined,
+      type: 'value_change',
       unit: {
         id: 1,
       },

package/src/screens/SelectUnit/index.js

@@ -26,10 +26,9 @@ const SelectUnit = () => {
     scriptName,
     routeName,
     isCreateNewAction,
+    unit,
     title,
     automate,
-    oldType,
-    unit,
   } = params;
   const [data, setData] = useState([]);
   const [selectedItem, setSelectedItem] = useState(data[0]);
@@ -39,11 +38,9 @@ const SelectUnit = () => {
   };
 
   const getAllUnits = useCallback(async () => {
-    const { success, data: automateData } = await axiosGet(
-      API.AUTOMATE.GET_ALL_UNITS()
-    );
+    const { success, data } = await axiosGet(API.AUTOMATE.GET_ALL_UNITS());
     if (success) {
-      setData(automateData);
+      setData(data);
     }
   }, []);
 
@@ -52,7 +49,7 @@ const SelectUnit = () => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: oldType,
+        type: type,
         havePermission: true,
         unit,
         isMultiUnits,
@@ -80,7 +77,6 @@ const SelectUnit = () => {
         unit: selectedItem,
         automateId,
         scriptName,
-        oldType,
       }
     );
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -159,7 +155,6 @@ const SelectUnit = () => {
             keyExtractor={(item) => item.id}
             data={data}
             renderItem={renderItem}
-            scrollIndicatorInsets={{ right: 1 }}
           />
         </View>
       </WrapHeaderScrollable>

package/src/screens/SetSchedule/index.js

@@ -12,12 +12,20 @@ import RepeatOptionsPopup from './components/RepeatOptionsPopup';
 import RowItem from './components/RowItem';
 import SelectWeekday from './components/SelectWeekday';
 import { useBoolean } from '../../hooks/Common';
-import { useTranslations } from '../../hooks/Common/useTranslations';
+import t, { useTranslations } from '../../hooks/Common/useTranslations';
 import styles from './styles/indexStyles';
 import { REPEAT_OPTIONS } from './components/RepeatOptionsPopup';
 import Routes from '../../utils/Route';
 import { popAction } from '../../navigations/utils';
 
+const getDateString = (date) => {
+  const today = moment();
+  if (date.isSame(today, 'day')) {
+    return date.format(`[${t('today')}], D MMMM YYYY `);
+  }
+  return date.format('ddd, D MMMM YYYY');
+};
+
 const SetSchedule = ({ route }) => {
   const t = useTranslations();
   const {
@@ -28,19 +36,10 @@ const SetSchedule = ({ route }) => {
     automateId, // wilk=l remove later
     automate = {},
     scriptName,
-    oldType,
   } = route.params;
   const { navigate, dispatch, goBack } = useNavigation();
   const [repeat, setRepeat] = useState(automate.repeat || REPEAT_OPTIONS.ONCE);
 
-  const getDateString = (date) => {
-    const today = moment();
-    if (date.isSame(today, 'day')) {
-      return date.format(`[${t('today')}], D MMMM YYYY `);
-    }
-    return date.format('ddd, D MMMM YYYY');
-  };
-
   const [time, setTime] = useState(
     automate.time_repeat
       ? moment(automate.time_repeat, 'HH:mm:ss')
@@ -120,7 +119,7 @@ const SetSchedule = ({ route }) => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: oldType,
+        type: type,
         havePermission: true,
         unit,
         isMultiUnits,
@@ -137,10 +136,7 @@ const SetSchedule = ({ route }) => {
     <>
       <View style={styles.container}>
         <HeaderCustom isShowClose onClose={onClose} />
-        <ScrollView
-          contentContainerStyle={styles.scollView}
-          scrollIndicatorInsets={{ right: 1 }}
-        >
+        <ScrollView contentContainerStyle={styles.scollView}>
           <Text type="H2" bold style={styles.title}>
             {t('set_schedule')}
           </Text>

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

@@ -6,6 +6,8 @@ import { TouchableOpacity } from 'react-native';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 
+jest.mock('axios');
+
 const wrapComponent = (current, getCurrentTab, showModal, textFilter) => (
   <SCProvider initState={mockSCStore({})}>
     <TabHeader

package/src/screens/SharedUnit/index.js

@@ -139,7 +139,6 @@ const Shared = () => {
             keyExtractor={(item, index) => item.id.toString()}
             ItemSeparatorComponent={() => <View style={styles.seperator} />}
             contentContainerStyle={styles.scrollView}
-            scrollIndicatorInsets={{ right: 1 }}
           />
         ) : (
           <FlatList
@@ -163,7 +162,6 @@ const Shared = () => {
             keyExtractor={(item, index) => item.id.toString()}
             ItemSeparatorComponent={() => <View style={styles.seperator} />}
             contentContainerStyle={styles.scrollView}
-            scrollIndicatorInsets={{ right: 1 }}
           />
         )}
       </View>

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

@@ -42,20 +42,20 @@ const SensorItem = ({
     }
   };
 
-  const handleOnTickedChild = (group, checked, childId) => {
+  const handleOnTickedChild = (idGroup, isChecked, childId) => {
     const dataTemp = [...dataConfig];
     const indexTemp = dataTemp.findIndex((i) => i.id === childId);
     dataTemp.splice(indexTemp, 1, {
       ...dataTemp[indexTemp],
-      isChecked: checked,
+      isChecked,
     });
     setDataConfig(dataTemp);
     onTickedChild &&
       onTickedChild(
-        group,
+        idGroup,
         id,
         childId,
-        checked,
+        isChecked,
         Boolean(dataTemp[indexTemp]?.isConfig)
       );
   };
@@ -74,15 +74,15 @@ const SensorItem = ({
   }, []);
 
   const renderData = useMemo(() => {
-    return dataConfig.map((i) => (
+    return dataConfig.map((item) => (
       <TitleCheckBox
-        title={i.name}
+        title={item.name}
         wrapCheckBoxStyle={styles.wrapCheckBoxStyle}
         onPress={handleOnTickedChild}
-        isChecked={i.isChecked}
-        id={i.id}
+        isChecked={item.isChecked}
+        id={item.id}
         titleStyle={styles.titleStyle}
-        key={i.id}
+        key={item.id}
         idGroup={idGroup}
       />
     ));
@@ -95,7 +95,9 @@ const SensorItem = ({
         source={{ uri: icon_kit }}
         style={styles.viewLeft}
         tintColor={
-          dataConfig.some((i) => i.isChecked) ? Colors.Primary : Colors.Gray
+          dataConfig.some((item) => item.isChecked)
+            ? Colors.Primary
+            : Colors.Gray
         }
       />
       <View style={styles.wrapRight}>

package/src/screens/Sharing/InfoMemberUnit.js

@@ -149,7 +149,7 @@ const InfoMemberUnit = memo(({ route }) => {
         screen: Routes.SharingSelectPermission,
         params: {
           unit: { id: unit?.id },
-          type: 'update_shared',
+          type: 'share_device',
           member: memberInfo,
         },
       });

package/src/screens/Sharing/MemberList.js

@@ -21,8 +21,10 @@ const MemberList = ({ route }) => {
   const isFocused = useIsFocused();
   const account = useSCContextSelector((state) => state.auth.account);
   const { unitId, unit } = route.params;
-  const { dataMembers, isRefresh, onRefresh, leaveUnit, loading } =
-    useDataMember(unitId, unit?.user_id);
+  const { dataMembers, isRefresh, onRefresh, leaveUnit } = useDataMember(
+    unitId,
+    unit?.user_id
+  );
   const { isOwner } = useIsOwnerOfUnit(unit?.user_id);
 
   const { stateAlertSharingMenu, hideStateAlertSharingMenu, stateLeaveUnit } =
@@ -65,7 +67,6 @@ const MemberList = ({ route }) => {
       />
     </TouchableOpacity>
   );
-
   return (
     <View style={styles.container}>
       <WrapHeaderScrollable
@@ -76,15 +77,13 @@ const MemberList = ({ route }) => {
         headerAniStyle={styles.headerAniStyle}
         styleScrollView={{ backgroundColor: Colors.White }}
       >
-        {!loading && (
-          <SharingMembers
-            testID={TESTID.SHARING_MEMBER}
-            dataMember={dataMembers}
-            unit={unit}
-            ownerId={unit.user_id}
-            currentUserId={account.user.id}
-          />
-        )}
+        <SharingMembers
+          testID={TESTID.SHARING_MEMBER}
+          dataMember={dataMembers}
+          unit={unit}
+          ownerId={unit.user_id}
+          currentUserId={account.user.id}
+        />
       </WrapHeaderScrollable>
       <AlertAction
         visible={stateAlertSharingMenu.visible}