@eohjsc/react-native-smart-city 0.3.10 → 0.3.13

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.10",
+  "version": "0.3.13",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/Action/ItemQuickAction.js

@@ -7,7 +7,7 @@ import { useRemoteControl } from '../../hooks/IoT';
 import { useConfigGlobalState } from '../../iot/states';
 import IconComponent from '../IconComponent';
 
-const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus, unit }) => {
+const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus }) => {
   const [isSendingCommand, setIsSendingCommand] = useState(false);
   const [action, setAction] = useState(sensor.action);
   // eslint-disable-next-line no-unused-vars

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -47,6 +47,8 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
     const configValue = configValues[config];
     if (configValue !== null && configValue !== undefined) {
       setValue(configValue);
+    } else {
+      setValue(valueDefault);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(configValues)]);

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

@@ -326,7 +326,7 @@ describe('Test NumberUpDownActionTemplate', () => {
     });
     const instance = wrapper.root;
     const text = instance.findAllByType(ActivityIndicator);
-    expect(text).toHaveLength(1);
+    expect(text).toHaveLength(0);
   });
   test('action up sensor device type is GOOGLE_HOME', async () => {
     const mockDoAction = jest.fn();

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

@@ -363,7 +363,7 @@ describe('Test ActionGroup', () => {
     });
     const instance = wrapper.root;
     const activity = instance.findAllByType(ActivityIndicator);
-    expect(activity.length).toEqual(1);
+    expect(activity.length).toEqual(0);
   });
 
   test('render ActionGroup StatesGridActionTemplate', async () => {

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/Device/ItemDevice.js

@@ -82,7 +82,7 @@ const ItemDevice = memo(
     const textConnected = isConnected
       ? t('connected')
       : isConnecting
-      ? ''
+      ? t('connecting')
       : t('disconnected');
 
     return (
@@ -98,7 +98,7 @@ const ItemDevice = memo(
             <TouchableOpacity onPress={goToSensorDisplay}>
               <IconComponent icon={sensor.icon} iconKit={sensor.icon_kit} />
             </TouchableOpacity>
-            <ItemQuickAction sensor={sensor} unit={unit} />
+            {!isConnecting && <ItemQuickAction sensor={sensor} unit={unit} />}
           </View>
           <TouchableOpacity onPress={goToSensorDisplay}>
             <Text

package/src/commons/OneTapTemplate/NumberUpDownActionTemplate.js

@@ -19,16 +19,20 @@ const NumberUpDownActionTemplate = memo(({ data, onSelectAction }) => {
   const { configuration, template, title } = data;
   const { config, text_format, min_value, max_value, action } = configuration;
   const [configValues] = useConfigGlobalState('configValues');
-  const [value, setValue] = useState((config && configValues[config]) || 28);
+  const [value, setValue] = useState();
   const [actionName, setActionName] = useState(null);
+  const valueDefault = 28;
 
   useEffect(() => {
     if (!config) {
+      setValue(valueDefault);
       return;
     }
     const configValue = configValues[config];
     if (configValue !== null && configValue !== undefined) {
       setValue(configValue);
+    } else {
+      setValue(valueDefault);
     }
   }, [configValues, config]);
 

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/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) =>
@@ -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/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,6 +78,7 @@ export type AppType = {
   isBluetoothEnabled: boolean;
   isNetworkConnected: boolean;
   camera_opened: any[];
+  notificationData: any;
 };
 
 export type IoTType = {

package/src/context/mockStore.ts

@@ -31,11 +31,23 @@ export const mockDataStore: ContextData = {
   automate: {
     starredScriptIds: [],
   },
+  app: {
+    isFirstOpenCamera: true,
+    isLavidaSource: false,
+    isConnectWifiGateway: false,
+    isBluetoothEnabled: true,
+    isNetworkConnected: true,
+    camera_opened: [],
+  },
   iot: {
-    isFirstTimeConnect: true,
-    isConnecting: false,
-    googlehome: {},
+    googlehome: {
+      isFirstTimeConnect: true,
+      isConnecting: false,
+      connections: {},
+    },
   },
+  valueEvaluations: {},
+  fetchedValueEvaluationUnits: [],
 };
 
 export const mockSCStore = (data: ContextData): ContextData => {
@@ -83,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,6 +59,7 @@ export const initialState = {
     isBluetoothEnabled: false,
     isNetworkConnected: false,
     camera_opened: [],
+    notificationData: null,
   },
   iot: {
     googlehome: {
@@ -65,6 +68,8 @@ export const initialState = {
       connections: {},
     },
   },
+  valueEvaluations: {},
+  fetchedValueEvaluationUnits: [],
 };
 
 export const reducer = (currentState: ContextData, action: Action) => {
@@ -201,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: {
@@ -211,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)
           ),
         },
       };
@@ -294,6 +299,35 @@ export const reducer = (currentState: ContextData, action: Action) => {
         },
       };
 
+    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,26 +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 = (callBack) => {
-  const [dataNofitication, setDataNofitication] = useState(null);
-
-  const onReceived = useCallback((data) => {
-    const { additionalData } = data;
-    setDataNofitication(additionalData);
-  }, []);
+  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);
-        callBack && callBack();
-      }
-    );
-  }, [callBack, 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>
   );
 });

