@eohjsc/react-native-smart-city 0.3.9 → 0.3.12

package/index.js

@@ -17,6 +17,7 @@ import NotificationStack from './src/navigations/NotificationStack';
 import MyPinnedSharedUnit from './src/commons/Dashboard/MyPinnedSharedUnit';
 import MyUnit from './src/commons/Dashboard/MyUnit';
 import SharedUnit from './src/commons/Unit/SharedUnit';
+import { Action } from './src/context/actionType';
 
 export {
   AddSubUnitStack,
@@ -40,4 +41,5 @@ export {
   SharedUnit,
   MyUnit,
   SCWrapper,
+  Action,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.09",
+  "version": "0.3.12",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/Device/HistoryChart.js

@@ -234,7 +234,7 @@ const HistoryChart = memo(
         )}
         <DateTimePickerModal
           isVisible={eventPicker.showModalStart}
-          date={eventPicker.startTime.valueOf()}
+          date={eventPicker.startTime?._d}
           mode={formatType || 'datetime'}
           onConfirm={onConfirmStart}
           onCancel={onCancel}
@@ -244,7 +244,7 @@ const HistoryChart = memo(
         />
         <DateTimePickerModal
           isVisible={eventPicker.showModalEnd}
-          date={eventPicker.endTime.valueOf()}
+          date={eventPicker.endTime?._d}
           mode={formatType || 'datetime'}
           onConfirm={onConfirmEnd}
           onCancel={onCancel}

package/src/commons/MediaPlayerDetail/index.js

@@ -96,6 +96,9 @@ const MediaPlayerDetail = ({
   }, [amount]);
 
   const renderCamera = useMemo(() => {
+    if (!uri) {
+      return null;
+    }
     return (
       <VLCPlayer
         autoAspectRatio={true}

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { View } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { useSensorsStatus } from '../../../hooks/Common';
 
@@ -8,7 +9,7 @@ import ItemDevice from '../../Device/ItemDevice';
 import ItemOneTap from '../OneTap/ItemOneTap';
 import ItemAddNew from '../../Device/ItemAddNew';
 import styles from './styles';
-import { notImplemented } from '../../../utils/Utils';
+import Routes from '../../../utils/Route';
 
 const SubUnitFavorites = ({
   isOwner,
@@ -18,11 +19,14 @@ const SubUnitFavorites = ({
   wrapItemStyle,
 }) => {
   const t = useTranslations();
+  const { navigate } = useNavigation();
 
   const { getStatus, serverDown } = useSensorsStatus(unit, favoriteDevices);
 
   const handleOnAddNew = () => {
-    notImplemented(t);
+    navigate(Routes.SelectDevices, {
+      unitId: unit.id,
+    });
   };
 
   return (

package/src/commons/UnitSummary/ConfigHistoryChart/__test__/ConfigHistoryChart.test.js

@@ -4,8 +4,13 @@ import ConfigHistoryChart from '../';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
 import HistoryChart from '../../../../commons/Device/HistoryChart';
+import MockAdapter from 'axios-mock-adapter';
+import { API } from '../../../../configs';
+import api from '../../../../utils/Apis/axios';
 
-const wrapComponent = (configs = []) => (
+const mock = new MockAdapter(api.axiosInstance);
+
+const wrapComponent = (configs = [1]) => (
   <SCProvider initState={mockSCStore({})}>
     <ConfigHistoryChart configs={configs} />
   </SCProvider>
@@ -16,6 +21,28 @@ describe('Test HistoryChart', () => {
 
   beforeAll(() => {
     jest.useFakeTimers();
+    mock.onGet(API.CONFIG.DISPLAY_HISTORY()).reply(200, [
+      {
+        config: 1,
+        data: [
+          {
+            url: 'https://valuelog-history/test',
+          },
+          {
+            x: '2022-06-16T00:00:00Z',
+            y: 5.0,
+          },
+        ],
+      },
+    ]);
+    mock.onGet('https://valuelog-history/test').reply(200, [
+      {
+        config_id: 1,
+        start_time: '2022-07-04T02:00:06.151765Z',
+        value_log: 0.0,
+        converted_value_log: 0.0,
+      },
+    ]);
   });
 
   it('Test render', async () => {

package/src/commons/UnitSummary/ConfigHistoryChart.js

@@ -11,45 +11,78 @@ export const dateTimeType = {
   dateTime: 'datetime',
 };
 
-export const updateConfigChart = (
-  success,
-  data,
-  configuration,
-  setChartData
-) => {
-  if (success) {
-    for (let i = 0; i < data.length; i++) {
-      for (let j = 0; j < data[i].data.length; j++) {
-        data[i].data[j].x = moment(data[i].data[j].x).toDate();
-      }
-    }
-    setChartData(
-      configuration.map((config) => {
-        config.data = data.find((k) => k.config === config.id).data;
-        return config;
-      })
-    );
-  }
-};
-
 const ConfigHistoryChart = memo(({ configs }) => {
   const [chartData, setChartData] = useState(configs);
   const [startDate, setStartDate] = useState(moment().subtract(1, 'days'));
   const [endDate, setEndDate] = useState(moment());
 
   useEffect(() => {
+    const fetchDataS3 = (url) => {
+      return (
+        axiosGet(url, {
+          transformRequest: (rq, headers) => {
+            delete headers.Authorization;
+            return rq;
+          },
+        })
+          // eslint-disable-next-line promise/prefer-await-to-then
+          .then((response) => {
+            return response.data;
+          })
+          // eslint-disable-next-line promise/prefer-await-to-callbacks
+          .catch((error) => {})
+      );
+    };
+
     const fetchData = async () => {
       let params = new URLSearchParams();
       let configuration = configs.filter((item) => item.id);
       configuration.map((item) => {
         params.append('config', item.id);
       });
-      params.append('date_from', startDate.valueOf() / 1000);
-      params.append('date_to', endDate.valueOf() / 1000);
+      params.append('date_from', startDate.unix());
+      params.append('date_to', endDate.unix());
+
       const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY(), {
         params,
       });
-      updateConfigChart(success, data, configuration, setChartData);
+      if (success) {
+        let urls = [];
+        data.forEach((config) => {
+          config.data.forEach((value_log) => {
+            if (value_log.url) {
+              urls.push(value_log.url);
+            } else {
+              value_log.x = moment(value_log.x).toDate();
+            }
+          });
+        });
+
+        // eslint-disable-next-line promise/prefer-await-to-then
+        Promise.all(urls.map(fetchDataS3)).then((result) => {
+          let s3_data = [].concat.apply(
+            [],
+            result.filter((r) => r.length > 0)
+          );
+          s3_data.forEach((value_log) => {
+            value_log.x = moment(value_log.start_time).toDate();
+            value_log.y = value_log.converted_value_log;
+          });
+          setChartData(
+            configuration.map((config) => {
+              let s3_config_data = [].concat.apply(
+                [],
+                s3_data.filter((x) => x.config_id === config.id)
+              );
+              let config_data = data.find((k) => k.config === config.id).data;
+              config_data = config_data.filter((k) => !('url' in k));
+              config.data = [...s3_config_data, ...config_data];
+              config.data = config.data.sort((a, b) => a.x > b.x);
+              return config;
+            })
+          );
+        });
+      }
     };
     fetchData();
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/src/configs/API.js

@@ -29,6 +29,9 @@ const API = {
     CHANGE_OWNER: (id) => `/property_manager/units/${id}/change_owner/`,
     FAVOURITE_DEVICES: (id) =>
       `/property_manager/units/${id}/favourite_devices/`,
+    DEVICES: (id) => `/property_manager/units/${id}/devices/`,
+    ADD_DEVICES_TO_FAVORITES: (id) =>
+      `/property_manager/units/${id}/add_devices_to_favourites/`,
   },
   SUB_UNIT: {
     REMOVE_SUB_UNIT: (unitId, id) =>
@@ -77,7 +80,7 @@ const API = {
     ACCESS: (id) => `/property_manager/shared_sensors/${id}/access/`,
   },
   CONFIG: {
-    DISPLAY_HISTORY: () => '/property_manager/configs/display_history/',
+    DISPLAY_HISTORY: () => '/property_manager/configs/display_history_v2/',
   },
   AUTOMATE: {
     ACTION_ONE_TAP: (id) => `/property_manager/automate/${id}/action_one_tap/`,
@@ -173,6 +176,7 @@ const API = {
       `/notifications/eoh/?page=${page}&type=${type}`,
     SET_READ: (id) => `/notifications/eoh/${id}/set_read/`,
   },
+  VALUE_EVALUATIONS: () => '/property_manager/config_value_evaluations/',
   EXTERNAL: {
     GOOGLE_MAP: {
       AUTO_COMPLETE:

package/src/configs/Constants.js

@@ -60,6 +60,9 @@ export const DEEP_LINK = {
   NOTIFICATION_SCREEN: 'app://eoh/notifications',
 };
 
+const URL_STREAM_CAMERA_DEMO =
+  'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4';
+
 export const Constants = {
   paddingTop: getStatusBarHeight(),
   width: Dimensions.get('window').width,
@@ -69,7 +72,7 @@ export const Constants = {
   FONT_PREFIX,
   isIphoneX,
   DEEP_LINK,
-  URL_STREAM_BALCONY_CAMERA,
+  URL_STREAM_CAMERA_DEMO,
 };
 
 export const DEVICE_TYPE = {
@@ -144,6 +147,25 @@ export const CONDITION_TYPES = {
   IS_ABOVE: 'IS_ABOVE',
 };
 
+export const STATE_VALUE_SENSOR_TYPES = [
+  {
+    type: 'smoke',
+    stateValue: ['not_detected', 'detected'],
+  },
+  {
+    type: 'fire',
+    stateValue: ['not_detected', 'detected'],
+  },
+  {
+    type: 'sos',
+    stateValue: ['not_activated', 'activated'],
+  },
+  {
+    type: 'filter_water',
+    stateValue: ['not_detected', 'detected'],
+  },
+];
+
 export const AUTOMATES = {
   one_tap: {
     value: AUTOMATE_TYPE.ONE_TAP,
@@ -830,6 +852,3 @@ export const PROBLEM_CODE = {
   UNKNOWN_ERROR: 'UNKNOWN_ERROR',
   CANCEL_ERROR: 'CANCEL_ERROR',
 };
-
-const URL_STREAM_BALCONY_CAMERA =
-  'rtsp://admin:Eoh@2020@101.99.33.220:30554/main';

package/src/configs/SCConfig.js

@@ -112,7 +112,7 @@ export class SCConfig {
 
 export const initSCConfig = (config) => {
   api.setBaseURL(config.apiRoot ?? SCDefaultConfig.apiRoot);
-  LocaleConfig.defaultLocale = config.language;
+  LocaleConfig.defaultLocale = config.language ?? SCConfig.language;
   SCConfig.language = config.language ?? SCConfig.language;
   SCConfig.apiRoot = config.apiRoot ?? SCDefaultConfig.apiRoot;
   SCConfig.GOOGLE_MAP_API_KEY =

package/src/context/actionType.ts

@@ -12,14 +12,16 @@ export const Action = {
   CAMERA_STATUS_CHANGE: 'CAMERA_STATUS_CHANGE',
   CLOSE_ALL_CAMERA: 'CLOSE_ALL_CAMERA',
   SET_FAVORITE_DEVICES: 'SET_FAVORITE_DEVICES',
-  ADD_DEVICE_TO_FAVORITES: 'ADD_DEVICE_TO_FAVORITES',
-  REMOVE_DEVICE_FROM_FAVORITES: 'REMOVE_DEVICE_FROM_FAVORITES',
+  ADD_DEVICES_TO_FAVORITES: 'ADD_DEVICE_TO_FAVORITES',
+  REMOVE_DEVICES_FROM_FAVORITES: 'REMOVE_DEVICE_FROM_FAVORITES',
   SET_STARRED_SCRIPTS: 'SET_STARRED_SCRIPTS',
   STAR_SCRIPT: 'STAR_SCRIPT',
   UNSTAR_SCRIPT: 'UNSTAR_SCRIPT',
   CONNECTING_GOOGLE_HOME: 'CONNECTING_GOOGLE_HOME',
   SET_GOOGLE_HOME_CONNECTIONS: 'SET_GOOGLE_HOME_CONNECTIONS',
   CHANGE_GOOGLE_HOME_CONN_STATE: 'CHANGE_GOOGLE_HOME_CONN_STATE',
+  UPDATE_VALUE_EVALUATIONS: 'UPDATE_VALUE_EVALUATIONS',
+  ON_RECEIVE_NOTIFICATION: 'ON_RECEIVE_NOTIFICATION',
 };
 
 export type AuthData = {
@@ -76,10 +78,12 @@ export type AppType = {
   isBluetoothEnabled: boolean;
   isNetworkConnected: boolean;
   camera_opened: any[];
+  notificationData: any;
 };
 
 export type IoTType = {
   googlehome: {
+    isFirstTimeConnect: boolean;
     isConnecting: boolean;
     connections: {};
   };

package/src/context/mockStore.ts

@@ -31,10 +31,23 @@ export const mockDataStore: ContextData = {
   automate: {
     starredScriptIds: [],
   },
+  app: {
+    isFirstOpenCamera: true,
+    isLavidaSource: false,
+    isConnectWifiGateway: false,
+    isBluetoothEnabled: true,
+    isNetworkConnected: true,
+    camera_opened: [],
+  },
   iot: {
-    isConnecting: false,
-    googlehome: {},
+    googlehome: {
+      isFirstTimeConnect: true,
+      isConnecting: false,
+      connections: {},
+    },
   },
+  valueEvaluations: {},
+  fetchedValueEvaluationUnits: [],
 };
 
 export const mockSCStore = (data: ContextData): ContextData => {
@@ -82,5 +95,7 @@ export const mockSCStore = (data: ContextData): ContextData => {
         connections: {},
       },
     },
+    valueEvaluations: {},
+    fetchedValueEvaluationUnits: [],
   };
 };

package/src/context/reducer.ts

@@ -12,7 +12,7 @@ import {
   AppType,
   IoTType,
 } from './actionType';
-import { uniq } from 'lodash';
+import { uniq, reduce } from 'lodash';
 
 export type ContextData = {
   auth: AuthData;
@@ -24,6 +24,8 @@ export type ContextData = {
   automate: AutomateType;
   app: AppType;
   iot: IoTType;
+  valueEvaluations: {};
+  fetchedValueEvaluationUnits: Array<number>;
 };
 
 export type Action = {
@@ -57,12 +59,17 @@ export const initialState = {
     isBluetoothEnabled: false,
     isNetworkConnected: false,
     camera_opened: [],
+    notificationData: null,
   },
   iot: {
     googlehome: {
+      isFirstTimeConnect: true,
+      isConnecting: false,
       connections: {},
     },
   },
+  valueEvaluations: {},
+  fetchedValueEvaluationUnits: [],
 };
 
 export const reducer = (currentState: ContextData, action: Action) => {
@@ -199,7 +206,7 @@ export const reducer = (currentState: ContextData, action: Action) => {
           favoriteDeviceIds: payload,
         },
       };
-    case Action.ADD_DEVICE_TO_FAVORITES:
+    case Action.ADD_DEVICES_TO_FAVORITES:
       return {
         ...currentState,
         unit: {
@@ -209,13 +216,13 @@ export const reducer = (currentState: ContextData, action: Action) => {
           ),
         },
       };
-    case Action.REMOVE_DEVICE_FROM_FAVORITES:
+    case Action.REMOVE_DEVICES_FROM_FAVORITES:
       return {
         ...currentState,
         unit: {
           ...currentState.unit,
           favoriteDeviceIds: currentState.unit.favoriteDeviceIds.filter(
-            (deviceId) => deviceId !== payload
+            (deviceId) => !payload.includes(deviceId)
           ),
         },
       };
@@ -256,6 +263,7 @@ export const reducer = (currentState: ContextData, action: Action) => {
           ...currentState.iot,
           googlehome: {
             ...currentState.iot.googlehome,
+            isFirstTimeConnect: false,
             isConnecting: false,
             connections: payload,
           },
@@ -268,6 +276,7 @@ export const reducer = (currentState: ContextData, action: Action) => {
           ...currentState.iot,
           googlehome: {
             ...currentState.iot.googlehome,
+            isFirstTimeConnect: false,
             isConnecting: false,
             connections: {
               ...currentState.iot.googlehome.connections,
@@ -283,11 +292,42 @@ export const reducer = (currentState: ContextData, action: Action) => {
           ...currentState.iot,
           googlehome: {
             ...currentState.iot.googlehome,
-            isConnecting: true,
+            isConnecting: currentState.iot.googlehome.isFirstTimeConnect
+              ? true
+              : false,
           },
         },
       };
 
+    case Action.UPDATE_VALUE_EVALUATIONS:
+      // eslint-disable-next-line no-case-declarations
+      const { data, unitId } = payload;
+      return {
+        ...currentState,
+        fetchedValueEvaluationUnits:
+          currentState.fetchedValueEvaluationUnits.indexOf(unitId) !== -1
+            ? currentState.fetchedValueEvaluationUnits
+            : [...currentState.fetchedValueEvaluationUnits, unitId],
+        valueEvaluations: reduce(
+          data,
+          (dict, item) => {
+            // eslint-disable-next-line no-param-reassign
+            dict[item.config] = item;
+            return dict;
+          },
+          currentState.valueEvaluations
+        ),
+      };
+
+    case Action.ON_RECEIVE_NOTIFICATION:
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          notificationData: payload,
+        },
+      };
+
     default:
       return currentState;
   }

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

@@ -0,0 +1,58 @@
+import React from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+import MockAdapter from 'axios-mock-adapter';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+import { useValueEvaluations } from '../index';
+import api from '../../../utils/Apis/axios';
+import { API } from '../../../configs';
+
+const mock = new MockAdapter(api.axiosInstance);
+
+const mockedSetAction = jest.fn();
+
+const wrapper = ({ children }) => <SCProvider>{children}</SCProvider>;
+
+const mockUseContext = jest.fn().mockImplementation(() => ({
+  stateData: mockSCStore({}),
+  setAction: mockedSetAction,
+}));
+
+React.useContext = mockUseContext;
+
+describe('Test useValueEvaluation', () => {
+  beforeEach(() => {
+    mock.resetHistory();
+  });
+
+  it('test unitId null', async () => {
+    renderHook(() => useValueEvaluations(null), {
+      wrapper,
+    });
+    expect(mock.history.get.length).toBe(0);
+  });
+
+  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,
+    });
+    expect(mock.history.get.length).toBe(1);
+  });
+
+  it('test request failed', async () => {
+    mock.onGet(API.VALUE_EVALUATIONS()).replyOnce(400, {
+      results: [],
+    });
+    renderHook(() => useValueEvaluations(1), {
+      wrapper,
+    });
+    expect(mock.history.get.length).toBe(1);
+  });
+});

package/src/hooks/IoT/index.js

@@ -1,4 +1,5 @@
 import useGGHomeConnection from './useGGHomeConnection';
 import useRemoteControl from './useRemoteControl';
+import useValueEvaluations from './useValueEvaluation';
 
-export { useGGHomeConnection, useRemoteControl };
+export { useGGHomeConnection, useRemoteControl, useValueEvaluations };

package/src/hooks/IoT/useValueEvaluation.js

@@ -0,0 +1,45 @@
+import { useCallback, useContext, useEffect } from 'react';
+import { API } from '../../configs';
+import { SCContext, useSCContextSelector } from '../../context';
+import { Action } from '../../context/actionType';
+import { axiosGet } from '../../utils/Apis/axios';
+
+const useValueEvaluations = (unitId) => {
+  const { setAction } = useContext(SCContext);
+
+  const fetchConfigValueEvaluations = useCallback(
+    async (page = 1) => {
+      if (!unitId) {
+        return;
+      }
+      const params = new URLSearchParams();
+      params.append('config__end_device__station__unit', unitId);
+      params.append('page', page);
+      const { success, data } = await axiosGet(API.VALUE_EVALUATIONS(), {
+        params,
+      });
+      if (success) {
+        setAction(Action.UPDATE_VALUE_EVALUATIONS, {
+          unitId,
+          data: data.results,
+        });
+        if (data.next) {
+          await fetchConfigValueEvaluations(page + 1);
+        }
+      }
+    },
+    [unitId, setAction]
+  );
+
+  const fetchedValueEvaluationUnits = useSCContextSelector((state) => {
+    return state.fetchedValueEvaluationUnits || [];
+  });
+
+  useEffect(() => {
+    if (!(fetchedValueEvaluationUnits.indexOf(unitId) !== -1)) {
+      fetchConfigValueEvaluations();
+    }
+  }, [unitId, fetchConfigValueEvaluations, fetchedValueEvaluationUnits]);
+};
+
+export default useValueEvaluations;

package/src/hooks/useReceiveNotifications.js

@@ -1,25 +1,20 @@
-import { useEffect, useState, useCallback } from 'react';
-import OneSignal from 'react-native-onesignal';
+import { useEffect, useState } from 'react';
+import { useSCContextSelector } from '../context';
 
-const useReceiveNotifications = () => {
-  const [dataNofitication, setDataNofitication] = useState(null);
-
-  const onReceived = useCallback((data) => {
-    const { additionalData } = data;
-    setDataNofitication(additionalData);
-  }, []);
+const useReceiveNotifications = (callBack) => {
+  const [dataNotification, setDataNotification] = useState(null);
+  const notificationData = useSCContextSelector(
+    (state) => state.app.notificationData
+  );
 
   useEffect(() => {
-    OneSignal.setNotificationWillShowInForegroundHandler(
-      (notifReceivedEvent) => {
-        let notif = notifReceivedEvent.getNotification();
-        setTimeout(() => notifReceivedEvent.complete(notif), 0);
-        onReceived(notif);
-      }
-    );
-  }, [onReceived]);
+    if (notificationData) {
+      setDataNotification(notificationData);
+      callBack && callBack();
+    }
+  }, [callBack, notificationData]);
 
-  return { dataNofitication };
+  return { dataNotification };
 };
 
 export default useReceiveNotifications;

package/src/navigations/UnitStack.js

@@ -51,6 +51,7 @@ import EmergencySetting from '../screens/EmergencySetting';
 import ConfirmUnitDeletion from '../screens/ConfirmUnitDeletion';
 import InfoMemberUnit from '../screens/Sharing/InfoMemberUnit';
 import EnterPassword from '../screens/EnterPassword';
+import SelectDevices from '../screens/Unit/SelectDevices';
 import { HanetCameraStack } from './HanetCameraStack';
 import { axiosGet } from '../utils/Apis/axios';
 import { API } from '../configs';
@@ -400,6 +401,13 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.SelectDevices}
+        component={SelectDevices}
+        options={{
+          headerShown: false,
+        }}
+      />
     </Stack.Navigator>
   );
 });