@eohjsc/react-native-smart-city 0.4.47 → 0.4.48

package/README.md

@@ -3,11 +3,7 @@
 ## Getting started
 
 1. Install package dependencies:
-- Using [react-native-get-random-values](https://www.npmjs.com/package/react-native-get-random-values): `yarn add react-native-get-random-values`
-```
-// Add this line to your 'index.js'
-import 'react-native-get-random-values'
-```
+
 - Using [Yarn](https://yarnpkg.com/): `yarn add react-native-reanimated@^1.10.1`
 
 2. Install:

package/android/build.gradle

@@ -10,17 +10,17 @@
 //   original location:
 //   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
 
-def DEFAULT_COMPILE_SDK_VERSION = 33
-def DEFAULT_BUILD_TOOLS_VERSION = '33.0.0'
-def DEFAULT_MIN_SDK_VERSION = 24
-def DEFAULT_TARGET_SDK_VERSION = 33
+def DEFAULT_COMPILE_SDK_VERSION = 28
+def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
+def DEFAULT_MIN_SDK_VERSION = 16
+def DEFAULT_TARGET_SDK_VERSION = 28
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
+apply plugin: 'maven'
 
 buildscript {
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
@@ -38,6 +38,9 @@ buildscript {
     }
 }
 
+apply plugin: 'com.android.library'
+apply plugin: 'maven'
+
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
@@ -103,17 +106,17 @@ def configureReactNativePom(def pom) {
 afterEvaluate { project ->
     // some Gradle build hooks ref:
     // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
-    // task androidJavadoc(type: Javadoc) {
-    //     source = android.sourceSets.main.java.srcDirs
-    //     classpath += files(android.bootClasspath)
-    //     classpath += files(project.getConfigurations().getByName('compile').asList())
-    //     include '**/*.java'
-    // }
-
-    // task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-    //     classifier = 'javadoc'
-    //     from androidJavadoc.destinationDir
-    // }
+    task androidJavadoc(type: Javadoc) {
+        source = android.sourceSets.main.java.srcDirs
+        classpath += files(android.bootClasspath)
+        classpath += files(project.getConfigurations().getByName('compile').asList())
+        include '**/*.java'
+    }
+
+    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
+        classifier = 'javadoc'
+        from androidJavadoc.destinationDir
+    }
 
     task androidSourcesJar(type: Jar) {
         classifier = 'sources'
@@ -132,13 +135,15 @@ afterEvaluate { project ->
 
     artifacts {
         archives androidSourcesJar
-        // archives androidJavadocJar
+        archives androidJavadocJar
     }
 
     task installArchives(type: Upload) {
         configuration = configurations.archives
-        repositories.maven {
-            url = uri("file://${projectDir}/../android/maven")
+        repositories.mavenDeployer {
+            // Deploy to react-native-event-bridge/maven, ready to publish to npm
+            repository url: "file://${projectDir}/../android/maven"
+            configureReactNativePom pom
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.4.47",
+  "version": "0.4.48",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -65,9 +65,7 @@
   "peerDependencies": {
     "@react-native-community/clipboard": "*",
     "react": "*",
-    "react-native": "*",
-    "react-native-modal": "*",
-    "react-native-modal-datetime-picker": "*"
+    "react-native": "*"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
@@ -112,14 +110,15 @@
     "@miblanchard/react-native-slider": "^2.2.0",
     "@react-native-clipboard/clipboard": "^1.11.1",
     "@react-native-community/async-storage": "^1.12.1",
-    "@react-native-community/cameraroll": "4.1.2",
+    "@react-native-community/cameraroll": "^4.0.0",
     "@react-native-community/checkbox": "^0.5.5",
-    "@react-native-community/datetimepicker": "^7.0.1",
+    "@react-native-community/datetimepicker": "https://github.com/hinh-eoh/datepicker",
     "@react-native-community/geolocation": "^2.0.2",
     "@react-native-community/masked-view": "^0.1.10",
     "@react-native-community/netinfo": "^9.3.4",
     "@react-native-community/segmented-control": "^2.1.1",
     "@react-native-community/slider": "^3.0.3",
+    "@react-native-community/toolbar-android": "^0.1.0-rc.2",
     "@react-native-picker/picker": "^1.16.7",
     "@react-navigation/bottom-tabs": "^5.8.0",
     "@react-navigation/drawer": "^5.9.0",
@@ -130,7 +129,6 @@
     "apisauce": "^2.1.5",
     "axios": "^0.19.2",
     "base-64": "^1.0.0",
-    "buffer": "^6.0.3",
     "deprecated-react-native-prop-types": "^2.3.0",
     "dotenv": "^8.2.0",
     "google-libphonenumber": "^3.2.10",
@@ -138,8 +136,7 @@
     "i18n-js": "^3.7.1",
     "i18next": "^20.1.0",
     "lodash": "^4.17.19",
-    "lottie-ios": "3.4.1",
-    "lottie-react-native": "5.1.4",
+    "lottie-react-native": "4.0.3",
     "moment": "^2.27.0",
     "moment-timezone": "^0.5.32",
     "numeral": "^2.0.6",
@@ -147,7 +144,7 @@
     "pluralize": "^8.0.0",
     "postinstall": "^0.7.0",
     "precompiled-mqtt": "^4.3.14-beta",
-    "pusher-js": "^8.0.2",
+    "pusher-js": "^7.4.0",
     "pusher-js-auth": "^4.0.1",
     "python-struct": "^1.1.3",
     "querystring": "^0.2.0",
@@ -173,7 +170,7 @@
     "react-native-draggable-flatlist": "^2.6.2",
     "react-native-fast-image": "^8.3.2",
     "react-native-geocoder": "^0.5.0",
-    "react-native-gesture-handler": "^2.10.0",
+    "react-native-gesture-handler": "^1.7.0",
     "react-native-get-location": "^2.0.0",
     "react-native-image-crop-picker": "^0.37.2",
     "react-native-image-resizer": "^1.4.5",
@@ -183,8 +180,8 @@
     "react-native-localize": "^1.4.1",
     "react-native-maps": "0.27.1",
     "react-native-maps-directions": "^1.8.0",
-    "react-native-modal": "^13.0.1",
-    "react-native-modal-datetime-picker": "15.0.0",
+    "react-native-modal": "^11.5.6",
+    "react-native-modal-datetime-picker": "^8.9.3",
     "react-native-new-snap-carousel": "^3.9.3",
     "react-native-onesignal": "^4.3.1",
     "react-native-pager-view": "^5.4.1",
@@ -203,7 +200,7 @@
     "react-native-udp": "^4.1.3",
     "react-native-version-check": "^3.4.2",
     "react-native-vlc-media-player": "^1.0.41",
-    "react-native-webview": "^12.0.2",
+    "react-native-webview": "11.17.2",
     "react-native-wheel-color-picker": "^1.2.0",
     "react-native-wheel-scrollview-picker": "^1.2.2",
     "react-native-wifi-reborn": "^4.5.0",
@@ -211,8 +208,8 @@
     "string-format": "^2.0.0",
     "sync-directory": "^5.1.7",
     "timezone-mock": "^1.1.3",
-    "uuid": "^9.0.0",
     "uuid-by-string": "^3.0.2",
+    "uuidv4": "^6.2.13",
     "validator": "^13.1.1",
     "victory-native": "^35.0.1"
   },

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -49,10 +49,13 @@ const NumberUpDownActionTemplate = ({
 
   const doActionAndWatchConfig = useCallback(
     async (actionData, actionValue) => {
-      let data = { value: actionValue, temperature: actionValue };
-      if (allow_config_store_value && config) {
-        data.config_id = config;
-        data.config_value = actionValue;
+      let data = actionValue;
+      if (device_type !== DEVICE_TYPE.GOOGLE_HOME) {
+        data = { temperature: actionValue };
+        if (allow_config_store_value && config) {
+          data.config_id = config;
+          data.config_value = actionValue;
+        }
       }
       await doAction(actionData, data);
       if (!is_managed_by_backend) {

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

@@ -111,8 +111,7 @@ describe('Test ColorPickerTemplate', () => {
     await act(async () => {
       await wheelpicker.props.onStart();
     });
-    // NOTE: Hinh will fix it later
-    expect(mockSetAction).not.toBeCalled();
+    expect(mockSetAction).toBeCalled();
   });
 
   it('test WheelColorPicker onChangeColorComplete', async () => {
@@ -129,15 +128,13 @@ describe('Test ColorPickerTemplate', () => {
     await act(async () => {
       await wheelpicker.props.onStart();
     });
-    // NOTE: Hinh will fix it later
-    expect(mockSetAction).toBeCalledTimes(0);
+    expect(mockSetAction).toBeCalledTimes(1);
     expect(mockDoAction).toBeCalledTimes(0);
 
     await act(async () => {
       await wheelpicker.props.onChangeColorComplete('#ffffff');
     });
-    // NOTE: Hinh will fix it later
-    expect(mockSetAction).toBeCalledTimes(0);
+    expect(mockSetAction).toBeCalledTimes(2);
     expect(mockDoAction).toBeCalledTimes(1);
   });
 });

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

@@ -400,10 +400,7 @@ describe('Test NumberUpDownTemplate', () => {
         id: 20,
         key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
       },
-      {
-        value: 26,
-        temperature: 26,
-      }
+      26
     );
   });
 

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

@@ -1,9 +1,14 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import { DEVICE_TYPE } from '../../../configs/Constants';
 import TwoButtonTemplate from '../TwoButtonTemplate';
 
+jest.mock('react', () => ({
+  ...jest.requireActual('react'),
+  useState: jest.fn(),
+}));
+
 jest.mock('@react-navigation/native', () => {
   return {
     ...jest.requireActual('@react-navigation/native'),
@@ -68,7 +73,11 @@ describe('Test TwoButtonTemplate', () => {
   };
   let wrapper;
 
+  const setState = jest.fn();
+  useState.mockImplementation((init) => [init, setState]);
+
   const assertRender = async (state, text) => {
+    useState.mockImplementationOnce((init) => [state, setState]);
     const mockDoAction = jest.fn();
     await act(async () => {
       wrapper = create(
@@ -92,6 +101,7 @@ describe('Test TwoButtonTemplate', () => {
   });
 
   const assertActionCall = async (state, action_data) => {
+    useState.mockImplementationOnce((init) => [state, setState]);
     const mockDoAction = jest.fn();
     await act(async () => {
       wrapper = create(

package/src/commons/Dashboard/MyPinnedSharedUnit/__test__/MyPinnedSharedUnit.test.js

@@ -12,6 +12,7 @@ import { API } from '../../../../configs';
 import { TouchableOpacity } from 'react-native';
 import api from '../../../../utils/Apis/axios';
 import SharedUnit from '../../../Unit/SharedUnit';
+import { Action } from '../../../../context/actionType';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -74,6 +75,10 @@ describe('Test MyPinnedSharedUnit', () => {
       goToAllSharedUnits.props.onPress();
     });
     expect(mockedNavigate).toHaveBeenCalled();
+    expect(mockSetAction).toBeCalledWith(
+      Action.IS_CHECK_CLEAR_CACHE_UNITS,
+      false
+    );
   });
 
   it('render without item', async () => {

package/src/commons/Dashboard/MyPinnedSharedUnit/index.js

@@ -96,7 +96,12 @@ const MyPinnedSharedUnit = ({ refreshing }) => {
             .filter((sharedUnit) => sharedUnit?.is_pin)
             .map((item, index) => (
               <View key={item.id}>
-                <SharedUnit item={item} index={index} isOptions={false} />
+                <SharedUnit
+                  item={item}
+                  index={index}
+                  navigation={navigation}
+                  isOptions={false}
+                />
                 {index !== sharedUnits.length - 1 && (
                   <View style={styles.separator} />
                 )}

package/src/commons/Dashboard/MyUnit/index.js

@@ -189,15 +189,13 @@ const MyUnit = ({ refreshing }) => {
 
   useEffect(() => {
     if (isDeleteUnitSuccessFully || previousMyUnits?.length > myUnits?.length) {
-      carouselRef?.current?.snapToItem(0, true);
-      setAction(Action.RESET_DELETE_UNIT_ACTION);
+      const to = setTimeout(() => {
+        carouselRef?.current?.snapToItem();
+        setAction(Action.RESET_DELETE_UNIT_ACTION);
+      }, 60);
+      return () => clearTimeout(to);
     }
-  }, [
-    isDeleteUnitSuccessFully,
-    setAction,
-    previousMyUnits?.length,
-    myUnits?.length,
-  ]);
+  }, [isDeleteUnitSuccessFully, setAction, previousMyUnits, myUnits]);
 
   return (
     <>

package/src/commons/DateTimeRangeChange/index.js

@@ -119,7 +119,7 @@ const DateTimeRangeChange = memo(
         </View>
         <DateTimePickerModal
           isVisible={eventPicker.showModalStart}
-          date={startDate._d}
+          date={startDate.valueOf()}
           mode={mode}
           onConfirm={onConfirmStart}
           onCancel={onCancel}
@@ -132,7 +132,7 @@ const DateTimeRangeChange = memo(
         />
         <DateTimePickerModal
           isVisible={eventPicker.showModalEnd}
-          date={endDate._d}
+          date={endDate.valueOf()}
           mode={mode}
           onConfirm={onConfirmEnd}
           onCancel={onCancel}
@@ -142,7 +142,7 @@ const DateTimeRangeChange = memo(
           cancelTextIOS={t('cancel')}
           confirmTextIOS={t('confirm')}
           maximumDate={new Date()}
-          minimumDate={startDate._d}
+          minimumDate={startDate.valueOf()}
         />
       </View>
     );

package/src/commons/Device/Hanet/ItemHanetDevice.js

@@ -1,6 +1,5 @@
 import React, { memo } from 'react';
 import {
-  Platform,
   StyleSheet,
   TouchableOpacity,
   TouchableWithoutFeedback,
@@ -59,10 +58,7 @@ const ItemHanetDevice = memo(
               {title}
             </Text>
             <View style={styles.row}>
-              <IconOutline
-                name={Platform.OS === 'android' ? 'right-square' : 'right'}
-                size={12}
-              />
+              <IconOutline name="right" size={12} />
             </View>
           </TouchableOpacity>
         </View>

package/src/commons/Device/ItemAddNew/index.js

@@ -1,5 +1,5 @@
 import React, { memo } from 'react';
-import { Platform, TouchableWithoutFeedback, View } from 'react-native';
+import { TouchableWithoutFeedback, View } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import Text from '../../Text';
 
@@ -16,11 +16,7 @@ const ItemAddNew = memo(({ title, onAddNew, wrapStyle }) => {
       <View style={[styles.container, wrapStyle]}>
         <View style={styles.boxIcon}>
           <View style={styles.buttonPlus}>
-            <IconOutline
-              name={Platform.OS === 'android' ? 'plus-square' : 'plus'}
-              size={22}
-              color={Colors.Gray8}
-            />
+            <IconOutline name="plus" size={22} color={Colors.Gray8} />
           </View>
         </View>
         <View>

package/src/commons/Device/ItemDevice.js

@@ -1,6 +1,5 @@
 import React, { memo, useCallback } from 'react';
 import {
-  Platform,
   StyleSheet,
   TouchableOpacity,
   TouchableWithoutFeedback,
@@ -160,10 +159,7 @@ const ItemDevice = memo(
               >
                 {description || textConnected}
               </Text>
-              <IconOutline
-                name={Platform.OS === 'android' ? 'right-square' : 'right'}
-                size={12}
-              />
+              <IconOutline name="right" size={12} />
             </View>
           </TouchableOpacity>
         </View>

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

@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import DraggableFlatList from 'react-native-draggable-flatlist';
@@ -13,7 +12,6 @@ const wrapComponent = ({ ...rest }) => (
   </SCProvider>
 );
 
-// NOTE: Hinh will fix it later
 describe('Test FlatListDnD', () => {
   let tree;
   let setData = jest.fn();
@@ -21,31 +19,31 @@ describe('Test FlatListDnD', () => {
   let renderItem = () => <></>;
 
   it('render FlatListDnD onDragEndCT', async () => {
-    // const onDragEndCT = jest.fn();
-    // await act(async () => {
-    //   tree = renderer.create(
-    //     wrapComponent({ data, setData, onDragEndCT, renderItem })
-    //   );
-    // });
-    // const instance = tree.root;
-    // const draggableFlatList = instance.findAllByType(DraggableFlatList);
-    // expect(draggableFlatList.length).toBe(1);
-    // await act(async () => {
-    //   draggableFlatList[0].props.onDragEnd({ data: [{ id: 2 }, { id: 1 }] });
-    // });
-    // expect(setData).toBeCalledWith([{ id: 2 }, { id: 1 }]);
+    const onDragEndCT = jest.fn();
+    await act(async () => {
+      tree = renderer.create(
+        wrapComponent({ data, setData, onDragEndCT, renderItem })
+      );
+    });
+    const instance = tree.root;
+    const draggableFlatList = instance.findAllByType(DraggableFlatList);
+    expect(draggableFlatList.length).toBe(1);
+    await act(async () => {
+      draggableFlatList[0].props.onDragEnd({ data: [{ id: 2 }, { id: 1 }] });
+    });
+    expect(setData).toBeCalledWith([{ id: 2 }, { id: 1 }]);
   });
 
-  // it('render FlatListDnD onDragEnd', async () => {
-  //   await act(async () => {
-  //     tree = renderer.create(wrapComponent({ data, setData, renderItem }));
-  //   });
-  //   const instance = tree.root;
-  //   const draggableFlatList = instance.findAllByType(DraggableFlatList);
-  //   expect(draggableFlatList.length).toBe(1);
-  //   await act(async () => {
-  //     draggableFlatList[0].props.onDragEnd({ data: [{ id: 2 }, { id: 1 }] });
-  //   });
-  //   expect(setData).toBeCalledWith([{ id: 2 }, { id: 1 }]);
-  // });
+  it('render FlatListDnD onDragEnd', async () => {
+    await act(async () => {
+      tree = renderer.create(wrapComponent({ data, setData, renderItem }));
+    });
+    const instance = tree.root;
+    const draggableFlatList = instance.findAllByType(DraggableFlatList);
+    expect(draggableFlatList.length).toBe(1);
+    await act(async () => {
+      draggableFlatList[0].props.onDragEnd({ data: [{ id: 2 }, { id: 1 }] });
+    });
+    expect(setData).toBeCalledWith([{ id: 2 }, { id: 1 }]);
+  });
 });

package/src/commons/GroupCheckBox/__test__/GroupCheckBox.test.js

@@ -1,12 +1,22 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { act, create } from 'react-test-renderer';
 import { TouchableOpacity } from 'react-native';
 
 import { AccessibilityLabel } from '../../../configs/Constants';
 import GroupCheckBox from '..';
 
+jest.mock('react', () => ({
+  ...jest.requireActual('react'),
+  useState: jest.fn(),
+}));
+
 describe('Test Group CheckBox', () => {
   let tree;
+  const mockSetState = () => {
+    const setState = jest.fn();
+    useState.mockImplementation((init) => [init, setState]);
+    return setState;
+  };
 
   const findGroupCheckBoxItem = (instance) => {
     const item = instance.find(
@@ -24,6 +34,7 @@ describe('Test Group CheckBox', () => {
         description: 'description',
       },
     ];
+    mockSetState();
     await act(async () => {
       tree = await create(<GroupCheckBox data={data} />);
     });
@@ -40,6 +51,7 @@ describe('Test Group CheckBox', () => {
       },
     ];
     const mockFunc = jest.fn();
+    const setState = mockSetState();
     await act(async () => {
       tree = await create(
         <GroupCheckBox data={data} onSelect={mockFunc} multiple />
@@ -50,6 +62,9 @@ describe('Test Group CheckBox', () => {
     await act(async () => {
       item.props.onSelect(0);
     });
+    expect(setState).toHaveBeenCalledTimes(2);
+    expect(setState).toHaveBeenNthCalledWith(1, [0]);
+    expect(setState).toHaveBeenNthCalledWith(2, [0]);
     expect(mockFunc).toHaveBeenCalledWith([
       { description: 'description', source: 'source', title: 'testItem' },
     ]);
@@ -70,6 +85,7 @@ describe('Test Group CheckBox', () => {
       },
     ];
     const mockFunc = jest.fn();
+    const setState = mockSetState();
     await act(async () => {
       tree = await create(<GroupCheckBox data={data} onSelect={mockFunc} />);
     });
@@ -78,6 +94,8 @@ describe('Test Group CheckBox', () => {
     await act(async () => {
       item.props.onSelect(0);
     });
+    expect(setState).toHaveBeenNthCalledWith(1, [0]);
+    expect(setState).toHaveBeenNthCalledWith(2, [0]);
     expect(mockFunc).toHaveBeenCalledWith({
       description: 'description 1',
       title: 'title 1',
@@ -96,6 +114,8 @@ describe('Test Group CheckBox', () => {
       },
     ];
     const mockFunc = jest.fn();
+    const setState = jest.fn();
+    useState.mockImplementation((init) => [[0], setState]);
     await act(async () => {
       tree = await create(<GroupCheckBox data={data} onSelect={mockFunc} />);
     });
@@ -108,6 +128,7 @@ describe('Test Group CheckBox', () => {
     await act(async () => {
       items[1].props.onSelect(0);
     });
+    expect(setState).toHaveBeenCalledWith([]); // called 1 time
     expect(mockFunc).toHaveBeenCalledWith({
       description: 'description 1',
       title: 'title 1',

package/src/commons/HeaderAni/index.js

@@ -1,12 +1,6 @@
 import React, { memo, useCallback } from 'react';
 import { Icon } from '@ant-design/react-native';
-import {
-  TouchableOpacity,
-  StyleSheet,
-  Animated,
-  View,
-  Platform,
-} from 'react-native';
+import { TouchableOpacity, StyleSheet, Animated, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { getStatusBarHeight } from 'react-native-iphone-x-helper';
 
@@ -101,11 +95,7 @@ const HeaderAni = memo(
             onPress={onPressLeft}
             accessibilityLabel={AccessibilityLabel.ICON_BACK}
           >
-            <Icon
-              name={Platform.OS === 'android' ? 'left-square' : 'left'}
-              size={27}
-              color={Colors.Gray9}
-            />
+            <Icon name={'left'} size={27} color={Colors.Gray9} />
           </TouchableOpacity>
           <View styles={styles.wrapRightComponent}>{rightComponent}</View>
         </Animated.View>