@eohjsc/react-native-smart-city 0.3.4 → 0.3.7

package/src/utils/Apis/axios.js

@@ -1,36 +1,35 @@
-import { create } from 'apisauce';
-import { getData, storeData } from '../Storage';
+import axios from 'axios';
+import { deleteData, getData, storeData } from '../Storage';
 import { ToastBottomHelper } from '../Utils';
 import NetInfo from '@react-native-community/netinfo';
-import { PROBLEM_CODE } from '../../configs/Constants';
-import { getTranslate } from '../I18n';
-import { SCConfig } from '../../configs';
 
-const api = create({
-  headers: {
-    'Content-Type': 'application/json',
-  },
-  timeout: 30000,
-});
+export const replaceParams = (apiURL, params) => {
+  let _result = apiURL;
+  if (typeof params === 'object') {
+    Object.keys(params).forEach((key) => {
+      _result = _result.replace(`{${key}}`, params[key]);
+    });
+  }
+  return _result;
+};
 
 const parseErrorResponse = async (error) => {
   let message;
   let data = {};
-  if (error.data instanceof Array) {
-    message = error.data[0];
-  } else if (error.data instanceof Object) {
-    data = error.data;
-    const firstKey = Object.keys(error.data)[0];
-    message = error.data[firstKey];
+  if (
+    error.response &&
+    error.response.data &&
+    error.response.data instanceof Object
+  ) {
+    data = error.response.data;
+    const firstKey = Object.keys(error.response.data)[0];
+    message = error.response.data[firstKey];
 
     if (message instanceof Array) {
       message = message[0];
     }
-    if (message?.message) {
-      message = message.message;
-    }
   } else {
-    message = error.data || error.problem;
+    message = error.message;
   }
 
   if (typeof message === 'string') {
@@ -42,11 +41,6 @@ const parseErrorResponse = async (error) => {
       }
     }
     if (!hideError) {
-      switch (error.problem) {
-        case PROBLEM_CODE.SERVER_ERROR:
-          message = getTranslate(SCConfig.language, 'server_error');
-          break;
-      }
       ToastBottomHelper.error(message);
     }
   }
@@ -56,7 +50,7 @@ const parseErrorResponse = async (error) => {
     error,
     message,
     data,
-    resp_status: error?.status || error?.response?.status,
+    resp_status: error?.response?.status,
   };
 };
 
