@eohjsc/react-native-smart-city 0.3.76 → 0.3.77

package/package.json

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

package/src/commons/Action/ItemQuickAction.js

@@ -6,89 +6,93 @@ import { useRemoteControl } from '../../hooks/IoT';
 import { useConfigGlobalState } from '../../iot/states';
 import IconComponent from '../IconComponent';
 
-const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus }) => {
-  const [isSendingCommand, setIsSendingCommand] = useState(false);
-  const [action, setAction] = useState(sensor.action);
-  // eslint-disable-next-line no-unused-vars
-  const [configValues, _] = useConfigGlobalState('configValues');
-  const [isOn, setIsOn] = useState(false);
+const ItemQuickAction = memo(
+  ({ sensor, wrapperStyle, setStatus, iconSize = 40 }) => {
+    const [isSendingCommand, setIsSendingCommand] = useState(false);
+    const [action, setAction] = useState(sensor.action);
+    // eslint-disable-next-line no-unused-vars
+    const [configValues, _] = useConfigGlobalState('configValues');
+    const [isOn, setIsOn] = useState(false);
 
-  const sendRemoteCommand = useRemoteControl();
-  const [processing, setProcessing] = useState(false);
+    const sendRemoteCommand = useRemoteControl();
+    const [processing, setProcessing] = useState(false);
 
-  useEffect(() => {
-    if (!(sensor.quick_action?.config_id in configValues)) {
-      return;
-    }
-    const configValue = configValues[sensor.quick_action.config_id];
-    setIsOn(configValue?.value);
-  }, [sensor, configValues]);
-
-  useEffect(() => {
-    if (!sensor.quick_action) {
-      return;
-    }
+    useEffect(() => {
+      if (!(sensor.quick_action?.config_id in configValues)) {
+        return;
+      }
+      const configValue = configValues[sensor.quick_action.config_id];
+      setIsOn(configValue?.value);
+    }, [sensor, configValues]);
 
-    if (isOn) {
-      setAction(sensor.quick_action.off_action);
-      setStatus && setStatus(sensor.quick_action.on_status);
-    } else {
-      setAction(sensor.quick_action.on_action);
-      setStatus && setStatus(sensor.quick_action.off_status);
-    }
-  }, [isOn, setStatus, sensor.quick_action]);
+    useEffect(() => {
+      if (!sensor.quick_action) {
+        return;
+      }
 
-  const userId = useSCContextSelector((state) => state?.auth.account.user.id);
-  const onActionPress = useCallback(async () => {
-    if (processing) {
-      return;
-    }
-    setProcessing(true);
-    let data = null;
-    if (
-      action?.allow_config_store_value_id === sensor?.quick_action?.config_id
-    ) {
-      if (action?.name?.toLowerCase().includes('off')) {
-        data = {
-          config_id: action?.allow_config_store_value_id,
-          config_value: 0,
-        };
+      if (isOn) {
+        setAction(sensor.quick_action.off_action);
+        setStatus && setStatus(sensor.quick_action.on_status);
       } else {
-        data = {
-          config_id: action?.allow_config_store_value_id,
-          config_value: 1,
-        };
+        setAction(sensor.quick_action.on_action);
+        setStatus && setStatus(sensor.quick_action.off_status);
       }
-      data = JSON.stringify(data);
-    }
-    await sendRemoteCommand(sensor, action, data, userId);
-    setIsSendingCommand(true);
+    }, [isOn, setStatus, sensor.quick_action]);
+
+    const userId = useSCContextSelector((state) => state?.auth.account.user.id);
+    const onActionPress = useCallback(async () => {
+      if (processing) {
+        return;
+      }
+      setProcessing(true);
+      let data = null;
+      if (
+        action?.allow_config_store_value_id === sensor?.quick_action?.config_id
+      ) {
+        if (action?.name?.toLowerCase().includes('off')) {
+          data = {
+            config_id: action?.allow_config_store_value_id,
+            config_value: 0,
+          };
+        } else {
+          data = {
+            config_id: action?.allow_config_store_value_id,
+            config_value: 1,
+          };
+        }
+        data = JSON.stringify(data);
+      }
+      await sendRemoteCommand(sensor, action, data, userId);
+      setIsSendingCommand(true);
 
-    if (!sensor.quick_action.will_auto_update_status) {
-      setTimeout(() => {
-        setIsOn(action.id === sensor.quick_action.on_action.id);
-      }, sensor.quick_action.interval);
+      if (!sensor.quick_action.will_auto_update_status) {
+        setTimeout(() => {
+          setIsOn(action.id === sensor.quick_action.on_action.id);
+        }, sensor.quick_action.interval);
+      }
+      setProcessing(false);
+    }, [processing, action, sensor, sendRemoteCommand, userId]);
+
+    if (!action) {
+      return <View />;
     }
-    setProcessing(false);
-  }, [processing, action, sensor, sendRemoteCommand, userId]);
 
-  if (!action) {
-    return <View />;
+    return (
+      <TouchableOpacity
+        accessibilityLabel={`${AccessibilityLabel.ITEM_QUICK_ACTION_PRESS}-${sensor?.id}`}
+        onPress={onActionPress}
+      >
+        <View style={wrapperStyle}>
+          <IconComponent
+            icon={action?.icon_kit || action?.icon || 'PoweroffOutlined'}
+            isSendingCommand={isSendingCommand}
+            iconSize={iconSize}
+            size={iconSize}
+          />
+        </View>
+      </TouchableOpacity>
+    );
   }
-
-  return (
-    <TouchableOpacity
-      accessibilityLabel={`${AccessibilityLabel.ITEM_QUICK_ACTION_PRESS}-${sensor?.id}`}
-      onPress={onActionPress}
-    >
-      <View style={wrapperStyle}>
-        <IconComponent
-          icon={action?.icon_kit || action?.icon || 'PoweroffOutlined'}
-          isSendingCommand={isSendingCommand}
-        />
-      </View>
-    </TouchableOpacity>
-  );
-});
+);
 
 export default ItemQuickAction;

package/src/screens/SubUnit/AddSubUnit.js

@@ -25,7 +25,13 @@ const AddSubUnit = ({ route }) => {
   const t = useTranslations();
   const { dismissKeyboard } = useKeyboardShow();
   const { navigate, goBack, dispatch } = useNavigation();
-  const { unit, addType, isAddUnit, location = '' } = route?.params;
+  const {
+    unit,
+    addType,
+    isAddUnit,
+    location = '',
+    isInsideUnit,
+  } = route?.params;
   const [roomName, setRoomName] = useState('');
   const [wallpaper, setWallpaper] = useState('');
   const [imageUrl, setImageUrl] = useState('');
@@ -94,18 +100,25 @@ const AddSubUnit = ({ route }) => {
             });
             return;
           }
-          dispatch(
-            replace(Routes.UnitStack, {
-              screen: Routes.UnitDetail,
-              params: {
-                unitId: unit.id,
-                unitData: unit,
-                stationId: data.id,
-                isAddSubUnit: true,
-                routeName: Routes.DashboardStack,
-              },
-            })
-          );
+          const commonPrams = {
+            unitId: unit.id,
+            unitData: unit,
+            stationId: data.id,
+            isAddSubUnit: true,
+            routeName: Routes.DashboardStack,
+          };
+          if (isInsideUnit) {
+            navigate(Routes.UnitDetail, {
+              params: commonPrams,
+            });
+          } else {
+            dispatch(
+              replace(Routes.UnitStack, {
+                screen: Routes.UnitDetail,
+                params: commonPrams,
+              })
+            );
+          }
           cleanData();
         } else {
           awaitCreate.current = false;
@@ -118,12 +131,13 @@ const AddSubUnit = ({ route }) => {
     roomName,
     location,
     wallpaper,
-    navigate,
+    dispatch,
     t,
     unit,
     addType,
-    dispatch,
+    isInsideUnit,
     goBack,
+    navigate,
     route.params,
   ]);
 

