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

chore: [] Add global prettier config, run it on commit, and prettify the codebase #546

Merged
merged 9 commits into from
Oct 28, 2021
Merged
Show file tree
Hide file tree
Changes from 6 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
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
node_modules/
.coverage/
dist/
build/
built/
dist/
vendor/
__snapshots__/
.coverage/
.cache/
1 change: 1 addition & 0 deletions apps/commercelayer/.prettierrc → .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
"singleQuote": true,
"jsxBracketSameLine": true
}

2 changes: 1 addition & 1 deletion apps/ai-image-tagging/frontend/.prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ module.exports = {
tabWidth: 2,
useTabs: false,
singleQuote: true,
jsxBracketSameLine: true
jsxBracketSameLine: true,
};
167 changes: 91 additions & 76 deletions apps/ai-image-tagging/frontend/src/components/AITagView/AITagView.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import React from 'react';
import PropTypes from 'prop-types';
import { CheckboxField, TextInput, Pill, Button, Note } from '@contentful/forma-36-react-components';
import {
CheckboxField,
TextInput,
Pill,
Button,
Note,
} from '@contentful/forma-36-react-components';
import get from 'lodash.get';

import { styles } from './styles';
Expand All @@ -12,34 +18,33 @@ async function callAPI(url) {
}

export class AITagView extends React.Component {

static propTypes = {
entries: PropTypes.object.isRequired,
notifier: PropTypes.object.isRequired,
locale: PropTypes.string.isRequired,
space: PropTypes.object.isRequired
space: PropTypes.object.isRequired,
};

constructor(props){
constructor(props) {
super(props);

this.state = {
value: "",
value: '',
tags: props.entries.imageTags.getValue() || [],
overwrite: true,
isMissingImage: !props.entries.image.getValue(),
unsupportedImageType: false,
imageRequirementsNotMet: false,
isFetchingTags: false
}
isFetchingTags: false,
};

this.validateImage();
}

componentDidMount() {
this.props.entries.image.onValueChanged(() => {
this.setState(() => ({
isMissingImage: !this.props.entries.image.getValue()
isMissingImage: !this.props.entries.image.getValue(),
}));
// always validate the image
this.validateImage();
Expand All @@ -50,54 +55,59 @@ export class AITagView extends React.Component {
const MAX_FILE_SIZE = 5 * Math.pow(2, 20); // 5MB limit from AWS Rekognition
const MIN_DIMENSION_SIZE = 80; // 80px limit
const imageId = get(this.props.entries.image.getValue(), 'sys.id');
if (!imageId) { return ; }
if (!imageId) {
return;
}

const file = await this.props.space.getAsset(imageId);
const locale = this.props.locale;
const contentType = get(file, `fields.file.${locale}.contentType`);
const details = get(file, `fields.file.${locale}.details`);
// test if file extension is PNG/JPEG/JPG
const isImageTypeValid = new RegExp(/^image\/(png|jpe?g)$/, 'i').test(contentType);
const isImageIncompatible = details.size > MAX_FILE_SIZE ||
details.width < MIN_DIMENSION_SIZE ||
details.height < MIN_DIMENSION_SIZE;
const isImageIncompatible =
details.size > MAX_FILE_SIZE ||
details.width < MIN_DIMENSION_SIZE ||
details.height < MIN_DIMENSION_SIZE;

this.setState(() => ({
unsupportedImageType: !isImageTypeValid,
imageRequirementsNotMet: isImageIncompatible
}))
}
imageRequirementsNotMet: isImageIncompatible,
}));
};

toggleOverwrite = () => {
this.setState(state => ({
overwrite: !state.overwrite
this.setState((state) => ({
overwrite: !state.overwrite,
}));
}
};

updateTags = async (tags) => {
const tagsWithoutDuplicates = [...new Set(tags)];
await this.props.entries.imageTags.setValue(tagsWithoutDuplicates);
this.setState(() => ({
tags: tagsWithoutDuplicates
tags: tagsWithoutDuplicates,
}));
}
};

addTag = async (e) => {
if (e.key !== "Enter" || !e.target.value) { return; }
if (e.key !== 'Enter' || !e.target.value) {
return;
}

await this.updateTags([e.target.value, ...this.state.tags]);
this.setState(() => ({
value: ""
value: '',
}));
}
};

