@eohjsc/react-native-smart-city 0.7.40 → 0.7.42

package/src/commons/SubUnit/Favorites/index.js

@@ -4,6 +4,10 @@ import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { useDevicesStatus } from '../../../hooks/Common';
 import { useWatchConfigs } from '../../../hooks/IoT';
+import useChipJsonConfiguration, {
+  useConnectChipMqtt,
+} from '../../../hooks/useMqtt';
+import useWatchSharedChips from '../../../hooks/IoT/useWatchSharedChips';
 
 import { Section } from '../../Section';
 import ItemDevice from '../../Device/ItemDevice';
@@ -11,7 +15,6 @@ import ItemOneTap from '../OneTap/ItemOneTap';
 import ItemAddNew from '../../Device/ItemAddNew';
 import styles from './styles';
 import Routes from '../../../utils/Route';
-import { DEVICE_TYPE } from '../../../configs/Constants';
 
 const SubUnitFavorites = ({
   isOwner,
@@ -25,22 +28,44 @@ const SubUnitFavorites = ({
 
   useDevicesStatus(unit, favoriteDevices);
 
+  const favoriteChipIdsSet = useMemo(() => {
+    return new Set(favoriteDevices?.map((device) => device.chip_id));
+  }, [favoriteDevices]);
+
+  const { chips, isFetching } = useChipJsonConfiguration({
+    dashboardId: unit?.id,
+  });
+
+  const listChipsMqtt = useMemo(() => {
+    return chips.filter((chip) => favoriteChipIdsSet.has(chip.id));
+  }, [chips, favoriteChipIdsSet]);
+
+  const { mqttConfigs } = useConnectChipMqtt(listChipsMqtt);
+
   const configsNeedWatching = useMemo(() => {
     const configIds = [];
+
     favoriteDevices.forEach((device) => {
-      if (
-        device?.quick_action?.config_id &&
-        ![DEVICE_TYPE.GOOGLE_HOME, DEVICE_TYPE.LG_THINQ].includes(
-          device?.device_type
-        )
-      ) {
+      if (device?.quick_action?.config_id && device?.is_managed_by_backend) {
         configIds.push(device.quick_action.config_id);
       }
     });
-    return configIds;
-  }, [favoriteDevices]);
 
-  useWatchConfigs(configsNeedWatching);
+    return configIds.filter((id) => !mqttConfigs[id]);
+  }, [favoriteDevices, mqttConfigs]);
+
+  useWatchConfigs(isFetching ? [] : configsNeedWatching);
+
+  const listSharedChipIds = useMemo(() => {
+    const chipMqttIdsSet = new Set(listChipsMqtt.map((chip) => chip.id));
+    return [...favoriteChipIdsSet].filter((id) => !chipMqttIdsSet.has(id));
+  }, [listChipsMqtt, favoriteChipIdsSet]);
+
+  useWatchSharedChips({
+    dashboardId: unit?.id,
+    filterChipIds: listSharedChipIds,
+    ready: !!listSharedChipIds.length,
+  });
 
   const handleOnAddNew = () => {
     navigate(Routes.SelectAddToFavorites, {

package/src/commons/SubUnit/ShortDetail.js

@@ -32,14 +32,17 @@ const ShortDetailSubUnit = ({ unit, station, isOwner }) => {
 
   useDevicesStatus(unit, station?.devices);
 
+  const stationChipIdsSet = useMemo(() => {
+    return new Set(station?.devices?.map((device) => device.chip_id));
+  }, [station?.devices]);
+
   const { chips, isFetching } = useChipJsonConfiguration({
     dashboardId: unit?.id,
   });
 
   const listChipsMqtt = useMemo(() => {
-    const stationChipIds = station?.devices?.map((device) => device.chip_id);
-    return chips?.filter((chip) => stationChipIds?.includes(chip.id));
-  }, [chips, station?.devices]);
+    return chips.filter((chip) => stationChipIdsSet.has(chip.id));
+  }, [chips, stationChipIdsSet]);
 
   const { mqttConfigs } = useConnectChipMqtt(listChipsMqtt);
 
@@ -64,7 +67,17 @@ const ShortDetailSubUnit = ({ unit, station, isOwner }) => {
   }, [station, mqttConfigs]);
 
   useWatchConfigs(isFetching ? [] : configsNeedWatching);
-  useWatchSharedChips({ dashboardId: unit?.id });
+
+  const listSharedChipIds = useMemo(() => {
+    const chipMqttIdsSet = new Set(listChipsMqtt.map((chip) => chip.id));
+    return [...stationChipIdsSet].filter((id) => !chipMqttIdsSet.has(id));
+  }, [listChipsMqtt, stationChipIdsSet]);
+
+  useWatchSharedChips({
+    dashboardId: unit?.id,
+    filterChipIds: listSharedChipIds,
+    ready: !!listSharedChipIds.length,
+  });
 
   const goToPlayBack = useCallback(() => {
     navigate(Routes.PlaybackCamera, {

package/src/commons/SubUnit/__test__/Favorites.test.js

@@ -1,12 +1,21 @@
 import React from 'react';
+import MockAdapter from 'axios-mock-adapter';
 import { act, create } from 'react-test-renderer';
+import { API } from '../../../configs';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { watchMultiDataChips, watchMultiConfigs } from '../../../iot/Monitor';
+import api from '../../../utils/Apis/axios';
+import { gatewayDataFactory } from '../../../utils/FactoryGateway';
 import ItemAddNew from '../../Device/ItemAddNew';
 import ItemDevice from '../../Device/ItemDevice';
 import SubUnitFavorites from '../Favorites';
 import ItemOneTap from '../OneTap/ItemOneTap';
 
+const mockAxios = new MockAdapter(api.axiosInstance);
+
+jest.mock('../../../iot/Monitor');
+
 const wrapComponent = (props) => (
   <SCProvider initState={mockSCStore({})}>
     <SubUnitFavorites {...props} />
@@ -18,6 +27,7 @@ describe('test ShortDetail Subunit', () => {
   let props;
 
   beforeEach(() => {
+    jest.useFakeTimers();
     props = {
       unit: {
         address: null,
@@ -78,6 +88,8 @@ describe('test ShortDetail Subunit', () => {
       ],
       isGGHomeConnected: true,
     };
+    watchMultiConfigs.mockClear();
+    watchMultiDataChips.mockClear();
   });
 
   it('render SubUnitFavorites', async () => {
@@ -96,4 +108,82 @@ describe('test ShortDetail Subunit', () => {
       await itemAddNew[0].props.onAddNew();
     });
   });
+
+  it('render using mqtt call watch config and data chips', async () => {
+    mockAxios
+      .onGet(API.CHIP.JSON_CONFIGURATION)
+      .reply(200, [gatewayDataFactory]);
+    mockAxios
+      .onGet(API.CHIP.SHARED_CONFIGURATION)
+      .reply(200, [gatewayDataFactory, { ...gatewayDataFactory, id: 7690 }]);
+    props.favoriteDevices = [
+      {
+        action: {
+          color: '#00979D',
+          icon: 'caretup',
+          id: 1,
+          key: '',
+        },
+        action2: null,
+        chip_id: 7690,
+        description: null,
+        icon: '',
+        id: 1,
+        name: 'People Counting',
+        quick_action: { config_id: 128283 },
+        remote_control_options: {},
+        station: {},
+        status: null,
+        status2: null,
+        is_managed_by_backend: true,
+      },
+    ];
+
+    await act(async () => {
+      tree = await create(wrapComponent(props));
+    });
+    await act(async () => {
+      jest.runOnlyPendingTimers();
+    });
+    expect(watchMultiConfigs).toHaveBeenCalledWith([128283]);
+    expect(watchMultiDataChips).toHaveBeenCalledWith([7690]);
+  });
+
+  it('render using mqtt not call watch config and data chips', async () => {
+    mockAxios
+      .onGet(API.CHIP.JSON_CONFIGURATION)
+      .reply(200, [gatewayDataFactory]);
+    mockAxios.onGet(API.CHIP.SHARED_CONFIGURATION).reply(200, []);
+    props.favoriteDevices = [
+      {
+        action: {
+          color: '#00979D',
+          icon: 'caretup',
+          id: 1,
+          key: '',
+        },
+        action2: null,
+        chip_id: 7689,
+        description: null,
+        icon: '',
+        id: 1,
+        name: 'People Counting',
+        quick_action: { config_id: 128282 },
+        remote_control_options: {},
+        station: {},
+        status: null,
+        status2: null,
+        is_managed_by_backend: true,
+      },
+    ];
+
+    await act(async () => {
+      tree = await create(wrapComponent(props));
+    });
+    await act(async () => {
+      jest.runOnlyPendingTimers();
+    });
+    expect(watchMultiConfigs).not.toHaveBeenCalled();
+    expect(watchMultiDataChips).not.toHaveBeenCalled();
+  });
 });

package/src/commons/SubUnit/__test__/ShortDetail.test.js

@@ -7,7 +7,7 @@ import { API } from '../../../configs';
 import { AccessibilityLabel } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { watchMultiConfigs } from '../../../iot/Monitor';
+import { watchMultiDataChips, watchMultiConfigs } from '../../../iot/Monitor';
 import { keyPermission } from '../../../utils/Permission/common';
 import api from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
@@ -78,6 +78,7 @@ describe('test ShortDetail Subunit', () => {
       isGGHomeConnected: true,
     };
     watchMultiConfigs.mockClear();
+    watchMultiDataChips.mockClear();
   });
 
   it('render ShortDetail', async () => {
@@ -191,10 +192,51 @@ describe('test ShortDetail Subunit', () => {
     expect(watchMultiConfigs).toHaveBeenCalledWith([1]);
   });
 
-  it('render using mqtt not call watch config', async () => {
+  it('render using mqtt call watch config and data chips', async () => {
     mockAxios
       .onGet(API.CHIP.JSON_CONFIGURATION)
       .reply(200, [gatewayDataFactory]);
+    mockAxios
+      .onGet(API.CHIP.SHARED_CONFIGURATION)
+      .reply(200, [gatewayDataFactory, { ...gatewayDataFactory, id: 7690 }]);
+    props.station.devices = [
+      {
+        action: {
+          color: '#00979D',
+          icon: 'caretup',
+          id: 1,
+          key: '',
+        },
+        action2: null,
+        chip_id: 7690,
+        description: null,
+        icon: '',
+        id: 1,
+        name: 'People Counting',
+        quick_action: { config_id: 128283 },
+        remote_control_options: {},
+        station: {},
+        status: null,
+        status2: null,
+        is_managed_by_backend: true,
+      },
+    ];
+
+    await act(async () => {
+      tree = await create(wrapComponent(props));
+    });
+    await act(async () => {
+      jest.runOnlyPendingTimers();
+    });
+    expect(watchMultiConfigs).toHaveBeenCalledWith([128283]);
+    expect(watchMultiDataChips).toHaveBeenCalledWith([7690]);
+  });
+
+  it('render using mqtt not call watch config and data chips', async () => {
+    mockAxios
+      .onGet(API.CHIP.JSON_CONFIGURATION)
+      .reply(200, [gatewayDataFactory]);
+    mockAxios.onGet(API.CHIP.SHARED_CONFIGURATION).reply(200, []);
     props.station.devices = [
       {
         action: {
@@ -225,6 +267,7 @@ describe('test ShortDetail Subunit', () => {
       jest.runOnlyPendingTimers();
     });
     expect(watchMultiConfigs).not.toHaveBeenCalled();
+    expect(watchMultiDataChips).not.toHaveBeenCalled();
   });
 
   ['ConfigAndEvaluation', 'ConfigValue', 'EvaluationOverConfig'].forEach(

package/src/commons/UnitSummary/ConfigHistoryChart/index.js

@@ -6,13 +6,17 @@ import { axiosGet } from '../../../utils/Apis/axios';
 import { getPusher } from '../../../utils/Pusher';
 
 const fetchDataS3 = async (url) => {
-  const { data } = await axiosGet(url, {
-    // todo Bang try not to use axiosGet
-    transformRequest: (rq, headers) => {
-      delete headers.Authorization;
-      return rq;
+  const { data } = await axiosGet(
+    url,
+    {
+      // todo Bang try not to use axiosGet
+      transformRequest: (rq, headers) => {
+        delete headers.Authorization;
+        return rq;
+      },
     },
-  });
+    true
+  );
   return data;
 };
 
@@ -51,9 +55,13 @@ export const useFetchConfigHistory = (
       params.append('date_from', date_from.format('YYYY-MM-DDTHH:mm:ss'));
       params.append('date_to', date_to.format('YYYY-MM-DDTHH:mm:ss'));
 
-      const { success, data } = await axiosGet(endpoint, {
-        params,
-      });
+      const { success, data } = await axiosGet(
+        endpoint,
+        {
+          params,
+        },
+        true
+      );
       await updateConfigChart(success, data, configs, setChartData);
       setProcessing(false);
     },

package/src/hooks/IoT/__test__/useValueEvaluation.test.js

@@ -1,11 +1,11 @@
-import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { act, renderHook } from '@testing-library/react-hooks';
 import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
+import { API } from '../../../configs';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import { useValueEvaluations } from '../index';
 import api from '../../../utils/Apis/axios';
-import { API } from '../../../configs';
+import { useValueEvaluations } from '../index';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -35,13 +35,11 @@ describe('Test useValueEvaluation', () => {
   it('test unitId not null request success', async () => {
     mock.onGet(API.VALUE_EVALUATIONS()).replyOnce(200, {
       results: [],
-      next: 'link',
     });
-    mock.onGet(API.VALUE_EVALUATIONS()).replyOnce(200, {
-      results: [],
-    });
-    renderHook(() => useValueEvaluations(1), {
-      wrapper,
+    await act(async () => {
+      renderHook(() => useValueEvaluations(1), {
+        wrapper,
+      });
     });
     expect(mock.history.get.length).toBe(1);
   });
@@ -50,8 +48,10 @@ describe('Test useValueEvaluation', () => {
     mock.onGet(API.VALUE_EVALUATIONS()).replyOnce(400, {
       results: [],
     });
-    renderHook(() => useValueEvaluations(1), {
-      wrapper,
+    await act(async () => {
+      renderHook(() => useValueEvaluations(1), {
+        wrapper,
+      });
     });
     expect(mock.history.get.length).toBe(1);
   });

package/src/hooks/IoT/useValueEvaluation.js

@@ -16,9 +16,13 @@ const useValueEvaluations = (unitId) => {
         return;
       }
       const params = { configs__end_device__station__unit: unitId, page: page };
-      const { success, data } = await axiosGet(API.VALUE_EVALUATIONS(), {
-        params,
-      });
+      const { success, data } = await axiosGet(
+        API.VALUE_EVALUATIONS(),
+        {
+          params,
+        },
+        true
+      );
       if (success) {
         setAction(Action.UPDATE_VALUE_EVALUATIONS, {
           unitId,

package/src/hooks/IoT/useWatchSharedChips.js

@@ -60,11 +60,15 @@ const useWatchSharedChips = ({ dashboardId, filterChipIds, ready = true }) => {
       return;
     }
     const getGateways = async () => {
-      const { success, data } = await axiosGet(API.CHIP.SHARED_CONFIGURATION, {
-        params: {
-          unit: dashboardId,
+      const { success, data } = await axiosGet(
+        API.CHIP.SHARED_CONFIGURATION,
+        {
+          params: {
+            unit: dashboardId,
+          },
         },
-      });
+        true
+      );
       if (success) {
         setChipIds(data.map((chip) => chip.id));
         handleUpdateConfigsById(data);

package/src/hooks/useMqtt.js

@@ -34,11 +34,15 @@ const useChipJsonConfiguration = ({ dashboardId, ready = true }) => {
   // get chip data
   useEffect(() => {
     const getGateways = async () => {
-      const { success, data } = await axiosGet(API.CHIP.JSON_CONFIGURATION, {
-        params: {
-          unit: dashboardId,
+      const { success, data } = await axiosGet(
+        API.CHIP.JSON_CONFIGURATION,
+        {
+          params: {
+            unit: dashboardId,
+          },
         },
-      });
+        true
+      );
       if (success) {
         setChips(data);
         handleUpdateConfigsById(data);

package/src/iot/UpdateStates.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 
-import { getConfigGlobalState, setConfigGlobalState } from './states';
+import { setConfigGlobalState } from './states';
 
 const isNewer = (valueTime, valueMicro, currentTime, currentMicro) => {
   if (valueTime?.isAfter(currentTime)) {
@@ -40,21 +40,42 @@ export const updateGlobalValues = (data) => {
   });
 };
 
+let pending = {};
+let scheduled = false;
+
 export const updateGlobalValue = (configId, value) => {
-  const configValues = getConfigGlobalState('configValues');
-  const currentValue = configValues[configId];
-  if (
-    !isNewer(
-      value.last_updated,
-      value.last_updated_micro,
-      currentValue?.last_updated || moment(0),
-      currentValue?.last_updated_micro || 0
-    )
-  ) {
-    return;
+  pending[configId] = value;
+
+  if (!scheduled) {
+    scheduled = true;
+
+    requestAnimationFrame(() => {
+      setConfigGlobalState('configValues', (prev) => {
+        let changed = false;
+        const next = { ...prev };
+
+        Object.keys(pending).forEach((id) => {
+          const val = pending[id];
+          const cur = prev[id];
+
+          if (
+            isNewer(
+              val.last_updated,
+              val.last_updated_micro,
+              cur?.last_updated || moment(0),
+              cur?.last_updated_micro || 0
+            )
+          ) {
+            next[id] = val;
+            changed = true;
+          }
+        });
+
+        pending = {};
+        scheduled = false;
+
+        return changed ? next : prev;
+      });
+    });
   }
-  setConfigGlobalState('configValues', {
-    ...configValues,
-    [configId]: value,
-  });
 };

package/src/iot/mqtt.js

@@ -193,6 +193,19 @@ const convert_ai = (bytes_str, config_data = null) => {
   );
 };
 
+const power_factor_4q_fp_pf = (value) => {
+  let pfVal;
+  if (value > 1) {
+    pfVal = 2 - value;
+  } else if (value < -1) {
+    pfVal = -2 - value;
+  } else {
+    pfVal = value;
+  }
+
+  return pfVal;
+};
+
 const mappingTransformer = {
   int_all: int_all,
   float_abcd: float_abcd,
@@ -224,6 +237,10 @@ const mappingTransformer = {
   int_64_cdab: int_64_cdab,
 };
 
+const mappingValueConverter = {
+  power_factor_4q_fp_pf: power_factor_4q_fp_pf,
+};
+
 const extract_config_value = (register, value_bytes) => {
   const transformer = mappingTransformer[register?.transformer];
   if (!transformer) {
@@ -303,6 +320,11 @@ const get_offset_sample_value = async (value, config) => {
   return value;
 };
 
+const getValueConverter = (value, config) => {
+  const converter = mappingValueConverter[config?.value_converter];
+  return converter ? converter(value) : value;
+};
+
 const check_filter = (value, config) => {
   if (!config?.active_filter) {
     return false;
@@ -333,6 +355,7 @@ const updateGlobalValueMqtt = async (config, value, time) => {
 
   value = get_scale_value(value, config);
   value = await get_offset_sample_value(value, config);
+  value = getValueConverter(value, config);
 
   if (check_filter(value, config)) {
     return;

package/src/navigations/AutomateStack.js

@@ -29,7 +29,11 @@ const AutomateStack = memo(() => {
 
   useEffect(() => {
     const fetchStarredScripts = async () => {
-      const { success, data } = await axiosGet(API.AUTOMATE.STARRED_SCRIPTS());
+      const { success, data } = await axiosGet(
+        API.AUTOMATE.STARRED_SCRIPTS(),
+        {},
+        true
+      );
       success && setAction(Action.SET_STARRED_SCRIPTS, data);
     };
     fetchStarredScripts();

package/src/screens/ActivityLog/hooks/index.js

@@ -101,9 +101,13 @@ export default ({ id, type, share, filterEnabled }) => {
     }
     params.append('page', page);
 
-    const { success, data } = await axiosGet(api.url(id), {
-      params: params,
-    });
+    const { success, data } = await axiosGet(
+      api.url(id),
+      {
+        params: params,
+      },
+      true
+    );
     if (success && data) {
       const { results = [] } = data;
       if (page === 1) {
@@ -123,7 +127,11 @@ export default ({ id, type, share, filterEnabled }) => {
     if (!api?.memberUrl || !filterEnabled?.user) {
       return;
     }
-    const { success, data } = await axiosGet(api.memberUrl(share?.id));
+    const { success, data } = await axiosGet(
+      api.memberUrl(share?.id),
+      {},
+      true
+    );
     if (success) {
       data.unshift({ id: 0, name: t('all') });
       setMembers(data);

package/src/screens/AddLocationMaps/index.js

@@ -66,7 +66,8 @@ const AddLocationMaps = memo(() => {
 
       const { success, data } = await axiosGet(
         API.EXTERNAL.GOOGLE_MAP.AUTO_COMPLETE,
-        config
+        config,
+        true
       );
       if (success) {
         setSearchData(data.predictions);
@@ -103,7 +104,8 @@ const AddLocationMaps = memo(() => {
 
     const { success, data } = await axiosGet(
       API.EXTERNAL.GOOGLE_MAP.GET_LAT_LNG_BY_PLACE_ID,
-      body
+      body,
+      true
     );
     if (success) {
       const { location } = data.result.geometry;
@@ -128,7 +130,8 @@ const AddLocationMaps = memo(() => {
               latlng: `${currentLatitude},${currentLongitude}`,
               key: SCConfig.GOOGLE_MAP_API_KEY,
             },
-          }
+          },
+          true
         );
         if (success && data.results.length > 0) {
           const result = data.results[0];

package/src/screens/AddNewGateway/RenameNewDevices.js

@@ -168,7 +168,8 @@ const RenameNewDevices = memo(({ route }) => {
         API.CHIP.RENAME_DEVICES(chipId),
         {
           params,
-        }
+        },
+        true
       );
       if (success) {
         setInfo(data);

package/src/screens/Automate/AddNewAction/ChooseConfig.js

@@ -27,7 +27,8 @@ const ChooseConfig = ({ route }) => {
 
     const { success, data: automateData } = await axiosGet(
       API.AUTOMATE.DISPLAY_CONFIGS(device.id),
-      { params }
+      { params },
+      true
     );
 
     if (success) {

package/src/screens/Automate/AddNewAction/ReceiverSelect.js

@@ -32,7 +32,11 @@ const ReceiverSelect = ({
   );
 
   const loadMembers = useCallback(async () => {
-    const { success, data } = await axiosGet(API.SHARE.UNITS_MEMBERS(unitId));
+    const { success, data } = await axiosGet(
+      API.SHARE.UNITS_MEMBERS(unitId),
+      {},
+      true
+    );
     if (success) {
       setMembers(
         data.map((item) => ({