@eohjsc/react-native-smart-city 0.2.97 → 0.2.98

package/src/commons/ActionGroup/__test__/OnOffTemplate.test.js

@@ -1,11 +1,25 @@
+/* eslint-disable promise/prefer-await-to-callbacks */
 import { TESTID } from '../../../configs/Constants';
 import { watchMultiConfigs } from '../../../iot/Monitor';
 import React from 'react';
 import { View } from 'react-native';
+import { useSelector } from 'react-redux';
 import { act, create } from 'react-test-renderer';
 import OnOffTemplate from '../OnOffTemplate';
 import OnOffButtonTemplate from '../OnOffTemplate/OnOffButtonTemplate';
 import OnOffSimpleTemplate from '../OnOffTemplate/OnOffSimpleTemplate';
+import { mockSCStore } from '../../../context/mockStore';
+import { SCProvider } from '../../../context';
+
+const wrapComponent = (actionGroup, mockDoAction, sensor) => (
+  <SCProvider initState={mockSCStore({})}>
+    <OnOffTemplate
+      actionGroup={actionGroup}
+      doAction={mockDoAction}
+      sensor={sensor}
+    />
+  </SCProvider>
+);
 
 jest.mock('../../../iot/Monitor');
 
@@ -13,9 +27,15 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{ 5: 2 }, null],
 }));
 
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
+
 describe('Test OnOffTemplate', () => {
-  let wrapper;
   let actionGroup;
+  let tree;
+  let sensor;
 
   const action_data = {
     color: '#00979D',
@@ -62,20 +82,23 @@ describe('Test OnOffTemplate', () => {
       },
       title: 'Turn on / off',
     };
+
+    sensor = { name: 'Sensor' };
+
+    const localState = {
+      isOnSwich: false,
+    };
+    useSelector.mockImplementation((cb) => {
+      return cb(localState);
+    });
   });
 
   test('render with template OnOffSimpleActionTemplate', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(
-        <OnOffTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{}}
-        />
-      );
+      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
     });
-    const instance = wrapper.root;
+    const instance = tree.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
     expect(template).toHaveLength(1);
   });
@@ -84,15 +107,9 @@ describe('Test OnOffTemplate', () => {
     actionGroup.template = 'on_off_button_action_template';
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(
-        <OnOffTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{}}
-        />
-      );
+      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
     });
-    const instance = wrapper.root;
+    const instance = tree.root;
     const template = instance.findAllByType(OnOffButtonTemplate);
     expect(template).toHaveLength(0);
   });
@@ -101,15 +118,9 @@ describe('Test OnOffTemplate', () => {
     actionGroup.template = 'wrong_template';
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(
-        <OnOffTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{}}
-        />
-      );
+      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
     });
-    const instance = wrapper.root;
+    const instance = tree.root;
 
     const templateOnOffButton = instance.findAll(
       (el) =>
@@ -125,32 +136,20 @@ describe('Test OnOffTemplate', () => {
   test('render with template OnOffSimpleActionTemplate with is_managed_by_backend', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(
-        <OnOffTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{ is_managed_by_backend: true }}
-        />
-      );
+      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
     });
-    const instance = wrapper.root;
+    const instance = tree.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
     expect(template).toHaveLength(1);
-    expect(watchMultiConfigs).toBeCalledTimes(1);
+    expect(watchMultiConfigs).toBeCalledTimes(0);
   });
 
   test('template OnOffSimpleActionTemplate doAction with is_on_value, match configValue', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(
-        <OnOffTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{ name: 'Sensor name' }}
-        />
-      );
+      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
     });
-    const instance = wrapper.root;
+    const instance = tree.root;
     const template = instance.findByType(OnOffSimpleTemplate);
     expect(template.props.isOn).toEqual(true);
 
@@ -160,7 +159,7 @@ describe('Test OnOffTemplate', () => {
     expect(mockDoAction).toHaveBeenCalledWith(
       action_off_data,
       null,
-      'Sensor name turn on / off off'
+      'Sensor turn on / off off'
     );
     expect(watchMultiConfigs).toBeCalledTimes(0);
   });
@@ -169,15 +168,9 @@ describe('Test OnOffTemplate', () => {
     actionGroup.configuration.is_on_value = [1];
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(
-        <OnOffTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{ name: 'Sensor name' }}
-        />
-      );
+      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
     });
