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

package/src/screens/Automate/ScriptDetail/utils.js

@@ -32,9 +32,43 @@ export const getAutomationData = (automate) => {
   return null;
 };
 
+const generateAutomationConditionValueEvaluation = (
+  automateData,
+  valueEvaluations,
+  t
+) => {
+  const { action, end_device_name, config_name, value } = automateData;
+
+  const index = value[1];
+  const valueEvaluation = valueEvaluations?.find((v) => v.id === value[0]);
+
+  if (valueEvaluation) {
+    if (valueEvaluation.template === 'range') {
+      return `${config_name} ${t('is')} ${
+        valueEvaluation.configuration.ranges[index]?.evaluate.text
+      }`;
+    }
+    if (valueEvaluation.template === 'boolean') {
+      return `${config_name} ${t('is')} ${
+        index
+          ? valueEvaluation.configuration.on.text
+          : valueEvaluation.configuration.off.text
+      }`;
+    }
+  }
+  let textEvent = '';
+  if (config_name) {
+    const stateConditionData = null;
+    textEvent = `${config_name} - ${t(stateConditionData?.stateValue[value])}`;
+  } else {
+    textEvent = `${end_device_name} - ${action}`;
+  }
+  return textEvent;
+};
+
 export const generateAutomationConditionText = (
   automate,
-  valueEvaluation,
+  valueEvaluations,
   t
 ) => {
   const automateData = getAutomationData(automate);
@@ -44,6 +78,13 @@ export const generateAutomationConditionText = (
 
   if ([AUTOMATE_TYPE.VALUE_CHANGE].includes(automate?.type)) {
     const { condition, config_name, value } = automateData;
+    if (condition === 'value_evaluation') {
+      return generateAutomationConditionValueEvaluation(
+        automateData,
+        valueEvaluations,
+        t
+      );
+    }
 
     let text;
     if (condition === '>') {
@@ -90,24 +131,6 @@ export const generateAutomationConditionText = (
       const textWeekday = sortWeekday.map((item) => weekday[item]).join(', ');
       return `${textWeekday} ${t('at')} ${time}`;
     }
-  } else if ([AUTOMATE_TYPE.EVENT].includes(automate?.type)) {
-    const { action, end_device_name, config_name, value } = automateData;
-
-    if (valueEvaluation) {
-      return `${config_name} ${t('is')} ${
-        valueEvaluation.configuration.ranges[value]?.evaluate.text
-      }`;
-    }
-    let textEvent = '';
-    if (config_name) {
-      const stateConditionData = null;
-      textEvent = `${config_name} - ${t(
-        stateConditionData?.stateValue[value]
-      )}`;
-    } else {
-      textEvent = `${end_device_name} - ${action}`;
-    }
-    return textEvent;
   }
   return null;
 };

package/src/screens/Automate/index.js

@@ -60,10 +60,7 @@ const Automate = () => {
     if (success && data && data.length) {
       setAutomatesData(data);
     }
-    const timeout = setTimeout(() => {
-      setIsLoading(false);
-      clearTimeout(timeout);
-    }, 1000);
+    setIsLoading(false);
   }, []);
 
   const onPressItem = useCallback(
@@ -197,6 +194,7 @@ const Automate = () => {
 
   useLayoutEffect(() => {
     setOptions({
+      /* istanbul ignore next */
       headerRight: () => (
         <TouchableOpacity style={styles.buttonAdd}>
           <IconFill name={'plus-circle'} size={28} color={Colors.Orange} />

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

@@ -360,6 +360,9 @@ describe('Test SensorDisplayItem', () => {
         },
       ],
       isWidgetOrder: undefined,
+      size: 120,
+      iconSize: 25,
+      textType: 'H4',
     });
   });
 
@@ -392,6 +395,9 @@ describe('Test SensorDisplayItem', () => {
           evaluate: null,
         },
       ],
+      size: 120,
+      iconSize: 25,
+      textType: 'H4',
       isWidgetOrder: undefined,
     });
   });
@@ -410,6 +416,9 @@ describe('Test SensorDisplayItem', () => {
 
     await _testCircleMini(item, {
       data: undefined,
+      size: 120,
+      iconSize: 25,
+      textType: 'H4',
       isWidgetOrder: undefined,
     });
   });

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

