@eohjsc/react-native-smart-city 0.4.41 → 0.4.43

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.4.41",
+  "version": "0.4.43",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -102,7 +102,6 @@
   "dependencies": {
     "@ant-design/icons-react-native": "^2.2.1",
     "@ant-design/react-native": "^4.0.5",
-    "@react-native-picker/picker": "^1.16.7",
     "@babel/helper-environment-visitor": "^7.16.7",
     "@eohjsc/react-native-keyboard-aware-scroll-view": "^0.9.5",
     "@formatjs/intl-getcanonicallocales": "^1.4.5",
@@ -121,6 +120,7 @@
     "@react-native-community/netinfo": "^9.3.4",
     "@react-native-community/segmented-control": "^2.1.1",
     "@react-native-community/slider": "^3.0.3",
+    "@react-native-picker/picker": "^1.16.7",
     "@react-navigation/bottom-tabs": "^5.8.0",
     "@react-navigation/drawer": "^5.9.0",
     "@react-navigation/native": "^5.7.0",
@@ -211,8 +211,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,13 +49,10 @@ const NumberUpDownActionTemplate = ({
 
   const doActionAndWatchConfig = useCallback(
     async (actionData, 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;
-        }
+      let data = { value: actionValue, 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__/NumberUpDownTemplate.test.js

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

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

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

package/src/commons/Modal/ModalCustom.js

@@ -16,8 +16,8 @@ const ModalCustom = (props) => {
       useNativeDriver
       animationIn={'slideInUp'}
       animationOut={'slideOutDown'}
-      animationInTiming={500}
-      animationOutTiming={500}
+      animationInTiming={400}
+      animationOutTiming={400}
       backdropColor={Colors.BlackTransparent5}
       hideModalContentWhileAnimating
       {...props}

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

@@ -89,6 +89,7 @@ const ItemOneTap = memo(({ automate = {}, wrapSyles, onPressItem }) => {
             color={Colors.Gray9}
             type="Body"
             style={styles.name}
+            accessibilityLabel={AccessibilityLabel.TEXT_AUTOMATE_NAME}
           >
             {script?.name}
           </Text>

package/src/configs/AccessibilityLabel.js

@@ -240,6 +240,7 @@ export default {
   ICON_CLOSE: 'ICON_CLOSE',
   ICON_MORE: 'ICON_MORE',
   ICON_ARROW_RIGHT: 'ICON_ARROW_RIGHT',
+  TEXT_AUTOMATE_NAME: 'TEXT_AUTOMATE_NAME',
 
   // Parking input maunaly spot
   PARKING_SPOT_INFO_BUTTON: 'PARKING_SPOT_INFO_BUTTON',

package/src/screens/Device/__test__/detail.test.js

@@ -194,6 +194,7 @@ describe('test DeviceDetail', () => {
     useLayoutEffectSpy.mockImplementation(() => setState);
     mock.reset();
     mockedNavigate.mockClear();
+    watchMultiConfigs.mockReset();
   });
 
   it('render DeviceDetail render SensorDisplayItem', async () => {
@@ -813,6 +814,65 @@ describe('test DeviceDetail', () => {
         el.props.accessibilityLabel === AccessibilityLabel.SENSOR_DISPLAY_ITEM
     );
     expect(sensorDisplayItem.length).toEqual(1);
-    expect(watchMultiConfigs).toHaveBeenCalled();
+    expect(watchMultiConfigs).toHaveBeenCalledWith([1]);
+  });
+
+  it('watch action config', async () => {
+    mock.onGet(API.CHIP.JSON_CONFIGURATION).reply(200, []);
+    const responseDisplay = {
+      items: [
+        {
+          id: 1,
+          order: 0,
+          template: 'on_off_button_action_template',
+          type: 'on_off_button_action_template',
+          configuration: {
+            config: 2,
+          },
+        },
+      ],
+    };
+    const responseDisplayValueV2 = {
+      configs: [{ id: 2 }],
+      is_connected: true,
+      last_updated: '2021-01-24T12:00:00.000Z',
+    };
+    mockAxios(responseDisplay, responseDisplayValueV2);
+    await act(async () => {
+      tree = await create(wrapComponent(store, account, route));
+    });
+
+    expect(watchMultiConfigs).toHaveBeenCalledWith([2]);
+  });
+
+  it('watch stages grid action config', async () => {
+    mock.onGet(API.CHIP.JSON_CONFIGURATION).reply(200, []);
+    const responseDisplay = {
+      items: [
+        {
+          id: 1,
+          order: 0,
+          template: 'StatesGridActionTemplate',
+          configuration: {
+            options: [
+              {
+                config: 3,
+              },
+            ],
+          },
+        },
+      ],
+    };
+    const responseDisplayValueV2 = {
+      configs: [{ id: 2 }],
+      is_connected: true,
+      last_updated: '2021-01-24T12:00:00.000Z',
+    };
+    mockAxios(responseDisplay, responseDisplayValueV2);
+    await act(async () => {
+      tree = await create(wrapComponent(store, account, route));
+    });
+
+    expect(watchMultiConfigs).toHaveBeenCalledWith([3]);
   });
 });

package/src/screens/Device/detail.js

@@ -59,7 +59,7 @@ import { useReceiveNotifications } from '../../hooks';
 import useChipJsonConfiguration, {
   useConnectChipMqtt,
 } from '../../hooks/useMqtt';
-import { realWatchMultiConfigs } from '../../iot/Monitor';
+import { watchMultiConfigs } from '../../iot/Monitor';
 
 const DeviceDetail = ({ route }) => {
   const configIdsTemp = useRef([]);
@@ -136,8 +136,7 @@ const DeviceDetail = ({ route }) => {
     }
 
     return action.some((item) => {
-      const { configuration } = item?.configuration;
-      return JSON.stringify(configuration).includes(
+      return JSON.stringify(item?.configuration)?.includes(
         '"command_prefer_over_bluetooth":true'
       );
     });
@@ -500,35 +499,30 @@ const DeviceDetail = ({ route }) => {
       let params = new URLSearchParams();
       const configIds = [];
 
+      // todo Bang refactor widgets like dashboard
       display.items.map((item) => {
-        const type = item?.template || item?.type;
         if (!item.configuration) {
           return;
         }
-        if (!['action', 'value'].includes(type)) {
-          return;
-        }
-        if (type === 'action') {
-          if (
-            [
-              'on_off_button_action_template',
-              'one_button_action_template',
-            ].includes(item.configuration.template)
-          ) {
-            !configIds.includes(item.configuration.configuration.config) &&
-              configIds.push(item.configuration.configuration.config);
+        item.configuration.configs?.map((config) => {
+          if (!configIds.includes(config.id)) {
+            configIds.push(config.id);
           }
-        }
-        if (type === 'value') {
-          item.configuration.configs.map((config) => {
-            if (!configIds.includes(config.id)) {
-              configIds.push(config.id);
-            }
-          });
+        });
+        item.configuration.options?.map((option) => {
+          if (!configIds.includes(option.config)) {
+            configIds.push(option.config);
+          }
+        });
+        if (item.configuration.config) {
+          !configIds.includes(item.configuration.config) &&
+            configIds.push(item.configuration.config);
         }
       });
       configIdsTemp.current = configIds.filter(Boolean);
 
+      watchMultiConfigs(configIdsTemp.current);
+
       configIds.map((id) => {
         params.append('config', id);
       });
@@ -725,7 +719,7 @@ const DeviceDetail = ({ route }) => {
   }, [sensor]);
 
   useEffect(() => {
-    appState === 'active' && realWatchMultiConfigs(configIdsTemp.current);
+    appState === 'active' && watchMultiConfigs(configIdsTemp.current);
   }, [appState]);
 
   const shouldRender =

package/src/screens/Sharing/InfoMemberUnit.js

@@ -58,7 +58,9 @@ const InfoMemberUnit = memo(({ route }) => {
       if (stateAlertAction?.is_change) {
         hideAlertAction();
         if (itemSelected?.role?.is_owner) {
-          setIsShowWarning(true);
+          setTimeout(() => {
+            setIsShowWarning(true);
+          }, 500);
         }
       } else {
         removeMember(

package/src/screens/Sharing/__test__/InfoMemberUnit.test.js

@@ -131,6 +131,7 @@ describe('Test InfoMemberUnit', () => {
   });
 
   it('test change owner', async () => {
+    jest.useFakeTimers();
     mock.onGet(API.SHARE.UNIT_MEMBER_INFO(1, 1)).reply(200, {
       id: 2,
       identity: 'owner',
@@ -163,6 +164,7 @@ describe('Test InfoMemberUnit', () => {
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
+    jest.runAllTimers();
     expect(alertAction.props.visible).toEqual(false);
     expect(modalPopupCT.props.isVisible).toEqual(true);