-    const instance = wrapper.root;
+    const instance = tree.root;
     const template = instance.findByType(OnOffSimpleTemplate);
     expect(template.props.isOn).toEqual(false);
 
@@ -187,22 +180,16 @@ describe('Test OnOffTemplate', () => {
     expect(mockDoAction).toHaveBeenCalledWith(
       action_on_data,
       null,
-      'Sensor name turn on / off on'
+      'Sensor turn on / off on'
     );
   });
 
   test('template OnOffSimpleActionTemplate doAction with is_on_value and is_managed_by_backend', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(
-        <OnOffTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{ name: 'Sensor name', is_managed_by_backend: true }}
-        />
-      );
+      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
     });
-    const instance = wrapper.root;
+    const instance = tree.root;
     const template = instance.findByType(OnOffSimpleTemplate);
     expect(template.props.isOn).toEqual(true);
 
@@ -212,9 +199,9 @@ describe('Test OnOffTemplate', () => {
     expect(mockDoAction).toHaveBeenCalledWith(
       action_off_data,
       null,
-      'Sensor name turn on / off off'
+      'Sensor turn on / off off'
     );
-    expect(watchMultiConfigs).toBeCalledTimes(2);
+    expect(watchMultiConfigs).toBeCalledTimes(0);
   });
 
   test('render with template OnOffSimpleActionTemplate with just action_data', async () => {
@@ -230,15 +217,9 @@ describe('Test OnOffTemplate', () => {
     };
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(
-        <OnOffTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{ is_managed_by_backend: true }}
-        />
-      );
+      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
     });
-    const instance = wrapper.root;
+    const instance = tree.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
     expect(template).toHaveLength(1);
     expect(template[0].props.disabled).toBeFalsy();
@@ -261,15 +242,9 @@ describe('Test OnOffTemplate', () => {
     };
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = await create(
-        <OnOffTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{ is_managed_by_backend: true }}
-        />
-      );
+      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
     });
-    const instance = wrapper.root;
+    const instance = tree.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
     expect(template).toHaveLength(1);
     expect(template[0].props.disabled).toBeTruthy();

package/src/commons/ActionGroup/__test__/OneBigButtonTemplate.test.js

@@ -1,8 +1,27 @@
+/* eslint-disable promise/prefer-await-to-callbacks */
 import React from 'react';
 import { create, act } from 'react-test-renderer';
 import { TouchableOpacity } from 'react-native';
+import { useSelector } from 'react-redux';
 
 import OneBigButtonTemplate from '../OneBigButtonTemplate';
