@eohjsc/react-native-smart-city 0.3.89 → 0.3.91

package/src/screens/SmartAccount/__test__/SmartAccount.test.js

@@ -38,7 +38,7 @@ describe('Test SmartAccount', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const scrollView = instance.findAllByType(ScrollView);
@@ -58,7 +58,7 @@ describe('Test SmartAccount', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const touchableOpacity = instance.find(
@@ -229,7 +229,7 @@ describe('Test SmartAccount', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const touchSupplierItem = instance.findAll(

package/src/screens/SmartIr/__test__/ButtonsBottom.test.js

@@ -16,7 +16,7 @@ describe('Test ButtonsBottom', () => {
 
   it('render ButtonsBottom', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const touchableOpacity = instance.findAllByType(TouchableOpacity);

package/src/screens/SmartIr/__test__/GroupButtonByType.test.js

@@ -37,7 +37,7 @@ describe('Test GroupButtonByType', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const bottomButton = instance.findAllByType(ButtonsBottom)[0];
@@ -70,7 +70,7 @@ describe('Test GroupButtonByType', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const bottomButton = instance.findAllByType(ButtonsBottom)[0];
@@ -88,7 +88,7 @@ describe('Test GroupButtonByType', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const bottomButton = instance.findAllByType(ButtonsBottom)[0];
@@ -106,7 +106,7 @@ describe('Test GroupButtonByType', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
 
     const instance = tree.root;
@@ -129,7 +129,7 @@ describe('Test GroupButtonByType', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
 
     const instance = tree.root;

package/src/screens/SmartIr/__test__/SelectBrand.test.js

@@ -31,7 +31,7 @@ describe('Test SelectBrand', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const scrollView = instance.findAllByType(ScrollView);
@@ -45,7 +45,7 @@ describe('Test SelectBrand', () => {
       },
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(route));
+      tree = await renderer.create(wrapComponent(route));
     });
     const instance = tree.root;
     const scrollView = instance.findAllByType(ScrollView);

package/src/screens/SmartIr/__test__/SelectDeviceType.test.js

@@ -27,7 +27,7 @@ describe('Test SelectIrDeviceType', () => {
 
   it('render SelectIrDeviceType', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const scrollView = instance.findAllByType(ScrollView);
@@ -36,7 +36,7 @@ describe('Test SelectIrDeviceType', () => {
 
   it('itemDevice SelectIrDeviceType onPress', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const scrollView = instance.findAllByType(ScrollView);

package/src/screens/SmartIr/__test__/SmartIr.test.js

@@ -34,7 +34,7 @@ describe('Test SmartIr', () => {
       type: 'smart_ir',
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(item));
+      tree = await renderer.create(wrapComponent(item));
     });
     const instance = tree.root;
     const itemAddNewList = instance.findAll(
@@ -55,7 +55,7 @@ describe('Test SmartIr', () => {
       type: 'smart_ir',
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(item));
+      tree = await renderer.create(wrapComponent(item));
     });
     const instance = tree.root;
     const itemAddNew = instance.find(

package/src/screens/Template/__test__/detail.test.js

@@ -57,7 +57,11 @@ describe('Test Detail', () => {
     await act(async () => {
       tree = await create(wrapComponent());
     });
-    jest.runAllTimers();
+
+    await act(async () => {
+      jest.runAllTimers();
+    });
+
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);
     await TouchableOpacities[0].props.onPress();
@@ -78,7 +82,11 @@ describe('Test Detail', () => {
     await act(async () => {
       tree = await create(wrapComponent());
     });
-    jest.runAllTimers();
+
+    await act(async () => {
+      jest.runAllTimers();
+    });
+
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);
     await act(async () => {

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

@@ -4,7 +4,11 @@ import MockAdapter from 'axios-mock-adapter';
 import renderer, { act } from 'react-test-renderer';
 import ParallaxScrollView from '../../../libs/react-native-parallax-scroll-view';
 import { BleManager } from 'react-native-ble-plx';
-import { useIsFocused } from '@react-navigation/native';
+import {
+  useIsFocused,
+  useNavigation,
+  useFocusEffect,
+} from '@react-navigation/native';
 import AsyncStorage from '@react-native-community/async-storage';
 import UnitDetail from '../Detail';
 import { API } from '../../../configs';
@@ -37,18 +41,6 @@ jest.mock('react-redux', () => {
   };
 });
 
-const mockedNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useIsFocused: jest.fn(),
-    useNavigation: () => ({
-      navigate: mockedNavigate,
-    }),
-    useFocusEffect: jest.fn(),
-  };
-});
-
 const mockConnectHomeAssistant = jest.fn();
 jest.mock('../../../hooks/IoT', () => {
   return {
@@ -66,6 +58,7 @@ jest.mock('react-native-onesignal', () => {
 });
 
 const mock = new MockAdapter(api.axiosInstance);
+useFocusEffect.mockImplementation((f) => f());
 
 describe('Test UnitDetail', () => {
   const route = {
@@ -81,6 +74,7 @@ describe('Test UnitDetail', () => {
   const getAutomates = API.UNIT.AUTOMATE(1);
 
   let tree;
+  const mockedNavigate = useNavigation().navigate;
 
   beforeEach(() => {
     jest.clearAllTimers();

package/src/screens/Unit/components/__test__/Header.test.js

@@ -34,7 +34,7 @@ describe('Test Header', () => {
   let tree;
   it('test hideModal', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const modal = instance.findAllByType(ModalCustom);
@@ -46,7 +46,7 @@ describe('Test Header', () => {
 
   it('test onItemClick', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const modal = instance.findAllByType(ModalCustom);
@@ -76,7 +76,7 @@ describe('Test Header', () => {
 
   it('test Popover Close Menu', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const popover = instance.findByType(Popover);
@@ -88,7 +88,7 @@ describe('Test Header', () => {
 
   it('test onpress touchableOpacity', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const popover = instance.findByType(HeaderCustom);

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

@@ -38,7 +38,7 @@ describe('Test 3PPowerConsumption', () => {
       listConfigs: [1, 2, 3],
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(summaryDetail));
+      tree = await renderer.create(wrapComponent(summaryDetail));
     });
     const instance = tree.root;
     const listIndicator = instance.find(

package/src/screens/UnitSummary/components/3PPowerConsumption/index.js

@@ -6,7 +6,7 @@ import moment from 'moment';
 import { Section, Today } from '../../../../commons';
 import ListQualityIndicator from '../../../../commons/Device/WaterQualitySensor/ListQualityIndicator';
 import PMSensorIndicator from '../../../../commons/Device/PMSensor/PMSensorIndicator';
-import ConfigHistoryChart from '../../../../commons/UnitSummary/ConfigHistoryChart';
+import VisualChart from '../../../Device/components/VisualChart';
 import { useTranslations } from '../../../../hooks/Common/useTranslations';
 import HistoryChart from '../../../../commons/Device/HistoryChart';
 import { axiosGet } from '../../../../utils/Apis/axios';
@@ -222,6 +222,18 @@ const ThreePhasePowerConsumption = memo(({ summaryDetail }) => {
       fetchData();
     }
   }, [startDate, endDate, listConfigs?.total_power, groupBy]);
+
+  const renderVisualChart = useMemo(() => {
+    if (!showBoxHistory) {
+      return null;
+    }
+    return (
+      <View>
+        <VisualChart item={{ configuration: { configs } }} />
+      </View>
+    );
+  }, [configs, showBoxHistory]);
+
   return (
     <>
       <Section type={'border'}>
@@ -231,11 +243,7 @@ const ThreePhasePowerConsumption = memo(({ summaryDetail }) => {
           style={styles.styleList}
           accessibilityLabel={AccessibilityLabel.LIST_QUALITY_INDICATOR_3PC}
         />
-        {showBoxHistory && (
-          <View>
-            <ConfigHistoryChart configs={configs} />
-          </View>
-        )}
+        {renderVisualChart}
       </Section>
 
       <Section type={'border'}>

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

@@ -32,7 +32,7 @@ describe('Test PowerConsumption', () => {
       listConfigs: [1, 2, 3],
     };
     await act(async () => {
-      tree = renderer.create(wrapComponent(summaryDetail));
+      tree = await renderer.create(wrapComponent(summaryDetail));
     });
     const instance = tree.root;
     const listIndicator = instance.find(

package/src/screens/UnitSummary/components/Temperature/index.js

@@ -5,7 +5,7 @@ import { useTranslations } from '../../../../hooks/Common/useTranslations';
 import { Colors } from '../../../../configs';
 import { Section, Today } from '../../../../commons';
 import ItemTemperature from './ItemTemperature';
-import ConfigHistoryChart from '../../../../commons/UnitSummary/ConfigHistoryChart';
+import VisualChart from '../../../Device/components/VisualChart';
 import SvgHumidity from '../../../../../assets/images/Device/humidity.svg';
 import SvgRain from '../../../../../assets/images/Device/rain-outline.svg';
 import SvgTemperature from '../../../../../assets/images/Device/temperature.svg';
@@ -92,7 +92,7 @@ const Temperature = memo(({ summaryDetail }) => {
       </Section>
       {showBoxHistory && (
         <Section type={'border'}>
-          <ConfigHistoryChart configs={configs} />
+          <VisualChart item={{ configuration: { configs } }} />
         </Section>
       )}
     </>

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

@@ -6,7 +6,7 @@ import { useTranslations } from '../../../../hooks/Common/useTranslations';
 import { Colors } from '../../../../configs';
 import Text from '../../../../commons/Text';
 import { Section, Today } from '../../../../commons';
-import ConfigHistoryChart from '../../../../commons/UnitSummary/ConfigHistoryChart';
+import VisualChart from '../../../Device/components/VisualChart';
 import SegmentedRoundDisplay from '../../../../commons/UnitSummary/AirQuality/SegmentedRoundDisplay';
 
 const UvIndex = memo(({ summaryDetail }) => {
@@ -75,7 +75,7 @@ const UvIndex = memo(({ summaryDetail }) => {
       </Section>
       {showBoxHistory && (
         <Section type={'border'}>
-          <ConfigHistoryChart configs={configs} />
+          <VisualChart item={{ configuration: { configs } }} />
         </Section>
       )}
     </>

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

@@ -3,7 +3,7 @@ import { StyleSheet, View } from 'react-native';
 import { useTranslations } from '../../../../hooks/Common/useTranslations';
 import { Today, Section } from '../../../../commons';
 import Text from '../../../../commons/Text';
-import ConfigHistoryChart from '../../../../commons/UnitSummary/ConfigHistoryChart';
+import VisualChart from '../../../Device/components/VisualChart';
 import Item from './Item';
 
 const WaterQuality = memo(({ summaryDetail }) => {
@@ -60,7 +60,7 @@ const WaterQuality = memo(({ summaryDetail }) => {
       </Section>
       {showBoxHistory && (
         <Section type={'border'}>
-          <ConfigHistoryChart configs={configs} />
+          <VisualChart item={{ configuration: { configs } }} />
         </Section>
       )}
     </>

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

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

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

@@ -20,7 +20,7 @@ describe('Test Total Power Consumption', () => {
 
   it('render Total Power Consumption', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const item = instance.find(

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

@@ -14,7 +14,7 @@ describe('UnitSummary components', () => {
       right_text: 'right_text test',
     };
     await act(async () => {
-      tree = renderer.create(<UnitSummary summary={summary} />);
+      tree = await renderer.create(<UnitSummary summary={summary} />);
     });
     const instance = tree.root;
     const textElement = instance.findAllByType(Text);
@@ -34,7 +34,7 @@ describe('UnitSummary components', () => {
     };
     const mockFuntion = jest.fn();
     await act(async () => {
-      tree = renderer.create(
+      tree = await renderer.create(
         <UnitSummary summary={summary} goToSummary={mockFuntion} />
       );
     });

package/src/utils/Apis/axios.js

@@ -75,6 +75,9 @@ const parseErrorResponse = async (error) => {
     if (message?.message) {
       message = message.message;
     }
+    if (firstKey !== 'non_field_errors') {
+      message = `${firstKey}: ${message}`;
+    }
   } else {
     message = error.data || error.problem;
   }

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

@@ -389,6 +389,7 @@
   "south": "South",
   "west": "West",
   "condition": "Condition",
+  "no_condition": "No condition",
   "north_east": "North East",
   "south_east": "South East",
   "south_west": "South West",

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

@@ -369,6 +369,7 @@
   "from": "Từ",
   "to": "đến",
   "condition": "Điều kiện",
+  "no_condition": "Không điều kiện",
   "shared_unit": "Khu vực được chia sẻ",
   "owner_unit": "Chủ khu vực",
   "sensor_device": "Thiết bị cảm biến",

package/src/utils/Route/index.js

@@ -114,15 +114,18 @@ const Routes = {
   Browser: 'Browser',
   ManageAccess: 'ManageAccess',
   MoveToAnotherSubUnit: 'MoveToAnotherSubUnit',
-  SelectSensorDevices: 'SelectSensorDevices',
-  SelectAction: 'SelectAction',
+  SelectMonitorDevices: 'SelectMonitorDevices',
+  SelectControlDevices: 'SelectControlDevices',
+  ChooseEvent: 'ChooseEvent',
+  ChooseAction: 'ChooseAction',
+  ChooseConfig: 'ChooseConfig',
   GuestInfo: 'GuestInfo',
   AddLGDevice: 'AddLGDevice',
   AddLGDeviceStack: 'AddLGDeviceStack',
   ScriptDetail: 'ScriptDetail',
   EditActionsList: 'EditActionsList',
   PlaybackCamera: 'PlaybackCamera',
-  SetUpSensor: 'SetUpSensor',
+  SetupConfigCondition: 'SetupConfigCondition',
   AddNewAutoSmart: 'AddNewAutoSmart',
   AllCamera: 'AllCamera',
   AddNewOneTap: 'AddNewOneTap',