package/src/screens/SubUnit/__test__/AddSubUnit.test.js

@@ -251,6 +251,48 @@ describe('Test AddSubUnit', () => {
     });
   });
 
+  it('test create sub-unit is in side Unit', async () => {
+    route.params = {
+      ...route.params,
+      isInsideUnit: true,
+    };
+    mock.onPost(API.SUB_UNIT.CREATE_SUB_UNIT(1)).reply(200, {});
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const viewButtonBottom = await makeValidateData(instance);
+    await act(async () => {
+      await viewButtonBottom.props.onRightClick();
+    });
+    expect(mockedNavigate).toHaveBeenCalledWith('UnitDetail', {
+      params: {
+        isAddSubUnit: true,
+        routeName: 'DashboardStack',
+        stationId: undefined,
+        unitData: { id: 1, name: 'Unit name' },
+        unitId: 1,
+      },
+    });
+  });
+
+  it('test create sub-unit is out side Unit', async () => {
+    route.params = {
+      ...route.params,
+      isInsideUnit: false,
+    };
+    mock.onPost(API.SUB_UNIT.CREATE_SUB_UNIT(1)).reply(200, {});
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const viewButtonBottom = await makeValidateData(instance);
+    await act(async () => {
+      await viewButtonBottom.props.onRightClick();
+    });
+    expect(mockNavigationDispatch).toBeCalledWith(mockReplace);
+  });
+
   it('test create sub-unit type AddHassiDevice', async () => {
     route.params = {
       ...route.params,

package/src/screens/Unit/AddMenu.js

@@ -28,7 +28,10 @@ const AddMenu = memo(({ unit, afterItemClick, showAdd, setHideAdd }) => {
         route: Routes.AddSubUnitStack,
         text: t('sub_unit'),
         image: <AddSubUnitIcon width={43} height={43} />,
-        data: { screen: Routes.AddSubUnit, params: { unit } },
+        data: {
+          screen: Routes.AddSubUnit,
+          params: { unit, isInsideUnit: true },
+        },
       },
       {
         id: 'add_member',