@eohjsc/react-native-smart-city 0.7.24 → 0.7.26

package/src/screens/SubUnit/AddSubUnit.js

@@ -13,11 +13,14 @@ import _TextInput from '../../commons/Form/TextInput';
 import Text from '../../commons/Text';
 import { API, Colors } from '../../configs';
 import { AccessibilityLabel } from '../../configs/Constants';
-import { useSCContextSelector } from '../../context';
 import useKeyboardShow from '../../hooks/Common/useKeyboardShow';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { replace } from '../../navigations/utils';
-import { axiosPost, createFormData } from '../../utils/Apis/axios';
+import {
+  axiosPost,
+  createFormData,
+  fetchWithCache,
+} from '../../utils/Apis/axios';
 import { useBackendPermission } from '../../utils/Permission/backend';
 import Routes from '../../utils/Route';
 import { ToastBottomHelper } from '../../utils/Utils';
@@ -29,7 +32,6 @@ const AddSubUnit = ({ route }) => {
   const { dismissKeyboard } = useKeyboardShow();
   const { navigate, goBack, dispatch } = useNavigation();
   const permissions = useBackendPermission();
-  const myUnits = useSCContextSelector((state) => state.myUnits);
 
   const {
     unit,
@@ -42,11 +44,15 @@ const AddSubUnit = ({ route }) => {
   const [wallpaper, setWallpaper] = useState('');
   const [imageUrl, setImageUrl] = useState('');
   const [showImagePicker, setShowImagePicker] = useState(false);
+  const [unitDetail, setUnitDetail] = useState({});
   let awaitCreate = useRef(false);
 
-  const unitChoose = useMemo(() => {
-    return myUnits?.find((item) => item?.id === unit?.id);
-  }, [myUnits, unit?.id]);
+  const fetchUnitDetail = useCallback(async () => {
+    await fetchWithCache(API.UNIT.UNIT_DETAIL(unit?.id), {}, (response) => {
+      const { success, data } = response;
+      success && setUnitDetail(data);
+    });
+  }, [unit?.id]);
 
   const cleanData = () => {
     setRoomName('');
@@ -133,7 +139,7 @@ const AddSubUnit = ({ route }) => {
         } else {
           awaitCreate.current = false;
           if (
-            unitChoose?.stations?.length >= permissions?.max_stations_per_unit
+            unitDetail?.stations?.length >= permissions?.max_stations_per_unit
           ) {
             ToastBottomHelper.error(
               t('reach_max_stations_per_unit', {
@@ -159,7 +165,7 @@ const AddSubUnit = ({ route }) => {
     goBack,
     navigate,
     route.params,
-    unitChoose?.stations?.length,
+    unitDetail?.stations?.length,
     permissions?.max_stations_per_unit,
   ]);
 
@@ -174,6 +180,10 @@ const AddSubUnit = ({ route }) => {
     }
   }, [imageUrl]);
 
+  useEffect(() => {
+    fetchUnitDetail();
+  }, [fetchUnitDetail]);
+
   const onChangeRoomName = useCallback(
     (value) => {
       setRoomName(value);

package/src/screens/SubUnit/__test__/AddSubUnit.test.js

@@ -295,6 +295,11 @@ describe('Test AddSubUnit', () => {
       isInsideUnit: false,
     };
     const spyToastError = jest.spyOn(ToastBottomHelper, 'error');
+    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, {
+      id: 1,
+      name: 'unit 1',
+      stations: [{ id: 1, name: 'station' }],
+    });
     mock.onPost(API.SUB_UNIT.CREATE_SUB_UNIT(1)).reply(400, {});
     await act(async () => {
       tree = await create(
@@ -308,9 +313,6 @@ describe('Test AddSubUnit', () => {
               },
             },
           },
-          myUnits: [
-            { id: 1, name: 'unit 1', stations: [{ id: 1, name: 'station' }] },
-          ],
         })
       );
     });

package/src/screens/Unit/GoToDetailUnit.js

@@ -0,0 +1,30 @@
+import { useNavigation } from '@react-navigation/native';
+import React, { useCallback } from 'react';
+
+import Routes from '../../utils/Route';
+import SelectUnit from '../../commons/SelectUnit';
+import { useTranslations } from '../../hooks/Common/useTranslations';
+
+const GoToDetailUnit = () => {
+  const t = useTranslations();
+  const navigation = useNavigation();
+
+  const goToDetail = useCallback(
+    (item) => {
+      navigation.navigate(Routes.UnitDetail, {
+        unitId: item.id,
+      });
+    },
+    [navigation]
+  );
+
+  return (
+    <SelectUnit
+      title={t('text_select_a_unit')}
+      subTitle={t('text_select_go_to_unit_detail')}
+      onPressNext={goToDetail}
+    />
+  );
+};
+
+export default GoToDetailUnit;

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

@@ -0,0 +1,103 @@
+import { useNavigation } from '@react-navigation/native';
+import React from 'react';
+import renderer, { act } from 'react-test-renderer';
+import MockAdapter from 'axios-mock-adapter';
+
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+import GoToDetailUnit from '../GoToDetailUnit';
+import { Search } from '../../../commons/DevMode';
+import { AccessibilityLabel } from '../../../configs/Constants';
+import Routes from '../../../utils/Route';
+import api from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
+
+const wrapComponent = () => (
+  <SCProvider initState={mockSCStore({})}>
+    <GoToDetailUnit />
+  </SCProvider>
+);
+
+const mock = new MockAdapter(api.axiosInstance);
+
+describe('Test GoToDetailUnit', () => {
+  let tree;
+  const data = [
+    {
+      id: 1,
+      name: 'Name 1',
+    },
+    {
+      id: 2,
+      name: 'Name 2',
+    },
+  ];
+
+  const mockedNavigate = useNavigation().navigate;
+  beforeEach(() => {
+    mockedNavigate.mockReset();
+    mock.resetHistory();
+  });
+
+  it('test render and navigate', async () => {
+    mock.onGet(API.SHARE.UNITS()).reply(200, data);
+    await act(async () => {
+      tree = await renderer.create(wrapComponent());
+    });
+
+    const instance = tree.root;
+    const unitItems = instance.findAllByProps({
+      accessibilityLabel: AccessibilityLabel.ITEM_UNIT,
+    });
+    expect(unitItems).toHaveLength(2);
+    const selectUnit = instance.findByProps({
+      accessibilityLabel: `${AccessibilityLabel.SELECT_UNIT_SELECT}-1`,
+    });
+    await act(async () => {
+      await selectUnit.props.onPress();
+    });
+    const rightClick = instance.findByProps({
+      accessibilityLabelPrefix: AccessibilityLabel.PREFIX.SELECT_UNIT,
+    });
+    await act(async () => {
+      await rightClick.props.onRightClick();
+    });
+
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitDetail, {
+      unitId: 1,
+    });
+  });
+
+  it('test filter unit by name', async () => {
+    mock.onGet(API.SHARE.UNITS()).reply(200, data);
+    await act(async () => {
+      tree = await renderer.create(wrapComponent());
+    });
+
+    const instance = tree.root;
+    const search = instance.findByType(Search);
+    await act(() => {
+      search.props.onSearch('Name 2');
+    });
+    const unitItems = instance.findAllByProps({
+      accessibilityLabel: AccessibilityLabel.ITEM_UNIT,
+    });
+    expect(unitItems).toHaveLength(1);
+    const selectUnit = instance.findByProps({
+      accessibilityLabel: `${AccessibilityLabel.SELECT_UNIT_SELECT}-2`,
+    });
+    await act(async () => {
+      await selectUnit.props.onPress();
+    });
+    const rightClick = instance.findByProps({
+      accessibilityLabelPrefix: AccessibilityLabel.PREFIX.SELECT_UNIT,
+    });
+    await act(async () => {
+      await rightClick.props.onRightClick();
+    });
+
+    expect(global.mockedNavigate).toHaveBeenCalledWith(Routes.UnitDetail, {
+      unitId: 2,
+    });
+  });
+});

package/src/utils/FactoryGateway.js

@@ -423,6 +423,90 @@ export const gatewayDataFactory = {
       chip: 7689,
       icon_kit: null,
     },
+    {
+      // Third Party
+      id: 9,
+      configs: [
+        {
+          id: 37,
+          status_texts: [],
+          is_on: false,
+          get_value_unit: '',
+          period_configs: [],
+          auto_triggers: [],
+          spotsensorconnect: null,
+          last_maxmin: null,
+          user_receive_email: [],
+          phone_send_sms: [],
+          status_configuration: {},
+          is_auto_release: false,
+          related_actions: [],
+          active: true,
+          name: 'LED',
+          is_read: true,
+          is_write: true,
+          range_min: null,
+          range_max: null,
+          unit: '',
+          scale: 1,
+          is_main: true,
+          is_chart: true,
+          is_report: true,
+          is_chart_column: false,
+          is_hide: false,
+          display_type: '',
+          is_alarm: false,
+          email_flags: false,
+          time_is_over: null,
+          maintain_time: 5,
+          number_send_email: null,
+          period_send_email: 15,
+          allow_min_value: 0,
+          allow_max_value: 0,
+          message: 'Thông báo.',
+          last_time_send_email: null,
+          ai_trans_offset_value: '0.000',
+          ai_trans_average_sample: 0,
+          last_values: [],
+          icon: '',
+          scale_write: 1,
+          lock: false,
+          flag: false,
+          index: 0,
+          decimal_behind: null,
+          active_filter: '',
+          high_level: 0,
+          low_level: 0,
+          value_converter: '',
+          ack: false,
+          sensor_type: '',
+          value_type: 'number',
+          enable_log_max_min: true,
+          log_value_mode: 1,
+          freq_log_data: 600,
+          number_days_storage: 180,
+          storage_start_date: '2025-01-07',
+          release_time: 0,
+          sensor: 9,
+          end_device: 4,
+          last_value: null,
+          last_value_log: null,
+        },
+      ],
+      active: true,
+      name: 'LED',
+      mix: true,
+      index: 0,
+      icon: '',
+      is_managed_by_backend: true,
+      device_id: '',
+      last_updated: null,
+      connection_time: 60,
+      sent_email: false,
+      realtime_monitoring: false,
+      chip: 3,
+      icon_kit: null,
+    },
   ],
   id: 7689,
   sn: '57ae596e-ef65-4162-9b6f-4f67f2c86632',
@@ -523,4 +607,25 @@ export const gatewayDataFactory = {
     ],
     chip: 7682,
   },
+  third_party_gateway: {
+    id: 4,
+    sensors: [
+      {
+        id: 5,
+        configs: [
+          {
+            id: 5,
+            key: 'led',
+            value_type: 'number',
+            device: 5,
+            config: 37,
+          },
+        ],
+        device_uid: '0x00158d00022fd388',
+        gateway: 4,
+        sensor: 9,
+      },
+    ],
+    chip: 7689,
+  },
 };

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

@@ -42,6 +42,9 @@ export default {
   contact_infomation: 'Contact Infomation',
   company_infomation: 'Company Infomation',
   terms_and_condition: 'Terms & Conditions',
+  add_to_dashboard: 'Add to Dashboard',
+  remove_from_dashboard: 'Remove from Dashboard',
+  dashboard_devices: 'Dashboard Devices',
   text_sub_units: 'Sub-units',
   text_my_units: 'My Units',
   text_shared_units: 'Shared Units',
@@ -379,6 +382,7 @@ export default {
   select_a_sub_unit_want_add_device:
     'Select a sub-unit that you want to add this device in',
   text_select_a_unit_have_device: 'Select a unit that has this device',
+  text_select_go_to_unit_detail: 'Select a unit to view details',
   text_select_permissions: 'Select permissions',
   text_select_permissions_desc: 'Select permissions will be grant',
   text_read_config: 'Read configs',

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

@@ -117,6 +117,9 @@ export default {
   text_good_night: 'Chào buổi tối, {0}',
   text_anonymous: '',
   multi_unit: 'Nhiều đơn vị',
+  add_to_dashboard: 'Thêm vào Dashboard',
+  remove_from_dashboard: 'Loại khỏi Dashboard',
+  dashboard_devices: 'Thiết bị thường dùng',
   text_my_units: 'Địa điểm của tôi',
   text_shared_units: 'Địa điểm được chia sẻ       ',
   text_copyright:
@@ -432,6 +435,7 @@ export default {
   text_select_a_gateway: 'Chọn một gateway',
   text_select_a_unit_desc: 'Chọn 1 địa điểm bạn muốn thêm thành viên',
   text_select_a_unit_have_device: 'Chọn một địa điểm có thiết bị này',
+  text_select_go_to_unit_detail: 'Chọn địa điểm để xem chi tiết',
   select_a_sub_unit_want_add_device:
     'Chọn một đơn vị con mà bạn muốn thêm thiết bị này vào',
   text_select_permissions: 'Chọn hành động',

package/src/utils/Route/index.js

@@ -49,6 +49,7 @@ const Routes = {
   Dashboard: 'Dashboard',
   Shared: 'Shared',
   UnitDetail: 'UnitDetail',
+  GoToDetailUnit: 'GoToDetailUnit',
   DrawerMain: 'DrawerMain',
   ConnectDevices: 'ConnectDevices',
   SharedStack: 'SharedStack',

package/src/utils/Storage.js

@@ -4,16 +4,30 @@ export const STORAGE_KEY = {
   FIREBASE_APP_CONFIG: 'app_config',
   FIREBASE_EXCHANGE_RATES: 'exchange_rates',
   FIREBASE_REVIEW_COMMENT_VIDEO: 'review_comment_video',
-  IS_FIRST_TIME_LOAD_MY_UNITS: 'IS_FIRST_TIME_LOAD_MY_UNITS',
-  IS_FIRST_TIME_LOAD_MY_SHARE_UNIT: 'IS_FIRST_TIME_LOAD_MY_SHARE_UNIT',
 };
 
 export const storeData = async (key, value) => {
-  return await AsyncStorage.setItem(`${key}`, value);
+  return await AsyncStorage.setItem(key, value);
 };
 
 export const getData = async (key) => {
-  return await AsyncStorage.getItem(`${key}`);
+  return await AsyncStorage.getItem(key);
+};
+
+export const storeObject = async (key, value) => {
+  return await AsyncStorage.setItem(key, JSON.stringify(value));
+};
+
+export const getObject = async (key, defaultValue) => {
+  const value = await AsyncStorage.getItem(key);
+  if (value === null) {
+    return defaultValue;
+  }
+  try {
+    return JSON.parse(value);
+  } catch (e) {
+    return defaultValue;
+  }
 };
 
 export const removeMultiple = async (keys) => {

package/src/utils/Utils.js

@@ -231,7 +231,8 @@ export const PIN_MAPPING = {
   },
 };
 
-export const keyExtractor = (item, index) => (item?.id || index).toString();
+export const keyExtractor = (item, index) =>
+  item?.id ? `id-${item.id}` : `index-${index}`;
 
 export default {
   validateEmail,

package/src/utils/Functions/preloadImages.js

@@ -1,38 +0,0 @@
-import FastImage from 'react-native-fast-image';
-import { API } from '../../configs';
-import { axiosGet } from '../Apis/axios';
-import { getData, STORAGE_KEY, storeData } from '../Storage';
-
-export const preloadImagesFromUnits = async (units, storeKey) => {
-  const isFirstTime = await getData(storeKey);
-  if (units?.length && !isFirstTime) {
-    await storeData(storeKey, 'true');
-    const results = await Promise.all(
-      units.map(async (item) => {
-        const unitId =
-          storeKey === STORAGE_KEY.IS_FIRST_TIME_LOAD_MY_UNITS
-            ? item?.id
-            : item?.unit?.id;
-        if (unitId) {
-          const { success, data } = await axiosGet(
-            API.UNIT.UNIT_DETAIL(unitId),
-            {},
-            true
-          );
-          return success && data;
-        }
-      })
-    );
-
-    const icons = results
-      .map((item) => item?.stations?.map((i) => i?.background) || [])
-      .flat()
-      .filter(Boolean);
-    FastImage.preload(
-      icons.map((uri) => ({
-        uri,
-        priority: FastImage.priority.high,
-      }))
-    );
-  }
-};