@eohjsc/react-native-smart-city 0.4.57 → 0.4.59

package/package.json

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

package/src/commons/Action/ItemQuickAction.js

@@ -98,6 +98,10 @@ const ItemQuickAction = memo(
       on_action?.id,
     ]);
 
+    if (!config_id) {
+      return <View />;
+    }
+
     return (
       <TouchableOpacity
         accessibilityLabel={`${AccessibilityLabel.ITEM_QUICK_ACTION_PRESS}-${sensor?.id}`}

package/src/commons/Calendar/styles.js

@@ -4,7 +4,7 @@ export default StyleSheet.create({
   calendar: {
     borderTopLeftRadius: 20,
     borderTopRightRadius: 20,
-    marginBottom: 50,
+    marginBottom: 100,
   },
   arrowRight: {
     transform: [{ rotate: '180deg' }],

package/src/commons/WheelDateTimePicker/styles.js

@@ -6,7 +6,7 @@ export default StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
     height: 180,
-    marginBottom: 50,
+    marginBottom: 100,
   },
   picker: {
     width: 120,

package/src/screens/Automate/AddNewAction/SelectMonitorDevices.js

@@ -10,12 +10,7 @@ import { AUTOMATE_TYPE } from '../../../configs/Constants';
 
 const SelectMonitorDevices = ({ route }) => {
   const t = useTranslations();
-  const {
-    automate = {},
-    isCreateNewAction,
-    closeScreen,
-    unit,
-  } = route?.params || {};
+  const { automate = {}, isCreateNewAction, closeScreen } = route?.params || {};
 
   const [stations, setStations] = useState([]);
   const [listStation, setListStation] = useState([]);
@@ -31,7 +26,7 @@ const SelectMonitorDevices = ({ route }) => {
       configs.params.type = 'event';
     }
     await fetchWithCache(
-      API.UNIT.DEVICE_SENSOR(automate?.unit ? automate?.unit : unit.id),
+      API.UNIT.DEVICE_SENSOR(automate?.unit),
       configs,
       (response) => {
         const { success, data } = response;
@@ -50,7 +45,7 @@ const SelectMonitorDevices = ({ route }) => {
       }
     );
     setLoading(false);
-  }, [automate?.type, automate?.unit, unit.id]);
+  }, [automate?.type, automate?.unit]);
 
   useEffect(() => {
     if (!automate?.sensor_id) {

package/src/screens/Automate/AddNewAction/SetupConfigCondition.js

@@ -58,13 +58,13 @@ const SetupConfigCondition = () => {
     if (item.evaluate_template === 'boolean') {
       return [
         {
-          title: item.evaluate_configuration?.on?.text,
+          title: item.evaluate_configuration?.off?.text,
           condition: 'value_evaluation',
           config: item.id,
           value: 0,
         },
         {
-          title: item.evaluate_configuration?.off?.text,
+          title: item.evaluate_configuration?.on?.text,
           condition: 'value_evaluation',
           config: item.id,
           value: 1,

package/src/screens/Automate/AddNewAction/__test__/SetupConfigCondition.test.js

@@ -172,8 +172,8 @@ describe('Test SetupConfigCondition', () => {
     );
     const texts = modalCustom.findAllByType(Text);
     expect(texts).toHaveLength(2);
-    expect(texts[0].props.children).toEqual('Case On');
-    expect(texts[1].props.children).toEqual('Case Off');
+    expect(texts[1].props.children).toEqual('Case On');
+    expect(texts[0].props.children).toEqual('Case Off');
   });
 
   const testConditionValue = async (value, message) => {

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

@@ -56,6 +56,7 @@ const navContextValue = {
   isFocused: () => false,
   addListener: jest.fn(() => jest.fn()),
 };
+
 const wrapComponent = (state, account, route) => (
   <SCProvider initState={state}>
     <NavigationContext.Provider

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

@@ -16,6 +16,12 @@ import Compass from '../../../commons/Device/WindDirection/Compass';
 import DeviceAlertStatus from '../../../commons/Device/DeviceAlertStatus';
 import MockAdapter from 'axios-mock-adapter';
 import api from '../../../utils/Apis/axios';
+import CurrentRainSensor from '../../../commons/Device/RainningSensor/CurrentRainSensor';
+
+jest.mock('../../../iot/states', () => ({
+  useConfigGlobalState: () => [{}, null],
+  getConfigGlobalState: () => 'en',
+}));
 
 new MockAdapter(api.axiosInstance);
 
@@ -102,6 +108,7 @@ describe('Test SensorDisplayItem', () => {
     const actionGroup = instance.findAllByType(ActionGroup);
     expect(actionGroup).toHaveLength(1);
   });
+
   it('render camera', async () => {
     const item = {
       id: 10452,
@@ -304,4 +311,106 @@ describe('Test SensorDisplayItem', () => {
     const flatListItems = instance.findAllByType(DeviceAlertStatus);
     expect(flatListItems).toHaveLength(1);
   });
+
+  const _testCircleMini = async (item, expectProps) => {
+    const sensor = {
+      name: 'Sensor name',
+      is_managed_by_backend: false,
+    };
+
+    await act(async () => {
+      tree = await renderer.create(wrapComponent({ item, sensor }));
+    });
+    const instance = tree.root;
+
+    const currentRainSensor = instance.findByType(CurrentRainSensor);
+    expect(currentRainSensor.props).toEqual(expectProps);
+  };
+
+  it('render circle_mini', async () => {
+    const globalStates = require('../../../iot/states');
+    globalStates.useConfigGlobalState = () => [{ 99: { value: 1 } }, null];
+
+    const item = {
+      id: 10452,
+      order: 0,
+      template: 'circle_mini',
+      type: 'circle_mini',
+      configuration: {
+        config: {
+          id: 99,
+          title: '1',
+          color: 'blue',
+        },
+      },
+      is_configuration_ready: true,
+    };
+
+    await _testCircleMini(item, {
+      data: [
+        {
+          id: 99,
+          title: '1',
+          color: 'blue',
+          value: 1,
+          evaluate: {
+            color: null,
+            text: '--',
+          },
+        },
+      ],
+      isWidgetOrder: undefined,
+    });
+  });
+
+  it('render circle_mini without config value', async () => {
+    const globalStates = require('../../../iot/states');
+    globalStates.useConfigGlobalState = () => [{ 2: { value: 1 } }, null];
+
+    const item = {
+      id: 10452,
+      order: 0,
+      template: 'circle_mini',
+      type: 'circle_mini',
+      configuration: {
+        config: {
+          id: 99,
+          title: '1',
+          color: 'blue',
+        },
+      },
+      is_configuration_ready: true,
+    };
+
+    await _testCircleMini(item, {
+      data: [
+        {
+          id: 99,
+          title: '1',
+          color: 'blue',
+          value: null,
+          evaluate: null,
+        },
+      ],
+      isWidgetOrder: undefined,
+    });
+  });
+
+  it('render circle_mini without config id', async () => {
+    const item = {
+      id: 10452,
+      order: 0,
+      template: 'circle_mini',
+      type: 'circle_mini',
+      configuration: {
+        config: null,
+      },
+      is_configuration_ready: true,
+    };
+
+    await _testCircleMini(item, {
+      data: undefined,
+      isWidgetOrder: undefined,
+    });
+  });
 });

package/src/screens/Device/components/SensorDisplayItem.js

@@ -46,6 +46,13 @@ export const SensorDisplayItem = ({
 
   const evaluateValue = useEvaluateValue();
 
+  const checkConfigValue = (configValue) => {
+    if (configValue === null || configValue === undefined) {
+      return false;
+    }
+    return true;
+  };
+
   const getData = useCallback(() => {
     if (!item.configuration) {
       return;
@@ -83,6 +90,34 @@ export const SensorDisplayItem = ({
     value_evaluation,
   ]);
 
+  const getDataCircleMini = useCallback(() => {
+    if (!item?.configuration?.config?.id) {
+      return;
+    }
+
+    const config = item.configuration.config;
+    const configValue = configValues[config.id]?.value;
+    const configEvaluate = evaluate[config.id] || {};
+
+    const hasConfigValue = checkConfigValue(configValue);
+
+    let value = {
+      id: config.id,
+      value: hasConfigValue ? configValue : null,
+      evaluate: hasConfigValue
+        ? evaluateValue(configValue, value_evaluation) || configEvaluate
+        : null,
+    };
+
+    return [{ ...config, ...value }].filter(Boolean);
+  }, [
+    configValues,
+    evaluate,
+    evaluateValue,
+    item.configuration,
+    value_evaluation,
+  ]);
+
   const doAction = useCallback(
     async (action, data) => {
       if (processing) {
@@ -156,6 +191,13 @@ export const SensorDisplayItem = ({
           isWidgetOrder={isWidgetOrder}
         />
       );
+    case 'circle_mini':
+      return (
+        <CurrentRainSensor
+          data={getDataCircleMini(item)}
+          isWidgetOrder={isWidgetOrder}
+        />
+      );
     case 'value':
       switch (type || template) {
         case 'circle':