@eohjsc/react-native-smart-city 0.2.68 → 0.2.72

package/package.json

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

package/src/commons/ActionGroup/CurtainButtonTemplate.js

@@ -1,22 +1,14 @@
 import React, { memo, useCallback, useState } from 'react';
 import { TouchableOpacity, View, Switch, Image } from 'react-native';
 import { Icon } from '@ant-design/react-native';
-import { useTranslations } from '../../hooks/Common/useTranslations';
 import styles from './CurtainButtonTemplateStyle';
 import Text from '../Text';
 import { TESTID } from '../../configs/Constants';
 import { Colors, Images } from '../../configs';
-import { Section } from '../../commons/Section';
-import { IconOutline } from '@ant-design/icons-react-native';
-import MenuActionAddSchedule from './hooks/MenuActionAddSchedule';
-import { useBoolean } from '../../hooks/Common';
 
 const CurtainButtonTemplate = memo(({ actionGroup, doAction }) => {
-  const t = useTranslations();
   const { configuration } = actionGroup;
   const [lock, setLock] = useState(false);
-  const [isShowModal, setShowModal, setHideModal] = useBoolean(false);
-
   const onButtonOpenPress = useCallback(
     () => doAction(configuration.open_action_data),
     [configuration.open_action_data, doAction]
@@ -118,28 +110,6 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction }) => {
             lock ? Colors.Primary : Colors.Gray6
           )}
       </View>
-      <Section style={styles.section}>
-        <View style={styles.reminderOption}>
-          <Text type="H4" color={Colors.Gray8}>
-            {t('schedule')}
-          </Text>
-          <TouchableOpacity onPress={setShowModal}>
-            <IconOutline name="plus" size={20} />
-          </TouchableOpacity>
-        </View>
-        <View>
-          <TouchableOpacity
-            onPress={setShowModal}
-            style={styles.tapToAddSchedule}
-          >
-            <Text type="Body" color={Colors.Gray6} center>
-              {t('tap_to_add_new_schedule')}
-            </Text>
-          </TouchableOpacity>
-        </View>
-
-        <MenuActionAddSchedule visible={isShowModal} hideModal={setHideModal} />
-      </Section>
     </>
   );
 });

package/src/commons/ActionGroup/CurtainButtonTemplateStyle.js

@@ -29,18 +29,6 @@ export default StyleSheet.create({
     alignItems: 'flex-end',
     paddingLeft: 5,
   },
-  section: {
-    marginHorizontal: 20,
-    borderRadius: 10,
-  },
-  reminderOption: {
-    flex: 1,
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-  },
-  tapToAddSchedule: {
-    paddingVertical: 50,
-  },
   buttonActionCurtain: {
     flex: 1,
     aspectRatio: 1,

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

@@ -67,6 +67,6 @@ describe('Test CurtainButtonTemplate', () => {
     });
     const instance = wrapper.root;
     const touchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(touchableOpacities.length).toEqual(18);
+    expect(touchableOpacities.length).toEqual(3);
   });
 });

package/src/commons/AlertAction/index.js

