@eohjsc/react-native-smart-city 0.2.21 → 0.2.27

package/src/iot/RemoteControl/__test__/Bluetooth.test.js

@@ -1,5 +1,6 @@
 import { BleManager } from 'react-native-ble-plx';
 import Toast from 'react-native-toast-message';
+import { getTranslate } from '../../../utils/I18n';
 import '../Bluetooth';
 import {
   scanBluetoothDevices,
@@ -8,7 +9,6 @@ import {
   SEND_COMMAND_OVER_BLUETOOTH_FAIL,
   clearFoundDevices,
 } from '../Bluetooth';
-import { t } from 'i18n-js';
 
 const bleManager = new BleManager();
 
@@ -32,7 +32,7 @@ describe('Test IOT Bluetooth', () => {
     expect(Toast.show).toBeCalledWith({
       type: 'success',
       position: 'bottom',
-      text1: t('text_ble_is_powered_on'),
+      text1: getTranslate('en', 'text_ble_is_powered_on'),
       visibilityTime: 1000,
     });
   });
@@ -91,9 +91,7 @@ describe('Test IOT Bluetooth', () => {
     expect(Toast.show).toBeCalledWith({
       type: 'success',
       position: 'bottom',
-      text1: t('Found bluetooth %{name} for remote control', {
-        name: device.localName,
-      }),
+      text1: 'Found bluetooth 123456 for remote control',
       visibilityTime: 1000,
     });
   });

package/src/iot/RemoteControl/__test__/GoogleHome.test.js

@@ -1,6 +1,5 @@
 import { createConnection, getStates } from 'home-assistant-js-websocket';
 import Toast from 'react-native-toast-message';
-import { t } from 'i18n-js';
 import axios from 'axios';
 import {
   googleHomeConnect,
@@ -9,6 +8,7 @@ import {
 } from '../GoogleHome';
 import { getConfigGlobalState, setConfigGlobalState } from '../../states';
 import { API } from '../../../configs';
+import { getTranslate } from '../../../utils/I18n';
 
 jest.mock('axios');
 jest.mock('home-assistant-js-websocket', () => {
@@ -177,9 +177,9 @@ describe('Remote Control Google Home', () => {
     });
     await googleHomeConnect(options);
     expect(Toast.show).toBeCalledWith({
-      type: 'error',
+      type: 'success',
       position: 'bottom',
-      text1: t('command_googlehome_lost'),
+      text1: getTranslate('en', 'command_googlehome_ready'),
       visibilityTime: 1000,
     });
   });

package/src/iot/RemoteControl/__test__/Internet.test.js

@@ -1,5 +1,3 @@
-import { t } from 'i18n-js';
-
 import Toast from 'react-native-toast-message';
 import axios from 'axios';
 import { sendCommandOverInternet } from '../Internet';
@@ -16,12 +14,7 @@ describe('Test IOT Remote Control Internet', () => {
     axios.post.mockImplementation(() => ({ status: 200 }));
     await sendCommandOverInternet({}, {}, 'internet');
     expect(axios.post).toBeCalled();
-    expect(Toast.show).toBeCalledWith({
-      type: 'success',
-      position: 'bottom',
-      text1: t('Command is sent to device via internet'),
-      visibilityTime: 1000,
-    });
+    expect(Toast.show).toBeCalledTimes(2);
   });
 
   test('Trigger action fail show error', async () => {

package/src/iot/RemoteControl/__test__/LgThinq.test.js

@@ -115,13 +115,13 @@ describe('Remote Control LG Thinq', () => {
         source: 'lg_thinq',
       }
     );
-    expect(axios.get).toHaveBeenCalledTimes(1);
-    expect(axios.get).toHaveBeenCalledWith(
+    expect(axios.get).toHaveBeenCalledTimes(0);
+    expect(axios.get).not.toHaveBeenCalledWith(
       API.IOT.LG.DEVICE_STATUS(sensor.id),
       {}
     );
     let configValues = getConfigGlobalState('configValues');
-    expect(configValues).toEqual({ 1: 'AUTO' });
+    expect(configValues).toEqual({ 1: 'LOW' });
   });
 
   it('Send command over lg thinq but fetch device status failed', async () => {
@@ -149,8 +149,8 @@ describe('Remote Control LG Thinq', () => {
     });
 
     expect(axios.post).toHaveBeenCalledTimes(1);
-    expect(axios.get).toHaveBeenCalledTimes(1);
-    expect(axios.get).toHaveBeenCalledWith(
+    expect(axios.get).toHaveBeenCalledTimes(0);
+    expect(axios.get).not.toHaveBeenCalledWith(
       API.IOT.LG.DEVICE_STATUS(sensor.id),
       {}
     );
@@ -241,11 +241,8 @@ describe('Remote Control LG Thinq', () => {
     await act(async () => {
       await jest.runAllTimers();
     });
-    expect(axios.get).toHaveBeenCalledTimes(2);
-    expect(axios.get).toHaveBeenCalledWith(
-      API.IOT.LG.DEVICE_STATUS(sensor.id),
-      {}
-    );
+    expect(axios.get).toHaveBeenCalledTimes(1);
+    expect(axios.get).toHaveBeenCalledWith(API.IOT.LG.DEVICE_STATUS(2), {});
     let configValues = getConfigGlobalState('configValues');
     expect(configValues).toEqual({ 1: 18, 2: 30 });
   });

package/src/iot/RemoteControl/index.js

@@ -5,7 +5,7 @@ import {
 import { sendCommandOverInternet } from './Internet';
 import { sendCommandOverGoogleHome } from './GoogleHome';
 import { ToastBottomHelper } from '../../utils/Utils';
-import { t } from 'i18n-js';
+import t from '../../hooks/Common/useTranslations';
 import { sendCommandOverLGThinq } from './LG';
 
 export const sendRemoteCommand = async (sensor, action, data) => {

package/src/iot/states.js

@@ -2,6 +2,7 @@ import { createGlobalState } from 'react-hooks-global-state';
 
 const { useGlobalState, setGlobalState, getGlobalState } = createGlobalState({
   configValues: {},
+  lang: 'en',
 });
 
 export const useConfigGlobalState = useGlobalState;

package/src/navigations/AutomateStack.js

@@ -0,0 +1,45 @@
+import React, { memo, useCallback } from 'react';
+import { TouchableOpacity } from 'react-native';
+import { createStackNavigator } from '@react-navigation/stack';
+import { useNavigation } from '@react-navigation/core';
+import { Icon } from '@ant-design/react-native';
+
+import Routes from '../utils/Route';
+import { screenOptions } from './utils';
+import { useTranslations } from '../hooks/Common/useTranslations';
+import { Colors, Theme } from '../configs';
+import Automate from '../screens/Automate';
+
+const Stack = createStackNavigator();
+
+const AutomateStack = memo(() => {
+  const t = useTranslations();
+  const navigation = useNavigation();
+
+  const toggleDrawer = useCallback(() => {
+    navigation.toggleDrawer();
+  }, [navigation]);
+
+  return (
+    <Stack.Navigator
+      screenOptions={{
+        ...screenOptions,
+        headerShown: true,
+        title: t('automate_scripts'),
+        headerLeft: () => (
+          <TouchableOpacity style={Theme.menuIcon} onPress={toggleDrawer}>
+            <Icon name={'menu'} color={Colors.Black} />
+          </TouchableOpacity>
+        ),
+        headerTitleAlign: 'left',
+        headerStyle: {
+          backgroundColor: Colors.Gray2,
+        },
+      }}
+    >
+      <Stack.Screen name={Routes.Automate} component={Automate} />
+    </Stack.Navigator>
+  );
+});
+
+export default AutomateStack;

package/src/navigations/SharedStack.js

@@ -3,7 +3,7 @@ import { createStackNavigator } from '@react-navigation/stack';
 import { TouchableOpacity, StyleSheet } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { Icon } from '@ant-design/react-native';
-import { t } from 'i18n-js';
+import { useTranslations } from '../hooks/Common/useTranslations';
 
 import Shared from '../screens/SharedUnit';
 import { Colors } from '../configs';
@@ -11,6 +11,7 @@ import Routes from '../utils/Route';
 
 const Stack = createStackNavigator();
 const SharedStack = memo(() => {
+  const t = useTranslations();
   const navigation = useNavigation();
   return (
     <Stack.Navigator>

package/src/navigations/UnitStack.js

@@ -2,7 +2,9 @@ import React, { memo } from 'react';
 import { StyleSheet } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { createStackNavigator } from '@react-navigation/stack';
-import { t } from 'i18n-js';
+import { get } from 'lodash';
+
+import { useTranslations } from '../hooks/Common/useTranslations';
 import { Colors, Device } from '../configs';
 import Route from '../utils/Route';
 import ActivityLogScreen from '../screens/ActivityLog';
@@ -21,15 +23,25 @@ import UVIndexGuide from '../screens/UVIndexGuide';
 import TDSGuide from '../screens/TDSGuide';
 import WaterQualityGuide from '../screens/WaterQualityGuide';
 import DeviceInfo from '../screens/DeviceInfo';
+import AddNewOneTap from '../screens/AddNewOneTap';
+import AddNewAutoSmart from '../screens/AddNewAutoSmart';
 import PlaybackCamera from '../screens/PlayBackCamera';
 import AllCamera from '../screens/AllCamera';
 import ManageAccessScreen from '../screens/ManageAccess';
-
-import _ from 'lodash';
+import GuestInfo from '../screens/GuestInfo';
+import ScriptDetail from '../screens/ScriptDetail';
+import EditActionsList from '../screens/EditActionsList';
+import SelectUnit from '../screens/SelectUnit';
+import SetSchedule from '../screens/SetSchedule';
+import SelectSensorDevices from '../screens/AddNewAction/SelectSensorDevices';
+import SelectAction from '../screens/AddNewAction/SelectAction';
+import EditSubUnit from '../screens/SubUnit/EditSubUnit';
+import SetUpSensor from '../screens/AddNewAction/SetupSensor';
 
 const Stack = createStackNavigator();
 
 export const UnitStack = memo((props) => {
+  const t = useTranslations();
   return (
     <Stack.Navigator
       screenOptions={{
@@ -54,7 +66,7 @@ export const UnitStack = memo((props) => {
       <Stack.Screen
         name={Route.UnitDetail}
         component={UnitDetail}
-        initialParams={_.get(props, 'route.params', null)}
+        initialParams={get(props, 'route.params', null)}
         options={{ headerShown: false }}
       />
       <Stack.Screen
@@ -92,11 +104,16 @@ export const UnitStack = memo((props) => {
         }}
       />
       <Stack.Screen
+        name={Route.ManageSubUnit}
+        component={ManageSubUnit}
+        options={{ headerShown: false }}
+      />
+      <Stack.Screen
+        name={Route.EditSubUnit}
+        component={EditSubUnit}
         options={{
           headerTitle: '',
         }}
-        name={Route.ManageSubUnit}
-        component={ManageSubUnit}
       />
       <Stack.Screen
         name={Route.DeviceDetail}
@@ -173,6 +190,69 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.GuestInfo}
+        component={GuestInfo}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.AddNewOneTap}
+        component={AddNewOneTap}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.AddNewAutoSmart}
+        component={AddNewAutoSmart}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.ScriptDetail}
+        component={ScriptDetail}
+        options={{
+          headerShown: false,
+          gestureEnabled: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.EditActionsList}
+        component={EditActionsList}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.SelectSensorDevices}
+        component={SelectSensorDevices}
+        options={{ headerShown: false }}
+      />
+      <Stack.Screen
+        name={Route.SelectUnit}
+        component={SelectUnit}
+        options={{ headerShown: false }}
+      />
+      <Stack.Screen
+        name={Route.SetUpSensor}
+        component={SetUpSensor}
+        options={{ headerShown: false }}
+      />
+      <Stack.Screen
+        name={Route.SelectAction}
+        component={SelectAction}
+        options={{ headerShown: false }}
+      />
+      <Stack.Screen
+        name={Route.SetSchedule}
+        component={SetSchedule}
+        options={{
+          headerShown: false,
+        }}
+      />
     </Stack.Navigator>
   );
 });

package/src/navigations/utils.js

@@ -1,4 +1,6 @@
 import * as React from 'react';
+import { CardStyleInterpolators } from '@react-navigation/stack';
+import { StackActions } from '@react-navigation/native';
 
 // NavigationContainer is referred here - Check NavigationStack
 export const navigationRef = React.createRef();
@@ -11,6 +13,12 @@ export function goBack() {
   navigationRef.current?.goBack();
 }
 
+export const screenOptions = {
+  cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
+};
+
+export const popAction = (value) => StackActions.pop(value);
+
 export default {
   navigate,
   goBack,

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

@@ -5,6 +5,14 @@ import { act, create } from 'react-test-renderer';
 import AQIGuide from '..';
 import Text from '../../../commons/Text';
 import { TESTID } from '../../../configs/Constants';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+
+const wrapComponent = () => (
+  <SCProvider initState={mockSCStore({})}>
+    <AQIGuide />
+  </SCProvider>
+);
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -29,7 +37,7 @@ describe('test AQIGuide', () => {
   test('render', async () => {
     let tree;
     act(() => {
-      tree = create(<AQIGuide />);
+      tree = create(wrapComponent());
     });
 
     const instance = tree.root;

package/src/screens/AQIGuide/index.js

@@ -6,7 +6,7 @@ import {
   TouchableOpacity,
   SafeAreaView,
 } from 'react-native';
-import { t } from 'i18n-js';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import { Colors, Theme } from '../../configs';
 import useTitleHeader from '../../hooks/Common/useTitleHeader';
@@ -21,9 +21,9 @@ import SvgVeryTired from '../../../assets/images/Feeling/very-tired.svg';
 import { useSCContextSelector } from '../../context';
 
 const AQIGuide = memo(() => {
+  const t = useTranslations();
   useTitleHeader(t('AQI Guide'));
   const language = useSCContextSelector((state) => state.language);
-
   const data = useMemo(
     () => ({
       titles: [

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

@@ -4,6 +4,8 @@ import { create } from 'react-test-renderer';
 import { act } from '@testing-library/react-hooks';
 import ActivityLog from '../';
 import { Constants } from '../../../configs';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
 
 const mockUseSelector = jest.fn();
 const mockSetState = jest.fn();
@@ -34,41 +36,28 @@ jest.mock('@react-navigation/core', () => {
 
 jest.mock('axios');
 
+const wrapComponent = () => (
+  <SCProvider initState={mockSCStore({})}>
+    <ActivityLog />
+  </SCProvider>
+);
+
 describe('Test Activity log', () => {
   let tree;
   Date.now = jest.fn(() => new Date('2021-07-02T15:48:24.917932Z'));
-  const data = [
-    {
-      date: '02/07/2021',
-      data: [
-        {
-          id: 2,
-          action: 'Gara Up',
-          name: 'Kevin Love',
-          created_at: '2021-07-01T15:48:24.917932Z',
-        },
-        {
-          id: 1,
-          action: 'Gara Down',
-          name: 'Stephen Holloway',
-          created_at: '2021-07-01T15:48:24.791769Z',
-        },
-      ],
-    },
-  ];
 
   afterEach(() => {
     mockSetState.mockClear();
   });
 
-  it('render empty list', () => {
+  it('render empty list', async () => {
     useState.mockImplementationOnce((init) => [init, mockSetState]);
     useState.mockImplementationOnce((init) => [init, mockSetState]);
     useState.mockImplementationOnce((init) => [init, mockSetState]);
     useState.mockImplementationOnce((init) => [false, mockSetState]);
     useState.mockImplementationOnce((init) => [false, mockSetState]);
-    act(() => {
-      tree = create(<ActivityLog />);
+    await act(() => {
+      tree = create(wrapComponent());
     });
     const instance = tree.root;
     const SectionListElement = instance.findAllByType(SectionList);
@@ -81,28 +70,14 @@ describe('Test Activity log', () => {
     });
   });
 
-  it('render list', () => {
-    useState.mockImplementationOnce((init) => [data, mockSetState]);
-    useState.mockImplementationOnce((init) => [false, mockSetState]);
-    useState.mockImplementationOnce((init) => [init, mockSetState]);
-    useState.mockImplementationOnce((init) => [false, mockSetState]);
-    useState.mockImplementationOnce((init) => [false, mockSetState]);
-    act(() => {
-      tree = create(<ActivityLog />);
-    });
-    const instance = tree.root;
-    const SectionListElement = instance.findAllByType(SectionList);
-    expect(SectionListElement).toHaveLength(1);
-  });
-
-  it('render ActivityIndicator', () => {
+  it('render ActivityIndicator', async () => {
     useState.mockImplementationOnce((init) => [[], mockSetState]);
     useState.mockImplementationOnce((init) => [true, mockSetState]);
     useState.mockImplementationOnce((init) => [init, mockSetState]);
     useState.mockImplementationOnce((init) => [false, mockSetState]);
     useState.mockImplementationOnce((init) => [false, mockSetState]);
-    act(() => {
-      tree = create(<ActivityLog />);
+    await act(() => {
+      tree = create(wrapComponent());
     });
     const instance = tree.root;
     const ActivityIndicatorElement = instance.findAllByType(ActivityIndicator);

package/src/screens/ActivityLog/index.js

@@ -2,7 +2,7 @@
 import React, { useEffect } from 'react';
 import { View, Text, SectionList, ActivityIndicator } from 'react-native';
 import moment from 'moment';
-import { t } from 'i18n-js';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 import { Colors } from '../../configs';
 import { HeaderCustom } from '../../commons/Header';
 import { getTitleFromTime } from '../../utils/Converter/time';
@@ -13,6 +13,7 @@ import styles from './Styles/indexStyles';
 const keyExtractor = (item) => item.id;
 
 const ActivityLogScreen = () => {
+  const t = useTranslations();
   const { params = {} } = useRoute();
   const { sensor } = params;
   const { data, isLoading, isRefreshing, onLoadMore, onRefresh } =

package/src/screens/AddCommon/SelectSubUnit.js

@@ -1,5 +1,5 @@
 import { useIsFocused, useNavigation } from '@react-navigation/native';
-import { t } from 'i18n-js';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 import React, { useCallback, useEffect, useState } from 'react';
 import { SafeAreaView, ScrollView, TouchableOpacity, View } from 'react-native';
 
@@ -13,6 +13,7 @@ import styles from './SelectSubUnitStyles';
 import Button from '../../commons/Button';
 
 const AddCommonSelectSubUnit = ({ route }) => {
+  const t = useTranslations();
   const navigation = useNavigation();
   const isFocused = useIsFocused();
   const { addType, unit_id } = route.params;
@@ -32,7 +33,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
         setSubTitle(t('select_a_sub_unit'));
         break;
     }
-  }, [title, subTitle, addType]);
+  }, [title, subTitle, addType, t]);
 
   const fetchDetails = useCallback(async () => {
     const { success, data } = await axiosGet(
@@ -55,8 +56,8 @@ const AddCommonSelectSubUnit = ({ route }) => {
     switch (addType) {
       case 'AddNewGateway':
         navigation.navigate(Routes.ScanChipQR, {
-          station: subUnits[selectedIndex].id,
-          unit_name: unit.name,
+          station: subUnits[selectedIndex]?.id,
+          unit_name: unit?.name,
           ...route.params,
         });
         break;

package/src/screens/AddCommon/SelectUnit.js

@@ -1,5 +1,5 @@
 import { useNavigation } from '@react-navigation/native';
-import { t } from 'i18n-js';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 import React, { useCallback, useEffect, useState } from 'react';
 import {
   SafeAreaView,
@@ -19,6 +19,7 @@ import Routes from '../../utils/Route';
 import { TESTID } from '../../configs/Constants';
 
 const AddCommonSelectUnit = ({ route }) => {
+  const t = useTranslations();
   const navigation = useNavigation();
   const { addType } = route.params;
   const [selectedIndex, setSelectedIndex] = useState(-1);
@@ -49,7 +50,7 @@ const AddCommonSelectUnit = ({ route }) => {
         setSubTitle(t('add_new_subunit_select_unit'));
         break;
     }
-  }, [title, subTitle, addType]);
+  }, [title, subTitle, addType, t]);
 
   useEffect(() => {
     (async () => {

package/src/screens/AddCommon/__test__/SelectSubUnit.test.js

@@ -0,0 +1,61 @@
+import React from 'react';
+import renderer, { act } from 'react-test-renderer';
+
+import AddCommonSelectSubUnit from '../SelectSubUnit';
+import { ViewButtonBottom } from '../../../commons';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+
+jest.mock('axios');
+
+const mockedGoBack = jest.fn();
+const mockedNavigate = jest.fn();
+jest.mock('@react-navigation/native', () => {
+  return {
+    ...jest.requireActual('@react-navigation/native'),
+    useNavigation: () => ({
+      navigate: mockedNavigate,
+      goBack: mockedGoBack,
+    }),
+    useIsFocused: () => ({}),
+  };
+});
+
+const wrapComponent = (route) => (
+  <SCProvider initState={mockSCStore({})}>
+    <AddCommonSelectSubUnit route={route} />
+  </SCProvider>
+);
+
+describe('Test SelectSubUnit', () => {
+  beforeEach(() => {
+    mockedNavigate.mockClear();
+    mockedGoBack.mockClear();
+  });
+  let tree;
+  test('test ViewButtonBottom leftClick', async () => {
+    const route = { params: { addType: 'AddNewGateway' } };
+    await act(async () => {
+      tree = renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const viewButtonBottom = instance.findByType(ViewButtonBottom);
+    act(() => {
+      viewButtonBottom.props.onLeftClick();
+    });
+    expect(mockedGoBack).toHaveBeenCalled();
+  });
+
+  test('test ViewButtonBottom onRightClick', async () => {
+    const route = { params: { addType: 'AddNewGateway' } };
+    await act(async () => {
+      tree = renderer.create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const viewButtonBottom = instance.findByType(ViewButtonBottom);
+    act(() => {
+      viewButtonBottom.props.onRightClick();
+    });
+    expect(mockedNavigate).toHaveBeenCalled();
+  });
+});