Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avatar Image Upload Limit #5900

Merged
merged 14 commits into from
Oct 19, 2021
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/CONST.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const NEW_EXPENSIFY_URL = 'https://new.expensify.com';
const CONST = {
// 50 megabytes in bytes
API_MAX_ATTACHMENT_SIZE: 52428800,
AVATAR_MAX_ATTACHMENT_SIZE: 3145728,
APP_DOWNLOAD_LINKS: {
ANDROID: 'https://play.google.com/store/apps/details?id=com.expensify.chat',
IOS: 'https://apps.apple.com/us/app/expensify-cash/id1530278510',
Expand Down
2 changes: 1 addition & 1 deletion src/components/AttachmentPicker/index.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function getDataForUpload(fileData) {
name: fileData.fileName || fileData.name || 'chat_attachment',
type: fileData.type,
uri: fileData.uri,
size: fileData.size,
size: fileData.fileSize || fileData.size,
};
}

Expand Down
41 changes: 39 additions & 2 deletions src/components/AvatarWithImagePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
Pressable, View, Animated, StyleSheet,
} from 'react-native';
import PropTypes from 'prop-types';
import lodashGet from 'lodash/get';
import Avatar from './Avatar';
import Icon from './Icon';
import PopoverMenu from './PopoverMenu';
Expand All @@ -13,6 +14,7 @@ import {
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import AttachmentPicker from './AttachmentPicker';
import ConfirmModal from './ConfirmModal';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import variables from '../styles/variables';
import CONST from '../CONST';
Expand Down Expand Up @@ -50,7 +52,7 @@ const propTypes = {
isUploading: PropTypes.bool,

/** Size of Indicator */
size: PropTypes.string,
size: PropTypes.oneOf([CONST.AVATAR_SIZE.LARGE, CONST.AVATAR_SIZE.DEFAULT]),

...withLocalizePropTypes,
};
Expand All @@ -70,8 +72,11 @@ class AvatarWithImagePicker extends React.Component {
constructor(props) {
super(props);
this.animation = new SpinningIndicatorAnimation();
this.setUploadLimitModalVisibility = this.setUploadLimitModalVisibility.bind(this);
this.isValidSize = this.isValidSize.bind(this);
this.state = {
isMenuVisible: false,
isMaxUploadSizeModalOpen: false,
};
}

Expand All @@ -93,6 +98,23 @@ class AvatarWithImagePicker extends React.Component {
this.animation.stop();
}

/**
* Toggle max upload limit modal's visibility
* @param {Boolean} isVisible
*/
setUploadLimitModalVisibility(isVisible) {
this.setState({isMaxUploadSizeModalOpen: isVisible});
}

/**
* Check if the attachment size is less than allowed size.
* @param {Object} image
* @returns {Boolean}
*/
isValidSize(image) {
return image && lodashGet(image, 'size', 0) < CONST.AVATAR_MAX_ATTACHMENT_SIZE;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we passing the size as a prop but then using the constant directly?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pecanoro size is for the size of the Avatar image - Large or default. Wasn't added in this PR. I just updated proptypes.

and for upload size limit I had added props but based on the feedback removed, so using CONST directly.

}

/**
* Create menu items list for avatar menu
*
Expand All @@ -106,7 +128,13 @@ class AvatarWithImagePicker extends React.Component {
text: this.props.translate('avatarWithImagePicker.uploadPhoto'),
onSelected: () => {
openPicker({
onPicked: this.props.onImageSelected,
onPicked: (image) => {
if (!this.isValidSize(image)) {
this.setUploadLimitModalVisibility(true);
return;
}
this.props.onImageSelected(image);
},
});
},
},
Expand Down Expand Up @@ -200,6 +228,15 @@ class AvatarWithImagePicker extends React.Component {
</AttachmentPicker>
</View>
</Pressable>
<ConfirmModal
title={this.props.translate('avatarWithImagePicker.imageUploadFailed')}
onConfirm={() => this.setUploadLimitModalVisibility(false)}
onCancel={() => this.setUploadLimitModalVisibility(false)}
isVisible={this.state.isMaxUploadSizeModalOpen}
prompt={this.props.translate('avatarWithImagePicker.sizeExceeded', {maxUploadSizeInMB: CONST.AVATAR_MAX_ATTACHMENT_SIZE / (1024 * 1024)})}
confirmText={this.props.translate('common.close')}
shouldShowCancelButton={false}
/>
</View>
);
}
Expand Down
2 changes: 2 additions & 0 deletions src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ export default {
uploadPhoto: 'Upload photo',
removePhoto: 'Remove photo',
editImage: 'Edit photo',
imageUploadFailed: 'Image upload failed',
sizeExceeded: ({maxUploadSizeInMB}) => `The selected image exceeds the maximum upload size of ${maxUploadSizeInMB}MB.`,
},
profilePage: {
profile: 'Profile',
Expand Down
2 changes: 2 additions & 0 deletions src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ export default {
uploadPhoto: 'Subir foto',
removePhoto: 'Eliminar foto',
editImage: 'Editar foto',
imageUploadFailed: 'Error al cargar la imagen',
sizeExceeded: ({maxUploadSizeInMB}) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
},
profilePage: {
profile: 'Perfil',
Expand Down