@@ -22,6 +22,8 @@ const AlertAction = ({
   children,
   testIDPrefix = '',
   animatedStyle,
+  boxLeftButtonStyle,
+  boxRightButtonStyle,
 }) => {
   return (
     <ModalCustom
@@ -54,6 +56,8 @@ const AlertAction = ({
             onRightClick={rightButtonClick}
             styleButtonLeftText={leftButtonStyle}
             styleButtonRightText={rightButtonStyle}
+            styleButtonLeft={boxLeftButtonStyle}
+            styleButtonRight={boxRightButtonStyle}
             testIDPrefix={testIDPrefix}
           />
         </View>
@@ -85,10 +89,8 @@ const styles = StyleSheet.create({
   modalHeader: {
     padding: 16,
     backgroundColor: Colors.White,
-    borderBottomWidth: 1,
     borderTopLeftRadius: 20,
     borderTopRightRadius: 20,
-    borderColor: Colors.Gray4,
   },
   modalHeaderText: {
     fontSize: 16,
@@ -97,7 +99,6 @@ const styles = StyleSheet.create({
   },
   descriptionText: {
     paddingHorizontal: 16,
-    paddingTop: 16,
   },
 });
 

package/src/commons/CameraDevice/index.js

@@ -42,7 +42,7 @@ const CameraDevice = ({ station, handleFullScreen, goToPlayBack }) => {
         )}
       </View>
 
-      {station.camera_devices.map((device) => (
+      {(station?.camera_devices || []).map((device) => (
         <View
           key={device.id}
           style={[

package/src/commons/Device/WaterQualitySensor/QualityIndicatorsItem.js

@@ -68,7 +68,7 @@ const styles = StyleSheet.create({
     borderWidth: 1,
     borderColor: Colors.Gray4,
     marginRight: 8,
-    width: (width / 375) * 109,
+    width: (width / 375) * 112,
   },
   rowFlex: {
     flexDirection: 'row',

package/src/commons/SubUnit/OneTap/OneTapStyles.js

@@ -33,13 +33,19 @@ export default StyleSheet.create({
     alignItems: 'center',
     paddingBottom: 3,
   },
-  dropDown: {
-    width: 114,
-    height: 40,
+  borderSelection: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+    paddingHorizontal: 5,
+    paddingLeft: 15,
     borderRadius: 30,
     backgroundColor: Colors.Gray3,
   },
-  boxDropDown: {
+  notShowBorder: {
+    paddingLeft: 15,
+  },
+  boxTextScenarito: {
     justifyContent: 'center',
     flexDirection: 'row',
     alignItems: 'center',
@@ -48,8 +54,11 @@ export default StyleSheet.create({
       android: 6,
     }),
   },
-  textDropDown: {
+  textSelection: {
     color: Colors.Primary,
     marginRight: 10,
   },
+  boxScenario: {
+    flexDirection: 'row',
+  },
 });

package/src/commons/SubUnit/OneTap/__test__/SubUnitAutomate.test.js

@@ -267,82 +267,19 @@ describe('test Item', () => {
     expect(goDetail).toHaveLength(1);
   });
 
-  test('render click select option filter by automation', async () => {
-    data.isOwner = false;
-    data.type = 'schedule';
-    data.listAutomate = [
-      {
-        text: AUTOMATE_TYPE.SCENARIO,
-        type: AUTOMATE_TYPE.ONE_TAP,
-        data: [
-          {
-            id: 1,
-            user: 6,
-            type: 'one_tap',
-            activate_at: null,
-            script: {
-              name: 'One-tap',
-              icon: '',
-              icon_kit: '',
-            },
-          },
-        ],
-      },
-      {
-        text: AUTOMATE_TYPE.AUTOMATION,
-        type: AUTOMATE_TYPE.AUTOMATION,
-        data: [
-          {
-            id: 2,
-            user: 6,
-            type: 'schedule',
-            activate_at: null,
-            script: {
-              name: 'Rain',
-              icon: '',
-              icon_kit: '',
-            },
-          },
-        ],
-      },
-    ];
-    const response = {
-      status: 200,
-    };
-
-    await axios.post.mockImplementation(async () => {
-      return response;
-    });
-
+  test('render click select option by automation', async () => {
     await act(async () => {
       tree = await create(wrapComponent(data));
     });
-
     const instance = tree.root;
-    const menuDropDown = instance.find(
+    const touchableOpacity = instance.findAll(
       (el) =>
         el.props.testID === TESTID.SUB_UNIT_SELECT_AUTOMATE_TYPE &&
         el.type === TouchableOpacity
     );
-    await act(async () => {
-      await menuDropDown.props.onPress();
+    act(() => {
+      touchableOpacity[0].props.onPress();
     });
-
-    const menu = instance.find(
-      (el) => el.props.testID === TESTID.NAVBAR_MENU_ACTION_MORE
-    );
-
-    expect(menu.props.isVisible).toBeTruthy();
-
-    const automation = menu.props.listMenuItem[1];
-
-    await act(async () => {
-      await menu.props.onItemClick(automation, 1);
-    });
-
-    const text = instance.find(
-      (el) => el.props.testID === TESTID.SUB_UNIT_TEXT_DROPDOWN
-    );
-    expect(text.props.children).toEqual(AUTOMATE_TYPE.AUTOMATION);
+    expect(touchableOpacity).toHaveLength(1);
   });
 });

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

@@ -1,16 +1,13 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { TouchableOpacity, View } from 'react-native';
-import { Icon } from '@ant-design/react-native';
 
-import { MenuActionMore, Section } from '../..';
+import { Section } from '../..';
 import ItemAddNew from '../../Device/ItemAddNew';
 import ItemOneTap from './ItemOneTap';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { useNavigation } from '@react-navigation/native';
 import Routes from '../../../utils/Route/index.js';
 import { AUTOMATE_TYPE, TESTID } from '../../../configs/Constants';
-import { Colors } from '../../../configs/Colors.js';
-import usePopover from '../../../hooks/Common/usePopover.js';
 import Text from '../../Text/index.js';
 
 import styles from './OneTapStyles.js';
@@ -33,11 +30,8 @@ const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
         break;
     }
   };
-  const { childRef, showingPopover, showPopoverWithRef, hidePopover } =
-    usePopover();
 
   const refMenuAction = useRef();
-  const handleShowMenuAction = () => showPopoverWithRef(refMenuAction);
 
   const onItemClick = useCallback((item, index) => {
     setAutomates(item);
@@ -50,23 +44,30 @@ const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
 
   return (
     <Section style={styles.noShadow}>
-      <TouchableOpacity
-        style={styles.dropDown}
-        onPress={handleShowMenuAction}
-        ref={refMenuAction}
-        testID={TESTID.SUB_UNIT_SELECT_AUTOMATE_TYPE}
-      >
-        <View style={styles.boxDropDown}>
-          <Text
-            testID={TESTID.SUB_UNIT_TEXT_DROPDOWN}
-            style={styles.textDropDown}
-            semibold
+      <View style={styles.boxScenario}>
+        {listAutomate.map((item, index) => (
+          <TouchableOpacity
+            style={
+              indexAutomate === index
+                ? styles.borderSelection
+                : styles.notShowBorder
+            }
+            onPress={() => onItemClick(item, index)}
+            ref={refMenuAction}
+            testID={TESTID.SUB_UNIT_SELECT_AUTOMATE_TYPE}
           >
-            {automates?.text}
-          </Text>
-          <Icon name={'caret-down'} size={14} style={{ color: Colors.Gray8 }} />
-        </View>
-      </TouchableOpacity>
+            <View style={styles.boxTextScenarito}>
+              <Text
+                testID={TESTID.SUB_UNIT_TEXT_DROPDOWN}
+                style={styles.textSelection}
+                semibold
+              >
+                {item?.text}
+              </Text>
+            </View>
+          </TouchableOpacity>
+        ))}
+      </View>
       <View style={styles.boxDevices}>
         {automates?.data &&
           automates.data.map((item) => (
@@ -78,16 +79,6 @@ const SubUnitAutomate = ({ isOwner, listAutomate, unit, wrapItemStyle }) => {
           wrapStyle={wrapItemStyle}
         />
       </View>
-      <MenuActionMore
-        isVisible={showingPopover}
-        hideMore={hidePopover}
-        listMenuItem={listAutomate}
-        childRef={childRef}
-        onItemClick={onItemClick}
-        isTextCenter={false}
-        testID={TESTID.NAVBAR_MENU_ACTION_MORE}
-        wrapStyle={styles.wrapStyle}
-      />
     </Section>
   );
 };

package/src/commons/ViewButtonBottom/index.js

@@ -16,6 +16,8 @@ const ViewButtonBottom = ({
   styleButton,
   styleButtonLeftText,
   styleButtonRightText,
+  styleButtonLeft,
+  styleButtonRight,
   testIDPrefix = '',
 }) => {
   const useTwoButton = leftTitle && rightTitle;
@@ -27,6 +29,7 @@ const ViewButtonBottom = ({
           style={[
             styles.button,
             styleButton,
+            styleButtonLeft,
             useTwoButton && styles.buttonMarginRight,
           ]}
           onPress={onLeftClick}
@@ -48,6 +51,7 @@ const ViewButtonBottom = ({
           style={[
             styles.button,
             styleButton,
+            styleButtonRight,
             useTwoButton && styles.buttonMarginLeft,
           ]}
           onPress={onRightClick}

package/src/configs/Constants.js

@@ -610,6 +610,8 @@ export const NOTIFICATION_TYPES = {
   PARKING_COMPLETED_DUE_TO_CAR_LEAVE: 'PARKING_COMPLETED_DUE_TO_CAR_LEAVE',
   NOTIFY_INVITE_MEMBER: 'NOTIFY_INVITE_MEMBER',
   REMINDER: 'REMINDER',
+  NOTIFY_REMOVE_UNIT: 'NOTIFY_REMOVE_UNIT',
+  NOTIFY_REMOVE_MEMBER: 'NOTIFY_REMOVE_MEMBER',
 };
 
 export const ACTIVITY_LOG_TYPES = {

package/src/configs/Images.js

@@ -7,7 +7,7 @@ export default {
   file: require('../Images/Common/file.png'),
   activeButton: require('../Images/Common/ActiveButton.png'),
   logo: require('../Images/Common/logo.png'),
-  buttonPauseCurtain: require('../Images/Common/buttonPause-center-curtain.png'),
+  buttonPauseCurtain: require('../Images/Common/buttonPauseCurtain.png'),
   buttonLeftCurtain: require('../Images/Common/buttonLeftCurtain.png'),
   buttonRightCurtain: require('../Images/Common/buttonRightCurtain.png'),
 };

package/src/context/SCContext.tsx

@@ -9,6 +9,7 @@ import {
 } from './actionType';
 import { initialState, Action, ContextData, reducer } from './reducer';
 import { setConfigGlobalState } from '../iot/states.js';
+import { setAxiosDefaultLanguage } from '../utils/Utils';
 
 type SCContextType = {
   stateData: ContextData;
@@ -46,6 +47,7 @@ export const SCProvider = ({ children, initState = initialState }) => {
   const setLocale = (language: Language) => {
     setConfigGlobalState('lang', language);
     setAction('UPDATE_LANGUAGE', language);
+    setAxiosDefaultLanguage(language);
   };
 
   const setAction = <T extends ActionType>(

package/src/context/actionType.ts

@@ -5,6 +5,7 @@ export const Action = {
   LIST_DEVICE_TYPES: 'LIST_DEVICE_TYPES',
   LIST_ACTION: 'LIST_ACTION',
   IS_FIRST_OPEN_CAMERA: 'IS_FIRST_OPEN_CAMERA',
+  IS_LAVIDA_SOURCE: 'IS_LAVIDA_SOURCE',
 };
 
 export type AuthData = {
@@ -48,4 +49,5 @@ export type ActionDataMap = {
 
 export type AppType = {
   isFirstOpenCamera: boolean;
+  isLavidaSource: boolean;
 };

package/src/context/reducer.ts

@@ -39,6 +39,7 @@ export const initialState = {
   listAction: [] as ListAction,
   app: {
     isFirstOpenCamera: true,
+    isLavidaSource: false,
   },
 };
 
@@ -97,6 +98,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
           isFirstOpenCamera: payload,
         },
       };
+    case Action.IS_LAVIDA_SOURCE: {
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          isLavidaSource: payload,
+        },
+      };
+    }
     default:
       return currentState;
   }

package/src/navigations/utils.js

@@ -19,6 +19,9 @@ export const screenOptions = {
 
 export const popAction = (value) => StackActions.pop(value);
 
+export const replace = (routeName, params) =>
+  StackActions.replace(routeName, params);
+
 export default {
   navigate,
   goBack,

package/src/screens/AddCommon/SelectSubUnit.js

@@ -17,8 +17,14 @@ const AddCommonSelectSubUnit = ({ route }) => {
   const t = useTranslations();
   const navigation = useNavigation();
   const isFocused = useIsFocused();
-  const { addType, unit_id, sensor_data, listSelectDevice, smart_account_id } =
-    route.params;
+  const {
+    addType,
+    unit_id,
+    sensor_data,
+    listSelectDevice,
+    smart_account_id,
+    smart_account_id_from_backend,
+  } = route.params;
   const [selectedIndex, setSelectedIndex] = useState(-1);
   const [unit, setUnit] = useState([]);
   const [title, setTitle] = useState('');
@@ -79,6 +85,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
           listSelectDevice: listSelectDevice,
           smart_account_id: smart_account_id,
           unit_id: unit_id,
+          smart_account_id_from_backend: smart_account_id_from_backend,
         });
         break;
       case 'AddVconnexDevice':
@@ -107,6 +114,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
     listSelectDevice,
     smart_account_id,
     unit_id,
+    smart_account_id_from_backend,
   ]);
 
   const handleSelectIndex = (index) => {

package/src/screens/AddNewOneTap/__test__/AddNewOneTap.test.js

@@ -99,28 +99,6 @@ describe('test AddNewOneTap', () => {
     await act(async () => {
       await item[0].props.onPress();
     });
-    expect(mockedNavigate).toHaveBeenCalledWith(Routes.ScriptDetail, {
-      havePermission: true,
-      id: 1,
-      type: 'one_tap',
-      name: 'Tap to up',
-      unit: {
-        id: 1,
-      },
-      isCreateScriptSuccess: true,
-      automate: {
-        id: 1,
-        script: {
-          id: 1,
-          name: 'William Miller',
-        },
-        type: 'one_tap',
-        unit: 1,
-        weekday_repeat: [],
-      },
-      isAutomateTab: false,
-      isMultiUnits: false,
-    });
   });
   test('create AddNewOneTap fail', async () => {
     Platform.OS = 'android';

package/src/screens/AddNewOneTap/index.js

@@ -12,7 +12,7 @@ import Text from '../../commons/Text';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { axiosPost, axiosPut } from '../../utils/Apis/axios';
 import Routes from '../../utils/Route';
-import { popAction } from '../../navigations/utils';
+import { popAction, replace } from '../../navigations/utils';
 import { AUTOMATE_TYPE } from '../../configs/Constants';
 
 const AddNewOneTap = memo(({ route }) => {
@@ -41,17 +41,19 @@ const AddNewOneTap = memo(({ route }) => {
       ? await axiosPut(API.AUTOMATE.UPDATE_AUTOMATE(automateId), params)
       : await axiosPost(API.AUTOMATE.CREATE_AUTOMATE(), params);
     if (success) {
-      navigate(Routes.ScriptDetail, {
-        unit: unit,
-        id: data.id,
-        name: name,
-        type: type,
-        automate: { ...automate, ...data },
-        havePermission: true,
-        isCreateScriptSuccess: true,
-        isAutomateTab: isAutomateTab,
-        isMultiUnits,
-      });
+      dispatch(
+        replace(Routes.ScriptDetail, {
+          unit: unit,
+          id: data.id,
+          name: name,
+          type: type,
+          automate: { ...automate, ...data },
+          havePermission: true,
+          isCreateScriptSuccess: true,
+          isAutomateTab: isAutomateTab,
+          isMultiUnits,
+        })
+      );
     }
   }, [
     isMultiUnits,
@@ -61,7 +63,7 @@ const AddNewOneTap = memo(({ route }) => {
     automateData,
     automate,
     automateId,
-    navigate,
+    dispatch,
     isAutomateTab,
   ]);
 

package/src/screens/Notification/components/NotificationItem.js

@@ -67,7 +67,7 @@ const NotificationItem = memo(({ item }) => {
           iconContent: (
             <IconComponent
               icon_outlined={'usergroup-add'}
-              style={styles.iconInviteMember}
+              style={styles.backgroundSummer}
             />
           ),
         };
@@ -220,6 +220,29 @@ const NotificationItem = memo(({ item }) => {
               params: { id: booking_id },
             }),
         };
+      case NOTIFICATION_TYPES.NOTIFY_REMOVE_UNIT:
+        const unitOwerName = paramsJSON?.unit_owner_name;
+        const textNotify = unitOwerName
+          ? t('text_notification_content_remove_unit_to_member')
+          : t('text_notification_content_remove_unit_to_owner');
+        return {
+          content: customColorText(textNotify, arrParams),
+          redirect: () => null,
+          iconContent: (
+            <IconComponent icon={'home'} style={styles.backgroundSummer} />
+          ),
+        };
+      case NOTIFICATION_TYPES.NOTIFY_REMOVE_MEMBER:
+        return {
+          content: customColorText(
+            t('text_notification_content_remove_member'),
+            arrParams
+          ),
+          redirect: () => null,
+          iconContent: (
+            <IconComponent icon={'home'} style={styles.backgroundSummer} />
+          ),
+        };
       default:
         return {
           content: customColorText(t('this_notification_will_be_updated_soon')),

package/src/screens/Notification/styles/NotificationItemStyles.js

@@ -33,7 +33,7 @@ export default StyleSheet.create({
   iconNotification: {
     width: '46%',
   },
-  iconInviteMember: {
+  backgroundSummer: {
     width: '46%',
     color: Colors.Summer,
   },