@eohjsc/react-native-smart-city 0.3.36 → 0.3.37

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

@@ -22,7 +22,7 @@ const wrapComponent = (summaryDetail) => (
 describe('Test PowerConsumption', () => {
   let tree;
 
-  test('render PowerConsumption', () => {
+  it('render PowerConsumption', async () => {
     const summaryDetail = {
       voltValue: 200,
       currentValue: 20,
@@ -31,7 +31,7 @@ describe('Test PowerConsumption', () => {
       totalPowerValue: 20,
       listConfigs: [1, 2, 3],
     };
-    act(() => {
+    await act(async () => {
       tree = renderer.create(wrapComponent(summaryDetail));
     });
     const instance = tree.root;
@@ -74,7 +74,7 @@ describe('Test PowerConsumption', () => {
     expect(listIndicator.props.data).toEqual(resultList);
   });
 
-  test('render PowerConsumption listConfigs.total_power', async () => {
+  it('render PowerConsumption listConfigs.total_power', async () => {
     const summaryDetail = {
       voltValue: 200,
       currentValue: 20,
@@ -100,7 +100,7 @@ describe('Test PowerConsumption', () => {
     expect(Todays).toBeDefined();
   });
 
-  test('render with unsuccess fetch', async () => {
+  it('render with unsuccess fetch', async () => {
     const summaryDetail = {
       voltValue: 200,
       currentValue: 20,
@@ -125,7 +125,7 @@ describe('Test PowerConsumption', () => {
     expect(Todays).toBeDefined();
   });
 
-  test('render without value', async () => {
+  it('render without value', async () => {
     const summaryDetail = {
       listConfigs: {
         active_power: 208,

package/src/screens/UnitSummary/components/RunningDevices/__test__/index.test.js

@@ -80,14 +80,14 @@ describe('test RunningDevices', () => {
       expect(texts.length).toEqual(0);
 
       const button = instance.findAllByType(TouchableOpacity);
-      act(() => {
+      await act(async () => {
         button[0].props.onPress();
       });
       expect(mockConnectHomeAssistant).toBeCalled();
     });
   });
 
-  test('render RunningDevices remote_control_options.bluetooth', async () => {
+  it('render RunningDevices remote_control_options.bluetooth', async () => {
     let tree;
     let unit = {
       remote_control_options: {
@@ -119,7 +119,7 @@ describe('test RunningDevices', () => {
     expect(texts.length).toEqual(0);
 
     const button = instance.findAllByType(TouchableOpacity);
-    act(() => {
+    await act(async () => {
       button[0].props.onPress();
     });
     expect(mockedNavigate).toBeCalledWith('DeviceDetail', {

package/src/screens/UnitSummary/components/Temperature/__test__/ChartAverage.test.js

@@ -6,9 +6,9 @@ import ChartAverage from '../ChartAverage';
 
 describe('Test ChartAverage', () => {
   let tree;
-  test('render ChartAverage', () => {
-    act(() => {
-      tree = create(<ChartAverage />);
+  it('render ChartAverage', async () => {
+    await act(async () => {
+      tree = await create(<ChartAverage />);
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);

package/src/screens/UnitSummary/components/Temperature/__test__/ItemAverage.test.js

@@ -6,9 +6,9 @@ import ItemAverage from '../ItemAverage';
 
 describe('Test ItemAverage', () => {
   let tree;
-  test('render ItemAverage', async () => {
-    act(() => {
-      tree = create(<ItemAverage />);
+  it('render ItemAverage', async () => {
+    await act(async () => {
+      tree = await create(<ItemAverage />);
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);

package/src/screens/UnitSummary/components/UvIndex/__test__/index.test.js

@@ -28,59 +28,59 @@ describe('Test UvIndex', () => {
   });
   let tree;
 
-  test('render UvIndex', async () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it('render UvIndex', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const Sections = instance.findAllByType(Section);
     expect(Sections).toHaveLength(2);
   });
 
-  test('render UvIndex with negative uv_value', async () => {
+  it('render UvIndex with negative uv_value', async () => {
     data.summaryDetail.uv_value = -1;
-    act(() => {
-      tree = create(wrapComponent(data));
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const Sections = instance.findAllByType(Section);
     expect(Sections).toHaveLength(2);
   });
 
-  test('render UvIndex with high uv_value', async () => {
+  it('render UvIndex with high uv_value', async () => {
     data.summaryDetail.uv_value = 11;
-    act(() => {
-      tree = create(wrapComponent(data));
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const Sections = instance.findAllByType(Section);
     expect(Sections).toHaveLength(2);
   });
 
-  test('render UvIndex with advices', async () => {
+  it('render UvIndex with advices', async () => {
     data.summaryDetail.advices = ['Amazing good chop'];
-    act(() => {
-      tree = create(wrapComponent(data));
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const Sections = instance.findAllByType(Section);
     expect(Sections).toHaveLength(2);
   });
 
-  test('render UvIndex without advices', async () => {
+  it('render UvIndex without advices', async () => {
     delete data.summaryDetail.advices;
-    act(() => {
-      tree = create(wrapComponent(data));
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const Sections = instance.findAllByType(Section);
     expect(Sections).toHaveLength(2);
   });
 
-  test('render UvIndex with undefined uv_value', async () => {
+  it('render UvIndex with undefined uv_value', async () => {
     data.summaryDetail.uv_value = undefined;
-    act(() => {
-      tree = create(wrapComponent(data));
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const Sections = instance.findAllByType(Section);

package/src/screens/UnitSummary/components/WaterQuality/__test__/index.test.js

@@ -42,36 +42,36 @@ describe('Test WaterQualityGuide', () => {
   });
   let tree;
 
-  test('render WaterQualityGuide', async () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it('render WaterQualityGuide', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const sections = instance.findAllByType(Section);
     expect(sections).toHaveLength(2);
   });
 
-  test('render WaterQuality without showBoxHistory', async () => {
+  it('render WaterQuality without showBoxHistory', async () => {
     data.summaryDetail.ph_id = 0;
     data.summaryDetail.tur_id = 0;
     data.summaryDetail.clo_id = 0;
-    act(() => {
-      tree = create(wrapComponent(data));
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const sections = instance.findAllByType(Section);
     expect(sections).toHaveLength(1);
   });
 
-  test('onClickItem waterType', async () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it('onClickItem waterType', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const buttons = instance.findAllByType(TouchableOpacity);
     expect(buttons).toHaveLength(5);
 
-    act(() => {
+    await act(async () => {
       buttons[0].props.onPress();
     });
     expect(mockedNavigate).toHaveBeenCalledTimes(1);
@@ -79,7 +79,7 @@ describe('Test WaterQualityGuide', () => {
       waterType: 'turbidity',
     });
 
-    act(() => {
+    await act(async () => {
       buttons[1].props.onPress();
     });
     expect(mockedNavigate).toHaveBeenCalledTimes(2);
@@ -87,7 +87,7 @@ describe('Test WaterQualityGuide', () => {
       waterType: 'ph',
     });
 
-    act(() => {
+    await act(async () => {
       buttons[2].props.onPress();
     });
     expect(mockedNavigate).toHaveBeenCalledTimes(3);

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

@@ -6,8 +6,8 @@ import TotalPowerBox from '../TotalPowerBox';
 describe('Test Total Power Box', () => {
   let tree;
 
-  test('render Total Power Box', () => {
-    act(() => {
+  it('render Total Power Box', async () => {
+    await act(async () => {
       tree = renderer.create(<TotalPowerBox title={'titleTest'} />);
     });
     const instance = tree.root;

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

@@ -18,8 +18,8 @@ const wrapComponent = () => (
 describe('Test Total Power Consumption', () => {
   let tree;
 
-  test('render Total Power Consumption', () => {
-    act(() => {
+  it('render Total Power Consumption', async () => {
+    await act(async () => {
       tree = renderer.create(wrapComponent());
     });
     const instance = tree.root;

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

@@ -18,8 +18,8 @@ describe('Test UnitSummary', () => {
   };
 
   it('Test index = 0', async () => {
-    await act(() => {
-      tree = create(<UnitSummary {...defaultProps} index={0} />);
+    await act(async () => {
+      tree = await create(<UnitSummary {...defaultProps} index={0} />);
     });
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);
@@ -30,8 +30,8 @@ describe('Test UnitSummary', () => {
   });
 
   it('Test index = 1', async () => {
-    await act(() => {
-      tree = create(<UnitSummary {...defaultProps} index={1} />);
+    await act(async () => {
+      tree = await create(<UnitSummary {...defaultProps} index={1} />);
     });
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);
@@ -42,8 +42,8 @@ describe('Test UnitSummary', () => {
   });
 
   it('Test len % 2 === 0 && index = len - 1', async () => {
-    await act(() => {
-      tree = create(<UnitSummary {...defaultProps} index={1} len={2} />);
+    await act(async () => {
+      tree = await create(<UnitSummary {...defaultProps} index={1} len={2} />);
     });
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);
@@ -54,8 +54,8 @@ describe('Test UnitSummary', () => {
   });
 
   it('Test len % 2 !== 0 && index = len - 1', async () => {
-    await act(() => {
-      tree = create(<UnitSummary {...defaultProps} index={2} len={3} />);
+    await act(async () => {
+      tree = await create(<UnitSummary {...defaultProps} index={2} len={3} />);
     });
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);

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

@@ -6,14 +6,14 @@ import UnitSummary from '..';
 describe('UnitSummary components', () => {
   let tree;
 
-  test('test render UnitSummary components', () => {
+  it('test render UnitSummary components', async () => {
     const summary = {
       left_value: 'left_value test',
       left_text: 'left_text test',
       right_value: 'right_value test',
       right_text: 'right_text test',
     };
-    act(() => {
+    await act(async () => {
       tree = renderer.create(<UnitSummary summary={summary} />);
     });
     const instance = tree.root;
@@ -25,7 +25,7 @@ describe('UnitSummary components', () => {
     expect(textElement[3].props.children).toEqual(summary.right_text);
   });
 
-  test('test onPress goToSummary', () => {
+  it('test onPress goToSummary', async () => {
     const summary = {
       left_value: 'left_value test',
       left_text: 'left_text test',
@@ -33,14 +33,14 @@ describe('UnitSummary components', () => {
       right_text: 'right_text test',
     };
     const mockFuntion = jest.fn();
-    act(() => {
+    await act(async () => {
       tree = renderer.create(
         <UnitSummary summary={summary} goToSummary={mockFuntion} />
       );
     });
     const instance = tree.root;
     const touchableOpacity = instance.findByType(TouchableOpacity);
-    act(() => {
+    await act(async () => {
       touchableOpacity.props.onPress();
     });
     expect(mockFuntion).toHaveBeenCalled();

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

@@ -102,9 +102,9 @@ describe('Test WaterQualityGuide', () => {
 
   let tree;
 
-  test('render WaterQualityGuide default turbidityGuide', async () => {
-    act(() => {
-      tree = create(wrapComponent(route));
+  it('render WaterQualityGuide default turbidityGuide', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
 
@@ -130,10 +130,10 @@ describe('Test WaterQualityGuide', () => {
     expect(textDescriptionLevel1).toHaveLength(0);
   });
 
-  test('render WaterQualityGuide with turbidityGuide', async () => {
+  it('render WaterQualityGuide with turbidityGuide', async () => {
     route.params.waterType = 'turbidity';
-    act(() => {
-      tree = create(wrapComponent(route));
+    await act(async () => {
+      tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
 
@@ -159,10 +159,10 @@ describe('Test WaterQualityGuide', () => {
     expect(textDescriptionLevel1).toHaveLength(0);
   });
 
-  test('render WaterQualityGuide with cloGuide', async () => {
+  it('render WaterQualityGuide with cloGuide', async () => {
     route.params.waterType = 'clo';
-    act(() => {
-      tree = create(wrapComponent(route));
+    await act(async () => {
+      tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
 
@@ -188,10 +188,10 @@ describe('Test WaterQualityGuide', () => {
     expect(textDescriptionLevel1).toHaveLength(0);
   });
 
-  test('render WaterQualityGuide with phGuide', async () => {
+  it('render WaterQualityGuide with phGuide', async () => {
     route.params.waterType = 'ph';
-    act(() => {
-      tree = create(wrapComponent(route));
+    await act(async () => {
+      tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
 

package/src/utils/Apis/axios.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { create } from 'apisauce';
 import { getData, storeData } from '../Storage';
 import { ToastBottomHelper } from '../Utils';
@@ -14,6 +15,27 @@ const api = create({
   timeout: 30000,
 });
 
+if (__DEV__ && process.env.NODE_ENV !== 'test') {
+  api.axiosInstance.interceptors.request.use((request) => {
+    console.log(`${request.method.toUpperCase()} ${request.url || ''}`);
+    if (process.env.DEBUG_AXIOS_DETAIL_REQUEST) {
+      if (request.data) {
+        console.log(JSON.stringify(request.data));
+      }
+      console.log(request.headers);
+    }
+    return request;
+  });
+
+  api.axiosInstance.interceptors.response.use((response) => {
+    console.log(`${response.status} ${response.config.url}`);
+    if (process.env.DEBUG_AXIOS_DETAIL_REQUEST) {
+      console.log(response.data);
+    }
+    return response;
+  });
+}
+
 const parseErrorResponse = async (error) => {
   let message;
   let data = {};

package/src/utils/Converter/__test__/array.test.js

@@ -1,6 +1,6 @@
 import { removeDuplicateSearch } from '../array';
 
-test('test removeDuplicateSearch', () => {
+it('test removeDuplicateSearch', async () => {
   let recentSearch = [
     { description: 'a' },
     { description: 'b' },

package/src/utils/Converter/__test__/url.test.js

@@ -1,6 +1,6 @@
 import { queryStringToPath } from '../url';
 
-test('test queryStringToPath', () => {
+it('test queryStringToPath', async () => {
   const oldUrl =
     // eslint-disable-next-line max-len
     'app://eoh/sync-lg-device?state=1&code=CODE&user_number=VN2106012039192&oauth2_backend_url=https%3A%2F%2Fkr.lgeapi.com%2F';

package/src/utils/Functions/__test__/Search.test.js

@@ -1,6 +1,6 @@
 const { convertToSlug } = require('../Search');
 
-it('Test Search function', () => {
+it('Test Search function', async () => {
   const data = convertToSlug('Bệnh viện');
   expect(data).toEqual('benh vien');
 });

package/src/utils/Functions/__test__/ShortEmail.test.js

@@ -1,6 +1,6 @@
 import { shortEmailName } from '../ShortEmail';
 
-it('Test shortEmailName function', () => {
+it('Test shortEmailName function', async () => {
   const data = shortEmailName('emailExample@gmail.com');
   expect(data).toEqual('emailExample');
 });

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

@@ -1007,7 +1007,7 @@
   "no_widgets": "No Widgets",
   "add_your_widget": "Add your widget in dashboard template",
   "label": "Label",
-  "choose_type_of_device": "Choose type of device",
+  "choose_type_of_device": "Choose Type of Device",
   "central_controller": "Central controller",
   "wifi_device": "Wifi device",
   "device_connect_without_gateway": "Connecting device without gateway",
@@ -1040,5 +1040,7 @@
   "turn_on_device_to_connect": "Turn on device to connect",
   "turn_on_zigbee_device_content": "Power ON the device and keep the device connected to the router. Make sure the end device still ON",
   "read_device_manual_guide": "Read Device's manual guide for more details.",
+  "fail_to_discover_device_wifi": "Fail to discover device wifi",
+  "try_to_turn_on_device_or_try_again": "Try to turn on device or Try again",
   "click_here_to_setup_device": "Click here to setup device"
 }

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

@@ -1004,7 +1004,7 @@
   "add_widget": "Thêm tiện ích con",
   "add_your_widget": "Thêm tiện ích của bạn vào mẫu trang tổng quan",
   "label": "Nhãn",
-  "choose_type_of_device": "Chọn loại thiết bị",
+  "choose_type_of_device": "Chọn Loại Thiết bị",
   "central_controller": "Bộ điều khiển trung tâm",
   "wifi_device": "Thiết bị wifi",
   "device_connect_without_gateway": "Kết nối thiết bị không có gateway",
@@ -1038,5 +1038,7 @@
   "turn_on_device_to_connect": "Bật thiết bị để kết nối",
   "turn_on_zigbee_device_content": "BẬT nguồn thiết bị và giữ thiết bị kết nối với bộ định tuyến. Đảm bảo thiết bị cuối vẫn BẬT",
   "read_device_manual_guide": "Đọc hướng dẫn sử dụng của Thiết bị để biết thêm chi tiết.",
+  "fail_to_discover_device_wifi": "Không phát hiện được wifi của thiết bị",
+  "try_to_turn_on_device_or_try_again": "Thử bật thiết bị hoặc Thử lại",
   "click_here_to_setup_device": "Chọn thiết bị thêm vào phòng"
 }

package/src/utils/__test__/InitData.test.js

@@ -8,12 +8,12 @@ describe('Test initData', () => {
     Sentry.setUser.mockClear();
   });
 
-  it('Test initData when has user', () => {
+  it('Test initData when has user', async () => {
     initData({ token: 1, user: { id: 1 } });
     expect(Sentry.setUser).toBeCalledWith({ id: 1 });
   });
 
-  it('Test initData when has no user', () => {
+  it('Test initData when has no user', async () => {
     initData({ token: 1 });
     expect(Sentry.setUser).not.toBeCalled();
   });

package/src/utils/__test__/Utils.test.js

@@ -1,11 +1,11 @@
 import { validateEmail, formatMoney } from '../Utils';
 
 describe('Test utils', () => {
-  test('test validateEmail', () => {
+  it('test validateEmail', async () => {
     const result = validateEmail('eoh.2020@gmail.com');
     expect(result).toEqual(true);
   });
-  test('test formatMoney', () => {
+  it('test formatMoney', async () => {
     const result = formatMoney(10000);
     expect(result).toEqual('10.000 đ');
   });

package/src/commons/UnitSummary/ConfigHistoryChart.js

@@ -1,105 +0,0 @@
-import React, { memo, useEffect, useState } from 'react';
-import moment from 'moment';
-
-import { API } from '../../configs';
-import HistoryChart from '../../commons/Device/HistoryChart';
-import { axiosGet } from '../../utils/Apis/axios';
-
-export const dateTimeType = {
-  date: 'date',
-  time: 'time',
-  dateTime: 'datetime',
-};
-
-const ConfigHistoryChart = memo(({ configs }) => {
-  const [chartData, setChartData] = useState(configs);
-  const [startDate, setStartDate] = useState(moment().subtract(1, 'days'));
-  const [endDate, setEndDate] = useState(moment());
-
-  useEffect(() => {
-    const fetchDataS3 = (url) => {
-      return (
-        axiosGet(url, {
-          transformRequest: (rq, headers) => {
-            delete headers.Authorization;
-            return rq;
-          },
-        })
-          // eslint-disable-next-line promise/prefer-await-to-then
-          .then((response) => {
-            return response.data;
-          })
-          // eslint-disable-next-line promise/prefer-await-to-callbacks
-          .catch((error) => {})
-      );
-    };
-
-    const fetchData = async () => {
-      let params = new URLSearchParams();
-      let configuration = configs.filter((item) => item.id);
-      configuration.map((item) => {
-        params.append('config', item.id);
-      });
-      params.append('date_from', startDate.unix());
-      params.append('date_to', endDate.unix());
-
-      const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY(), {
-        params,
-      });
-      if (success) {
-        let urls = [];
-        data.forEach((config) => {
-          config.data.forEach((value_log) => {
-            if (value_log.url) {
-              urls.push(value_log.url);
-            } else {
-              value_log.x = moment(value_log.x).toDate();
-            }
-          });
-        });
-
-        // eslint-disable-next-line promise/prefer-await-to-then
-        Promise.all(urls.map(fetchDataS3)).then((result) => {
-          let s3_data = [].concat.apply(
-            [],
-            result.filter((r) => r.length > 0)
-          );
-          s3_data.forEach((value_log) => {
-            value_log.x = moment(value_log.start_time).toDate();
-            value_log.y = value_log.converted_value_log;
-          });
-          setChartData(
-            configuration.map((config) => {
-              let s3_config_data = [].concat.apply(
-                [],
-                s3_data.filter((x) => x.config_id === config.id)
-              );
-              let config_data = data.find((k) => k.config === config.id).data;
-              config_data = config_data.filter((k) => !('url' in k));
-              config.data = [...s3_config_data, ...config_data];
-              config.data = config.data.sort((a, b) => a.x > b.x);
-              return config;
-            })
-          );
-        });
-      }
-    };
-    fetchData();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [startDate, endDate]);
-
-  if (!chartData.length) {
-    return false;
-  }
-
-  return (
-    <HistoryChart
-      configuration={{ type: 'line_chart', date_format: 'DD.MM' }}
-      datas={chartData}
-      setStartDate={setStartDate}
-      setEndDate={setEndDate}
-    />
-  );
-});
-
-export default ConfigHistoryChart;