+import { mockSCStore } from '../../../context/mockStore';
+import { SCProvider } from '../../../context';
+
+const wrapComponent = (actionGroup, mockDoAction, sensor) => (
+  <SCProvider initState={mockSCStore({})}>
+    <OneBigButtonTemplate
+      actionGroup={actionGroup}
+      doAction={mockDoAction}
+      sensor={sensor}
+    />
+  </SCProvider>
+);
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(),
+}));
 
 describe('Test OneBigButtonTemplate', () => {
   const action_data = {
@@ -23,24 +42,25 @@ describe('Test OneBigButtonTemplate', () => {
       text: 'UP',
     },
   };
-  const sensor = {
-    name: 'Sensor name',
-  };
-  let wrapper;
+  let tree;
+  let sensor;
 
-  test('render OneBigButtonTemplate', () => {
-    const mockDoAction = jest.fn();
-    act(() => {
-      wrapper = create(
-        <OneBigButtonTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={sensor}
-        />
-      );
+  beforeEach(() => {
+    const localState = {
+      isOnSwich: false,
+    };
+    useSelector.mockImplementation((cb) => {
+      return cb(localState);
     });
+    sensor = { name: 'Sensor' };
+  });
 
-    const instance = wrapper.root;
+  test('render OneBigButtonTemplate', async () => {
+    const mockDoAction = jest.fn();
+    await act(async () => {
+      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
+    });
+    const instance = tree.root;
     const buttons = instance.findAllByType(TouchableOpacity);
     expect(buttons.length).toEqual(1);
 
@@ -49,10 +69,6 @@ describe('Test OneBigButtonTemplate', () => {
     });
 
     expect(mockDoAction).toHaveBeenCalledTimes(1);
-    expect(mockDoAction).toHaveBeenCalledWith(
-      action_data,
-      null,
-      'Sensor name up'
-    );
+    expect(mockDoAction).toHaveBeenCalledWith(action_data, null, 'Sensor up');
   });
 });

package/src/commons/Auth/AccountList.js

@@ -5,7 +5,7 @@ import AccountItem from './AccountItem';
 
 const AccountList = ({ accounts }) => {
   return (
-    <ScrollView>
+    <ScrollView scrollIndicatorInsets={{ right: 1 }}>
       {accounts.map((account) => (
         <AccountItem key={account.id || account.name} account={account} />
       ))}

package/src/commons/Device/HistoryChart.js

@@ -239,6 +239,8 @@ const HistoryChart = memo(
           onConfirm={onConfirmStart}
           onCancel={onCancel}
           display="spinner"
+          cancelTextIOS={t('cancel')}
+          confirmTextIOS={t('confirm')}
         />
         <DateTimePickerModal
           isVisible={eventPicker.showModalEnd}
@@ -247,6 +249,8 @@ const HistoryChart = memo(
           onConfirm={onConfirmEnd}
           onCancel={onCancel}
           display="spinner"
+          cancelTextIOS={t('cancel')}
+          confirmTextIOS={t('confirm')}
         />
       </View>
     );

package/src/commons/Device/PMSensor/PMSensorIndicatior.js

@@ -1,4 +1,5 @@
 import React, { memo, useCallback } from 'react';
+import { View } from 'react-native';
 import { FlatList } from 'react-native';
 import QualityIndicatorItem from '../WaterQualitySensor/QualityIndicatorsItem';
 import styles from './PMSensorIndicatorStyles';
@@ -26,18 +27,21 @@ const PMSensorIndicatior = memo(({ data, style }) => {
   const isScrollMode = data.length > 3;
 
   return (
-    <FlatList
-      bounces={false}
-      numColumns={1}
-      horizontal={true}
-      contentContainerStyle={[
-        styles.standard,
-        !isScrollMode && styles.centerItem,
-      ]}
-      data={data}
-      keyExtractor={keyExtractor}
-      renderItem={renderItem}
-    />
+    <View style={styles.wrap}>
+      <FlatList
+        bounces={false}
+        numColumns={1}
+        horizontal={true}
+        contentContainerStyle={[
+          styles.standard,
+          !isScrollMode && styles.centerItem,
+        ]}
+        data={data}
+        keyExtractor={keyExtractor}
+        renderItem={renderItem}
+        scrollIndicatorInsets={{ right: 1 }}
+      />
+    </View>
   );
 });
 

package/src/commons/Device/PMSensor/PMSensorIndicatorStyles.js

@@ -10,4 +10,7 @@ export default StyleSheet.create({
     flex: 1,
     justifyContent: 'center',
   },
+  wrap: {
+    marginVertical: 16,
+  },
 });

package/src/commons/Device/WaterQualitySensor/ListQualityIndicator.js

@@ -27,6 +27,7 @@ const ListQualityIndicator = ({ data, style }) => {
         showsHorizontalScrollIndicator={false}
         nestedScrollEnabled
         contentContainerStyle={[styles.flatlistContent, style]}
+        scrollIndicatorInsets={{ right: 1 }}
       />
     </View>
   );

package/src/commons/FullLoading/index.js

@@ -22,7 +22,8 @@ const styles = StyleSheet.create({
     left: 0,
     bottom: 0,
     right: 0,
-    zIndex: 10,
+    zIndex: 1000, // works on ios
+    elevation: 1000, // works on android
   },
   background: {
     backgroundColor: colorOpacity(Colors.White, 0.8),

package/src/commons/MenuActionAddnew/index.js

@@ -59,6 +59,7 @@ const MenuActionAddnew = memo(
               data={dataActions}
               keyExtractor={keyExtractor}
               renderItem={renderItem}
+              scrollIndicatorInsets={{ right: 1 }}
             />
           </View>
         </View>

package/src/commons/MenuActionList/index.js

@@ -57,6 +57,7 @@ const MenuActionList = memo(
               data={listItem}
               keyExtractor={keyExtractor}
               renderItem={renderItem}
+              scrollIndicatorInsets={{ right: 1 }}
             />
           </View>
         </View>

package/src/commons/MenuActionMore/index.js

@@ -50,7 +50,7 @@ const MenuActionMore = memo(
         isVisible={isVisible}
         arrowStyle={styles.wrap}
       >
-        <ScrollView>
+        <ScrollView scrollIndicatorInsets={{ right: 1 }}>
           {listMenuItem.map((item, index) => {
             return (
               <TouchableOpacity

package/src/commons/PreventAccess/__test__/PreventAccess.test.js

@@ -0,0 +1,62 @@
+import React from 'react';
+import { create } from 'react-test-renderer';
+import { act } from 'react-test-renderer';
+import PreventAccess from '..';
+import { TESTID } from '../../../configs/Constants';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+import Text from '../../Text';
+
+const mockGoBack = jest.fn();
+
+const wrapComponent = (headerBodyText, visible, hidePreventAccess) => (
+  <SCProvider initState={mockSCStore({})}>
+    <PreventAccess
+      headerBodyText={headerBodyText}
+      visible={visible}
+      hidePreventAccess={hidePreventAccess}
+    />
+  </SCProvider>
+);
+
+jest.mock('@react-navigation/native', () => {
+  return {
+    ...jest.requireActual('@react-navigation/native'),
+    useRoute: jest.fn(),
+    useNavigation: () => ({
+      goBack: mockGoBack,
+    }),
+  };
+});
+
+describe('Test PreventAccess.test', () => {
+  let tree;
+  let headerBodyText;
+  let visible;
+  let hidePreventAccess = () => {};
+
+  test('onItemClick MenuActionList', () => {
+    act(() => {
+      tree = create(wrapComponent(headerBodyText, visible, hidePreventAccess));
+    });
+    const instance = tree.root;
+    const text = instance.findAllByType(Text);
+    expect(text).toHaveLength(5);
+    const button1 = instance.find(
+      (el) => el.props.testID === TESTID.BUTTON_PREVENT_ACCESS
+    );
+    const button2 = instance.find(
+      (el) => el.props.testID === TESTID.TEXT_PREVENT_ACCESS
+    );
+    act(() => {
+      button1.props.onBackButtonPress();
+    });
+
+    act(() => {
+      button2.props.onPress();
+    });
+    expect(button1).toBeDefined();
+    expect(button2).toBeDefined();
+    expect(mockGoBack).toHaveBeenCalled();
+  });
+});

package/src/commons/PreventAccess/index.js

@@ -7,6 +7,7 @@ import t from '../../hooks/Common/useTranslations';
 import Text from '../Text';
 import { Colors } from '../../configs';
 import { styles } from './styles';
+import { TESTID } from '../../configs/Constants';
 
 const PreventAccess = memo(({ headerBodyText, visible, hidePreventAccess }) => {
   const { goBack } = useNavigation();
@@ -37,6 +38,7 @@ const PreventAccess = memo(({ headerBodyText, visible, hidePreventAccess }) => {
       transparent={true}
       onBackButtonPress={handleBackPress}
       style={styles.container}
+      testID={TESTID.BUTTON_PREVENT_ACCESS}
     >
       <View style={styles.popoverStyle}>
         <View style={styles.actionTextWrap}>
@@ -48,7 +50,13 @@ const PreventAccess = memo(({ headerBodyText, visible, hidePreventAccess }) => {
           </Text>
         </View>
         <View style={styles.endOfText}>
-          <Text size={16} bold color={Colors.Primary} onPress={handleDonePopup}>
+          <Text
+            testID={TESTID.TEXT_PREVENT_ACCESS}
+            size={16}
+            bold
+            color={Colors.Primary}
+            onPress={handleDonePopup}
+          >
             {dataText?.endOfText}
           </Text>
         </View>

package/src/configs/Constants.js

@@ -722,6 +722,10 @@ export const TESTID = {
   AUTO_LOCK_BUTTON_ENABLE: 'AUTO_LOCK_BUTTON_ENABLE',
   AUTO_LOCK_BUTTON_INSTANT: 'AUTO_LOCK_BUTTON_INSTANT',
   AUTO_LOCK_BUTTON_RELOCK_TIMING: 'AUTO_LOCK_BUTTON_RELOCK_TIMING',
+
+  //PreventAccess
+  BUTTON_PREVENT_ACCESS: 'BUTTON_PREVENT_ACCESS',
+  TEXT_PREVENT_ACCESS: 'TEXT_PREVENT_ACCESS',
 };
 
 export const NOTIFICATION_TYPES = {

package/src/context/actionType.ts

@@ -17,6 +17,7 @@ export const Action = {
   SET_STARRED_SCRIPTS: 'SET_STARRED_SCRIPTS',
   STAR_SCRIPT: 'STAR_SCRIPT',
   UNSTAR_SCRIPT: 'UNSTAR_SCRIPT',
+  IS_FULL_LOADING: 'IS_FULL_LOADING',
 };
 
 export type AuthData = {

package/src/context/reducer.ts

@@ -42,6 +42,7 @@ export const initialState = {
   statusBar: {} as StatusBar,
   listDevice: {} as ListDevice,
   listAction: [] as ListAction,
+  isFullLoading: false as Boolean,
   unit: {
     favoriteDeviceIds: [],
   },
@@ -66,6 +67,8 @@ export const reducer = (currentState: ContextData, action: Action) => {
       return { ...currentState, auth: payload };
     case Action.STORE_STATUS_BAR:
       return { ...currentState, statusBar: payload };
+    case Action.IS_FULL_LOADING:
+      return { ...currentState, isFullLoading: payload };
     case Action.UPDATE_LANGUAGE:
       return { ...currentState, language: payload };
     case Action.LIST_DEVICE_TYPES:

package/src/screens/AQIGuide/index.js

@@ -83,7 +83,7 @@ const AQIGuide = memo(() => {
 
   return (
     <SafeAreaView style={styles.container}>
-      <ScrollView style={styles.container}>
+      <ScrollView style={styles.container} scrollIndicatorInsets={{ right: 1 }}>
         {titles.map((item, index) => {
           const { title, des } = item;
           return (

package/src/screens/ActivityLog/FilterPopup.js

@@ -257,6 +257,8 @@ const FilterPopup = ({
         onCancel={onPickerCancel}
         onHide={releaseLockShowing}
         display="spinner"
+        cancelTextIOS={t('cancel')}
+        confirmTextIOS={t('confirm')}
       />
     </>
   );

package/src/screens/AddCommon/SelectSubUnit.js

@@ -174,6 +174,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
         <ScrollView
           style={styles.scrollContainer}
           showsVerticalScrollIndicator={false}
+          scrollIndicatorInsets={{ right: 1 }}
         >
           <Section type={'border'}>
             {subUnits.map((item, index) => (

package/src/screens/AddCommon/SelectUnit.js

@@ -159,6 +159,7 @@ const AddCommonSelectUnit = ({ route }) => {
         <ScrollView
           style={styles.scrollContainer}
           showsVerticalScrollIndicator={false}
+          scrollIndicatorInsets={{ right: 1 }}
         >
           <Section type={'border'}>
             {units.map((item, index) => (

package/src/screens/AddLocationMaps/index.js

@@ -169,7 +169,10 @@ const AddLocationMaps = memo(() => {
         </Text>
         <View style={styles.searchLocation}>
           <SearchBarLocation input={input} onTextInput={onTextInput} />
-          <ScrollView style={styles.searchData}>
+          <ScrollView
+            style={styles.searchData}
+            scrollIndicatorInsets={{ right: 1 }}
+          >
             {searchData.map((item) => (
               <RowLocation item={item} onPress={onPressRowLocation} />
             ))}

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -175,6 +175,7 @@ const SelectSensorDevices = memo(({ route }) => {
       <ScrollView
         style={styles.wrap}
         contentContainerStyle={styles.contentContainerStyle}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Text bold type="H2" style={styles.title}>
           {t(title)}
@@ -216,7 +217,11 @@ const SelectSensorDevices = memo(({ route }) => {
         style={styles.bottomButtonView}
         mainTitle={t('continue')}
         onPressMain={onPressContinue}
-        typeMain={selectedDevice ? 'primary' : 'disabled'}
+        typeMain={
+          Object.keys(selectedDevice || {}).length === 0
+            ? 'disabled'
+            : 'primary'
+        }
       />
     </View>
   );

package/src/screens/AddNewDevice/index.js

@@ -90,6 +90,7 @@ const AddNewDevice = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           <GroupCheckBox data={stations} onSelect={handleOnSelect} />