package/src/screens/AddNewAction/SelectAction.js

@@ -134,6 +134,7 @@ const SelectAction = memo(({ route }) => {
           value: itemTemp?.value,
           config_id: itemTemp?.id,
           config_name: itemTemp?.name,
+          sensor_type: itemTemp?.sensor_type,
         },
         scriptName,
       });
@@ -300,9 +301,9 @@ const SelectAction = memo(({ route }) => {
       if (isNumberValue) {
         return `${item?.name} ${
           item?.title ? item.title : t('is_below') + ' (<)'
-        }{' '}${item?.value} ${item?.unit}`;
+        } ${item?.value} ${item?.unit}`;
       }
-      return t(stateConditionData?.stateValue[item?.value === 1 ? 1 : 0]);
+      return t(stateConditionData?.stateValue[item?.value]);
     },
     [t]
   );

package/src/screens/AddNewAction/SetupSensor.js

@@ -56,7 +56,7 @@ const SetUpSensor = () => {
     modalNumberConditionData[0]
   );
   const [itemActiveStateModal, setItemActiveStateModal] = useState(
-    modalStateConditionData?.stateValue[0]
+    modalStateConditionData?.stateValue[1]
   );
   const [value, setValue] = useState(parseFloat(item?.value || 0));
   const [minimum] = useState(isHasLimit ? parseInt(item?.range_min, 10) : 0);
@@ -226,7 +226,8 @@ const SetUpSensor = () => {
         <View style={styles.modalContent}>
           {(isNumberValue
             ? modalNumberConditionData
-            : modalStateConditionData?.stateValue
+            : /* Disable picking not_active/not_dectect option -> temporaly remove not_acitve option */
+              modalStateConditionData?.stateValue.slice(1)
           ).map((i, index) => (
             <>
               <TouchableOpacity

package/src/screens/Device/detail.js

@@ -44,12 +44,13 @@ import {
   useBoolean,
   useGGHomeDeviceConnected,
 } from '../../hooks/Common';
-import { useGGHomeConnection } from '../../hooks/IoT';
+import { useGGHomeConnection, useValueEvaluations } from '../../hooks/IoT';
 import { SensorDisplayItem } from './components/SensorDisplayItem';
 import { useSCContextSelector } from '../../context';
 import { EmergencyCountdown } from './components/EmergencyCountdown';
 import { SensorConnectStatusViewHeader } from './components/SensorConnectStatusViewHeader';
 import { useDisconnectedDevice } from './hooks/useDisconnectedDevice';
+import { useEvaluateValue } from './hooks/useEvaluateValue';
 import { Card } from '../../commons/CardShadow';
 import PreventAccess from '../../commons/PreventAccess';
 import { notImplemented } from '../../utils/Utils';
@@ -117,6 +118,8 @@ const DeviceDetail = ({ route }) => {
     });
   }, [display]);
 
+  useValueEvaluations(unitId || unitData?.id);
+
   useDisconnectedDevice(sensorName, isDeviceHasBle, serverDown);
 
   const isShowSetupEmergencyContact = useMemo(
@@ -438,21 +441,32 @@ const DeviceDetail = ({ route }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [sensor, unit, isNetworkConnected, fetchDataDeviceDetail]);
 
+  const evaluateValue = useEvaluateValue();
+
   const getData = useCallback(
     (item) => {
       if (!item.configuration) {
         return;
       }
       const data = item.configuration.configs.map((config) => {
-        const value = displayValues.find((k) => k.id === config.id);
-        if (!value) {
+        const configValue = configValues[config.id];
+        const displayValue = displayValues.find((k) => k.id === config.id);
+        if (!configValue && !displayValue) {
           return;
         }
+        const value = configValue
+          ? {
+              id: config.id,
+              value: configValue,
+              evaluate: evaluateValue(config.id, configValue),
+            }
+          : displayValue;
+
         return { ...config, ...value };
       });
       return data.filter((value) => value);
     },
-    [displayValues]
+    [configValues, displayValues, evaluateValue]
   );
 
   useEffect(() => {
@@ -509,29 +523,6 @@ const DeviceDetail = ({ route }) => {
     }
   }, [sensor, display]);
 
-  useEffect(() => {
-    setDisplayValues((currentDisplayValues) => {
-      for (const [configId, value] of Object.entries(configValues)) {
-        const intId = parseInt(configId, 10);
-        const index = currentDisplayValues.findIndex(
-          (element) => element.id === intId
-        );
-
-        const item = currentDisplayValues[index];
-        if (index !== -1) {
-          currentDisplayValues[index].value = value;
-          currentDisplayValues[index].evaluate = item.evaluate;
-        } else {
-          currentDisplayValues.push({
-            id: intId,
-            value: value,
-          });
-        }
-      }
-      return currentDisplayValues;
-    });
-  }, [configValues, setDisplayValues]);
-
   const isShowEmergencyResolve =
     display.items.filter(
       (item) =>