@eohjsc/react-native-smart-city 0.3.31 → 0.3.32

package/src/screens/AddCommon/SelectSubUnit.js

@@ -1,22 +1,12 @@
-import React, { useCallback, useEffect, useState, useMemo } from 'react';
-import { useIsFocused, useNavigation } from '@react-navigation/native';
+import React, { useCallback, useEffect, useState } from 'react';
+import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
-import { SafeAreaView, ScrollView, TouchableOpacity, View } from 'react-native';
-
-import { API } from '../../configs';
-import { Section, RadioCircle, ViewButtonBottom } from '../../commons';
-import { axiosGet } from '../../utils/Apis/axios';
-import Text from '../../commons/Text';
 import Routes from '../../utils/Route';
-import { TESTID } from '../../configs/Constants';
-import styles from './SelectSubUnitStyles';
-import Button from '../../commons/Button';
-import { SCConfig } from '../../configs/SCConfig';
+import SelectSubUnit from '../../commons/SelectSubUnit';
 
 const AddCommonSelectSubUnit = ({ route }) => {
   const t = useTranslations();
   const navigation = useNavigation();
-  const isFocused = useIsFocused();
   const {
     addType,
     unit_id,
@@ -26,34 +16,15 @@ const AddCommonSelectSubUnit = ({ route }) => {
     smart_account_id_from_backend,
     username,
     brand,
-    scan_sensor_data,
-    gateway,
-    devicePrefixName,
-    wifi_ssid,
-    wifi_pass,
-  } = route.params;
-  const [selectedIndex, setSelectedIndex] = useState(-1);
-  const [unit, setUnit] = useState([]);
+  } = route?.params || {};
   const [title, setTitle] = useState('');
   const [subTitle, setSubTitle] = useState('');
-  const [nameSubUnit, setNameSubUnit] = useState('');
 
   useEffect(() => {
     switch (addType) {
-      case 'AddNewGateway':
-        setTitle(t('add_new_gateway'));
-        setSubTitle(t('select_a_sub_unit'));
-        break;
       case 'AddHassiDevice':
         setTitle(t('select_a_sub_unit'));
         break;
-      case 'AddVconnexDevice':
-        setTitle(t('select_a_sub_unit'));
-        break;
-      case 'AddDeviceNewFlow':
-        setTitle(t('text_select_sub_unit'));
-        setSubTitle(t('select_a_sub_unit_want_add_device'));
-        break;
       default:
         setTitle(t('add_new_gateway'));
         setSubTitle(t('select_a_sub_unit'));
@@ -61,166 +32,48 @@ const AddCommonSelectSubUnit = ({ route }) => {
     }
   }, [title, subTitle, addType, t]);
 
-  const fetchDetails = useCallback(async () => {
-    const { success, data } = await axiosGet(
-      API.UNIT.UNIT_DETAIL(unit_id),
-      {},
-      true
-    );
-    if (success) {
-      setUnit(data);
-    }
-  }, [unit_id]);
-
-  useEffect(() => {
-    isFocused && fetchDetails();
-  }, [fetchDetails, isFocused]);
-
-  const subUnits = useMemo(() => unit.stations || [], [unit]);
-
-  const onPressNext = useCallback(() => {
-    switch (addType) {
-      case 'AddNewGateway':
-        navigation.navigate(Routes.ScanChipQR, {
-          station: subUnits[selectedIndex]?.id,
-          unit_name: unit?.name,
-          ...route.params,
-          isNewFlow: false,
-        });
-        break;
-      case 'AddHassiDevice':
-        navigation.navigate(Routes.SmartAccountConnecting, {
-          listSensorIds: route.params.listSensorIds,
-          station: subUnits[selectedIndex]?.id,
-          nameSubUnit: nameSubUnit,
-          sensor_data: sensor_data,
-          listSelectDevice: listSelectDevice,
-          smart_account_id: smart_account_id,
-          unit_id: unit_id,
-          smart_account_id_from_backend: smart_account_id_from_backend,
-          username,
-          brand,
-        });
-        break;
-      case 'AddVconnexDevice':
-        navigation.navigate(Routes.Browser, {
-          link: API.IOT.VCONNEX.AUTHORIZE(
-            SCConfig.VCONNEX_CLIENT_ID,
-            SCConfig.VCONNEX_REDIRECT_URI_APP,
-            unit.user_id,
-            unit_id,
-            subUnits[selectedIndex]?.id
-          ),
-        });
-        break;
-      case 'AddDeviceNewFlow':
-        navigation.navigate(Routes.ConnectingProcess, {
-          station: subUnits[selectedIndex],
-          unit: unit,
-          scan_sensor_data: scan_sensor_data,
-          gateway: gateway,
-          devicePrefixName: devicePrefixName,
-          wifi_ssid: wifi_ssid,
-          wifi_pass: wifi_pass,
-        });
-        break;
-      default:
-        break;
-    }
-  }, [
-    addType,
-    navigation,
-    subUnits,
-    selectedIndex,
-    unit,
-    route.params,
-    nameSubUnit,
-    sensor_data,
-    listSelectDevice,
-    smart_account_id,
-    unit_id,
-    smart_account_id_from_backend,
-    username,
-    brand,
-    scan_sensor_data,
-    gateway,
-    devicePrefixName,
-    wifi_ssid,
-    wifi_pass,
-  ]);
-
-  const handleSelectIndex = (index) => {
-    setNameSubUnit(subUnits[index].name);
-    if (index !== selectedIndex) {
-      setSelectedIndex(index);
-    } else {
-      setSelectedIndex(-1);
-    }
-  };
-  const addSubUnit = useCallback(() => {
-    navigation.navigate(Routes.AddSubUnitStack, {
-      screen: Routes.AddSubUnit,
-      params: { unit, ...route.params, addType: 'AddHassiDevice' },
-    });
-  }, [navigation, unit, route.params]);
+  const onPressNext = useCallback(
+    (unit, subUnit) => {
+      switch (addType) {
+        case 'AddHassiDevice':
+          navigation.navigate(Routes.SmartAccountConnecting, {
+            listSensorIds: route.params.listSensorIds,
+            stationId: subUnit?.id,
+            nameSubUnit: subUnit?.name,
+            sensor_data: sensor_data,
+            listSelectDevice: listSelectDevice,
+            smart_account_id: smart_account_id,
+            unit_id: unit_id,
+            smart_account_id_from_backend: smart_account_id_from_backend,
+            username,
+            brand,
+          });
+          break;
+        default:
+          break;
+      }
+    },
+    [
+      addType,
+      navigation,
+      route.params,
+      sensor_data,
+      listSelectDevice,
+      smart_account_id,
+      unit_id,
+      smart_account_id_from_backend,
+      username,
+      brand,
+    ]
+  );
 
   return (
-    <SafeAreaView style={styles.container}>
-      <Text semibold style={styles.title}>
-        {title}
-      </Text>
-      <Text style={styles.subtitle}>{subTitle}</Text>
-      <View style={styles.contentContainer}>
-        <ScrollView
-          style={styles.scrollContainer}
-          showsVerticalScrollIndicator={false}
-          scrollIndicatorInsets={{ right: 1 }}
-        >
-          <Section type={'border'}>
-            {subUnits.map((item, index) => (
-              <TouchableOpacity
-                key={index}
-                style={styles.rowContainer}
-                onPress={() => handleSelectIndex(index)}
-              >
-                <RadioCircle
-                  active={selectedIndex === index}
-                  testID={TESTID.SELECT_SUBUNIT_RADIO_BUTTON}
-                />
-                <TouchableOpacity
-                  style={styles.row}
-                  onPress={() => handleSelectIndex(index)}
-                  testID={TESTID.SELECT_SUBUNIT_SELECT}
-                >
-                  <Text style={styles.text} testID={TESTID.SELECT_SUBUNIT_NAME}>
-                    {item.name}
-                  </Text>
-                </TouchableOpacity>
-              </TouchableOpacity>
-            ))}
-          </Section>
-          <View style={styles.buttonAdd}>
-            <Button
-              type="primaryBorder"
-              title={`${t('add_new_sub_unit')} +`}
-              onPress={addSubUnit}
-              width="auto"
-              height={32}
-              textType="setupBorder"
-              textSemiBold={false}
-            />
-          </View>
-        </ScrollView>
-        <ViewButtonBottom
-          leftTitle={t('cancel')}
-          onLeftClick={() => navigation.goBack()}
-          rightTitle={t('next')}
-          rightDisabled={selectedIndex === -1}
-          onRightClick={onPressNext}
-          testIDPrefix={TESTID.PREFIX.SELECT_UNIT}
-        />
-      </View>
-    </SafeAreaView>
+    <SelectSubUnit
+      subTitle={subTitle}
+      title={title}
+      unitId={unit_id}
+      onPressNext={onPressNext}
+    />
   );
 };
 

package/src/screens/AddCommon/SelectUnit.js

@@ -1,29 +1,13 @@
 import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import React, { useCallback, useEffect, useState } from 'react';
-import {
-  SafeAreaView,
-  ScrollView,
-  StyleSheet,
-  TouchableOpacity,
-  View,
-  StatusBar,
-  Platform,
-} from 'react-native';
-
-import { API, Colors } from '../../configs';
-import { Section, RadioCircle, ViewButtonBottom } from '../../commons';
-import { axiosGet } from '../../utils/Apis/axios';
-import Text from '../../commons/Text';
 import Routes from '../../utils/Route';
-import { TESTID } from '../../configs/Constants';
+import SelectUnit from '../../commons/SelectUnit';
 
 const AddCommonSelectUnit = ({ route }) => {
   const t = useTranslations();
   const navigation = useNavigation();
-  const { addType, scan_sensor_data } = route.params;
-  const [selectedIndex, setSelectedIndex] = useState(-1);
-  const [units, setUnits] = useState([]);
+  const { addType } = route?.params || {};
   const [title, setTitle] = useState('');
   const [subTitle, setSubTitle] = useState('');
 
@@ -48,13 +32,6 @@ const AddCommonSelectUnit = ({ route }) => {
       case 'AddHassioDevice':
         setTitle(t('text_select_a_unit'));
         break;
-      case 'AddVconnexDevice':
-        setTitle(t('text_select_a_unit'));
-        break;
-      case 'AddDeviceNewFlow':
-        setTitle(t('text_select_a_unit'));
-        setSubTitle(t('text_select_a_unit_have_device'));
-        break;
       default:
         setTitle(t('add_new_sub_unit'));
         setSubTitle(t('add_new_subunit_select_unit'));
@@ -62,189 +39,59 @@ const AddCommonSelectUnit = ({ route }) => {
     }
   }, [title, subTitle, addType, t]);
 
-  useEffect(() => {
-    (async () => {
-      const { data, success } = await axiosGet(API.SHARE.UNITS());
-      if (success) {
-        const normalizeData = data.map((unit) => ({
-          name: unit.name,
-          id: unit.id,
-        }));
-        setUnits(normalizeData);
+  const onPressNext = useCallback(
+    (unit) => {
+      switch (addType) {
+        case 'AddSubUnit':
+          navigation.navigate(Routes.AddSubUnit, {
+            unit,
+          });
+          break;
+        case 'AddDevice':
+          navigation.navigate(Routes.AddNewDevice, {
+            unit_id: unit?.id,
+          });
+          break;
+        case 'AddMember':
+          navigation.navigate(Routes.SharingSelectPermission, {
+            unit,
+          });
+          break;
+        case 'AddLGDevice':
+          navigation.navigate(Routes.AddLGDevice, {
+            code: route.params.code,
+            backend_url: route.params.backend_url
+              .replace(/%2F/g, '/')
+              .replace(/%3A/g, ':'),
+            unit_id: unit?.id,
+          });
+          break;
+        case 'AddHassioDevice':
+          navigation.navigate(Routes.SmartAccountConnecting, {
+            username: route.params.username,
+            password: route.params.password,
+            brand: route.params.brand,
+            unit_id: unit?.id,
+          });
+          break;
+        default:
+          break;
       }
-    })();
-  }, []);
-
-  const onPressNext = useCallback(() => {
-    switch (addType) {
-      case 'AddSubUnit':
-        navigation.navigate(Routes.AddSubUnit, {
-          unit: units[selectedIndex],
-        });
-        break;
-      case 'AddDevice':
-        navigation.navigate(Routes.AddNewDevice, {
-          unit_id: units[selectedIndex].id,
-        });
-        break;
-      case 'AddMember':
-        navigation.navigate(Routes.SharingSelectPermission, {
-          unit: units[selectedIndex],
-        });
-        break;
-      case 'AddLGDevice':
-        navigation.navigate(Routes.AddLGDevice, {
-          code: route.params.code,
-          backend_url: route.params.backend_url
-            .replace(/%2F/g, '/')
-            .replace(/%3A/g, ':'),
-          unit_id: units[selectedIndex].id,
-        });
-        break;
-      case 'AddHassioDevice':
-        navigation.navigate(Routes.SmartAccountConnecting, {
-          username: route.params.username,
-          password: route.params.password,
-          brand: route.params.brand,
-          unit_id: units[selectedIndex].id,
-        });
-        break;
-      case 'AddVconnexDevice':
-        navigation.navigate(Routes.AddDeviceStack, {
-          screen: Routes.AddCommonSelectSubUnit,
-          params: {
-            unit_id: units[selectedIndex].id,
-            addType: 'AddVconnexDevice',
-          },
-        });
-        break;
-      case 'AddDeviceNewFlow':
-        navigation.navigate(Routes.AddGatewaySelectGateway, {
-          unit_id: units[selectedIndex].id,
-          addType: 'AddDeviceNewFlow',
-          scan_sensor_data,
-        });
-        break;
-      default:
-        break;
-    }
-  }, [
-    addType,
-    navigation,
-    units,
-    selectedIndex,
-    route.params.code,
-    route.params.backend_url,
-    route.params.username,
-    route.params.password,
-    route.params.brand,
-    scan_sensor_data,
-  ]);
-
-  const handleSelectIndex = (index) => {
-    if (index !== selectedIndex) {
-      setSelectedIndex(index);
-    } else {
-      setSelectedIndex(-1);
-    }
-  };
+    },
+    [
+      addType,
+      navigation,
+      route.params.code,
+      route.params.backend_url,
+      route.params.username,
+      route.params.password,
+      route.params.brand,
+    ]
+  );
 
   return (
-    <SafeAreaView style={styles.container}>
-      <Text semibold style={styles.title}>
-        {title}
-      </Text>
-      <Text style={styles.subtitle}>{subTitle}</Text>
-      <View style={styles.contentContainer}>
-        <ScrollView
-          style={styles.scrollContainer}
-          showsVerticalScrollIndicator={false}
-          scrollIndicatorInsets={{ right: 1 }}
-        >
-          <Section type={'border'}>
-            {units.map((item, index) => (
-              <TouchableOpacity
-                key={index}
-                style={styles.rowContainer}
-                onPress={() => handleSelectIndex(index)}
-              >
-                <RadioCircle
-                  active={selectedIndex === index}
-                  testID={TESTID.SELECT_UNIT_RADIO_BUTTON}
-                />
-                <TouchableOpacity
-                  style={styles.row}
-                  onPress={() => handleSelectIndex(index)}
-                  testID={TESTID.SELECT_UNIT_SELECT}
-                >
-                  <Text style={styles.text} testID={TESTID.SELECT_UNIT_NAME}>
-                    {item.name}
-                  </Text>
-                </TouchableOpacity>
-              </TouchableOpacity>
-            ))}
-          </Section>
-        </ScrollView>
-        <ViewButtonBottom
-          leftTitle={t('cancel')}
-          onLeftClick={() => navigation.goBack()}
-          rightTitle={t('next')}
-          rightDisabled={selectedIndex === -1}
-          onRightClick={onPressNext}
-          testIDPrefix={TESTID.PREFIX.SELECT_UNIT}
-        />
-      </View>
-    </SafeAreaView>
+    <SelectUnit title={title} subTitle={subTitle} onPressNext={onPressNext} />
   );
 };
 
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: Colors.Gray2,
-    paddingTop: Platform.OS === 'android' ? StatusBar.currentHeight : 0,
-  },
-  contentContainer: {
-    flex: 1,
-    justifyContent: 'space-between',
-  },
-  scrollContainer: {
-    width: '100%',
-    flex: 1,
-  },
-  title: {
-    color: Colors.Gray9,
-    fontSize: 20,
-    lineHeight: 28,
-    marginTop: 8,
-    marginBottom: 4,
-    marginLeft: 16,
-  },
-  subtitle: {
-    color: Colors.Gray8,
-    fontSize: 14,
-    lineHeight: 22,
-    marginLeft: 16,
-    marginBottom: 16,
-  },
-  row: {
-    flex: 1,
-    paddingVertical: 16,
-    borderBottomColor: Colors.Gray4,
-    borderBottomWidth: 1,
-    marginRight: 24,
-    marginLeft: 16,
-  },
-  rowContainer: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    paddingLeft: 16,
-  },
-  text: {
-    fontSize: 16,
-    lineHeight: 24,
-    color: Colors.Gray9,
-  },
-});
-
 export default AddCommonSelectUnit;

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

