@eohjsc/react-native-smart-city 0.3.8 → 0.3.9

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

@@ -2,14 +2,18 @@ import React, { useState } from 'react';
 import { TouchableOpacity } from 'react-native';
 import { useRoute } from '@react-navigation/native';
 import { act, create } from 'react-test-renderer';
-import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+
 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();
@@ -47,7 +51,6 @@ describe('Test Select unit screen', () => {
   beforeEach(() => {
     mockSetState.mockClear();
     mockNavigate.mockClear();
-    axios.get.mockClear();
   });
 
   it('Test render', async () => {
@@ -72,9 +75,7 @@ describe('Test Select unit screen', () => {
         },
       ],
     };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(200, response.data);
     useState.mockImplementation((init) => [response.data, mockSetState]);
     await act(async () => {
       tree = await create(wrapComponent());
@@ -99,12 +100,8 @@ describe('Test Select unit screen', () => {
         isCreateNewAction: false,
       },
     });
-    const response = {
-      status: 400,
-    };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+
+    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(400);
 
     await act(async () => {
       tree = await create(wrapComponent());
@@ -117,8 +114,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: {
@@ -142,9 +139,7 @@ describe('Test Select unit screen', () => {
         },
       ],
     };
-    axios.get.mockImplementation(async () => {
-      return response;
-    });
+    mock.onGet(API.AUTOMATE.GET_ALL_UNITS()).reply(200, response.data);
 
     await act(async () => {
       tree = await create(wrapComponent());
@@ -152,16 +147,6 @@ 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 &&
@@ -172,34 +157,6 @@ 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 () => {
@@ -235,7 +192,7 @@ describe('Test Select unit screen', () => {
       isCreateNewAction: true,
       isMultiUnits: undefined,
       name: '1',
-      type: 'value_change',
+      type: undefined,
       unit: {
         id: 1,
       },

package/src/screens/SelectUnit/index.js

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

package/src/screens/SetSchedule/index.js

@@ -12,20 +12,12 @@ import RepeatOptionsPopup from './components/RepeatOptionsPopup';
 import RowItem from './components/RowItem';
 import SelectWeekday from './components/SelectWeekday';
 import { useBoolean } from '../../hooks/Common';
-import t, { useTranslations } from '../../hooks/Common/useTranslations';
+import { 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 {
@@ -36,10 +28,19 @@ 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')
@@ -119,7 +120,7 @@ const SetSchedule = ({ route }) => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: type,
+        type: oldType,
         havePermission: true,
         unit,
         isMultiUnits,
@@ -136,7 +137,10 @@ const SetSchedule = ({ route }) => {
     <>
       <View style={styles.container}>
         <HeaderCustom isShowClose onClose={onClose} />
-        <ScrollView contentContainerStyle={styles.scollView}>
+        <ScrollView
+          contentContainerStyle={styles.scollView}
+          scrollIndicatorInsets={{ right: 1 }}
+        >
           <Text type="H2" bold style={styles.title}>
             {t('set_schedule')}
           </Text>

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

@@ -6,8 +6,6 @@ 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,6 +139,7 @@ const Shared = () => {
             keyExtractor={(item, index) => item.id.toString()}
             ItemSeparatorComponent={() => <View style={styles.seperator} />}
             contentContainerStyle={styles.scrollView}
+            scrollIndicatorInsets={{ right: 1 }}
           />
         ) : (
           <FlatList
@@ -162,6 +163,7 @@ 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 = (idGroup, isChecked, childId) => {
+  const handleOnTickedChild = (group, checked, childId) => {
     const dataTemp = [...dataConfig];
     const indexTemp = dataTemp.findIndex((i) => i.id === childId);
     dataTemp.splice(indexTemp, 1, {
       ...dataTemp[indexTemp],
-      isChecked,
+      isChecked: checked,
     });
     setDataConfig(dataTemp);
     onTickedChild &&
       onTickedChild(
-        idGroup,
+        group,
         id,
         childId,
-        isChecked,
+        checked,
         Boolean(dataTemp[indexTemp]?.isConfig)
       );
   };
@@ -74,15 +74,15 @@ const SensorItem = ({
   }, []);
 
   const renderData = useMemo(() => {
-    return dataConfig.map((item) => (
+    return dataConfig.map((i) => (
       <TitleCheckBox
-        title={item.name}
+        title={i.name}
         wrapCheckBoxStyle={styles.wrapCheckBoxStyle}
         onPress={handleOnTickedChild}
-        isChecked={item.isChecked}
-        id={item.id}
+        isChecked={i.isChecked}
+        id={i.id}
         titleStyle={styles.titleStyle}
-        key={item.id}
+        key={i.id}
         idGroup={idGroup}
       />
     ));
@@ -95,9 +95,7 @@ const SensorItem = ({
         source={{ uri: icon_kit }}
         style={styles.viewLeft}
         tintColor={
-          dataConfig.some((item) => item.isChecked)
-            ? Colors.Primary
-            : Colors.Gray
+          dataConfig.some((i) => i.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: 'share_device',
+          type: 'update_shared',
           member: memberInfo,
         },
       });

package/src/screens/Sharing/MemberList.js

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