deleteTag = async (tag) => {
const newTags = this.state.tags.filter(t => t !== tag);
const newTags = this.state.tags.filter((t) => t !== tag);
await this.updateTags(newTags);
}
};

fetchTags = async () => {
const imageId = get(this.props.entries.image.getValue(), 'sys.id')
fetchTags = async () => {
const imageId = get(this.props.entries.image.getValue(), 'sys.id');
const file = await this.props.space.getAsset(imageId);
const locale = this.props.locale;
const fullURL = get(file, `fields.file.${locale}.url`);
Expand All @@ -110,67 +120,72 @@ export class AITagView extends React.Component {
// upload new tags
const newTags = this.state.overwrite ? aiTags : [...aiTags, ...this.state.tags];
this.updateTags(newTags);
} catch(e) {
this.props.notifier.error("Image Tagging failed. Please try again later.")
} catch (e) {
this.props.notifier.error('Image Tagging failed. Please try again later.');
} finally {
this.setState(() => ({ isFetchingTags: false }));
}
}
};

updateValue = (e) => {
this.setState({
value: e.target.value
value: e.target.value,
});
}
};

render() {
let hasImageError = !this.state.isMissingImage && (this.state.unsupportedImageType || this.state.imageRequirementsNotMet)
let imageErrorMsg = this.state.unsupportedImageType ? "Unfortunately, we can only auto-tag PNG and JPG file types" : "Please make sure your image is less than 5MB and has dimensions of at least 80px for both width and height";

return <div className={ styles.inputWrapper }>
<TextInput
testId="image-tag"
placeholder="Type a tag and press enter"
width="large"
disabled={ this.state.isMissingImage }
value={ this.state.value }
onChange={ this.updateValue }
onKeyPress={ this.addTag }
/>
<div className={ styles.pillWrapper }>
{
this.state.tags.map((tag, index) => (
let hasImageError =
!this.state.isMissingImage &&
(this.state.unsupportedImageType || this.state.imageRequirementsNotMet);
let imageErrorMsg = this.state.unsupportedImageType
? 'Unfortunately, we can only auto-tag PNG and JPG file types'
: 'Please make sure your image is less than 5MB and has dimensions of at least 80px for both width and height';

return (
<div className={styles.inputWrapper}>
<TextInput
testId="image-tag"
placeholder="Type a tag and press enter"
width="large"
disabled={this.state.isMissingImage}
value={this.state.value}
onChange={this.updateValue}
onKeyPress={this.addTag}
/>
<div className={styles.pillWrapper}>
{this.state.tags.map((tag, index) => (
<Pill
className={ styles.pill }
className={styles.pill}
key={`${tag}-${index}`}
label={ tag }
onClose={ this.deleteTag.bind(this, tag) }
label={tag}
onClose={this.deleteTag.bind(this, tag)}
/>
))
}
))}
</div>
{hasImageError && (
<Note noteType="warning" className={styles.fileWarning}>
{imageErrorMsg}
</Note>
)}
<Button
id="fetch-tag-btn"
className={styles.btn}
buttonType="primary"
type="button"
disabled={this.state.isMissingImage || hasImageError}
loading={this.state.isFetchingTags}
onClick={this.fetchTags}
>
Auto-tag from AI
</Button>
<CheckboxField
id="overwrite-tags"
labelText="Overwrite existing tags"
disabled={this.state.isMissingImage || hasImageError}
checked={this.state.overwrite}
onChange={this.toggleOverwrite}
/>
</div>
{
hasImageError &&
<Note noteType="warning" className={ styles.fileWarning }>{ imageErrorMsg }</Note>
}
<Button
id="fetch-tag-btn"
className={ styles.btn }
buttonType="primary"
type="button"
disabled={ this.state.isMissingImage || hasImageError }
loading={ this.state.isFetchingTags }
onClick={ this.fetchTags }
>
Auto-tag from AI
</Button>
<CheckboxField
id="overwrite-tags"
labelText="Overwrite existing tags"
disabled={ this.state.isMissingImage || hasImageError }
checked={ this.state.overwrite }
onChange={ this.toggleOverwrite }
/>
</div>
);
}
}
Loading