@@ -8,7 +8,7 @@ import { ViewButtonBottom } from '../../../commons';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import Text from '../../../commons/Text';
-import { TESTID } from '../../../configs/Constants';
+import { AccessibilityLabel } from '../../../configs/Constants';
 import api from '../../../utils/Apis/axios';
 import { API } from '../../../configs';
 
@@ -39,21 +39,9 @@ describe('Test SelectSubUnit', () => {
     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' } };
+    const route = { params: { addType: 'AddHassiDevice' } };
     await act(async () => {
       tree = renderer.create(wrapComponent(route));
     });
@@ -65,23 +53,18 @@ describe('Test SelectSubUnit', () => {
     expect(mockedNavigate).toHaveBeenCalled();
   });
 });
+
 describe('Test SelectSubUnit container', () => {
   beforeEach(() => {
     mockedNavigate.mockClear();
     mockedGoBack.mockClear();
   });
   let tree;
-  const list_type = [
-    'AddNewGateway',
-    'AddHassiDevice',
-    'AddVconnexDevice',
-    'AddDeviceNewFlow',
-  ];
+  const list_type = ['AddHassiDevice'];
   const result = [
-    'Select a sub-unit that you want to add this gateway',
     '',
     '',
-    'Then, select a sub-unit that you want to add this device in',
+    'Select a sub-unit that you want to add this device in',
   ];
 
   list_type.forEach(function (type, i) {
@@ -115,8 +98,8 @@ describe('Test SelectSubUnit container', () => {
 
       const next = instance.find(
         (item) =>
-          item.props.testID ===
-          `${TESTID.PREFIX.SELECT_UNIT}${TESTID.VIEW_BUTTON_BOTTOM_RIGHT_BUTTON}`
+          item.props.accessibilityLabel ===
+          `${AccessibilityLabel.PREFIX.SELECT_UNIT}${AccessibilityLabel.VIEW_BUTTON_BOTTOM_RIGHT_BUTTON}`
       );
 
       await act(async () => {
@@ -124,21 +107,12 @@ describe('Test SelectSubUnit container', () => {
       });
 
       switch (type) {
-        case 'AddNewGateway':
-          expect(mockedNavigate).toBeCalledWith('ScanChipQR', {
-            addType: 'AddNewGateway',
-            station: undefined,
-            isNewFlow: false,
-            unit_name: undefined,
-          });
-          break;
         case 'AddHassiDevice':
           expect(mockedNavigate).toBeCalledWith('SmartAccountConnecting', {
             unit_id: undefined,
             brand: undefined,
             listSelectDevice: undefined,
             listSensorIds: undefined,
-            nameSubUnit: '',
             sensor_data: undefined,
             smart_account_id: undefined,
             smart_account_id_from_backend: undefined,
@@ -146,23 +120,6 @@ describe('Test SelectSubUnit container', () => {
             username: undefined,
           });
           break;
-        case 'AddVconnexDevice':
-          expect(mockedNavigate).toBeCalledWith('Browser', {
-            // eslint-disable-next-line max-len
-            link: 'https://partner-api.vconnex.vn/oauth/authorize?client_id=&redirect_uri=&response_type=code&scope=SYNCH&scope=CONTROL&scope=QUERY&state=undefined@undefined@undefined',
-          });
-          break;
-        case 'AddDeviceNewFlow':
-          expect(mockedNavigate).toBeCalledWith('ConnectingProcess', {
-            devicePrefixName: undefined,
-            gateway: undefined,
-            scan_sensor_data: undefined,
-            station: undefined,
-            unit: [],
-            wifi_pass: undefined,
-            wifi_ssid: undefined,
-          });
-          break;
         default:
           break;
       }