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

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}

package/src/screens/Sharing/SelectPermission.js

@@ -1,4 +1,4 @@
-import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   SafeAreaView,
   View,
@@ -32,12 +32,8 @@ const SelectPermission = ({ route }) => {
   const [isTickAllDevices, setIsTickAllDevices] = useState(false);
   const [activeItemId, setActiveItemId] = useState(-1);
   const [loading, setLoading] = useState(true);
-  const [hasDataChecked, setHasDataChecked] = useState(false);
   const [dataDeviceShared, setDataDeviceShared] = useState([]);
-
-  const isUpdateSharedDevice = useMemo(() => {
-    return type === 'update_shared';
-  }, [type]);
+  const [hasDataChecked, setHasDataChecked] = useState(false);
 
   const onTickTitle = (idGroup, isChecked, id) => {
     if (!idGroup) {
@@ -70,7 +66,7 @@ const SelectPermission = ({ route }) => {
       data[index] = {
         ...data[index],
         isChecked,
-        devices: data[index]?.sensors.map((i) => ({
+        sensors: data[index]?.sensors.map((i) => ({
           ...i,
           isChecked,
           actions: i.actions.map((j) => ({ ...j, isChecked })),
@@ -102,10 +98,6 @@ const SelectPermission = ({ route }) => {
       sensor.actions.some((i) => !i.isChecked)
     );
 
-    stationCheck(data);
-  };
-
-  const stationCheck = (data) => {
     for (let station of data) {
       if (station.sensors.length) {
         station.isChecked = !station.sensors.some((i) => !i.isChecked);
@@ -123,82 +115,53 @@ const SelectPermission = ({ route }) => {
 
     sensor.isChecked = isChecked;
 
-    stationCheck(data);
+    for (let station of data) {
+      if (station.sensors.length) {
+        station.isChecked = !station.sensors.some((i) => !i.isChecked);
+      }
+    }
+    setIsTickAllDevices(!dataStationTemp.some((i) => !i.isChecked));
+    dataStationTemp = data;
+    setDataStations(data);
   };
 
   const autoCheckedGroup = useCallback(async () => {
-    if (isUpdateSharedDevice) {
+    if (type === 'share_device') {
       if (hasDataChecked) {
         const stationIds = object_Ids(dataDeviceShared)?.stationIds;
         const sensorIds = object_Ids(dataDeviceShared)?.sensorIds;
         const actionIds = object_Ids(dataDeviceShared)?.actionIds;
         const configIds = object_Ids(dataDeviceShared)?.configIds;
-        const sensor_checked = [];
-        const action_checked = [];
-        const config_checked = [];
-        const action_temp = [];
-        const config_temp = [];
-        for (let station in dataStations) {
-          for (let item in dataStations[station].sensors) {
-            const itemTemp = dataStations[station].sensors[item];
-            dataStations[station].sensors[item] = {
+        const data = dataStations?.map((i) => ({
+          ...i,
+          isChecked: stationIds.includes(i.id),
+        }));
+        for (let station in data) {
+          for (let item in data[station].sensors) {
+            const itemTemp = data[station].sensors[item];
+            data[station].sensors[item] = {
               ...itemTemp,
               isChecked: sensorIds.includes(itemTemp?.id),
-              actions: itemTemp.actions.map((i) => {
-                if (actionIds?.includes(i.id)) {
-                  action_checked.push(i);
-                }
-                action_temp.push(i);
-                return {
-                  ...i,
-                  isChecked: actionIds?.includes(i.id),
-                };
-              }),
-              read_configs: itemTemp.read_configs.map((i) => {
-                if (configIds?.includes(i.id)) {
-                  config_checked.push(i);
-                }
-                config_temp.push(i);
-                return {
-                  ...i,
-                  isChecked: configIds?.includes(i.id),
-                };
-              }),
+              actions: itemTemp.actions.map((i) => ({
+                ...i,
+                isChecked: actionIds?.includes(i.id),
+              })),
+              read_configs: itemTemp.read_configs.map((i) => ({
+                ...i,
+                isChecked: configIds?.includes(i.id),
+              })),
             };
-            if (dataStations[station].sensors[item]?.isChecked) {
-              sensor_checked.push(dataStations[station].sensors[item]);
-            }
           }
         }
-        const check_action_config = () => {
-          return (
-            action_checked?.length === action_temp?.length &&
-            config_checked?.length === config_temp?.length
-          );
-        };
-        const data = dataStations?.map((i) => {
-          return {
-            ...i,
-            isChecked:
-              check_action_config() &&
-              i?.sensors?.length === sensor_checked?.length &&
-              stationIds.includes(i.id),
-          };
-        });
         const sensorIdsDefault = object_Ids(data)?.sensorIds;
-        const stationIdsDefault = object_Ids(data)?.stationIds;
         setDataStations(data);
-        setIsTickAllDevices(
-          check_action_config() &&
-            sensorIdsDefault?.length === sensorIds?.length &&
-            stationIdsDefault?.length === stationIds?.length
-        );
+        setIsTickAllDevices(sensorIdsDefault?.length === sensorIds?.length);
         setHasDataChecked(false);
       }
     }
-  }, [dataDeviceShared, dataStations, hasDataChecked, isUpdateSharedDevice]);
+  }, [dataDeviceShared, dataStations, hasDataChecked, type]);
 
-  const GroupSenSorItem = ({ item = {} }) => {
+  const GroupSenSorItem = ({ item = {}, index }) => {
     const { name = '', sensors = [], isChecked, id = '' } = item;
     return (
       <View style={styles.viewGroup}>
@@ -211,11 +174,11 @@ const SelectPermission = ({ route }) => {
           idGroup={id}
         />
         <View style={styles.wrapSensor}>
-          {sensors?.map((i, index) => (
+          {sensors.map((i, index) => (
             <SensorItem
               item={i}
               key={i.id}
-              isRenderSeparated={index !== sensors?.length - 1}
+              isRenderSeparated={index !== sensors.length - 1}
               onTickedChild={onTickedChild}
               onTickedSensor={onTickedSensor}
               titleGroup={name}
@@ -236,47 +199,38 @@ const SelectPermission = ({ route }) => {
       for (let item of station.sensors) {
         let arrIdControlTemp = [],
           arrIdReadTemp = [];
-
         for (let i of item.actions) {
           i.isChecked && arrIdControlTemp.push(i.id);
         }
         for (let i of item.read_configs) {
           i.isChecked && arrIdReadTemp.push(i.id);
         }
-
-        if (arrIdControlTemp.length) {
+        arrIdControlTemp.length &&
           control_permissions.push({ id: item.id, values: arrIdControlTemp });
-        }
-
-        if (arrIdReadTemp.length) {
+        arrIdReadTemp.length &&
           read_permissions.push({ id: item.id, values: arrIdReadTemp });
-        }
-
-        if (
-          !arrIdControlTemp.length &&
+        !arrIdControlTemp.length &&
           !arrIdReadTemp.length &&
-          item.isChecked
-        ) {
+          item.isChecked &&
           read_permissions.push({ id: item.id, values: [] });
-        }
       }
     }
     if (!read_permissions.length && !control_permissions.length) {
       Alert.alert('', t('choose_at_least_one'));
       return;
     }
-    if (isUpdateSharedDevice) {
+    if (type === 'share_device') {
       const phone =
         member?.phone_number && member?.email
           ? member?.phone_number
           : member?.phone_number || '';
       const email = member?.phone_number ? '' : member?.email || '';
+
       const { success } = await axiosPost(API.SHARE.SHARE(), {
         phone,
         email,
         unit: unit?.id,
         permissions: { read_permissions, control_permissions },
-        is_remove_old_permission: true,
       });
       if (success) {
         navigation.goBack();
@@ -295,46 +249,47 @@ const SelectPermission = ({ route }) => {
 
   const renderFlatList = useMemo(() => {
     return (
-      <FlatList
-        keyExtractor={(item) => item.id}
-        extraData={dataStations}
-        data={dataStations}
-        renderItem={renderGroupItem}
-        ListHeaderComponent={
-          dataStations?.length > 0 ? (
-            <TitleCheckBox
-              title={t('text_all_devices')}
-              wrapStyle={styles.wrapAllDevices}
-              onPress={onTickTitle}
-              titleStyle={styles.textAllDevice}
-              isChecked={isTickAllDevices}
-            />
-          ) : (
-            <></>
-          )
-        }
-        scrollIndicatorInsets={{ right: 1 }}
-      />
+      Boolean(dataStations.length) && (
+        <FlatList
+          keyExtractor={(item) => item.id}
+          extraData={dataStations}
+          data={dataStations}
+          renderItem={renderGroupItem}
+          ListHeaderComponent={
+            Boolean(dataStations?.length) && (
+              <TitleCheckBox
+                title={t('text_all_devices')}
+                wrapStyle={styles.wrapAllDevices}
+                onPress={onTickTitle}
+                titleStyle={styles.textAllDevice}
+                isChecked={isTickAllDevices}
+              />
+            )
+          }
+        />
+      )
     );
-
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [dataStations, isTickAllDevices, activeItemId]);
 
-  useEffect(() => {
-    autoCheckedGroup();
-  }, [autoCheckedGroup]);
-
   const getShareUnitPermission = useCallback(async () => {
-    if (isUpdateSharedDevice && dataStations?.length > 0) {
-      const response = await axiosGet(
-        API.SHARE.UNIT_MEMBER_SHARE_DEVICE(unit?.id, member?.id)
-      );
-      if (response?.success) {
-        setDataDeviceShared(response?.data);
-        setHasDataChecked(true);
+    if (type === 'share_device') {
+      if (dataStations?.length > 0) {
+        const response = await axiosGet(
+          API.SHARE.UNIT_MEMBER_SHARE_DEVICE(unit?.id, member?.id)
+        );
+        if (response.success) {
+          setDataDeviceShared(response.data);
+          setHasDataChecked(true);
+        }
       }
+      setLoading(false);
     }
-  }, [dataStations?.length, isUpdateSharedDevice, member?.id, unit?.id]);
+  }, [dataStations?.length, member?.id, type, unit?.id]);
+
+  useEffect(() => {
+    autoCheckedGroup();
+  }, [autoCheckedGroup]);
 
   useEffect(() => {
     getShareUnitPermission();
@@ -354,7 +309,7 @@ const SelectPermission = ({ route }) => {
       }
       setLoading(false);
     })();
-  }, [dataStations?.length, isUpdateSharedDevice, member?.id, unit]);
+  }, [unit]);
 
   useEffect(() => {
     dataStationTemp = dataStations;
@@ -386,7 +341,7 @@ const SelectPermission = ({ route }) => {
           testIDPrefix={TESTID.PREFIX.SHARING_SELECT_PERMISSION}
           leftTitle={t('cancel')}
           onLeftClick={() => navigation.goBack()}
-          rightTitle={isUpdateSharedDevice ? t('done') : t('next')}
+          rightTitle={type === 'share_device' ? t('done') : t('next')}
           rightDisabled={false}
           onRightClick={onPressBottom}
         />
@@ -395,4 +350,4 @@ const SelectPermission = ({ route }) => {
   );
 };
 
-export default memo(SelectPermission);
+export default SelectPermission;

package/src/screens/Sharing/__test__/InfoMemberUnit.test.js

@@ -1,18 +1,14 @@
 import React from 'react';
 import { create, act } from 'react-test-renderer';
 import { TouchableOpacity } from 'react-native';
-import MockAdapter from 'axios-mock-adapter';
-
 import InfoMemberUnit from '../InfoMemberUnit';
 import { HeaderCustom } from '../../../commons/Header';
+import axios from 'axios';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import { AlertAction } from '../../../commons';
 import API from '../../../configs/API';
 import { TESTID } from '../../../configs/Constants';
-import api from '../../../utils/Apis/axios';
-
-const mock = new MockAdapter(api.axiosInstance);
 
 jest.mock('../../../hooks/Common', () => {
   return {
@@ -28,20 +24,20 @@ jest.mock('react', () => {
   };
 });
 
-const mockGoBack = jest.fn();
-
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
     useRoute: jest.fn(),
     useNavigation: () => ({
-      goBack: mockGoBack,
+      goBack: jest.fn(),
       navigate: mockedNavigate,
     }),
     useIsFocused: () => mockUseIsFocused,
   };
 });
 
+jest.mock('axios');
+
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <InfoMemberUnit route={route} />
@@ -53,6 +49,7 @@ describe('Test InfoMemberUnit', () => {
   let route;
 
   beforeEach(() => {
+    axios.get.mockClear();
     mockedNavigate.mockClear();
     route = {
       params: {
@@ -68,35 +65,20 @@ describe('Test InfoMemberUnit', () => {
       },
     };
   });
-
-  it('render InfoMemberUnit without params', async () => {
-    mock.onGet(API.SHARE.UNIT_MEMBER_INFO(1, 1)).reply(200, {
-      id: 1,
-      identity: 'owner',
-      phone_number: '88888',
-      name: 'user',
-      email: 'abc@gmail.com',
-    });
-    await act(async () => {
-      tree = await create(wrapComponent({}));
-    });
-    const instance = tree.root;
-    const header = instance.findAllByType(HeaderCustom);
-    const alertAction = instance.findAllByType(AlertAction);
-    expect(header).toHaveLength(1);
-    expect(alertAction).toHaveLength(1);
-    await act(async () => {
-      alertAction[0].props.rightButtonClick();
-    });
-  });
-
   it('render InfoMemberUnit', async () => {
-    mock.onGet(API.SHARE.UNIT_MEMBER_INFO(1, 1)).reply(200, {
-      id: 1,
-      identity: 'owner',
-      phone_number: '88888',
-      name: 'user',
-      email: 'abc@gmail.com',
+    mockUseIsFocused.mockImplementation(() => true);
+    const response = {
+      status: 200,
+      data: {
+        id: 1,
+        identity: 'owner',
+        phone_number: '88888',
+        name: 'user',
+        email: 'abc@gmail.com',
+      },
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
     });
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -104,20 +86,19 @@ describe('Test InfoMemberUnit', () => {
     const instance = tree.root;
     const header = instance.findAllByType(HeaderCustom);
     const alertAction = instance.findAllByType(AlertAction);
+    expect(header).toHaveLength(1);
+    expect(alertAction).toHaveLength(1);
     await act(async () => {
       alertAction[0].props.rightButtonClick();
     });
-    expect(header).toHaveLength(1);
-    expect(alertAction).toHaveLength(1);
   });
-
   it('render InfoMemberUnit delete member', async () => {
-    mock.onGet(API.SHARE.UNIT_MEMBER_INFO(1, 1)).reply(200, {
-      id: 1,
-      identity: 'owner',
-      phone_number: '88888',
-      name: 'user',
-      email: 'abc@gmail.com',
+    mockUseIsFocused.mockImplementation(() => true);
+    const response = {
+      status: 200,
+    };
+    axios.delete.mockImplementation(async () => {
+      return response;
     });
     await act(async () => {
       tree = await create(wrapComponent(route));
@@ -130,10 +111,11 @@ describe('Test InfoMemberUnit', () => {
     );
     expect(header).toHaveLength(1);
     expect(buttonRemove).toHaveLength(1);
-    mock.onDelete(API.SHARE.UNITS_MEMBER_DETAIL(1)).reply(200);
     await act(async () => {
       buttonRemove[0].props.onPress();
     });
-    expect(mockGoBack).toBeCalled();
+    expect(axios.delete).toHaveBeenCalledWith(
+      API.SHARE.UNITS_MEMBER_DETAIL(1, undefined)
+    );
   });
 });