@@ -81,7 +75,6 @@ export async function fetchWithCache(url, config = {}, updateMethod) {
     if (cacheResponse) {
       updateMethod(cacheResponse);
     }
-    // eslint-disable-next-line no-empty
   } catch {}
   const response = await axiosGet(url, config, true);
   if (!response.cache) {
@@ -90,34 +83,25 @@ export async function fetchWithCache(url, config = {}, updateMethod) {
 }
 
 export async function axiosGet(URL, config = {}, cache = false) {
+  const cacheKey = `@CACHE_REQUEST_${URL}`;
   let response;
   try {
-    response = await api.get(URL, config.params, config);
+    response = await axios.get(URL, config);
   } catch (error) {
     if (cache) {
-      if (error.message === 'Network Error') {
-        return (
-          (await axiosCache(URL, 500)) || (await parseErrorResponse(error))
-        );
-      }
-      if (!error?.response || error?.response?.status >= 500) {
+      // only network error or server error
+      if (!error.response || error.response.status >= 500) {
         return (
-          (await axiosCache(URL, error?.response?.status)) ||
+          (await axiosCache(URL, error.response.status)) ||
           (await parseErrorResponse(error))
         );
+      } else {
+        await deleteData(cacheKey);
       }
     }
     return await parseErrorResponse(error);
   }
-  const { data, problem } = response;
-  if (problem) {
-    if (cache) {
-      return (
-        (await axiosCache(URL, 500)) || (await parseErrorResponse(response))
-      );
-    }
-    return await parseErrorResponse(response);
-  }
+  const { data } = response;
   if (response.status === 200) {
     if (cache) {
       await storeData(`@CACHE_REQUEST_${URL}`, JSON.stringify(data));
@@ -137,23 +121,18 @@ export async function axiosGet(URL, config = {}, cache = false) {
 async function axiosCall(method, ...args) {
   let response;
   try {
-    response = await api[method](...args);
+    response = await axios[method](...args);
   } catch (error) {
     return await parseErrorResponse(error);
   }
 
-  const { data, problem } = response;
-  if (problem) {
-    return await parseErrorResponse(response);
-  }
-
+  const { data } = response;
   if (response.status >= 200 && response.status < 300) {
     return {
       success: true,
       data,
     };
   }
-  await parseErrorResponse(response);
 
   return {
     success: false,
@@ -207,5 +186,3 @@ export function createFormData(data, list_file_field) {
 
   return formData;
 }
-
-export default api;

package/src/utils/Converter/time.js

@@ -1,6 +1,24 @@
 import t from '../../hooks/Common/useTranslations';
 import moment from 'moment';
 
+export const transformDatetime = (data = {}, listFieldName = []) => {
+  listFieldName.forEach((name) => {
+    const value = data[name];
+    const isArray = Array.isArray(value);
+
+    if (!data.hasOwnProperty(name)) {
+      return;
+    }
+
+    if (isArray) {
+      data[name] = value.map((item) => (item ? moment(item) : item));
+      return;
+    }
+
+    data[name] = value ? moment(value) : value;
+  });
+};
+
 export const timeDifference = (current, previous, symbol = false) => {
   let msPerMinute = 60 * 1000;
   let msPerHour = msPerMinute * 60;

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

@@ -985,11 +985,5 @@
   "you_need_to_enter_password": "You need to enter password to perform this action",
   "note": "Note",
   "back": "Back",
-  "invaild_data": "Invaild data",
-  "This {name} was removed!" : "This {name} was removed!",
-  "camera_request_permission": "Camera request permission",
-  "camera_request_permission_des": "To use camera, please unlock camera permission",
-  "location_require_message": "EoH needs your location permission to get current location.",
-  "turn_on_location_service": "Turn on location service for your phone",
-  "turn_on_location_service_des": "To continue, let your device turn on location by turning on location service in Settings"
+  "This {name} was removed!" : "This {name} was removed!"
 }

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

@@ -985,12 +985,5 @@
   "maxmium_contacts": "Địa chỉ liên hệ tối đa",
   "note": "Lưu ý ",
   "back": "Quay lại",
-  "invaild_data": "Dữ liệu không hợp lệ",
-  "This {name} was removed!" : "{Name} này đã bị xóa!",
-  "location_perm_denied": "Ứng dụng không cho phép truy cập vị trí.",
-  "camera_request_permission": "Quyền yêu cầu máy ảnh",
-  "camera_request_permission_des": "Để sử dụng máy ảnh, vui lòng mở khóa quyền đối với máy ảnh",
-  "location_require_message": "Eoh cần quyền truy cập vị trí của bạn để lấy vị trí hiện tại.",
-  "turn_on_location_service": "Bật dịch vụ vị trí cho điện thoại của bạn",
-  "turn_on_location_service_des": "Để tiếp tục, bật dịch vụ vị trí cho điện thoại của bạn trong Cài Đặt"
+  "This {name} was removed!" : "{Name} này đã bị xóa!"
 }

package/src/utils/Route/index.js

@@ -136,7 +136,6 @@ const Routes = {
   SmartAccount: 'SmartAccount',
   SmartHomeDashboard: 'SmartHomeDashboard',
   SetupGeneratePasscode: 'SetupGeneratePasscode',
-  SideMenuDetail: 'SideMenuDetail',
   SelectDeviceType: 'SelectDeviceType',
   SelectBrand: 'SelectBrand',
   GroupButtonByType: 'GroupButtonByType',

package/src/utils/Utils.js

@@ -1,21 +1,21 @@
-import { PixelRatio, Linking, Alert } from 'react-native';
+import { PixelRatio, Linking } from 'react-native';
 import Toast from 'react-native-toast-message';
 import validator from 'validator';
+import axios from 'axios';
 import { Constants } from '../configs';
-import api from './Apis/axios';
 
 export const setAxiosDefaultAuthToken = (token) => {
-  api.setHeaders({ Authorization: `Token ${token}` });
+  axios.defaults.headers.common.Accept = 'application/json';
+  axios.defaults.headers.common.Authorization = `Token ${token}`;
 };
 
 export const setAxiosDefaultLanguage = (language) => {
-  api.setHeaders({
-    'Accept-Language': language || Constants.LANGUAGE.DEFAULT,
-  });
+  axios.defaults.headers.common['Accept-Language'] =
+    language || Constants.LANGUAGE.DEFAULT;
 };
 
 export const deleteDefaultAuthToken = () => {
-  delete api.headers.Authorization;
+  delete axios.defaults.headers.common.Authorization;
 };
 
 export const validateEmail = (text) => {
@@ -129,10 +129,6 @@ export const object_Ids = (data) => {
   return listObject;
 };
 
-export const notImplemented = (t) => {
-  Alert.alert(t('feature_under_development'));
-};
-
 export default {
   validateEmail,
   isObjectEmpty,

package/src/commons/ActionGroup/OnOffSmartLock/PasscodeList/__test__/ItemPasscode.test.js

@@ -1,24 +0,0 @@
-import React from 'react';
-import { TouchableOpacity } from 'react-native';
-import { act, create } from 'react-test-renderer';
-import { SCProvider } from '../../../../../context';
-import { mockSCStore } from '../../../../../context/mockStore';
-import ItemPasscode from '../ItemPasscode';
-
-const wrapComponent = (route = {}) => (
-  <SCProvider initState={mockSCStore({})}>
-    <ItemPasscode route={route} />
-  </SCProvider>
-);
-
-describe('Test ItemPasscode', () => {
-  let tree;
-  test('test render without params', async () => {
-    await act(async () => {
-      tree = await create(wrapComponent());
-    });
-    const instance = tree.root;
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(TouchableOpacities).toHaveLength(2);
-  });
-});

package/src/commons/ActionGroup/__test__/NumberUpDownTemplateWithNullConfigValue.test.js

@@ -1,60 +0,0 @@
-import React from 'react';
-import { TouchableOpacity } from 'react-native';
-import { act, create } from 'react-test-renderer';
-import Text from '../../../commons/Text';
-import { watchMultiConfigs } from '../../../iot/Monitor';
-import NumberUpDownActionTemplate from '../NumberUpDownActionTemplate';
-
-jest.mock('../../../iot/Monitor');
-
-jest.mock('../../../iot/states', () => ({
-  useConfigGlobalState: () => [{ 5: null }, null],
-}));
-
-describe('Test NumberUpDownActionTemplate', () => {
-  const action_data = {
-    color: '#00979D',
-    command_prefer_over_bluetooth: true,
-    command_prefer_over_googlehome: false,
-    command_prefer_over_internet: false,
-    googlehome_actions: [],
-    icon: 'caret-up',
-    id: 20,
-    key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
-  };
-
-  let actionGroup;
-  let wrapper;
-
-  beforeEach(() => {
-    watchMultiConfigs.mockClear();
-    actionGroup = {
-      configuration: {
-        config: 5,
-        action_data,
-        min_value: 16,
-        max_value: 30,
-        text_format: '{number} *C',
-      },
-    };
-  });
-
-  test('render template', async () => {
-    const mockDoAction = jest.fn();
-    await act(async () => {
-      wrapper = await create(
-        <NumberUpDownActionTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{ is_managed_by_backend: true }}
-        />
-      );
-    });
-    const instance = wrapper.root;
-    const text = instance.findByType(Text);
-    expect(text.props.children).toEqual('28 *C');
-
-    const touchs = instance.findAllByType(TouchableOpacity);
-    expect(touchs).toHaveLength(2);
-  });
-});

package/src/commons/ActionGroup/__test__/StatesGridActionTemplate.test.js

@@ -1,77 +0,0 @@
-import React from 'react';
-import { TouchableOpacity } from 'react-native';
-import { act, create } from 'react-test-renderer';
-import Text from '../../Text';
-import StatesGridActionTemplate from '../StatesGridActionTemplate';
-
-const mockDoAction = jest.fn();
-const mockActionData = jest.fn();
-
-describe('Test StatesGridActionTemplate', () => {
-  let tree;
-  const actionGroup = {
-    configuration: {
-      options: [
-        {
-          config: true,
-          active: false,
-          text: 'item 1',
-          icon_kit_data: 'icon_kit_data',
-          icon: '123',
-          icon_outlined: 'icon_outlined',
-          action_data: mockActionData,
-        },
-        {
-          config: false,
-          active: true,
-          text: 'item 2',
-          icon_kit_data: 'icon_kit_data',
-          icon: 'icon',
-          icon_outlined: 'icon_outlined',
-          action_data: mockActionData,
-        },
-      ],
-      is_on_value: true,
-    },
-    title: 'Title',
-  };
-  const sensor = {
-    is_managed_by_backend: true,
-    device_type: '',
-    name: 'Sensor name',
-  };
-
-  test('test render without params', async () => {
-    await act(async () => {
-      tree = await create(<StatesGridActionTemplate />);
-    });
-    const instance = tree.root;
-    const Texts = instance.findAllByType(Text);
-    expect(Texts).toHaveLength(1);
-  });
-
-  test('test render with params', async () => {
-    await act(async () => {
-      tree = await create(
-        <StatesGridActionTemplate
-          doAction={mockDoAction}
-          sensor={sensor}
-          actionGroup={actionGroup}
-        />
-      );
-    });
-    const instance = tree.root;
-    const Texts = instance.findAllByType(Text);
-    expect(Texts).toHaveLength(3);
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(TouchableOpacities).toHaveLength(2);
-    await TouchableOpacities[0].props.onPress();
-    expect(mockDoAction).toBeCalledWith(
-      mockActionData,
-      null,
-      `${sensor.name} ${actionGroup.title.toLowerCase()} ${
-        actionGroup.configuration.options[0].text
-      }`
-    );
-  });
-});

package/src/commons/Calendar/__test__/Calendar.test.js

@@ -1,33 +0,0 @@
-import React from 'react';
-import renderer, { act } from 'react-test-renderer';
-import CalendarComponent from '../';
-import { Calendar } from 'react-native-calendars';
-// eslint-disable-next-line no-unused-vars
-import BottomSheet from '../../BottomSheet';
-import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
-
-const mockSetState = jest.fn();
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    useState: jest.fn((init) => [init, mockSetState]),
-  };
-});
-const wrapComponent = (route, navigation) => (
-  <SCProvider initState={mockSCStore({})}>
-    <CalendarComponent route={route} />
-  </SCProvider>
-);
-describe('Test Calendar component', () => {
-  let tree;
-
-  test('create Calendar', () => {
-    act(() => {
-      tree = renderer.create(wrapComponent());
-    });
-    const instance = tree.root;
-    const calendar = instance.findAllByType(Calendar);
-    expect(calendar).toHaveLength(1);
-  });
-});

package/src/commons/Device/Hanet/ItemHanetDevice.test.js

@@ -1,58 +0,0 @@
-import React from 'react';
-import { TouchableWithoutFeedback } from 'react-native';
-import renderer, { act } from 'react-test-renderer';
-import ItemHanetDevice from './ItemHanetDevice';
-import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
-
-const wrapComponent = (props) => (
-  <SCProvider initState={mockSCStore({})}>
-    <ItemHanetDevice {...props} />
-  </SCProvider>
-);
-
-const mockNavigate = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      navigate: mockNavigate,
-    }),
-  };
-});
-
-describe('Test ItemHanetDevice', () => {
-  let tree, props;
-
-  beforeEach(() => {
-    props = {
-      svgMain: 'icon',
-      title: 'title',
-      sensor: {},
-      unit: {},
-      station: {},
-    };
-  });
-
-  test('render ItemHanetDevice', () => {
-    act(() => {
-      tree = renderer.create(wrapComponent(props));
-    });
-    const instance = tree.root;
-    const touches = instance.findAllByType(TouchableWithoutFeedback);
-    act(() => {
-      tree = touches[0].props.onPress();
-    });
-    expect(mockNavigate).toBeCalled();
-  });
-
-  test('render ItemHanetDevice sensor has icon', () => {
-    props.sensor.icon_kit = 'icon';
-    act(() => {
-      tree = renderer.create(wrapComponent(props));
-    });
-    const instance = tree.root;
-    const touches = instance.findAllByType(TouchableWithoutFeedback);
-    expect(touches.length).toBeGreaterThan(0);
-  });
-});

package/src/commons/FieldTemplate/ChooseUserField/ChooseFieldStyles.js

@@ -1,25 +0,0 @@
-import { StyleSheet } from 'react-native';
-import { Colors } from '../../../configs';
-
-export default StyleSheet.create({
-  wrapper: {
-    flexDirection: 'row',
-    paddingTop: 30,
-  },
-  textHeadLine: {
-    fontSize: 16,
-    color: Colors.Gray9,
-    fontWeight: 'bold',
-  },
-  buttonValue: {
-    flex: 1,
-    flexDirection: 'row',
-    justifyContent: 'flex-end',
-    alignItems: 'center',
-  },
-  value: {
-    marginRight: 20,
-    fontSize: 14,
-    color: Colors.Gray8,
-  },
-});

package/src/commons/FieldTemplate/ChooseUserField/ChoosePopup.js

@@ -1,96 +0,0 @@
-import React, { useState, useCallback } from 'react';
-import { View, ScrollView, TouchableOpacity } from 'react-native';
-import { Colors } from '../../../configs';
-import { TESTID } from '../../../configs/Constants';
-import { useTranslations } from '../../../hooks/Common/useTranslations';
-import BottomButtonView from '../../BottomButtonView';
-import { ModalCustom } from '../../Modal';
-import RadioCircle from '../../RadioCircle';
-import Text from '../../Text';
-
-import styles from './ChoosePopupStyles';
-
-const RowMember = ({ member, isSelected, onSelect }) => {
-  const handleOnPress = useCallback(() => {
-    onSelect(member);
-  }, [onSelect, member]);
-  return (
-    <TouchableOpacity
-      style={styles.row}
-      onPress={handleOnPress}
-      testID={TESTID.CHOOSE_ITEM}
-    >
-      <RadioCircle active={isSelected} />
-      <View style={styles.wrapText}>
-        <Text type="H4" color={Colors.Gray9}>
-          {member.name
-            ? member.name
-            : member.phone_number
-            ? member.phone_number
-            : member.email}
-        </Text>
-      </View>
-    </TouchableOpacity>
-  );
-};
-
-const ChoosePopup = ({ isVisible, title, onHide, members, onApply }) => {
-  const t = useTranslations();
-  const [selectedUsers, setSelectedUsers] = useState({});
-
-  const handleOnSelectUser = useCallback((user) => {
-    setSelectedUsers(user);
-  }, []);
-
-  const handleOnApply = useCallback(() => {
-    onApply(selectedUsers);
-    onHide();
-  }, [selectedUsers, onApply, onHide]);
-
-  const handleOnCancel = useCallback(() => {
-    onHide();
-  }, [onHide]);
-
-  return (
-    <ModalCustom
-      testID={TESTID.CHOOSE_POPUP}
-      isVisible={isVisible}
-      onBackButtonPress={handleOnCancel}
-      onBackdropPress={handleOnCancel}
-      useNativeDriver={true}
-      useNativeDriverForBackdrop={true}
-      animationIn={'zoomIn'}
-      animationOut={'zoomOut'}
-      style={styles.wrapPopup}
-    >
-      <View style={[styles.popup, styles.heigh50percent]}>
-        <Text type="H4" style={styles.title} bold>
-          {title}
-        </Text>
-        <View style={styles.separator} />
-        <ScrollView>
-          {members.map((member, index) => (
-            <RowMember
-              key={index}
-              member={member}
-              isSelected={selectedUsers.id === member.id}
-              onSelect={handleOnSelectUser}
-            />
-          ))}
-        </ScrollView>
-        <View style={styles.separator} />
-        <BottomButtonView
-          rowButton={true}
-          testIDPrefix={TESTID.CHOOSE_POPUP}
-          style={styles.bottomButtonView}
-          secondaryTitle={t('cancel')}
-          mainTitle={t('apply')}
-          onPressSecondary={handleOnCancel}
-          onPressMain={handleOnApply}
-        />
-      </View>
-    </ModalCustom>
-  );
-};
-
-export default ChoosePopup;

package/src/commons/FieldTemplate/ChooseUserField/ChoosePopupStyles.js

@@ -1,39 +0,0 @@
-import { StyleSheet } from 'react-native';
-import { Colors, Constants } from '../../../configs';
-
-export default StyleSheet.create({
-  wrapPopup: {
-    marginHorizontal: 16,
-  },
-  popup: {
-    backgroundColor: Colors.White,
-    width: '100%',
-    height: (Constants.height * 80) / 100,
-    padding: 24,
-    paddingBottom: 100,
-    borderRadius: 10,
-  },
-  heigh50percent: {
-    height: (Constants.height * 50) / 100,
-  },
-  title: {
-    marginBottom: 16,
-  },
-  bottomButtonView: {
-    marginBottom: 24,
-  },
-  separator: {
-    height: 0.5,
-    backgroundColor: Colors.Gray4,
-  },
-  row: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  wrapText: {
-    flex: 1,
-    paddingVertical: 8,
-    marginRight: 24,
-    marginLeft: 16,
-  },
-});