@eohjsc/react-native-smart-city 0.7.42 → 0.7.44

package/src/screens/Sharing/hooks/__test__/index.test.js

@@ -34,7 +34,7 @@ describe('Test useDataMember', () => {
     await act(async () => {
       result.current.leaveUnit(1);
     });
-    expect(global.mockedNavigate).toBeCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 
   it('render useDataMember loadMembers', async () => {
@@ -65,6 +65,6 @@ describe('Test useDataMember', () => {
     await act(async () => {
       result.current.removeMember(1, 'json');
     });
-    expect(global.mockedGoBack).toBeCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 });

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

@@ -67,7 +67,7 @@ const useDataMember = (unitId, userUnitId = undefined) => {
       await axiosDelete(API.SHARE.UNITS_MEMBER_DETAIL(unitId, 'me'));
       ToastBottomHelper.success(t('sharing_you_left', { name: unitName }));
       setDataMembers([]);
-      navigate(Routes.Dashboard);
+      navigate(Routes.Main);
     },
     [navigate, t, unitId]
   );

package/src/screens/SmartAccount/ListDevice/index.js

@@ -123,7 +123,7 @@ const ListDeviceSmartAccount = ({ route }) => {
   return (
     <View style={styles.wrap}>
       <WrapHeaderScrollable
-        onLeft={() => (device_data ? navigate(Routes.Dashboard) : goBack())}
+        onLeft={() => (device_data ? navigate(Routes.Main) : goBack())}
         title={t('devices')}
         headerAniStyle={styles.headerAniStyle}
       >

package/src/screens/SubUnit/AddSubUnit.js

@@ -85,7 +85,7 @@ const AddSubUnit = ({ route }) => {
               screen: Routes.UnitDetail,
               params: {
                 unitId: data?.id,
-                routeName: Routes.DashboardStack,
+                routeName: Routes.Main,
               },
             })
           );
@@ -123,7 +123,7 @@ const AddSubUnit = ({ route }) => {
             unitData: unit,
             stationId: data.id,
             isAddSubUnit: true,
-            routeName: Routes.DashboardStack,
+            routeName: Routes.Main,
           };
           if (isInsideUnit) {
             navigate(Routes.UnitDetail, commonPrams);

package/src/screens/SubUnit/__test__/AddSubUnit.test.js

@@ -247,7 +247,7 @@ describe('Test AddSubUnit', () => {
     });
     expect(global.mockedNavigate).toHaveBeenCalledWith('UnitDetail', {
       isAddSubUnit: true,
-      routeName: 'DashboardStack',
+      routeName: 'Main',
       stationId: undefined,
       unitData: {
         id: 1,

package/src/screens/SyncLGDevice/AddLGDevice.js

@@ -47,7 +47,7 @@ const AddLGDevice = memo(({ route }) => {
     );
     if (!success || !data.access_token) {
       ToastBottomHelper.error(t('lg_sync_failed'));
-      navigate(Routes.Dashboard);
+      navigate(Routes.Main);
       return;
     }
 
@@ -63,12 +63,12 @@ const AddLGDevice = memo(({ route }) => {
     );
     if (!successSync) {
       ToastBottomHelper.error(t('lg_sync_failed'));
-      navigate(Routes.Dashboard);
+      navigate(Routes.Main);
       return;
     }
 
     ToastBottomHelper.success(t('lg_sync_success'));
-    navigate(Routes.Dashboard);
+    navigate(Routes.Main);
   }, [backend_url, code, navigate, stationId, t]);
 
   const stations =

package/src/screens/SyncLGDevice/__test__/AddLGDevice.test.js

@@ -188,7 +188,7 @@ describe('Test Add LG Device', () => {
       text1: getTranslate('en', 'lg_sync_success'),
       visibilityTime: 1000,
     });
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 
   it('ViewButtonBottom onRightClick with case sync device fail', async () => {
@@ -240,7 +240,7 @@ describe('Test Add LG Device', () => {
       text1: getTranslate('en', 'lg_sync_failed'),
       visibilityTime: 1000,
     });
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 
   it('ViewButtonBottom onRightClick with stationId but sync failed', async () => {
@@ -286,7 +286,7 @@ describe('Test Add LG Device', () => {
       text1: getTranslate('en', 'lg_sync_failed'),
       visibilityTime: 1000,
     });
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 
   it('ViewButtonBottom onRightClick with stationId but get token failed, wrong data', async () => {
@@ -329,7 +329,7 @@ describe('Test Add LG Device', () => {
 
     expect(spyToastSuccess).not.toBeCalled();
     expect(spyToastError).toBeCalled();
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
 
     spyToastSuccess.mockReset();
     spyToastSuccess.mockRestore();
@@ -365,7 +365,7 @@ describe('Test Add LG Device', () => {
 
     expect(spyToastSuccess).not.toBeCalled();
     expect(spyToastError).toBeCalled();
-    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Dashboard);
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
 
     spyToastSuccess.mockReset();
     spyToastSuccess.mockRestore();

package/src/screens/Unit/Detail.js

@@ -205,9 +205,7 @@ const UnitDetail = ({ route }) => {
     [navigate]
   );
 
-  useBlockBack(
-    isSuccessfullyConnected ? RouterHardware(Routes.Dashboard) : goBack
-  );
+  useBlockBack(isSuccessfullyConnected ? RouterHardware(Routes.Main) : goBack);
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const { isFirstOpenCamera, appState } = useSCContextSelector(
     (state) => state.app

package/src/screens/Unit/__test__/Detail.test.js

@@ -497,7 +497,7 @@ describe('Test UnitDetail', () => {
 
   it('test get automate onPress goBack', async () => {
     Platform.OS = 'ios';
-    route.params.routeName = Routes.Dashboard;
+    route.params.routeName = Routes.Main;
     jest.useFakeTimers();
 
     mock.onGet(getAutomates).reply(200, [{}]);
@@ -515,11 +515,11 @@ describe('Test UnitDetail', () => {
     await act(async () => {
       await touchableOpacities[0].props.onPress();
     });
-    expect(global.mockedGoBack).toBeCalled();
+    expect(global.mockedGoBack).toHaveBeenCalled();
   });
 
   it('test onPress goBack with routeName', async () => {
-    useRoute.mockReturnValue({ params: { routeName: Routes.Dashboard } });
+    useRoute.mockReturnValue({ params: { routeName: Routes.Main } });
     await act(async () => {
       tree = await renderer.create(wrapComponent(route, account));
     });
@@ -528,6 +528,6 @@ describe('Test UnitDetail', () => {
     await act(async () => {
       await touchableOpacities[0].props.onPress();
     });
-    expect(global.mockedNavigate).toBeCalled();
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.Main);
   });
 });

package/src/screens/UnitSummary/components/PowerConsumption/__test__/PowerConsumption.test.js

@@ -2,6 +2,7 @@ import MockAdapter from 'axios-mock-adapter';
 import renderer, { act, create } from 'react-test-renderer';
 
 import moment from 'moment';
+import { ActivityIndicator } from 'react-native';
 import { Today } from '../../../../../commons';
 import DateTimeRangeChange from '../../../../../commons/DateTimeRangeChange';
 import PowerConsumptionChart from '../../../../../commons/Device/PowerConsumptionChart';
@@ -308,4 +309,35 @@ describe('Test PowerConsumption', () => {
       powerConsumptionChart.findByType(DateTimeRangeChange).props.endTime
     ).toEqual(newEndDate);
   });
+
+  it('should show ActivityIndicator when isFetching is true', async () => {
+    const summaryDetail = {
+      listConfigs: {
+        total_power: 207,
+      },
+    };
+
+    let resolvePromise;
+    const pendingPromise = new Promise((resolve) => {
+      resolvePromise = resolve;
+    });
+
+    mock.onGet(API.VALUE_CONSUME.DISPLAY_HISTORY()).reply(async () => {
+      await pendingPromise;
+      return [200, []];
+    });
+
+    await act(async () => {
+      tree = await create(wrapComponent(summaryDetail));
+    });
+
+    const instance = tree.root;
+    const activityIndicator = instance.findByType(ActivityIndicator);
+    expect(activityIndicator).toBeDefined();
+    expect(activityIndicator.props.size).toEqual('large');
+
+    await act(async () => {
+      resolvePromise();
+    });
+  });
 });

package/src/utils/I18n/translations/en.js

@@ -1348,6 +1348,7 @@ export default {
   not_activated: 'Not activated',
   open: 'Open',
   close: 'Close',
+  detail: 'Detail',
   create_contact_success: 'Create contact success!',
   can_not_login_to_current_ssid: "Can't login to current SSID",
   confirm_password_not_match: 'Confirm password does not match',

package/src/utils/I18n/translations/vi.js

@@ -1346,6 +1346,7 @@ export default {
   not_activated: 'Không kích hoạt',
   open: 'Mở',
   close: 'Đóng',
+  detail: 'Chi tiết',
   create_contact_success: 'Tạo liên hệ thành công!',
   can_not_login_to_current_ssid: 'Không thể đăng nhập vào SSID hiện tại',
   confirm_password_not_match: 'Mật khẩu xác nhận không trùng khớp',