@eohjsc/react-native-smart-city 0.7.30 → 0.7.32

package/android/build.gradle

@@ -10,10 +10,10 @@
 //   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 = 32
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
+def DEFAULT_COMPILE_SDK_VERSION = 34
+def DEFAULT_BUILD_TOOLS_VERSION = '34.0.0'
 def DEFAULT_MIN_SDK_VERSION = 24
-def DEFAULT_TARGET_SDK_VERSION = 32
+def DEFAULT_TARGET_SDK_VERSION = 34
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -111,12 +111,12 @@ afterEvaluate { project ->
     }
 
     task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
         from androidJavadoc.destinationDir
     }
 
     task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
+        archiveClassifier = 'sources'
         from android.sourceSets.main.java.srcDirs
         include '**/*.java'
     }

package/package.json

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

package/src/configs/API.js

@@ -149,6 +149,8 @@ const API = {
     CREATE_AUTOMATE_V2: () => '/property_manager/automate_v2/',
     UPDATE_AUTOMATE: (automateId) =>
       `/property_manager/automate/${automateId}/`,
+    ENABLE_NOTIFICATIONS: (automateId) =>
+      `/property_manager/automate/${automateId}/enable_notifications/`,
     ENABLE_SCRIPT: (automateId) =>
       `/property_manager/automate/${automateId}/enable_script/`,
     STAR_SCRIPT: (id) => `/property_manager/automate/${id}/star_script/`,

package/src/configs/AccessibilityLabel.js

@@ -262,6 +262,8 @@ export default {
   AUTOMATE_SELECT_CONDITION: 'AUTOMATE_SELECT_CONDITION',
   AUTOMATE_DELETE_CONDITION: 'AUTOMATE_DELETE_CONDITION',
   AUTOMATE_NUMBER_CONDITION: 'AUTOMATE_NUMBER_CONDITION',
+  SWITCH_ENABLE_SCRIPT: 'SWITCH_ENABLE_SCRIPT',
+  SWITCH_ENABLE_NOTIFICATIONS_SCRIPT: 'SWITCH_ENABLE_NOTIFICATIONS_SCRIPT',
 
   // Parking input maunaly spot
   PARKING_SPOT_INFO_BUTTON: 'PARKING_SPOT_INFO_BUTTON',

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

@@ -10,6 +10,7 @@ import BottomButtonView from '../../../commons/BottomButtonView';
 import { Search } from '../../../commons/DevMode';
 import { convertToSlug } from '../../../utils/Functions/Search';
 import { axiosGet } from '../../../utils/Apis/axios';
+import { shortEmailName } from '../../../utils/Utils';
 import { API, Colors } from '../../../configs';
 import { useSCContextSelector } from '../../../context';
 import { Image } from 'react-native';
@@ -111,7 +112,7 @@ const ReceiverSelect = ({
   );
 
   const RowMember = memo(({ member, index, onValueChange }) => {
-    const { id, name, avatar, share_id, label, invalidLabel, disabled } =
+    const { id, name, email, avatar, share_id, label, invalidLabel, disabled } =
       member;
     const [role, roleColor] = useMemo(() => {
       if (!share_id) {
@@ -124,8 +125,9 @@ const ReceiverSelect = ({
     }, [share_id, id]);
 
     const firstWordsInName = useMemo(() => {
-      return name.charAt();
-    }, [name]);
+      const nameTemp = name || shortEmailName(email);
+      return nameTemp?.charAt() || '';
+    }, [email, name]);
 
     const circleColor = arrColor[index % arrColor.length];
 

package/src/screens/Automate/EditActionsList/UpdateReceiverEmailScript.js

@@ -8,7 +8,7 @@ import { useTranslations } from '../../../hooks/Common/useTranslations';
 import BottomButtonView from '../../../commons/BottomButtonView';
 import { axiosPut, axiosGet } from '../../../utils/Apis/axios';
 import { API, Colors } from '../../../configs';
-import { ToastBottomHelper } from '../../../utils/Utils';
+import { ToastBottomHelper, shortEmailName } from '../../../utils/Utils';
 import Routes from '../../../utils/Route';
 import moment from 'moment';
 import CheckBox from '@react-native-community/checkbox';
@@ -110,8 +110,9 @@ const UpdateReceiverEmailScript = ({ route }) => {
     }, [share_id, id]);
 
     const firstWordsInName = useMemo(() => {
-      return name.charAt();
-    }, [name]);
+      const nameTemp = name || shortEmailName(email);
+      return nameTemp?.charAt() || '';
+    }, [email, name]);
 
     const circleColor = arrColor[index % arrColor.length];
 

package/src/screens/Automate/EditActionsList/UpdateReceiverSmsScript.js

@@ -8,7 +8,7 @@ import { useTranslations } from '../../../hooks/Common/useTranslations';
 import BottomButtonView from '../../../commons/BottomButtonView/index.js';
 import { axiosPut, axiosGet } from '../../../utils/Apis/axios.js';
 import { API, Colors } from '../../../configs/index.js';
-import { ToastBottomHelper } from '../../../utils/Utils.js';
+import { ToastBottomHelper, shortEmailName } from '../../../utils/Utils.js';
 import Routes from '../../../utils/Route/index.js';
 import moment from 'moment';
 import CheckBox from '@react-native-community/checkbox';
@@ -96,7 +96,7 @@ const UpdateReceiverSmsScript = ({ route }) => {
   );
 
   const RowMember = memo(({ member, index, onValueChange }) => {
-    const { id, name, avatar, share_id, phone_number } = member;
+    const { id, name, email, avatar, share_id, phone_number } = member;
     const [role, roleColor] = useMemo(() => {
       if (!share_id) {
         return [t('owner'), Colors.Primary];
@@ -108,8 +108,9 @@ const UpdateReceiverSmsScript = ({ route }) => {
     }, [share_id, id]);
 
     const firstWordsInName = useMemo(() => {
-      return name.charAt();
-    }, [name]);
+      const nameTemp = name || shortEmailName(email);
+      return nameTemp?.charAt() || '';
+    }, [email, name]);
 
     const circleColor = arrColor[index % arrColor.length];
 

package/src/screens/Automate/ScriptDetail/Styles/indexStyles.js

@@ -53,7 +53,7 @@ export default StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'space-between',
-    marginBottom: 7,
+    marginBottom: 16,
   },
   editButton: {
     height: 40,

package/src/screens/Automate/ScriptDetail/__test__/index.test.js

@@ -3,7 +3,7 @@ import { BackHandler, Platform } from 'react-native';
 import { create, act } from 'react-test-renderer';
 import Toast from 'react-native-toast-message';
 import { useNavigation } from '@react-navigation/native';
-import { Switch, TouchableOpacity } from 'react-native';
+import { TouchableOpacity } from 'react-native';
 import MockAdapter from 'axios-mock-adapter';
 
 import { SCProvider } from '../../../../context';
@@ -92,6 +92,7 @@ describe('Test ScriptDetail', () => {
           script: {
             name: 'name',
             enable: true,
+            enabled_notifications: true,
           },
         },
       },
@@ -920,7 +921,9 @@ describe('Test ScriptDetail', () => {
       tree = await create(wrapComponent(route));
     });
     const instance = tree.root;
-    const switchButton = instance.findByType(Switch);
+    const switchButton = instance.findByProps({
+      accessibilityLabel: AccessibilityLabel.SWITCH_ENABLE_SCRIPT,
+    });
     await act(async () => {
       await switchButton.props.onValueChange(false);
     });
@@ -939,6 +942,116 @@ describe('Test ScriptDetail', () => {
         el.type === TouchableOpacity
     );
     expect(buttonEditScript).toHaveLength(0);
+    expect(mock.history.post).toHaveLength(1);
+    expect(mock.history.post[0].url).toEqual(API.AUTOMATE.ENABLE_SCRIPT(1));
+  });
+
+  it('test press disable script false', async () => {
+    mock.onGet(API.AUTOMATE.SCRIPT_ITEMS(1)).reply(200, data);
+    mock.onPost(API.AUTOMATE.ENABLE_SCRIPT(1)).reply(400);
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const switchButton = instance.findByProps({
+      accessibilityLabel: AccessibilityLabel.SWITCH_ENABLE_SCRIPT,
+    });
+    expect(switchButton.props.value).toBeTruthy();
+
+    await act(async () => {
+      await switchButton.props.onValueChange(false);
+    });
+    expect(switchButton.props.value).toBeTruthy();
+    const buttonAddScript = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.BUTTON_ADD_SCRIPT_ACTION &&
+        el.type === TouchableOpacity
+    );
+    expect(buttonAddScript).toHaveLength(1);
+
+    const buttonEditScript = instance.findAll(
+      (el) =>
+        el.props.accessibilityLabel ===
+          AccessibilityLabel.BUTTON_EDIT_SCRIPT_ACTION &&
+        el.type === TouchableOpacity
+    );
+    expect(buttonEditScript).toHaveLength(1);
+    expect(mock.history.post).toHaveLength(1);
+    expect(mock.history.post[0].url).toEqual(API.AUTOMATE.ENABLE_SCRIPT(1));
+  });
+
+  it('test enable notifications for script', async () => {
+    mock.onGet(API.AUTOMATE.SCRIPT_ITEMS(1)).reply(200, data);
+    mock.onPost(API.AUTOMATE.ENABLE_NOTIFICATIONS(1)).reply(200);
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+
+    const instance = tree.root;
+    const enableNotificationsSwitch = instance.findByProps({
+      accessibilityLabel: AccessibilityLabel.SWITCH_ENABLE_NOTIFICATIONS_SCRIPT,
+    });
+    expect(enableNotificationsSwitch.props.value).toBeTruthy();
+
+    await act(async () => {
+      await enableNotificationsSwitch.props.onValueChange(false);
+    });
+    expect(enableNotificationsSwitch.props.value).toBeFalsy();
+    expect(mock.history.post).toHaveLength(1);
+    expect(mock.history.post[0].url).toEqual(
+      API.AUTOMATE.ENABLE_NOTIFICATIONS(1)
+    );
+  });
+
+  it('test enable notifications for script fail', async () => {
+    mock.onGet(API.AUTOMATE.SCRIPT_ITEMS(1)).reply(200, data);
+    mock.onPost(API.AUTOMATE.ENABLE_NOTIFICATIONS(1)).reply(400);
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+
+    const instance = tree.root;
+    const enableNotificationsSwitch = instance.findByProps({
+      accessibilityLabel: AccessibilityLabel.SWITCH_ENABLE_NOTIFICATIONS_SCRIPT,
+    });
+    expect(enableNotificationsSwitch.props.value).toBeTruthy();
+
+    await act(async () => {
+      await enableNotificationsSwitch.props.onValueChange(false);
+    });
+    expect(enableNotificationsSwitch.props.value).toBeTruthy();
+    expect(mock.history.post).toHaveLength(1);
+    expect(mock.history.post[0].url).toEqual(
+      API.AUTOMATE.ENABLE_NOTIFICATIONS(1)
+    );
+  });
+
+  it('test hidden enable notifications switch when disable script', async () => {
+    mock.onGet(API.AUTOMATE.SCRIPT_ITEMS(1)).reply(200, data);
+    mock.onPost(API.AUTOMATE.ENABLE_SCRIPT(1)).reply(200, data);
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+
+    const instance = tree.root;
+    const enableSwitch = instance.findByProps({
+      accessibilityLabel: AccessibilityLabel.SWITCH_ENABLE_SCRIPT,
+    });
+    let enableNotificationsSwitchs = instance.findAllByProps({
+      accessibilityLabel: AccessibilityLabel.SWITCH_ENABLE_NOTIFICATIONS_SCRIPT,
+    });
+    expect(enableSwitch.props.value).toBeTruthy();
+    expect(enableNotificationsSwitchs).toHaveLength(1);
+
+    await act(async () => {
+      await enableSwitch.props.onValueChange(false);
+    });
+    expect(enableSwitch.props.value).toBeFalsy();
+    enableNotificationsSwitchs = instance.findAllByProps({
+      accessibilityLabel: AccessibilityLabel.SWITCH_ENABLE_NOTIFICATIONS_SCRIPT,
+    });
+    expect(enableNotificationsSwitchs).toHaveLength(0);
   });
 
   it('test press add action reach limit', async () => {
@@ -1068,6 +1181,7 @@ describe('Test ScriptDetail', () => {
       script: {
         name: 'name',
         enable: true,
+        enabled_notifications: true,
       },
     };
     route.params = {

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

@@ -108,10 +108,14 @@ const ScriptDetail = ({ route }) => {
     chip_local_control,
     is_local_control,
     chip_id_local_control,
+    enabled_notifications,
   } = script || {};
 
   const [local_control, setLocalControl] = useState({});
   const [enableScript, setEnableScript] = useState(enable);
+  const [enableNotificationsScript, setEnableNotificationsScript] = useState(
+    enabled_notifications
+  );
   const [listMenuItemCondition, setListMenuItemCondition] = useState([]);
   const [isShowAddCondition, setIsShowAddCondition] = useState(false);
   const permissions = useBackendPermission();
@@ -289,6 +293,7 @@ const ScriptDetail = ({ route }) => {
     if (success) {
       setAutomate(automateData);
       setEnableScript(automateData.script.enable);
+      setEnableNotificationsScript(automateData.script.enabled_notifications);
       setNeedAllCondition(automateData.is_need_all_conditions);
     }
   }, [automateId]);
@@ -330,7 +335,6 @@ const ScriptDetail = ({ route }) => {
 
   const onChangeSwitch = useCallback(
     async (checked) => {
-      setEnableScript(checked);
       const { success } = await axiosPost(
         API.AUTOMATE.ENABLE_SCRIPT(automateId),
         {
@@ -338,8 +342,24 @@ const ScriptDetail = ({ route }) => {
         }
       );
       if (success) {
-        ToastBottomHelper.success(t('update_successfully'));
         setEnableScript(checked);
+        ToastBottomHelper.success(t('update_successfully'));
+      }
+    },
+    [automateId, t]
+  );
+
+  const onChangeNotificationsSwitch = useCallback(
+    async (checked) => {
+      const { success } = await axiosPost(
+        API.AUTOMATE.ENABLE_NOTIFICATIONS(automateId),
+        {
+          enable: checked,
+        }
+      );
+      if (success) {
+        setEnableNotificationsScript(checked);
+        ToastBottomHelper.success(t('update_successfully'));
       }
     },
     [automateId, t]
@@ -680,7 +700,25 @@ const ScriptDetail = ({ route }) => {
               <Text type="H3" semibold>
                 {t('enable_this_script')}
               </Text>
-              <Switch value={enableScript} onValueChange={onChangeSwitch} />
+              <Switch
+                value={enableScript}
+                onValueChange={onChangeSwitch}
+                accessibilityLabel={AccessibilityLabel.SWITCH_ENABLE_SCRIPT}
+              />
+            </View>
+          )}
+          {!!enableScript && (
+            <View style={styles.row}>
+              <Text type="H3" semibold>
+                {t('enable_notifications_for_this_script')}
+              </Text>
+              <Switch
+                value={enableNotificationsScript}
+                onValueChange={onChangeNotificationsSwitch}
+                accessibilityLabel={
+                  AccessibilityLabel.SWITCH_ENABLE_NOTIFICATIONS_SCRIPT
+                }
+              />
             </View>
           )}
           {renderLocalControl}

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

@@ -1109,6 +1109,7 @@ export default {
   automate: 'Automate',
   smart: 'Smart',
   enable_this_script: 'Enable this script',
+  enable_notifications_for_this_script: 'Enable notifications for this script',
   local_control: 'Local control',
   local_control_update_success: 'Local control update successful',
   choose_gateway: 'Choose gateway',

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

@@ -1118,6 +1118,7 @@ export default {
   automate: 'Tự động',
   smart: 'Thông minh',
   enable_this_script: 'Kích hoạt kịch bản này',
+  enable_notifications_for_this_script: 'Bật thông báo cho kịch bản này',
   local_control: 'Điều khiển tại biên',
   local_control_update_success: 'Cập nhật điều khiển tại biên thành công',
   choose_gateway: 'Chọn gateway',