@@ -194,6 +194,9 @@ export const SensorDisplayItem = ({
     case 'circle_mini':
       return (
         <CurrentRainSensor
+          size={120}
+          textType="H4"
+          iconSize={25}
           data={getDataCircleMini(item)}
           isWidgetOrder={isWidgetOrder}
         />

package/src/screens/Device/hooks/__test__/useEvaluateValue.test.js

@@ -177,7 +177,7 @@ describe('useEvaluateValue', () => {
 
   it('test evaluate fetch from server if not exists', async () => {
     const mock = new MockAdapter(api.axiosInstance);
-    mock.onGet(API.FETCH_VALUE_EVALUATION(111)).reply(200, {
+    mock.onGet(API.VALUE_EVALUATIONS()).reply(200, {
       unit_id: 1,
       configs: [111],
     });

package/src/screens/Device/hooks/useEvaluateValue.js

@@ -87,7 +87,7 @@ export const useEvaluateValue = () => {
   return evaluateValue;
 };
 
-export const useGetEvaluateValue = (configId) => {
+export const useGetEvaluateValue = (configId, unitId) => {
   const valueEvaluations = useSCContextSelector((state) => {
     return state.valueEvaluations;
   });
@@ -95,13 +95,17 @@ export const useGetEvaluateValue = (configId) => {
 
   if (configId && valueEvaluations[configId] === undefined) {
     (async () => {
-      const { success, data } = await axiosGet(
-        API.FETCH_VALUE_EVALUATION(configId)
-      );
+      const { success, data } = await axiosGet(API.VALUE_EVALUATIONS(), {
+        configs__id: configId,
+      });
       if (success) {
+        setAction(Action.INIT_VALUE_EVALUATIONS, {
+          configId: configId,
+        });
+
         setAction(Action.UPDATE_VALUE_EVALUATIONS, {
-          unitId: data.unit_id,
-          data: [data],
+          unitId: unitId,
+          data: data.results,
         });
       }
     })();

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

@@ -12,6 +12,8 @@ import { API } from '../../../configs';
 import api from '../../../utils/Apis/axios';
 import { WrapHeaderScrollable } from '../../../commons';
 
+import { getPusher } from '../../../utils/Pusher';
+
 const wrapComponent = () => (
   <SCProvider initState={mockSCStore({})}>
     <NavigationContext.Provider
@@ -154,4 +156,12 @@ describe('test Notification', () => {
     });
     expect(refreshControl).toBeDefined();
   });
+
+  it('should call unwatchNotificationData when unmounting', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+      await tree.unmount();
+    });
+    expect(getPusher().unsubscribe).toBeCalledWith('private-user-1');
+  });
 });

package/src/screens/Unit/__test__/AddMenu.test.js

@@ -8,6 +8,7 @@ import AddMenu from '../AddMenu';
 import { useNavigation } from '@react-navigation/native';
 import { ToastBottomHelper } from '../../../utils/Utils';
 import { getTranslate } from '../../../utils/I18n';
+import Routes from '../../../utils/Route';
 
 const mockedAfterItemClick = jest.fn();
 const mockedHideAddModal = jest.fn();
@@ -130,4 +131,79 @@ describe('Test AddMenu Unit', () => {
     });
     expect(spyToastError).not.toBeCalled();
   });
+
+  it('add sub_unit but has not permission', async () => {
+    let unit = {
+      id: 1,
+      name: 'Unit 1',
+      stations: [
+        { name: 'station name 1' },
+        { name: 'station name 2' },
+        { name: 'station name 3' },
+      ],
+    };
+    await act(async () => {
+      tree = await create(
+        wrapComponent(unit, {
+          auth: {
+            account: {
+              user: {
+                permissions: {
+                  max_stations_per_unit: 1,
+                },
+              },
+            },
+          },
+        })
+      );
+    });
+
+    const instance = tree.root;
+    const menuActionAddnew = instance.findByType(MenuActionAddnew);
+    await act(async () => {
+      menuActionAddnew.props.onItemClick(menuActionAddnew.props.dataActions[0]);
+    });
+    expect(spyToastError).toBeCalledWith(
+      getTranslate('en', 'reach_max_stations_per_unit'),
+      '',
+      7000
+    );
+  });
+
+  it('add smart account', async () => {
+    let unit = {
+      id: 1,
+      name: 'Unit 1',
+      stations: [
+        { name: 'station name 1' },
+        { name: 'station name 2' },
+        { name: 'station name 3' },
+      ],
+    };
+    await act(async () => {
+      tree = await create(
+        wrapComponent(unit, {
+          auth: {
+            account: {
+              user: {
+                permissions: {
+                  max_stations_per_unit: 1,
+                },
+              },
+            },
+          },
+        })
+      );
+    });
+
+    const instance = tree.root;
+    const menuActionAddnew = instance.findByType(MenuActionAddnew);
+    await act(async () => {
+      menuActionAddnew.props.onItemClick(menuActionAddnew.props.dataActions[3]);
+    });
+    expect(mockedNavigate).toBeCalledWith(Routes.SmartAccountStack, {
+      params: { unitId: 1, unitName: 'Unit 1' },
+      screen: 'SmartAccount',
+    });
+  });
 });

package/src/screens/WaterQualityGuide/__test__/index.test.js

@@ -6,11 +6,6 @@ import Text from '../../../commons/Text';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 
-jest.mock('react', () => ({
-  ...jest.requireActual('react'),
-  useLayoutEffect: jest.fn(),
-}));
-
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
     <WaterQualityGuide route={route} />

package/src/utils/I18n/translations/en.js

@@ -1444,4 +1444,6 @@ export default {
   end_devices_added: 'end devices added',
   bellow_widget_is_not_configured: 'Bellow widget is not configured',
   bellow_widget_is_wrongly_configured: 'Bellow widget is wrongly configured',
+  'customize...': 'Customize...',
+  when_value_is: 'When value is',
 };

package/src/utils/I18n/translations/vi.js

@@ -1455,4 +1455,6 @@ export default {
   end_devices_added: 'thiết bị được thêm vào',
   bellow_widget_is_not_configured: 'Tiện ích bên dưới chưa được cấu hình',
   bellow_widget_is_wrongly_configured: 'Tiện ích bên dưới được cấu hình sai',
+  'customize...': 'Tùy chỉnh...',
+  when_value_is: 'Khi giá trị là',
 };

package/src/utils/Route/index.js

@@ -114,11 +114,16 @@ const Routes = {
   Browser: 'Browser',
   ManageAccess: 'ManageAccess',
   MoveToAnotherSubUnit: 'MoveToAnotherSubUnit',
+
+  // start automate
   SelectMonitorDevices: 'SelectMonitorDevices',
   SelectControlDevices: 'SelectControlDevices',
   ChooseEvent: 'ChooseEvent',
   ChooseAction: 'ChooseAction',
   ChooseConfig: 'ChooseConfig',
+  PreviewAutomate: 'PreviewAutomate',
+  // end automate
+
   GuestInfo: 'GuestInfo',
   AddLGDevice: 'AddLGDevice',
   AddLGDeviceStack: 'AddLGDeviceStack',