Compare commits

...
28 Commits
Author SHA1 Message Date
Maksim Eltyshev ac1df5201d fix: Fix path traversal vulnerability 2022-08-04 00:37:30 +02:00
Maksim Eltyshev fbe24c0fc0 chore: Update version 2022-08-03 13:28:41 +02:00
Maksim Eltyshev 79daed6afa docs: Add security policy
Closes #276
2022-08-03 16:15:40 +05:00
Maksim Eltyshev a9111bf7ba feat: Add Korean translation. Thanks to @chooya 2022-08-03 12:21:01 +02:00
Maksim Eltyshev 2d50211892 fix: Fix label style 2022-08-01 00:18:22 +02:00
Maksim Eltyshev 139971eca9 chore: Update version 2022-07-29 17:50:11 +02:00
Maksim Eltyshev 34db8947b6 feat: Toggle actions details, little redesign 2022-07-29 17:40:18 +02:00
Maksim Eltyshev 82e4f73c1f ref: Fix variable names 2022-07-29 17:11:38 +02:00
Maksim Eltyshev 560bddbe18 fix: Fix styles 2022-07-26 13:53:30 +02:00
Maksim Eltyshev 9c192f4b5c fix: Fix select behaviour 2022-07-26 12:49:40 +02:00
Maksim Eltyshev a148a3aae5 feat: Add language selector
Closes #212
2022-07-26 12:26:42 +02:00
Maksim Eltyshev 7c1b885d2a chore: Update version 2022-07-24 17:17:59 +02:00
Maksim Eltyshev a3f33d0361 fix: Fix core locale loading 2022-07-24 17:13:28 +02:00
Maksim Eltyshev fe62180cda chore: Update dependencies 2022-07-24 17:04:26 +02:00
Maksim Eltyshev 58abd0691f chore: Update version 2022-07-21 11:42:56 +02:00
Maksim Eltyshev ad67b9ba24 feat: Add tasks reordering
Closes #50, closes #232
2022-07-21 11:31:05 +02:00
Maksim Eltyshev ddf9a32ea9 chore: Update version 2022-06-24 17:20:44 +02:00
Maksim Eltyshev e01a2eafba fix: Fix crash when uploading attachment 2022-06-24 17:17:42 +02:00
Maksim Eltyshev 3b3bff1b6b fix: Allow to use endpoints via http 2022-06-24 11:59:04 +02:00
Maksim Eltyshev ecc45c7a9e chore: Update version 2022-06-22 18:19:34 +02:00
Maksim Eltyshev 3497e09703 feat: Add pdf viewer to attachments gallery 2022-06-22 17:01:35 +02:00
Maksim Eltyshev dfc52191fc chore: Update version 2022-06-22 09:09:44 +02:00
Maksim Eltyshev 6268ced4cb ref: Collapse image data into one column 2022-06-21 12:01:41 +02:00
Maksim Eltyshev e7495e0067 fix: Fix routes again 2022-06-20 18:48:13 +02:00
Maksim Eltyshev b8c065e0c8 fix: Fix routes 2022-06-20 18:46:03 +02:00
Maksim Eltyshev 86e4864d1b feat: Add gallery for attachments 2022-06-20 18:27:39 +02:00
Maksim Eltyshev 0be598ca9e chore: Update version 2022-06-17 18:17:08 +02:00
Dominik Dancs ba850801c5 feat: Add Slovak translation (#265) 2022-06-17 20:16:15 +05:00
123 changed files with 12839 additions and 8982 deletions
+13
View File
@@ -0,0 +1,13 @@
# Security Policy
## Supported Versions
Most recent release.
## Reporting a Vulnerability
Please report any security issues you discovered to meltyshev@gmail.com. If the issue is confirmed, we will release a patch as soon as possible depending on complexity.
**Do NOT create public issues on GitHub for security vulnerabilities.**
Thank you for your contribution!
+9670 -6062
View File
File diff suppressed because it is too large Load Diff
+24 -22
View File
@@ -63,58 +63,60 @@
} }
}, },
"dependencies": { "dependencies": {
"classnames": "^2.2.6", "classnames": "^2.3.1",
"connected-react-router": "^6.9.2", "connected-react-router": "^6.9.3",
"date-fns": "^2.28.0", "date-fns": "^2.29.1",
"dequal": "^2.0.2", "dequal": "^2.0.3",
"history": "^4.10.1", "history": "^4.10.1",
"i18next": "^21.6.16", "i18next": "^21.8.14",
"i18next-browser-languagedetector": "^6.1.4", "i18next-browser-languagedetector": "^6.1.4",
"initials": "^3.1.2", "initials": "^3.1.2",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.1",
"lodash": "^4.17.20", "lodash": "^4.17.21",
"node-sass": "^7.0.1", "node-sass": "^7.0.1",
"photoswipe": "^5.3.0",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"react": "^17.0.2", "react": "^17.0.2",
"react-beautiful-dnd": "^13.0.0", "react-beautiful-dnd": "^13.1.0",
"react-datepicker": "^4.7.0", "react-datepicker": "^4.8.0",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-dropzone": "^12.0.5", "react-dropzone": "^14.2.2",
"react-i18next": "^11.16.6", "react-i18next": "^11.18.1",
"react-input-mask": "^2.0.4", "react-input-mask": "^2.0.4",
"react-markdown": "^8.0.2", "react-markdown": "^8.0.3",
"react-photoswipe-gallery": "^2.2.1",
"react-redux": "^7.2.8", "react-redux": "^7.2.8",
"react-router-dom": "^5.3.1", "react-router-dom": "^5.3.1",
"react-scripts": "5.0.1", "react-scripts": "5.0.1",
"react-textarea-autosize": "^8.3.3", "react-textarea-autosize": "^8.3.4",
"redux": "^4.1.2", "redux": "^4.2.0",
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",
"redux-orm": "^0.16.2", "redux-orm": "^0.16.2",
"redux-saga": "^1.1.3", "redux-saga": "^1.1.3",
"remark-breaks": "^3.0.2", "remark-breaks": "^3.0.2",
"remark-gfm": "^3.0.1", "remark-gfm": "^3.0.1",
"reselect": "^4.1.5", "reselect": "^4.1.6",
"sails.io.js": "^1.2.1", "sails.io.js": "^1.2.1",
"semantic-ui-react": "^2.1.2", "semantic-ui-react": "^2.1.3",
"socket.io-client": "^2.3.1", "socket.io-client": "^2.3.1",
"validator": "^13.7.0", "validator": "^13.7.0",
"whatwg-fetch": "^3.5.0" "whatwg-fetch": "^3.6.2"
}, },
"devDependencies": { "devDependencies": {
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.7", "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
"babel-preset-airbnb": "^5.0.0", "babel-preset-airbnb": "^5.0.0",
"chai": "^4.3.6", "chai": "^4.3.6",
"enzyme": "^3.11.0", "enzyme": "^3.11.0",
"eslint": "^8.13.0", "eslint": "^8.20.0",
"eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.5.0", "eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0", "eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-prettier": "^4.0.0", "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.29.4", "eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.4.0", "eslint-plugin-react-hooks": "^4.6.0",
"jest-enzyme": "^7.1.2", "jest-enzyme": "^7.1.2",
"prettier": "2.6.2", "prettier": "2.7.1",
"react-test-renderer": "^17.0.2" "react-test-renderer": "^17.0.2"
} }
} }
+25 -1
View File
@@ -1,6 +1,5 @@
import ActionTypes from '../constants/ActionTypes'; import ActionTypes from '../constants/ActionTypes';
// eslint-disable-next-line import/prefer-default-export
export const fetchActions = (cardId) => ({ export const fetchActions = (cardId) => ({
type: ActionTypes.ACTIONS_FETCH, type: ActionTypes.ACTIONS_FETCH,
payload: { payload: {
@@ -24,3 +23,28 @@ fetchActions.failure = (cardId, error) => ({
error, error,
}, },
}); });
export const toggleActionsDetails = (cardId, isVisible) => ({
type: ActionTypes.ACTIONS_DETAILS_TOGGLE,
payload: {
cardId,
isVisible,
},
});
toggleActionsDetails.success = (cardId, actions, users) => ({
type: ActionTypes.ACTIONS_DETAILS_TOGGLE__SUCCESS,
payload: {
cardId,
actions,
users,
},
});
toggleActionsDetails.failure = (cardId, error) => ({
type: ActionTypes.ACTIONS_DETAILS_TOGGLE__FAILURE,
payload: {
cardId,
error,
},
});
+7 -1
View File
@@ -1,7 +1,13 @@
import EntryActionTypes from '../../constants/EntryActionTypes'; import EntryActionTypes from '../../constants/EntryActionTypes';
// eslint-disable-next-line import/prefer-default-export
export const fetchActionsInCurrentCard = () => ({ export const fetchActionsInCurrentCard = () => ({
type: EntryActionTypes.ACTIONS_IN_CURRENT_CARD_FETCH, type: EntryActionTypes.ACTIONS_IN_CURRENT_CARD_FETCH,
payload: {}, payload: {},
}); });
export const toggleActionsDetailsInCurrentCard = (isVisible) => ({
type: EntryActionTypes.ACTIONS_DETAILS_IN_CURRENT_CARD_TOGGLE,
payload: {
isVisible,
},
});
+8
View File
@@ -29,6 +29,14 @@ export const handleTaskUpdate = (task) => ({
}, },
}); });
export const moveTask = (id, index) => ({
type: EntryActionTypes.TASK_MOVE,
payload: {
id,
index,
},
});
export const deleteTask = (id) => ({ export const deleteTask = (id) => ({
type: EntryActionTypes.TASK_DELETE, type: EntryActionTypes.TASK_DELETE,
payload: { payload: {
+7
View File
@@ -41,6 +41,13 @@ export const handleUserUpdate = (user) => ({
}, },
}); });
export const updateCurrentUserLanguage = (language) => ({
type: EntryActionTypes.CURRENT_USER_LANGUAGE_UPDATE,
payload: {
language,
},
});
export const updateUserEmail = (id, data) => ({ export const updateUserEmail = (id, data) => ({
type: EntryActionTypes.USER_EMAIL_UPDATE, type: EntryActionTypes.USER_EMAIL_UPDATE,
payload: { payload: {
@@ -15,7 +15,7 @@ const DEFAULT_DATA = {
const ListAdd = React.memo(({ onCreate, onClose }) => { const ListAdd = React.memo(({ onCreate, onClose }) => {
const [t] = useTranslation(); const [t] = useTranslation();
const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA); const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
const [selectNameFieldState, selectNameField] = useToggle(); const [focusNameFieldState, focusNameField] = useToggle();
const nameField = useRef(null); const nameField = useRef(null);
@@ -44,16 +44,16 @@ const ListAdd = React.memo(({ onCreate, onClose }) => {
onCreate(cleanData); onCreate(cleanData);
setData(DEFAULT_DATA); setData(DEFAULT_DATA);
selectNameField(); focusNameField();
}, [onCreate, data, setData, selectNameField]); }, [onCreate, data, setData, focusNameField]);
useEffect(() => { useEffect(() => {
nameField.current.select(); nameField.current.focus();
}, []); }, []);
useDidUpdate(() => { useDidUpdate(() => {
nameField.current.select(); nameField.current.focus();
}, [selectNameFieldState]); }, [focusNameFieldState]);
return ( return (
<Form className={styles.wrapper} onSubmit={handleSubmit}> <Form className={styles.wrapper} onSubmit={handleSubmit}>
+1 -1
View File
@@ -35,7 +35,7 @@ const AddStep = React.memo(({ onCreate, onClose }) => {
}, [onCreate, onClose, data]); }, [onCreate, onClose, data]);
useEffect(() => { useEffect(() => {
nameField.current.select(); nameField.current.focus();
}, []); }, []);
return ( return (
@@ -77,6 +77,7 @@
.cover { .cover {
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
margin-bottom: 2px;
vertical-align: middle; vertical-align: middle;
} }
@@ -114,6 +115,7 @@
} }
.wrapper { .wrapper {
cursor: auto;
display: block; display: block;
margin-bottom: 8px; margin-bottom: 8px;
} }
+1 -1
View File
@@ -79,7 +79,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
useEffect(() => { useEffect(() => {
if (isOpened) { if (isOpened) {
field.current.ref.current.select(); field.current.ref.current.focus();
} }
}, [isOpened]); }, [isOpened]);
@@ -1,7 +1,7 @@
import React, { useCallback } from 'react'; import React, { useCallback } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { Comment, Icon, Loader, Visibility } from 'semantic-ui-react'; import { Button, Comment, Icon, Loader, Visibility } from 'semantic-ui-react';
import { ActionTypes } from '../../../constants/Enums'; import { ActionTypes } from '../../../constants/Enums';
import CommentAdd from './CommentAdd'; import CommentAdd from './CommentAdd';
@@ -14,15 +14,22 @@ const Actions = React.memo(
items, items,
isFetching, isFetching,
isAllFetched, isAllFetched,
isDetailsVisible,
isDetailsFetching,
canEdit, canEdit,
canEditAllComments, canEditAllComments,
onFetch, onFetch,
onDetailsToggle,
onCommentCreate, onCommentCreate,
onCommentUpdate, onCommentUpdate,
onCommentDelete, onCommentDelete,
}) => { }) => {
const [t] = useTranslation(); const [t] = useTranslation();
const handleToggleDetailsClick = useCallback(() => {
onDetailsToggle(!isDetailsVisible);
}, [isDetailsVisible, onDetailsToggle]);
const handleCommentUpdate = useCallback( const handleCommentUpdate = useCallback(
(id, data) => { (id, data) => {
onCommentUpdate(id, data); onCommentUpdate(id, data);
@@ -38,54 +45,51 @@ const Actions = React.memo(
); );
return ( return (
<> <div className={styles.contentModule}>
{canEdit && ( <div className={styles.moduleWrapper}>
<div className={styles.contentModule}> <Icon name="list ul" className={styles.moduleIcon} />
<div className={styles.moduleWrapper}> <div className={styles.moduleHeader}>
<Icon name="comment outline" className={styles.moduleIcon} /> {t('common.actions')}
<div className={styles.moduleHeader}>{t('common.addComment')}</div> <Button
<CommentAdd onCreate={onCommentCreate} /> content={isDetailsVisible ? t('action.hideDetails') : t('action.showDetails')}
</div> className={styles.toggleButton}
onClick={handleToggleDetailsClick}
/>
</div> </div>
)} {canEdit && <CommentAdd onCreate={onCommentCreate} />}
<div className={styles.contentModule}> <div className={styles.wrapper}>
<div className={styles.moduleWrapper}> <Comment.Group>
<Icon name="list ul" className={styles.moduleIcon} /> {items.map((item) =>
<div className={styles.moduleHeader}>{t('common.actions')}</div> item.type === ActionTypes.COMMENT_CARD ? (
<div className={styles.wrapper}> <Item.Comment
<Comment.Group> key={item.id}
{items.map((item) => data={item.data}
item.type === ActionTypes.COMMENT_CARD ? ( createdAt={item.createdAt}
<Item.Comment isPersisted={item.isPersisted}
key={item.id} user={item.user}
data={item.data} canEdit={(item.user.isCurrent && canEdit) || canEditAllComments}
createdAt={item.createdAt} onUpdate={(data) => handleCommentUpdate(item.id, data)}
isPersisted={item.isPersisted} onDelete={() => handleCommentDelete(item.id)}
user={item.user} />
canEdit={(item.user.isCurrent && canEdit) || canEditAllComments} ) : (
onUpdate={(data) => handleCommentUpdate(item.id, data)} <Item
onDelete={() => handleCommentDelete(item.id)} key={item.id}
/> type={item.type}
) : ( data={item.data}
<Item createdAt={item.createdAt}
key={item.id} user={item.user}
type={item.type} />
data={item.data} ),
createdAt={item.createdAt} )}
user={item.user} </Comment.Group>
/>
),
)}
</Comment.Group>
</div>
{isFetching ? (
<Loader active inverted inline="centered" size="small" className={styles.loader} />
) : (
!isAllFetched && <Visibility fireOnMount onOnScreen={onFetch} />
)}
</div> </div>
{isFetching || isDetailsFetching ? (
<Loader active inverted inline="centered" size="small" className={styles.loader} />
) : (
!isAllFetched && <Visibility fireOnMount onOnScreen={onFetch} />
)}
</div> </div>
</> </div>
); );
}, },
); );
@@ -94,9 +98,12 @@ Actions.propTypes = {
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
isFetching: PropTypes.bool.isRequired, isFetching: PropTypes.bool.isRequired,
isAllFetched: PropTypes.bool.isRequired, isAllFetched: PropTypes.bool.isRequired,
isDetailsVisible: PropTypes.bool.isRequired,
isDetailsFetching: PropTypes.bool.isRequired,
canEdit: PropTypes.bool.isRequired, canEdit: PropTypes.bool.isRequired,
canEditAllComments: PropTypes.bool.isRequired, canEditAllComments: PropTypes.bool.isRequired,
onFetch: PropTypes.func.isRequired, onFetch: PropTypes.func.isRequired,
onDetailsToggle: PropTypes.func.isRequired,
onCommentCreate: PropTypes.func.isRequired, onCommentCreate: PropTypes.func.isRequired,
onCommentUpdate: PropTypes.func.isRequired, onCommentUpdate: PropTypes.func.isRequired,
onCommentDelete: PropTypes.func.isRequired, onCommentDelete: PropTypes.func.isRequired,
@@ -8,12 +8,14 @@
} }
.moduleHeader { .moduleHeader {
align-items: center;
color: #17394d; color: #17394d;
display: flex;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
line-height: 20px; height: 36px;
justify-content: space-between;
margin: 0 0 4px; margin: 0 0 4px;
padding: 8px 0;
} }
.moduleIcon { .moduleIcon {
@@ -33,6 +35,24 @@
position: relative; position: relative;
} }
.toggleButton {
background: transparent;
box-shadow: none;
color: #6b808c;
float: right;
font-weight: normal;
margin-right: 0;
padding: 6px 11px;
text-align: left;
text-decoration: underline;
transition: none;
&:hover {
background: rgba(9, 30, 66, 0.08);
color: #092d42;
}
}
.wrapper { .wrapper {
margin-left: -40px; margin-left: -40px;
margin-top: 12px; margin-top: 12px;
@@ -1,10 +1,11 @@
import React, { useCallback, useRef } from 'react'; import React, { useCallback, useRef, useState } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import TextareaAutosize from 'react-textarea-autosize'; import TextareaAutosize from 'react-textarea-autosize';
import { Button, Form, TextArea } from 'semantic-ui-react'; import { Button, Form, TextArea } from 'semantic-ui-react';
import { useDidUpdate, useToggle } from '../../../lib/hooks';
import { useForm } from '../../../hooks'; import { useClosableForm, useForm } from '../../../hooks';
import styles from './CommentAdd.module.scss'; import styles from './CommentAdd.module.scss';
@@ -14,10 +15,16 @@ const DEFAULT_DATA = {
const CommentAdd = React.memo(({ onCreate }) => { const CommentAdd = React.memo(({ onCreate }) => {
const [t] = useTranslation(); const [t] = useTranslation();
const [isOpened, setIsOpened] = useState(false);
const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA); const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
const [selectTextFieldState, selectTextField] = useToggle();
const textField = useRef(null); const textField = useRef(null);
const close = useCallback(() => {
setIsOpened(false);
}, []);
const submit = useCallback(() => { const submit = useCallback(() => {
const cleanData = { const cleanData = {
...data, ...data,
@@ -32,7 +39,12 @@ const CommentAdd = React.memo(({ onCreate }) => {
onCreate(cleanData); onCreate(cleanData);
setData(DEFAULT_DATA); setData(DEFAULT_DATA);
}, [onCreate, data, setData]); selectTextField();
}, [onCreate, data, setData, selectTextField]);
const handleFieldFocus = useCallback(() => {
setIsOpened(true);
}, []);
const handleFieldKeyDown = useCallback( const handleFieldKeyDown = useCallback(
(event) => { (event) => {
@@ -43,10 +55,16 @@ const CommentAdd = React.memo(({ onCreate }) => {
[submit], [submit],
); );
const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(close);
const handleSubmit = useCallback(() => { const handleSubmit = useCallback(() => {
submit(); submit();
}, [submit]); }, [submit]);
useDidUpdate(() => {
textField.current.ref.current.focus();
}, [selectTextFieldState]);
return ( return (
<Form onSubmit={handleSubmit}> <Form onSubmit={handleSubmit}>
<TextArea <TextArea
@@ -55,15 +73,24 @@ const CommentAdd = React.memo(({ onCreate }) => {
name="text" name="text"
value={data.text} value={data.text}
placeholder={t('common.writeComment')} placeholder={t('common.writeComment')}
minRows={3} minRows={isOpened ? 3 : 1}
spellCheck={false} spellCheck={false}
className={styles.field} className={styles.field}
onFocus={handleFieldFocus}
onKeyDown={handleFieldKeyDown} onKeyDown={handleFieldKeyDown}
onChange={handleFieldChange} onChange={handleFieldChange}
onBlur={handleFieldBlur}
/> />
<div className={styles.controls}> {isOpened && (
<Button positive content={t('action.addComment')} disabled={!data.text} /> <div className={styles.controls}>
</div> <Button
positive
content={t('action.addComment')}
onMouseOver={handleControlMouseOver}
onMouseOut={handleControlMouseOut}
/>
</div>
)}
</Form> </Form>
); );
}); });
@@ -76,7 +76,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
useEffect(() => { useEffect(() => {
if (isOpened) { if (isOpened) {
textField.current.ref.current.select(); textField.current.ref.current.focus();
} }
}, [isOpened]); }, [isOpened]);
@@ -37,7 +37,7 @@ const TextFileAddModal = React.memo(({ content, onCreate, onClose }) => {
}, [content, onCreate, onClose, data]); }, [content, onCreate, onClose, data]);
useEffect(() => { useEffect(() => {
nameField.current.select(); nameField.current.focus();
}, []); }, []);
return ( return (
@@ -1,6 +1,8 @@
import React, { useCallback } from 'react'; import React, { useCallback } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classNames from 'classnames';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { Gallery, Item as GalleryItem } from 'react-photoswipe-gallery';
import { Button } from 'semantic-ui-react'; import { Button } from 'semantic-ui-react';
import { useToggle } from '../../../lib/hooks'; import { useToggle } from '../../../lib/hooks';
@@ -8,81 +10,152 @@ import Item from './Item';
import styles from './Attachments.module.scss'; import styles from './Attachments.module.scss';
const Attachments = React.memo(({ items, onUpdate, onDelete, onCoverUpdate }) => { const INITIALLY_VISIBLE = 4;
const [t] = useTranslation();
const [isOpened, toggleOpened] = useToggle();
const handleToggleClick = useCallback(() => { const Attachments = React.memo(
toggleOpened(); ({ items, onUpdate, onDelete, onCoverUpdate, onGalleryOpen, onGalleryClose }) => {
}, [toggleOpened]); const [t] = useTranslation();
const [isAllVisible, toggleAllVisible] = useToggle();
const handleCoverSelect = useCallback( const handleCoverSelect = useCallback(
(id) => { (id) => {
onCoverUpdate(id); onCoverUpdate(id);
}, },
[onCoverUpdate], [onCoverUpdate],
); );
const handleCoverDeselect = useCallback(() => { const handleCoverDeselect = useCallback(() => {
onCoverUpdate(null); onCoverUpdate(null);
}, [onCoverUpdate]); }, [onCoverUpdate]);
const handleUpdate = useCallback( const handleUpdate = useCallback(
(id, data) => { (id, data) => {
onUpdate(id, data); onUpdate(id, data);
}, },
[onUpdate], [onUpdate],
); );
const handleDelete = useCallback( const handleDelete = useCallback(
(id) => { (id) => {
onDelete(id); onDelete(id);
}, },
[onDelete], [onDelete],
); );
const visibleItems = isOpened ? items : items.slice(0, 4); const handleBeforeGalleryOpen = useCallback(
(gallery) => {
onGalleryOpen();
return ( gallery.on('destroy', () => {
<> onGalleryClose();
{visibleItems.map((item) => ( });
<Item },
[onGalleryOpen, onGalleryClose],
);
const handleToggleAllVisibleClick = useCallback(() => {
toggleAllVisible();
}, [toggleAllVisible]);
const galleryItemsNode = items.map((item, index) => {
const isPdf = item.url && item.url.endsWith('.pdf');
let props;
if (item.image) {
props = item.image;
} else {
props = {
content: isPdf ? (
// eslint-disable-next-line jsx-a11y/alt-text
<object
data={item.url}
type="application/pdf"
className={classNames(styles.content, styles.contentPdf)}
/>
) : (
<span className={classNames(styles.content, styles.contentError)}>
{t('common.thereIsNoPreviewAvailableForThisAttachment')}
</span>
),
};
}
const isVisible = isAllVisible || index < INITIALLY_VISIBLE;
return (
<GalleryItem
{...props} // eslint-disable-line react/jsx-props-no-spreading
key={item.id} key={item.id}
name={item.name} original={item.url}
url={item.url} caption={item.name}
coverUrl={item.coverUrl} >
createdAt={item.createdAt} {({ ref, open }) =>
isCover={item.isCover} isVisible ? (
isPersisted={item.isPersisted} <Item
onCoverSelect={() => handleCoverSelect(item.id)} ref={ref}
onCoverDeselect={handleCoverDeselect} name={item.name}
onUpdate={(data) => handleUpdate(item.id, data)} url={item.url}
onDelete={() => handleDelete(item.id)} coverUrl={item.coverUrl}
/> createdAt={item.createdAt}
))} isCover={item.isCover}
{items.length > 4 && ( isPersisted={item.isPersisted}
<Button onClick={item.image || isPdf ? open : undefined}
fluid onCoverSelect={() => handleCoverSelect(item.id)}
content={ onCoverDeselect={handleCoverDeselect}
isOpened onUpdate={(data) => handleUpdate(item.id, data)}
? t('action.showFewerAttachments') onDelete={() => handleDelete(item.id)}
: t('action.showAllAttachments', { />
hidden: items.length - visibleItems.length, ) : (
}) <span ref={ref} />
)
} }
className={styles.toggleButton} </GalleryItem>
onClick={handleToggleClick} );
/> });
)}
</> return (
); <>
}); <Gallery
withCaption
withDownloadButton
options={{
showHideAnimationType: 'none',
closeTitle: '',
zoomTitle: '',
arrowPrevTitle: '',
arrowNextTitle: '',
errorMsg: '',
}}
onBeforeOpen={handleBeforeGalleryOpen}
>
{galleryItemsNode}
</Gallery>
{items.length > INITIALLY_VISIBLE && (
<Button
fluid
content={
isAllVisible
? t('action.showFewerAttachments')
: t('action.showAllAttachments', {
hidden: items.length - INITIALLY_VISIBLE,
})
}
className={styles.toggleButton}
onClick={handleToggleAllVisibleClick}
/>
)}
</>
);
},
);
Attachments.propTypes = { Attachments.propTypes = {
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
onUpdate: PropTypes.func.isRequired, onUpdate: PropTypes.func.isRequired,
onDelete: PropTypes.func.isRequired, onDelete: PropTypes.func.isRequired,
onCoverUpdate: PropTypes.func.isRequired, onCoverUpdate: PropTypes.func.isRequired,
onGalleryOpen: PropTypes.func.isRequired,
onGalleryClose: PropTypes.func.isRequired,
}; };
export default Attachments; export default Attachments;
@@ -1,4 +1,26 @@
:global(#app) { :global(#app) {
.content {
bottom: 0;
left: 0;
margin: auto;
position: absolute;
right: 0;
top: 0;
}
.contentPdf {
height: 100%;
width: 1120px;
}
.contentError {
color: #fff;
font-size: 20px;
font-weight: 700;
height: 20px;
width: 470px;
}
.toggleButton { .toggleButton {
background: transparent; background: transparent;
box-shadow: none; box-shadow: none;
@@ -8,24 +8,32 @@ import EditPopup from './EditPopup';
import styles from './Item.module.scss'; import styles from './Item.module.scss';
const Item = React.memo( const Item = React.forwardRef(
({ (
name, {
url, name,
coverUrl, url,
createdAt, coverUrl,
isCover, createdAt,
isPersisted, isCover,
onCoverSelect, isPersisted,
onCoverDeselect, onCoverSelect,
onUpdate, onCoverDeselect,
onDelete, onClick,
}) => { onUpdate,
onDelete,
},
ref,
) => {
const [t] = useTranslation(); const [t] = useTranslation();
const handleClick = useCallback(() => { const handleClick = useCallback(() => {
window.open(url, '_blank'); if (onClick) {
}, [url]); onClick();
} else {
window.open(url, '_blank');
}
}, [url, onClick]);
const handleToggleCoverClick = useCallback( const handleToggleCoverClick = useCallback(
(event) => { (event) => {
@@ -54,7 +62,7 @@ const Item = React.memo(
return ( return (
/* eslint-disable jsx-a11y/click-events-have-key-events, /* eslint-disable jsx-a11y/click-events-have-key-events,
jsx-a11y/no-static-element-interactions */ jsx-a11y/no-static-element-interactions */
<div className={styles.wrapper} onClick={handleClick}> <div ref={ref} className={styles.wrapper} onClick={handleClick}>
{/* eslint-enable jsx-a11y/click-events-have-key-events, {/* eslint-enable jsx-a11y/click-events-have-key-events,
jsx-a11y/no-static-element-interactions */} jsx-a11y/no-static-element-interactions */}
<div <div
@@ -133,6 +141,7 @@ Item.propTypes = {
createdAt: PropTypes.instanceOf(Date), createdAt: PropTypes.instanceOf(Date),
isCover: PropTypes.bool.isRequired, isCover: PropTypes.bool.isRequired,
isPersisted: PropTypes.bool.isRequired, isPersisted: PropTypes.bool.isRequired,
onClick: PropTypes.func,
onCoverSelect: PropTypes.func.isRequired, onCoverSelect: PropTypes.func.isRequired,
onCoverDeselect: PropTypes.func.isRequired, onCoverDeselect: PropTypes.func.isRequired,
onUpdate: PropTypes.func.isRequired, onUpdate: PropTypes.func.isRequired,
@@ -143,6 +152,7 @@ Item.defaultProps = {
url: undefined, url: undefined,
coverUrl: undefined, coverUrl: undefined,
createdAt: undefined, createdAt: undefined,
onClick: undefined,
}; };
export default Item; export default React.memo(Item);
+34 -2
View File
@@ -1,4 +1,4 @@
import React, { useCallback } from 'react'; import React, { useCallback, useRef } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classNames from 'classnames'; import classNames from 'classnames';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
@@ -34,6 +34,8 @@ const CardModal = React.memo(
isSubscribed, isSubscribed,
isActionsFetching, isActionsFetching,
isAllActionsFetched, isAllActionsFetched,
isActionsDetailsVisible,
isActionsDetailsFetching,
listId, listId,
boardId, boardId,
projectId, projectId,
@@ -61,11 +63,13 @@ const CardModal = React.memo(
onLabelDelete, onLabelDelete,
onTaskCreate, onTaskCreate,
onTaskUpdate, onTaskUpdate,
onTaskMove,
onTaskDelete, onTaskDelete,
onAttachmentCreate, onAttachmentCreate,
onAttachmentUpdate, onAttachmentUpdate,
onAttachmentDelete, onAttachmentDelete,
onActionsFetch, onActionsFetch,
onActionsDetailsToggle,
onCommentActionCreate, onCommentActionCreate,
onCommentActionUpdate, onCommentActionUpdate,
onCommentActionDelete, onCommentActionDelete,
@@ -73,6 +77,8 @@ const CardModal = React.memo(
}) => { }) => {
const [t] = useTranslation(); const [t] = useTranslation();
const isGalleryOpened = useRef(false);
const handleNameUpdate = useCallback( const handleNameUpdate = useCallback(
(newName) => { (newName) => {
onUpdate({ onUpdate({
@@ -124,6 +130,22 @@ const CardModal = React.memo(
}); });
}, [isSubscribed, onUpdate]); }, [isSubscribed, onUpdate]);
const handleGalleryOpen = useCallback(() => {
isGalleryOpened.current = true;
}, []);
const handleGalleryClose = useCallback(() => {
isGalleryOpened.current = false;
}, []);
const handleClose = useCallback(() => {
if (isGalleryOpened.current) {
return;
}
onClose();
}, [onClose]);
const userIds = users.map((user) => user.id); const userIds = users.map((user) => user.id);
const labelIds = labels.map((label) => label.id); const labelIds = labels.map((label) => label.id);
@@ -313,6 +335,7 @@ const CardModal = React.memo(
canEdit={canEdit} canEdit={canEdit}
onCreate={onTaskCreate} onCreate={onTaskCreate}
onUpdate={onTaskUpdate} onUpdate={onTaskUpdate}
onMove={onTaskMove}
onDelete={onTaskDelete} onDelete={onTaskDelete}
/> />
</div> </div>
@@ -328,6 +351,8 @@ const CardModal = React.memo(
onUpdate={onAttachmentUpdate} onUpdate={onAttachmentUpdate}
onDelete={onAttachmentDelete} onDelete={onAttachmentDelete}
onCoverUpdate={handleCoverUpdate} onCoverUpdate={handleCoverUpdate}
onGalleryOpen={handleGalleryOpen}
onGalleryClose={handleGalleryClose}
/> />
</div> </div>
</div> </div>
@@ -336,9 +361,12 @@ const CardModal = React.memo(
items={actions} items={actions}
isFetching={isActionsFetching} isFetching={isActionsFetching}
isAllFetched={isAllActionsFetched} isAllFetched={isAllActionsFetched}
isDetailsVisible={isActionsDetailsVisible}
isDetailsFetching={isActionsDetailsFetching}
canEdit={canEdit} canEdit={canEdit}
canEditAllComments={canEditAllCommentActions} canEditAllComments={canEditAllCommentActions}
onFetch={onActionsFetch} onFetch={onActionsFetch}
onDetailsToggle={onActionsDetailsToggle}
onCommentCreate={onCommentActionCreate} onCommentCreate={onCommentActionCreate}
onCommentUpdate={onCommentActionUpdate} onCommentUpdate={onCommentActionUpdate}
onCommentDelete={onCommentActionDelete} onCommentDelete={onCommentActionDelete}
@@ -445,7 +473,7 @@ const CardModal = React.memo(
); );
return ( return (
<Modal open closeIcon size="small" centered={false} onClose={onClose}> <Modal open closeIcon centered={false} onClose={handleClose} className={styles.wrapper}>
{canEdit ? ( {canEdit ? (
<AttachmentAddZone onCreate={onAttachmentCreate}>{contentNode}</AttachmentAddZone> <AttachmentAddZone onCreate={onAttachmentCreate}>{contentNode}</AttachmentAddZone>
) : ( ) : (
@@ -464,6 +492,8 @@ CardModal.propTypes = {
isSubscribed: PropTypes.bool.isRequired, isSubscribed: PropTypes.bool.isRequired,
isActionsFetching: PropTypes.bool.isRequired, isActionsFetching: PropTypes.bool.isRequired,
isAllActionsFetched: PropTypes.bool.isRequired, isAllActionsFetched: PropTypes.bool.isRequired,
isActionsDetailsVisible: PropTypes.bool.isRequired,
isActionsDetailsFetching: PropTypes.bool.isRequired,
listId: PropTypes.string.isRequired, listId: PropTypes.string.isRequired,
boardId: PropTypes.string.isRequired, boardId: PropTypes.string.isRequired,
projectId: PropTypes.string.isRequired, projectId: PropTypes.string.isRequired,
@@ -493,11 +523,13 @@ CardModal.propTypes = {
onLabelDelete: PropTypes.func.isRequired, onLabelDelete: PropTypes.func.isRequired,
onTaskCreate: PropTypes.func.isRequired, onTaskCreate: PropTypes.func.isRequired,
onTaskUpdate: PropTypes.func.isRequired, onTaskUpdate: PropTypes.func.isRequired,
onTaskMove: PropTypes.func.isRequired,
onTaskDelete: PropTypes.func.isRequired, onTaskDelete: PropTypes.func.isRequired,
onAttachmentCreate: PropTypes.func.isRequired, onAttachmentCreate: PropTypes.func.isRequired,
onAttachmentUpdate: PropTypes.func.isRequired, onAttachmentUpdate: PropTypes.func.isRequired,
onAttachmentDelete: PropTypes.func.isRequired, onAttachmentDelete: PropTypes.func.isRequired,
onActionsFetch: PropTypes.func.isRequired, onActionsFetch: PropTypes.func.isRequired,
onActionsDetailsToggle: PropTypes.func.isRequired,
onCommentActionCreate: PropTypes.func.isRequired, onCommentActionCreate: PropTypes.func.isRequired,
onCommentActionUpdate: PropTypes.func.isRequired, onCommentActionUpdate: PropTypes.func.isRequired,
onCommentActionDelete: PropTypes.func.isRequired, onCommentActionDelete: PropTypes.func.isRequired,
@@ -193,4 +193,14 @@
margin: 0 8px 4px 0; margin: 0 8px 4px 0;
text-transform: uppercase; text-transform: uppercase;
} }
.wrapper {
width: 880px;
}
@media (max-width: 926px) {
.wrapper {
width: 95%;
}
}
} }
@@ -66,7 +66,7 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate },
useEffect(() => { useEffect(() => {
if (isOpened) { if (isOpened) {
field.current.ref.current.select(); field.current.ref.current.focus();
} }
}, [isOpened]); }, [isOpened]);
@@ -17,7 +17,7 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
const [t] = useTranslation(); const [t] = useTranslation();
const [isOpened, setIsOpened] = useState(false); const [isOpened, setIsOpened] = useState(false);
const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA); const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
const [selectNameFieldState, selectNameField] = useToggle(); const [focusNameFieldState, focusNameField] = useToggle();
const nameField = useRef(null); const nameField = useRef(null);
@@ -43,8 +43,8 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
onCreate(cleanData); onCreate(cleanData);
setData(DEFAULT_DATA); setData(DEFAULT_DATA);
selectNameField(); focusNameField();
}, [onCreate, data, setData, selectNameField]); }, [onCreate, data, setData, focusNameField]);
useImperativeHandle( useImperativeHandle(
ref, ref,
@@ -81,13 +81,13 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
useEffect(() => { useEffect(() => {
if (isOpened) { if (isOpened) {
nameField.current.ref.current.select(); nameField.current.ref.current.focus();
} }
}, [isOpened]); }, [isOpened]);
useDidUpdate(() => { useDidUpdate(() => {
nameField.current.ref.current.select(); nameField.current.ref.current.focus();
}, [selectNameFieldState]); }, [focusNameFieldState]);
if (!isOpened) { if (!isOpened) {
return React.cloneElement(children, { return React.cloneElement(children, {
+72 -57
View File
@@ -1,6 +1,8 @@
import React, { useCallback, useRef } from 'react'; import React, { useCallback, useRef } from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classNames from 'classnames'; import classNames from 'classnames';
import { Draggable } from 'react-beautiful-dnd';
import { Button, Checkbox, Icon } from 'semantic-ui-react'; import { Button, Checkbox, Icon } from 'semantic-ui-react';
import NameEdit from './NameEdit'; import NameEdit from './NameEdit';
@@ -8,72 +10,85 @@ import ActionsPopup from './ActionsPopup';
import styles from './Item.module.scss'; import styles from './Item.module.scss';
const Item = React.memo(({ name, isCompleted, isPersisted, canEdit, onUpdate, onDelete }) => { const Item = React.memo(
const nameEdit = useRef(null); ({ id, index, name, isCompleted, isPersisted, canEdit, onUpdate, onDelete }) => {
const nameEdit = useRef(null);
const handleClick = useCallback(() => { const handleClick = useCallback(() => {
if (isPersisted && canEdit) { if (isPersisted && canEdit) {
nameEdit.current.open(); nameEdit.current.open();
} }
}, [isPersisted, canEdit]); }, [isPersisted, canEdit]);
const handleNameUpdate = useCallback( const handleNameUpdate = useCallback(
(newName) => { (newName) => {
onUpdate({
name: newName,
});
},
[onUpdate],
);
const handleToggleChange = useCallback(() => {
onUpdate({ onUpdate({
name: newName, isCompleted: !isCompleted,
}); });
}, }, [isCompleted, onUpdate]);
[onUpdate],
);
const handleToggleChange = useCallback(() => { const handleNameEdit = useCallback(() => {
onUpdate({ nameEdit.current.open();
isCompleted: !isCompleted, }, []);
});
}, [isCompleted, onUpdate]);
const handleNameEdit = useCallback(() => { return (
nameEdit.current.open(); <Draggable draggableId={id} index={index} isDragDisabled={!isPersisted || !canEdit}>
}, []); {({ innerRef, draggableProps, dragHandleProps }, { isDragging }) => {
const contentNode = (
// eslint-disable-next-line react/jsx-props-no-spreading
<div {...draggableProps} {...dragHandleProps} ref={innerRef} className={styles.wrapper}>
<span className={styles.checkboxWrapper}>
<Checkbox
checked={isCompleted}
disabled={!isPersisted || !canEdit}
className={styles.checkbox}
onChange={handleToggleChange}
/>
</span>
<NameEdit ref={nameEdit} defaultValue={name} onUpdate={handleNameUpdate}>
<div className={classNames(canEdit && styles.contentHoverable)}>
{/* eslint-disable jsx-a11y/click-events-have-key-events,
jsx-a11y/no-static-element-interactions */}
<span
className={classNames(styles.text, canEdit && styles.textEditable)}
onClick={handleClick}
>
{/* eslint-enable jsx-a11y/click-events-have-key-events,
jsx-a11y/no-static-element-interactions */}
<span className={classNames(styles.task, isCompleted && styles.taskCompleted)}>
{name}
</span>
</span>
{isPersisted && canEdit && (
<ActionsPopup onNameEdit={handleNameEdit} onDelete={onDelete}>
<Button className={classNames(styles.button, styles.target)}>
<Icon fitted name="pencil" size="small" />
</Button>
</ActionsPopup>
)}
</div>
</NameEdit>
</div>
);
return ( return isDragging ? ReactDOM.createPortal(contentNode, document.body) : contentNode;
<div className={styles.wrapper}> }}
<span className={styles.checkboxWrapper}> </Draggable>
<Checkbox );
checked={isCompleted} },
disabled={!isPersisted || !canEdit} );
className={styles.checkbox}
onChange={handleToggleChange}
/>
</span>
<NameEdit ref={nameEdit} defaultValue={name} onUpdate={handleNameUpdate}>
<div className={classNames(canEdit && styles.contentHoverable)}>
{/* eslint-disable jsx-a11y/click-events-have-key-events,
jsx-a11y/no-static-element-interactions */}
<span
className={classNames(styles.text, canEdit && styles.textEditable)}
onClick={handleClick}
>
{/* eslint-enable jsx-a11y/click-events-have-key-events,
jsx-a11y/no-static-element-interactions */}
<span className={classNames(styles.task, isCompleted && styles.taskCompleted)}>
{name}
</span>
</span>
{isPersisted && canEdit && (
<ActionsPopup onNameEdit={handleNameEdit} onDelete={onDelete}>
<Button className={classNames(styles.button, styles.target)}>
<Icon fitted name="pencil" size="small" />
</Button>
</ActionsPopup>
)}
</div>
</NameEdit>
</div>
);
});
Item.propTypes = { Item.propTypes = {
id: PropTypes.string.isRequired,
index: PropTypes.number.isRequired,
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
isCompleted: PropTypes.bool.isRequired, isCompleted: PropTypes.bool.isRequired,
isPersisted: PropTypes.bool.isRequired, isPersisted: PropTypes.bool.isRequired,
@@ -27,7 +27,7 @@
vertical-align: top; vertical-align: top;
z-index: 2000; z-index: 2000;
line-height: 1; line-height: 1;
height: 32px; height: 100%;
} }
.contentHoverable:hover { .contentHoverable:hover {
@@ -69,10 +69,10 @@
.wrapper { .wrapper {
border-radius: 3px; border-radius: 3px;
cursor: auto;
margin-left: -40px; margin-left: -40px;
min-height: 32px; min-height: 32px;
position: relative; position: relative;
transition: all 0.14s ease-in;
width: calc(100% + 40px); width: calc(100% + 40px);
} }
} }
@@ -71,7 +71,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
useEffect(() => { useEffect(() => {
if (isOpened) { if (isOpened) {
field.current.ref.current.select(); field.current.ref.current.focus();
} }
}, [isOpened]); }, [isOpened]);
+52 -21
View File
@@ -1,16 +1,34 @@
import React, { useCallback } from 'react'; import React, { useCallback } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { DragDropContext, Droppable } from 'react-beautiful-dnd';
import { Progress } from 'semantic-ui-react'; import { Progress } from 'semantic-ui-react';
import { closePopup } from '../../../lib/popup';
import DroppableTypes from '../../../constants/DroppableTypes';
import Item from './Item'; import Item from './Item';
import Add from './Add'; import Add from './Add';
import styles from './Tasks.module.scss'; import styles from './Tasks.module.scss';
const Tasks = React.memo(({ items, canEdit, onCreate, onUpdate, onDelete }) => { const Tasks = React.memo(({ items, canEdit, onCreate, onUpdate, onMove, onDelete }) => {
const [t] = useTranslation(); const [t] = useTranslation();
const handleDragStart = useCallback(() => {
closePopup();
}, []);
const handleDragEnd = useCallback(
({ draggableId, source, destination }) => {
if (!destination || source.index === destination.index) {
return;
}
onMove(draggableId, destination.index);
},
[onMove],
);
const handleUpdate = useCallback( const handleUpdate = useCallback(
(id, data) => { (id, data) => {
onUpdate(id, data); onUpdate(id, data);
@@ -39,26 +57,38 @@ const Tasks = React.memo(({ items, canEdit, onCreate, onUpdate, onDelete }) => {
className={styles.progress} className={styles.progress}
/> />
)} )}
{items.map((item) => ( <DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
<Item <Droppable droppableId="tasks" type={DroppableTypes.TASK}>
key={item.id} {({ innerRef, droppableProps, placeholder }) => (
name={item.name} // eslint-disable-next-line react/jsx-props-no-spreading
isCompleted={item.isCompleted} <div {...droppableProps} ref={innerRef}>
isPersisted={item.isPersisted} {items.map((item, index) => (
canEdit={canEdit} <Item
onUpdate={(data) => handleUpdate(item.id, data)} key={item.id}
onDelete={() => handleDelete(item.id)} id={item.id}
/> index={index}
))} name={item.name}
{canEdit && ( isCompleted={item.isCompleted}
<Add onCreate={onCreate}> isPersisted={item.isPersisted}
<button type="button" className={styles.taskButton}> canEdit={canEdit}
<span className={styles.taskButtonText}> onUpdate={(data) => handleUpdate(item.id, data)}
{items.length > 0 ? t('action.addAnotherTask') : t('action.addTask')} onDelete={() => handleDelete(item.id)}
</span> />
</button> ))}
</Add> {placeholder}
)} {canEdit && (
<Add onCreate={onCreate}>
<button type="button" className={styles.taskButton}>
<span className={styles.taskButtonText}>
{items.length > 0 ? t('action.addAnotherTask') : t('action.addTask')}
</span>
</button>
</Add>
)}
</div>
)}
</Droppable>
</DragDropContext>
</> </>
); );
}); });
@@ -68,6 +98,7 @@ Tasks.propTypes = {
canEdit: PropTypes.bool.isRequired, canEdit: PropTypes.bool.isRequired,
onCreate: PropTypes.func.isRequired, onCreate: PropTypes.func.isRequired,
onUpdate: PropTypes.func.isRequired, onUpdate: PropTypes.func.isRequired,
onMove: PropTypes.func.isRequired,
onDelete: PropTypes.func.isRequired, onDelete: PropTypes.func.isRequired,
}; };
@@ -13,7 +13,6 @@
border-radius: 3px; border-radius: 3px;
box-sizing: border-box; box-sizing: border-box;
color: #fff; color: #fff;
display: inline-block;
font-weight: 400; font-weight: 400;
outline: none; outline: none;
overflow: hidden; overflow: hidden;
+6 -6
View File
@@ -17,7 +17,7 @@ const DEFAULT_DATA = {
const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => { const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => {
const [t] = useTranslation(); const [t] = useTranslation();
const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA); const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
const [selectNameFieldState, selectNameField] = useToggle(); const [focusNameFieldState, focusNameField] = useToggle();
const nameField = useRef(null); const nameField = useRef(null);
@@ -35,8 +35,8 @@ const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => {
onCreate(cleanData); onCreate(cleanData);
setData(DEFAULT_DATA); setData(DEFAULT_DATA);
selectNameField(); focusNameField();
}, [onCreate, data, setData, selectNameField]); }, [onCreate, data, setData, focusNameField]);
const handleFieldKeyDown = useCallback( const handleFieldKeyDown = useCallback(
(event) => { (event) => {
@@ -65,13 +65,13 @@ const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => {
useEffect(() => { useEffect(() => {
if (isOpened) { if (isOpened) {
nameField.current.ref.current.select(); nameField.current.ref.current.focus();
} }
}, [isOpened]); }, [isOpened]);
useDidUpdate(() => { useDidUpdate(() => {
nameField.current.ref.current.select(); nameField.current.ref.current.focus();
}, [selectNameFieldState]); }, [focusNameFieldState]);
return ( return (
<Form <Form
+1 -1
View File
@@ -83,7 +83,7 @@ const Login = React.memo(
}, [onAuthenticate, data]); }, [onAuthenticate, data]);
useEffect(() => { useEffect(() => {
emailOrUsernameField.current.select(); emailOrUsernameField.current.focus();
}, []); }, []);
useEffect(() => { useEffect(() => {
@@ -33,7 +33,7 @@ const ProjectAddModal = React.memo(({ defaultData, isSubmitting, onCreate, onClo
}, [onCreate, data]); }, [onCreate, data]);
useEffect(() => { useEffect(() => {
nameField.current.select(); nameField.current.focus();
}, []); }, []);
return ( return (
+1
View File
@@ -10,6 +10,7 @@ import CoreWrapperContainer from '../containers/CoreWrapperContainer';
import NotFound from './NotFound'; import NotFound from './NotFound';
import 'react-datepicker/dist/react-datepicker.css'; import 'react-datepicker/dist/react-datepicker.css';
import 'photoswipe/dist/photoswipe.css';
import '../lib/custom-ui/styles.css'; import '../lib/custom-ui/styles.css';
import '../styles.module.scss'; import '../styles.module.scss';
@@ -32,7 +32,7 @@ const createData = (timer) => {
const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) => { const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) => {
const [t] = useTranslation(); const [t] = useTranslation();
const [data, handleFieldChange, setData] = useForm(() => createData(defaultValue)); const [data, handleFieldChange, setData] = useForm(() => createData(defaultValue));
const [isEditing, toggleEdit] = useToggle(); const [isEditing, toggleEditing] = useToggle();
const hoursField = useRef(null); const hoursField = useRef(null);
const minutesField = useRef(null); const minutesField = useRef(null);
@@ -55,10 +55,10 @@ const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) =
onClose(); onClose();
}, [defaultValue, onUpdate, onClose]); }, [defaultValue, onUpdate, onClose]);
const handleToggleEditClick = useCallback(() => { const handleToggleEditingClick = useCallback(() => {
setData(createData(defaultValue)); setData(createData(defaultValue));
toggleEdit(); toggleEditing();
}, [defaultValue, setData, toggleEdit]); }, [defaultValue, setData, toggleEditing]);
const handleSubmit = useCallback(() => { const handleSubmit = useCallback(() => {
const parts = { const parts = {
@@ -149,7 +149,7 @@ const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) =
type="button" type="button"
icon={isEditing ? 'close' : 'edit'} icon={isEditing ? 'close' : 'edit'}
className={styles.iconButton} className={styles.iconButton}
onClick={handleToggleEditClick} onClick={handleToggleEditingClick}
/> />
</div> </div>
{isEditing && <Button positive content={t('action.save')} />} {isEditing && <Button positive content={t('action.save')} />}
@@ -88,7 +88,7 @@ const UserAddStep = React.memo(
}, [onCreate, data]); }, [onCreate, data]);
useEffect(() => { useEffect(() => {
emailField.current.select(); emailField.current.focus();
}, []); }, []);
useEffect(() => { useEffect(() => {
@@ -87,7 +87,7 @@ const UserEmailEditStep = React.memo(
}, [email, usePasswordConfirmation, onUpdate, onClose, data]); }, [email, usePasswordConfirmation, onUpdate, onClose, data]);
useEffect(() => { useEffect(() => {
emailField.current.select(); emailField.current.focus();
}, []); }, []);
useEffect(() => { useEffect(() => {
@@ -70,7 +70,7 @@ const UserPasswordEditStep = React.memo(
}, [usePasswordConfirmation, onUpdate, data]); }, [usePasswordConfirmation, onUpdate, data]);
useEffect(() => { useEffect(() => {
passwordField.current.select(); passwordField.current.focus();
}, []); }, []);
useEffect(() => { useEffect(() => {
@@ -1,8 +1,9 @@
import React, { useCallback } from 'react'; import React, { useCallback } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { Button, Divider, Header, Tab } from 'semantic-ui-react'; import { Button, Divider, Dropdown, Header, Tab } from 'semantic-ui-react';
import locales from '../../../locales';
import AvatarEditPopup from './AvatarEditPopup'; import AvatarEditPopup from './AvatarEditPopup';
import User from '../../User'; import User from '../../User';
import UserInformationEdit from '../../UserInformationEdit'; import UserInformationEdit from '../../UserInformationEdit';
@@ -20,12 +21,14 @@ const AccountPane = React.memo(
avatarUrl, avatarUrl,
phone, phone,
organization, organization,
language,
isAvatarUpdating, isAvatarUpdating,
usernameUpdateForm, usernameUpdateForm,
emailUpdateForm, emailUpdateForm,
passwordUpdateForm, passwordUpdateForm,
onUpdate, onUpdate,
onAvatarUpdate, onAvatarUpdate,
onLanguageUpdate,
onUsernameUpdate, onUsernameUpdate,
onUsernameUpdateMessageDismiss, onUsernameUpdateMessageDismiss,
onEmailUpdate, onEmailUpdate,
@@ -41,6 +44,13 @@ const AccountPane = React.memo(
}); });
}, [onUpdate]); }, [onUpdate]);
const handleLanguageChange = useCallback(
(_, { value }) => {
onLanguageUpdate(value === 'auto' ? null : value); // FIXME: hack
},
[onLanguageUpdate],
);
return ( return (
<Tab.Pane attached={false} className={styles.wrapper}> <Tab.Pane attached={false} className={styles.wrapper}>
<AvatarEditPopup <AvatarEditPopup
@@ -60,6 +70,32 @@ const AccountPane = React.memo(
}} }}
onUpdate={onUpdate} onUpdate={onUpdate}
/> />
<Divider horizontal section>
<Header as="h4">
{t('common.language', {
context: 'title',
})}
</Header>
</Divider>
<Dropdown
fluid
selection
options={[
{
key: 'auto',
value: 'auto',
text: t('common.detectAutomatically'),
},
...locales.map((locale) => ({
key: locale.language,
value: locale.language,
flag: locale.country,
text: locale.name,
})),
]}
value={language || 'auto'}
onChange={handleLanguageChange}
/>
<Divider horizontal section> <Divider horizontal section>
<Header as="h4"> <Header as="h4">
{t('common.authentication', { {t('common.authentication', {
@@ -129,6 +165,7 @@ AccountPane.propTypes = {
avatarUrl: PropTypes.string, avatarUrl: PropTypes.string,
phone: PropTypes.string, phone: PropTypes.string,
organization: PropTypes.string, organization: PropTypes.string,
language: PropTypes.string,
isAvatarUpdating: PropTypes.bool.isRequired, isAvatarUpdating: PropTypes.bool.isRequired,
/* eslint-disable react/forbid-prop-types */ /* eslint-disable react/forbid-prop-types */
usernameUpdateForm: PropTypes.object.isRequired, usernameUpdateForm: PropTypes.object.isRequired,
@@ -137,6 +174,7 @@ AccountPane.propTypes = {
/* eslint-enable react/forbid-prop-types */ /* eslint-enable react/forbid-prop-types */
onUpdate: PropTypes.func.isRequired, onUpdate: PropTypes.func.isRequired,
onAvatarUpdate: PropTypes.func.isRequired, onAvatarUpdate: PropTypes.func.isRequired,
onLanguageUpdate: PropTypes.func.isRequired,
onUsernameUpdate: PropTypes.func.isRequired, onUsernameUpdate: PropTypes.func.isRequired,
onUsernameUpdateMessageDismiss: PropTypes.func.isRequired, onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
onEmailUpdate: PropTypes.func.isRequired, onEmailUpdate: PropTypes.func.isRequired,
@@ -150,6 +188,7 @@ AccountPane.defaultProps = {
avatarUrl: undefined, avatarUrl: undefined,
phone: undefined, phone: undefined,
organization: undefined, organization: undefined,
language: undefined,
}; };
export default AccountPane; export default AccountPane;
@@ -14,6 +14,7 @@ const UserSettingsModal = React.memo(
avatarUrl, avatarUrl,
phone, phone,
organization, organization,
language,
subscribeToOwnCards, subscribeToOwnCards,
isAvatarUpdating, isAvatarUpdating,
usernameUpdateForm, usernameUpdateForm,
@@ -21,6 +22,7 @@ const UserSettingsModal = React.memo(
passwordUpdateForm, passwordUpdateForm,
onUpdate, onUpdate,
onAvatarUpdate, onAvatarUpdate,
onLanguageUpdate,
onUsernameUpdate, onUsernameUpdate,
onUsernameUpdateMessageDismiss, onUsernameUpdateMessageDismiss,
onEmailUpdate, onEmailUpdate,
@@ -44,12 +46,14 @@ const UserSettingsModal = React.memo(
avatarUrl={avatarUrl} avatarUrl={avatarUrl}
phone={phone} phone={phone}
organization={organization} organization={organization}
language={language}
isAvatarUpdating={isAvatarUpdating} isAvatarUpdating={isAvatarUpdating}
usernameUpdateForm={usernameUpdateForm} usernameUpdateForm={usernameUpdateForm}
emailUpdateForm={emailUpdateForm} emailUpdateForm={emailUpdateForm}
passwordUpdateForm={passwordUpdateForm} passwordUpdateForm={passwordUpdateForm}
onUpdate={onUpdate} onUpdate={onUpdate}
onAvatarUpdate={onAvatarUpdate} onAvatarUpdate={onAvatarUpdate}
onLanguageUpdate={onLanguageUpdate}
onUsernameUpdate={onUsernameUpdate} onUsernameUpdate={onUsernameUpdate}
onUsernameUpdateMessageDismiss={onUsernameUpdateMessageDismiss} onUsernameUpdateMessageDismiss={onUsernameUpdateMessageDismiss}
onEmailUpdate={onEmailUpdate} onEmailUpdate={onEmailUpdate}
@@ -92,6 +96,7 @@ UserSettingsModal.propTypes = {
avatarUrl: PropTypes.string, avatarUrl: PropTypes.string,
phone: PropTypes.string, phone: PropTypes.string,
organization: PropTypes.string, organization: PropTypes.string,
language: PropTypes.string,
subscribeToOwnCards: PropTypes.bool.isRequired, subscribeToOwnCards: PropTypes.bool.isRequired,
isAvatarUpdating: PropTypes.bool.isRequired, isAvatarUpdating: PropTypes.bool.isRequired,
/* eslint-disable react/forbid-prop-types */ /* eslint-disable react/forbid-prop-types */
@@ -101,6 +106,7 @@ UserSettingsModal.propTypes = {
/* eslint-enable react/forbid-prop-types */ /* eslint-enable react/forbid-prop-types */
onUpdate: PropTypes.func.isRequired, onUpdate: PropTypes.func.isRequired,
onAvatarUpdate: PropTypes.func.isRequired, onAvatarUpdate: PropTypes.func.isRequired,
onLanguageUpdate: PropTypes.func.isRequired,
onUsernameUpdate: PropTypes.func.isRequired, onUsernameUpdate: PropTypes.func.isRequired,
onUsernameUpdateMessageDismiss: PropTypes.func.isRequired, onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
onEmailUpdate: PropTypes.func.isRequired, onEmailUpdate: PropTypes.func.isRequired,
@@ -115,6 +121,7 @@ UserSettingsModal.defaultProps = {
avatarUrl: undefined, avatarUrl: undefined,
phone: undefined, phone: undefined,
organization: undefined, organization: undefined,
language: undefined,
}; };
export default UserSettingsModal; export default UserSettingsModal;
@@ -87,7 +87,7 @@ const UserUsernameEditStep = React.memo(
}, [username, usePasswordConfirmation, onUpdate, onClose, data]); }, [username, usePasswordConfirmation, onUpdate, onClose, data]);
useEffect(() => { useEffect(() => {
usernameField.current.select(); usernameField.current.focus();
}, []); }, []);
useEffect(() => { useEffect(() => {
+3
View File
@@ -225,6 +225,9 @@ export default {
ACTIONS_FETCH: 'ACTIONS_FETCH', ACTIONS_FETCH: 'ACTIONS_FETCH',
ACTIONS_FETCH__SUCCESS: 'ACTIONS_FETCH__SUCCESS', ACTIONS_FETCH__SUCCESS: 'ACTIONS_FETCH__SUCCESS',
ACTIONS_FETCH__FAILURE: 'ACTIONS_FETCH__FAILURE', ACTIONS_FETCH__FAILURE: 'ACTIONS_FETCH__FAILURE',
ACTIONS_DETAILS_TOGGLE: 'ACTIONS_DETAILS_TOGGLE',
ACTIONS_DETAILS_TOGGLE__SUCCESS: 'ACTIONS_DETAILS_TOGGLE__SUCCESS',
ACTIONS_DETAILS_TOGGLE__FAILURE: 'ACTIONS_DETAILS_TOGGLE__FAILURE',
/* Action */ /* Action */
+1 -1
View File
@@ -13,7 +13,7 @@ const ACCESS_TOKEN_KEY = 'accessToken';
const ACCESS_TOKEN_EXPIRES = 365; const ACCESS_TOKEN_EXPIRES = 365;
const POSITION_GAP = 65535; const POSITION_GAP = 65535;
const ACTIONS_LIMIT = 10; const ACTIONS_LIMIT = 50;
export default { export default {
SERVER_BASE_URL, SERVER_BASE_URL,
+2
View File
@@ -1,9 +1,11 @@
const BOARD = 'BOARD'; const BOARD = 'BOARD';
const LIST = 'LIST'; const LIST = 'LIST';
const CARD = 'CARD'; const CARD = 'CARD';
const TASK = 'TASK';
export default { export default {
BOARD, BOARD,
LIST, LIST,
CARD, CARD,
TASK,
}; };
+3
View File
@@ -31,6 +31,7 @@ export default {
USER_UPDATE: `${PREFIX}/USER_UPDATE`, USER_UPDATE: `${PREFIX}/USER_UPDATE`,
CURRENT_USER_UPDATE: `${PREFIX}/CURRENT_USER_UPDATE`, CURRENT_USER_UPDATE: `${PREFIX}/CURRENT_USER_UPDATE`,
USER_UPDATE_HANDLE: `${PREFIX}/USER_UPDATE_HANDLE`, USER_UPDATE_HANDLE: `${PREFIX}/USER_UPDATE_HANDLE`,
CURRENT_USER_LANGUAGE_UPDATE: `${PREFIX}/CURRENT_USER_LANGUAGE_UPDATE`,
USER_EMAIL_UPDATE: `${PREFIX}/USER_EMAIL_UPDATE`, USER_EMAIL_UPDATE: `${PREFIX}/USER_EMAIL_UPDATE`,
CURRENT_USER_EMAIL_UPDATE: `${PREFIX}/CURRENT_USER_EMAIL_UPDATE`, CURRENT_USER_EMAIL_UPDATE: `${PREFIX}/CURRENT_USER_EMAIL_UPDATE`,
USER_EMAIL_UPDATE_ERROR_CLEAR: `${PREFIX}/USER_EMAIL_UPDATE_ERROR_CLEAR`, USER_EMAIL_UPDATE_ERROR_CLEAR: `${PREFIX}/USER_EMAIL_UPDATE_ERROR_CLEAR`,
@@ -138,6 +139,7 @@ export default {
TASK_CREATE_HANDLE: `${PREFIX}/TASK_CREATE_HANDLE`, TASK_CREATE_HANDLE: `${PREFIX}/TASK_CREATE_HANDLE`,
TASK_UPDATE: `${PREFIX}/TASK_UPDATE`, TASK_UPDATE: `${PREFIX}/TASK_UPDATE`,
TASK_UPDATE_HANDLE: `${PREFIX}/TASK_UPDATE_HANDLE`, TASK_UPDATE_HANDLE: `${PREFIX}/TASK_UPDATE_HANDLE`,
TASK_MOVE: `${PREFIX}/TASK_MOVE`,
TASK_DELETE: `${PREFIX}/TASK_DELETE`, TASK_DELETE: `${PREFIX}/TASK_DELETE`,
TASK_DELETE_HANDLE: `${PREFIX}/TASK_DELETE_HANDLE`, TASK_DELETE_HANDLE: `${PREFIX}/TASK_DELETE_HANDLE`,
@@ -153,6 +155,7 @@ export default {
/* Actions */ /* Actions */
ACTIONS_IN_CURRENT_CARD_FETCH: `${PREFIX}/ACTIONS_IN_CURRENT_CARD_FETCH`, ACTIONS_IN_CURRENT_CARD_FETCH: `${PREFIX}/ACTIONS_IN_CURRENT_CARD_FETCH`,
ACTIONS_DETAILS_IN_CURRENT_CARD_TOGGLE: `${PREFIX}/ACTIONS_DETAILS_IN_CURRENT_CARD_TOGGLE`,
/* Action */ /* Action */
@@ -32,8 +32,10 @@ import {
fetchActionsInCurrentCard, fetchActionsInCurrentCard,
fetchBoard, fetchBoard,
moveCurrentCard, moveCurrentCard,
moveTask,
removeLabelFromCurrentCard, removeLabelFromCurrentCard,
removeUserFromCurrentCard, removeUserFromCurrentCard,
toggleActionsDetailsInCurrentCard,
transferCurrentCard, transferCurrentCard,
updateAttachment, updateAttachment,
updateCommentAction, updateCommentAction,
@@ -59,6 +61,8 @@ const mapStateToProps = (state) => {
timer, timer,
isSubscribed, isSubscribed,
isActionsFetching, isActionsFetching,
isActionsDetailsVisible,
isActionsDetailsFetching,
isAllActionsFetched, isAllActionsFetched,
boardId, boardId,
listId, listId,
@@ -78,6 +82,8 @@ const mapStateToProps = (state) => {
isSubscribed, isSubscribed,
isActionsFetching, isActionsFetching,
isAllActionsFetched, isAllActionsFetched,
isActionsDetailsVisible,
isActionsDetailsFetching,
listId, listId,
boardId, boardId,
projectId, projectId,
@@ -111,11 +117,13 @@ const mapDispatchToProps = (dispatch) =>
onLabelDelete: deleteLabel, onLabelDelete: deleteLabel,
onTaskCreate: createTaskInCurrentCard, onTaskCreate: createTaskInCurrentCard,
onTaskUpdate: updateTask, onTaskUpdate: updateTask,
onTaskMove: moveTask,
onTaskDelete: deleteTask, onTaskDelete: deleteTask,
onAttachmentCreate: createAttachmentInCurrentCard, onAttachmentCreate: createAttachmentInCurrentCard,
onAttachmentUpdate: updateAttachment, onAttachmentUpdate: updateAttachment,
onAttachmentDelete: deleteAttachment, onAttachmentDelete: deleteAttachment,
onActionsFetch: fetchActionsInCurrentCard, onActionsFetch: fetchActionsInCurrentCard,
onActionsDetailsToggle: toggleActionsDetailsInCurrentCard,
onCommentActionCreate: createCommentActionInCurrentCard, onCommentActionCreate: createCommentActionInCurrentCard,
onCommentActionUpdate: updateCommentAction, onCommentActionUpdate: updateCommentAction,
onCommentActionDelete: deleteCommentAction, onCommentActionDelete: deleteCommentAction,
@@ -10,6 +10,7 @@ import {
updateCurrentUser, updateCurrentUser,
updateCurrentUserAvatar, updateCurrentUserAvatar,
updateCurrentUserEmail, updateCurrentUserEmail,
updateCurrentUserLanguage,
updateCurrentUserPassword, updateCurrentUserPassword,
updateCurrentUserUsername, updateCurrentUserUsername,
} from '../actions/entry'; } from '../actions/entry';
@@ -23,6 +24,7 @@ const mapStateToProps = (state) => {
avatarUrl, avatarUrl,
phone, phone,
organization, organization,
language,
subscribeToOwnCards, subscribeToOwnCards,
isAvatarUpdating, isAvatarUpdating,
emailUpdateForm, emailUpdateForm,
@@ -37,6 +39,7 @@ const mapStateToProps = (state) => {
avatarUrl, avatarUrl,
phone, phone,
organization, organization,
language,
subscribeToOwnCards, subscribeToOwnCards,
isAvatarUpdating, isAvatarUpdating,
emailUpdateForm, emailUpdateForm,
@@ -50,6 +53,7 @@ const mapDispatchToProps = (dispatch) =>
{ {
onUpdate: updateCurrentUser, onUpdate: updateCurrentUser,
onAvatarUpdate: updateCurrentUserAvatar, onAvatarUpdate: updateCurrentUserAvatar,
onLanguageUpdate: updateCurrentUserLanguage,
onUsernameUpdate: updateCurrentUserUsername, onUsernameUpdate: updateCurrentUserUsername,
onUsernameUpdateMessageDismiss: clearCurrentUserUsernameUpdateError, onUsernameUpdateMessageDismiss: clearCurrentUserUsernameUpdateError,
onEmailUpdate: updateCurrentUserEmail, onEmailUpdate: updateCurrentUserEmail,
+29 -15
View File
@@ -1,11 +1,11 @@
import i18n from 'i18next'; import i18n from 'i18next';
import languageDetector from 'i18next-browser-languagedetector'; import LanguageDetector from 'i18next-browser-languagedetector';
import { initReactI18next } from 'react-i18next'; import { initReactI18next } from 'react-i18next';
import formatDate from 'date-fns/format'; import formatDate from 'date-fns/format';
import parseDate from 'date-fns/parse'; import parseDate from 'date-fns/parse';
import { registerLocale, setDefaultLocale } from 'react-datepicker'; import { registerLocale, setDefaultLocale } from 'react-datepicker';
import { embedLocales, languages } from './locales'; import { embeddedLocales, languages } from './locales';
i18n.dateFns = { i18n.dateFns = {
locales: {}, locales: {},
@@ -52,12 +52,12 @@ const parseDatePostProcessor = {
}; };
i18n i18n
.use(languageDetector) .use(LanguageDetector)
.use(formatDatePostProcessor) .use(formatDatePostProcessor)
.use(parseDatePostProcessor) .use(parseDatePostProcessor)
.use(initReactI18next) .use(initReactI18next)
.init({ .init({
resources: embedLocales, resources: embeddedLocales,
fallbackLng: 'en', fallbackLng: 'en',
supportedLngs: languages, supportedLngs: languages,
load: 'languageOnly', load: 'languageOnly',
@@ -74,27 +74,41 @@ i18n
}, },
}, },
react: { react: {
useSuspense: false, useSuspense: true,
}, },
debug: process.env.NODE_ENV !== 'production', debug: process.env.NODE_ENV !== 'production',
}); });
i18n.loadCoreLocale = (language = i18n.resolvedLanguage) => { i18n.loadCoreLocale = async (language = i18n.resolvedLanguage) => {
if (language === 'en') { if (language === 'en') {
return; return;
} }
import(`./locales/${language}/core`).then((module) => { const { default: locale } = await import(`./locales/${language}/core`);
const locale = module.default;
Object.keys(locale).forEach((namespace) => { Object.keys(locale).forEach((namespace) => {
if (namespace === 'dateFns') { if (namespace === 'dateFns') {
i18n.dateFns.addLocale(language, locale[namespace]); i18n.dateFns.addLocale(language, locale[namespace]);
} else { } else {
i18n.addResourceBundle(language, namespace, locale[namespace], true, true); i18n.addResourceBundle(language, namespace, locale[namespace], true, true);
} }
});
}); });
}; };
i18n.detectLanguage = () => {
const {
services: { languageDetector, languageUtils },
} = i18n;
localStorage.removeItem(languageDetector.options.lookupLocalStorage);
const detectedLanguages = languageDetector.detect();
i18n.language = languageUtils.getBestMatchFromCodes(detectedLanguages);
i18n.languages = languageUtils.toResolveHierarchy(i18n.language);
i18n.resolvedLanguage = undefined;
i18n.setResolvedLanguage(i18n.language);
};
export default i18n; export default i18n;
@@ -32,14 +32,12 @@ const Markdown = React.memo(({ linkStopPropagation, ...props }) => {
} }
return ( return (
/* eslint-disable react/jsx-props-no-spreading */
<ReactMarkdown <ReactMarkdown
{...props} {...props} // eslint-disable-line react/jsx-props-no-spreading
components={components} components={components}
remarkPlugins={[remarkGfm, remarkBreaks]} remarkPlugins={[remarkGfm, remarkBreaks]}
className="markdown-body" className="markdown-body"
/> />
/* eslint-enable react/jsx-props-no-spreading */
); );
}); });
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'cs',
country: 'cz',
name: 'Čeština',
embeddedLocale: login,
};
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'da',
country: 'dk',
name: 'Dansk',
embeddedLocale: login,
};
+5
View File
@@ -72,6 +72,7 @@ export default {
deleteTask_title: 'Aufgabe löschen', deleteTask_title: 'Aufgabe löschen',
deleteUser_title: 'Benutzer löschen', deleteUser_title: 'Benutzer löschen',
description: 'Beschreibung', description: 'Beschreibung',
detectAutomatically: 'Automatische Erkennung',
dropFileToUpload: 'Datei ablegen, um hochzuladen', dropFileToUpload: 'Datei ablegen, um hochzuladen',
editAttachment_title: 'Anhang bearbieten', editAttachment_title: 'Anhang bearbieten',
editAvatar_title: 'Avatar bearbeiten', editAvatar_title: 'Avatar bearbeiten',
@@ -97,6 +98,7 @@ export default {
hours: 'Stunden', hours: 'Stunden',
invalidCurrentPassword: 'Das aktuelle Passwort ist falsch', invalidCurrentPassword: 'Das aktuelle Passwort ist falsch',
labels: 'Labels', labels: 'Labels',
language: 'Sprache',
leaveBoard_title: 'Board verlassen', leaveBoard_title: 'Board verlassen',
leaveProject_title: 'Projekt verlassen', leaveProject_title: 'Projekt verlassen',
list: 'Listen', list: 'Listen',
@@ -134,6 +136,7 @@ export default {
subscribeToMyOwnCardsByDefault: 'Standardmäßig meine eigenen Karten abonnieren', subscribeToMyOwnCardsByDefault: 'Standardmäßig meine eigenen Karten abonnieren',
taskActions_title: 'Aufgabenaktionen', taskActions_title: 'Aufgabenaktionen',
tasks: 'Aufgaben', tasks: 'Aufgaben',
thereIsNoPreviewAvailableForThisAttachment: 'Für diesen Anhang ist keine Vorschau verfügbar',
time: 'Zeit', time: 'Zeit',
timer: 'Timer', timer: 'Timer',
title: 'Titel', title: 'Titel',
@@ -192,6 +195,7 @@ export default {
editTimer_title: 'Timer bearbeiten', editTimer_title: 'Timer bearbeiten',
editTitle_title: 'Titel bearbeiten', editTitle_title: 'Titel bearbeiten',
editUsername_title: 'Benutzername ändern', editUsername_title: 'Benutzername ändern',
hideDetails: 'Details ausblenden',
leaveBoard: 'Board verlassen', leaveBoard: 'Board verlassen',
leaveProject: 'Projekt verlassen', leaveProject: 'Projekt verlassen',
logOut_title: 'Ausloggen', logOut_title: 'Ausloggen',
@@ -207,6 +211,7 @@ export default {
removeMember: 'Mitglied entfernen', removeMember: 'Mitglied entfernen',
save: 'Speichern', save: 'Speichern',
showAllAttachments: 'Alle Anhänge anzeigen ({{hidden}} versteckt)', showAllAttachments: 'Alle Anhänge anzeigen ({{hidden}} versteckt)',
showDetails: 'Details anzeigen',
showFewerAttachments: 'Weniger Anhänge anzeigen', showFewerAttachments: 'Weniger Anhänge anzeigen',
start: 'Start', start: 'Start',
stop: 'Stopp', stop: 'Stopp',
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'de',
country: 'de',
name: 'Deutsch',
embeddedLocale: login,
};
+6
View File
@@ -64,6 +64,7 @@ export default {
deleteTask_title: 'Delete Task', deleteTask_title: 'Delete Task',
deleteUser_title: 'Delete User', deleteUser_title: 'Delete User',
description: 'Description', description: 'Description',
detectAutomatically: 'Detect automatically',
dropFileToUpload: 'Drop file to upload', dropFileToUpload: 'Drop file to upload',
editAttachment_title: 'Edit Attachment', editAttachment_title: 'Edit Attachment',
editAvatar_title: 'Edit Avatar', editAvatar_title: 'Edit Avatar',
@@ -90,6 +91,7 @@ export default {
hours: 'Hours', hours: 'Hours',
invalidCurrentPassword: 'Invalid current password', invalidCurrentPassword: 'Invalid current password',
labels: 'Labels', labels: 'Labels',
language: 'Language',
leaveBoard_title: 'Leave Board', leaveBoard_title: 'Leave Board',
leaveProject_title: 'Leave Project', leaveProject_title: 'Leave Project',
list: 'List', list: 'List',
@@ -127,6 +129,8 @@ export default {
subscribeToMyOwnCardsByDefault: 'Subscribe to my own cards by default', subscribeToMyOwnCardsByDefault: 'Subscribe to my own cards by default',
taskActions_title: 'Task Actions', taskActions_title: 'Task Actions',
tasks: 'Tasks', tasks: 'Tasks',
thereIsNoPreviewAvailableForThisAttachment:
'There is no preview available for this attachment',
time: 'Time', time: 'Time',
timer: 'Timer', timer: 'Timer',
title: 'Title', title: 'Title',
@@ -184,6 +188,7 @@ export default {
editTimer_title: 'Edit Timer', editTimer_title: 'Edit Timer',
editTitle_title: 'Edit Title', editTitle_title: 'Edit Title',
editUsername_title: 'Edit Username', editUsername_title: 'Edit Username',
hideDetails: 'Hide details',
leaveBoard: 'Leave board', leaveBoard: 'Leave board',
leaveProject: 'Leave project', leaveProject: 'Leave project',
logOut_title: 'Log Out', logOut_title: 'Log Out',
@@ -199,6 +204,7 @@ export default {
removeMember: 'Remove member', removeMember: 'Remove member',
save: 'Save', save: 'Save',
showAllAttachments: 'Show all attachments ({{hidden}} hidden)', showAllAttachments: 'Show all attachments ({{hidden}} hidden)',
showDetails: 'Show details',
showFewerAttachments: 'Show fewer attachments', showFewerAttachments: 'Show fewer attachments',
start: 'Start', start: 'Start',
stop: 'Stop', stop: 'Stop',
+11
View File
@@ -0,0 +1,11 @@
import merge from 'lodash/merge';
import login from './login';
import core from './core';
export default {
language: 'en',
country: 'us',
name: 'English',
embeddedLocale: merge(login, core),
};
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'es',
country: 'es',
name: 'Español',
embeddedLocale: login,
};
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'fr',
country: 'fr',
name: 'Français',
embeddedLocale: login,
};
+24 -31
View File
@@ -1,35 +1,28 @@
import merge from 'lodash/merge'; import cs from './cs';
import fromPairs from 'lodash/fromPairs'; import da from './da';
import de from './de';
import en from './en';
import es from './es';
import fr from './fr';
import ja from './ja';
import ko from './ko';
import pl from './pl';
import ru from './ru';
import sk from './sk';
import sv from './sv';
import uz from './uz';
import zh from './zh';
import csLogin from './cs/login'; const locales = [cs, da, de, en, es, fr, ja, ko, pl, ru, sk, sv, uz, zh];
import daLogin from './da/login';
import deLogin from './de/login';
import enLogin from './en/login';
import enCore from './en/core';
import esLogin from './es/login';
import frLogin from './fr/login';
import jaLogin from './ja/login';
import plLogin from './pl/login';
import ruLogin from './ru/login';
import svLogin from './sv/login';
import uzLogin from './uz/login';
import zhLogin from './zh/login';
const localePairs = [ export default locales;
['cs', csLogin],
['da', daLogin],
['de', deLogin],
['en', merge(enLogin, enCore)],
['es', esLogin],
['fr', frLogin],
['ja', jaLogin],
['pl', plLogin],
['ru', ruLogin],
['sv', svLogin],
['uz', uzLogin],
['zh', zhLogin],
];
export const languages = localePairs.map((locale) => locale[0]); export const languages = locales.map((locale) => locale.language);
export const embedLocales = fromPairs(localePairs); export const embeddedLocales = locales.reduce(
(result, locale) => ({
...result,
[locale.language]: locale.embeddedLocale,
}),
{},
);
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'ja',
country: 'jp',
name: '日本語',
embeddedLocale: login,
};
+220
View File
@@ -0,0 +1,220 @@
import dateFns from 'date-fns/locale/ko';
/* Translated by Park Seok Ho */
export default {
dateFns,
format: {
date: 'yyyy/M/d',
time: 'HH:mm',
dateTime: '$t(format:date) $t(format:time)',
longDate: 'MMMMd일',
longDateTime: "MMMMd'일 ' HH:MM",
},
translation: {
common: {
account: '계정',
actions: '활동',
addAttachment_title: '첨부파일 추가',
addComment: '댓글',
addManager_title: '관리자 추가',
addMember_title: '회원 추가',
addUser_title: '사용자 추가',
administrator: '시스템 관리자',
all: 'All',
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
'모든 변경 사항은 연결이 복원된 후 자동으로 저장됩니다',
areYouSureYouWantToDeleteThisAttachment: '첨부 파일을 삭제하시겠습니까?',
areYouSureYouWantToDeleteThisBoard: '보드를 삭제하시겠습니까?',
areYouSureYouWantToDeleteThisCard: '항목카드를 삭제하시겠습니까?',
areYouSureYouWantToDeleteThisComment: '댓글을 삭제하시겠습니까?',
areYouSureYouWantToDeleteThisLabel: '라벨을 삭제하시겠습니까?',
areYouSureYouWantToDeleteThisList: '리스트를 삭제하시겠습니까?',
areYouSureYouWantToDeleteThisProject: '프로젝트를 삭제하시겠습니까?',
areYouSureYouWantToDeleteThisTask: '태스트를 삭제하겠습니까?',
areYouSureYouWantToDeleteThisUser: '이 유저를 삭제하겠습니까?',
areYouSureYouWantToLeaveBoard: '이 보드에서 나가시겠습니까?',
areYouSureYouWantToLeaveProject: '이 프로젝트에서 나가시겠습니까?',
areYouSureYouWantToRemoveThisManagerFromProject: '프로젝트에서 관리자를 제거하시겠습니까?',
areYouSureYouWantToRemoveThisMemberFromBoard: '이 회원을 보드에서 탈퇴시키겠습니까?',
attachment: '첨부파일',
attachments: '첨부파일',
authentication: '계정 관리',
background: 'Background',
board: '보드',
boardNotFound_title: '보드를 찾을 수 없습니다.',
cardActions_title: 'Card Actions',
cardNotFound_title: '항목카드를 찾을 수 없습니다.',
cardOrActionAreDeleted: '항목카드 혹은 활동내역이 삭제되었습니다.',
color: 'Color',
createBoard_title: '보드명칭을 입력하세요.',
createLabel_title: '라벨 생성',
createNewOneOrSelectExistingOne: '새 항목을 만들거나<br />기존 항목을 선택하세요.',
createProject_title: '프로젝트 생성',
createTextFile_title: 'Text File 생성',
currentPassword: '현재 비밀번호',
dangerZone_title: 'Danger Zone',
date: '날짜',
dueDate_title: '완료일',
deleteAttachment_title: '첨부파일 삭제',
deleteBoard_title: '보드 삭제',
deleteCard_title: '항목 카드 삭제',
deleteComment_title: '댓글 삭제',
deleteLabel_title: '라벨 삭제',
deleteList_title: '리스트 삭제',
deleteProject_title: '프로젝트 삭제',
deleteTask_title: '태스크 삭제',
deleteUser_title: '사용자 삭제',
description: '설명',
detectAutomatically: '자동으로 감지',
dropFileToUpload: '업로드 하기 위해서 파일을 Drop 하세요.',
editAttachment_title: '첨부 수정',
editAvatar_title: '프로필사진 수정',
editBoard_title: '보드 수정',
editDueDate_title: '완료일 수정',
editEmail_title: '메일 수정',
editInformation_title: '정보 수정',
editLabel_title: '라벨 수정',
editPassword_title: '비밀번호 수정',
editTimer_title: '타이머 수정',
editUsername_title: '사용자이름 수정',
email: '메일',
emailAlreadyInUse: '기 가입된 이메일이 존재합니다.',
enterCardTitle: '항목카드명을 입력하세요...',
enterDescription: '자세한 설명을 작성하세요...',
enterFilename: '파일이름을 입력하세요...',
enterListTitle: '리스트명을 입력 (예,todo,완료,이슈등...)',
enterProjectTitle: '프로젝트명칭을 입력하세요.',
enterTaskDescription: '태스크 설명을 입력하세요...',
filterByLabels_title: '라벨 검색',
filterByMembers_title: '회원으로 검색',
fromComputer_title: 'PC로 부터',
general: 'General',
hours: '시',
invalidCurrentPassword: '현재 패스워드는 유효하지 않습니다.',
labels: '라벨',
language: '언어 선택',
leaveBoard_title: '보드 탈퇴',
leaveProject_title: '프로젝트 탈퇴',
list: '내역',
listActions_title: '활용 내역',
managers: '관리자',
members: '팀원',
minutes: '분',
moveCard_title: '항목카드 이동',
name: '이름',
newEmail: '새로운 메일',
newPassword: '새로운 패스워드',
newUsername: '새로운 사용자 이름',
noConnectionToServer: '서버에 연결할수 없습니다.',
noBoards: '보드가 존재하지 않습니다.',
noLists: '리스트가 존재하지 않습니다.',
noProjects: '프로젝트가 존재하지 않습니다.',
notifications: '알림',
noUnreadNotifications: '알림을 모두 확인했습니다.',
openBoard_title: '보드열기',
optional_inline: '옵션',
organization: '조직',
phone: '전화번호',
preferences: '환경설정',
pressPasteShortcutToAddAttachmentFromClipboard:
'Tip: 클립보드에서 첨부 파일을 추가하려면 Ctrl-V(Mac의 경우 Cmd-V) 입니다..',
project: '프로젝트',
projectNotFound_title: '프로젝트가 존재하지 않습니다.',
removeManager_title: '관리자 삭제',
removeMember_title: '맴버 삭제',
seconds: '초',
selectBoard: '보드 선택',
selectList: '리스트 선택',
selectProject: '프로젝트 선택',
settings: '설정',
subscribeToMyOwnCardsByDefault: '내 항목카드는 기본으로 구독',
taskActions_title: '태스크 활동',
tasks: '태스크',
thereIsNoPreviewAvailableForThisAttachment:
'이 첨부 파일에 사용할 수 있는 미리보기가 없습니다.',
time: '시간',
timer: '활동시간',
title: '제목',
userActions_title: '',
userAddedThisCardToList: '<0>{{user}}</0><1>이 카드를 {{list}}</1>에 추가했습니다.',
userLeftNewCommentToCard:
'{{user}}이(가) <2>{{card}}</2>에 «{{comment}}»라는 댓글을 남겼습니다',
userMovedCardFromListToList: '{{user}} moved <2>{{card}}</2> from {{fromList}} to {{toList}}',
userMovedThisCardFromListToList:
'<0>{{user}}</0><1> 이 항목카드를 {{fromList}} 에서 {{toList}} 으로 이동했습니다. </1>',
username: '아이디',
usernameAlreadyInUse: '이미 사용중인 사용자입니다.',
users: '사용자',
writeComment: '댓글 작성...',
},
action: {
addAnotherCard: '다른 항목카드 추가',
addAnotherList: '다른 리스트 추가',
addAnotherTask: '다른 TASK 추가',
addCard: '항목카드 추가',
addCard_title: '항목카드 추가',
addComment: '댓글 추가',
addList: '리스트 추가',
addMoreDetailedDescription: '자세한 설명 추가',
addTask: '태스트 추가',
addToCard: '항목카드 추가',
addUser: '사용자 추가',
createBoard: '보드 생성',
createFile: '파일 생성',
createLabel: '라벨 생성',
createNewLabel: '새로운 라벨 생성',
createProject: '프로젝트 생성',
delete: '삭제',
deleteAttachment: '첨부삭제',
deleteAvatar: '프로필 사진 삭제',
deleteBoard: '보드 삭제',
deleteCard: '항목카드 삭제',
deleteCard_title: '항목카드 삭제',
deleteComment: '댓글 삭제',
deleteImage: '이미지 삭제',
deleteLabel: '라벨 삭제',
deleteList: '리스트 삭제',
deleteList_title: '리스트 삭제',
deleteProject: '프로젝트 삭제',
deleteProject_title: '프로젝트 삭제',
deleteTask: '태스트 삭제',
deleteTask_title: '태스트 삭제',
deleteUser: '사용자 삭제',
edit: '수정',
editDueDate_title: '완료일 수정',
editDescription_title: '설명 수정',
editEmail_title: '메일 수정',
editInformation_title: '정보 수정',
editPassword_title: '패스워드 수정',
editTimer_title: '시간 수정',
editTitle_title: '제목 수정',
editUsername_title: '이름 수정',
leaveBoard: '보드에서 나가기',
leaveProject: '프로젝트에서 나가기',
logOut_title: '로그아웃',
makeCover_title: '커버 만들기',
move: '이동',
moveCard_title: '항목카드 이동',
remove: '제거',
removeBackground: '백그라운드 제거',
removeCover_title: '커버 제거',
removeFromBoard: '보드에서 제거',
removeFromProject: '프로젝트에서 제거',
removeManager: '관리자 삭제',
removeMember: '멤버 삭제',
save: '저장',
showAllAttachments: '모든 첨부파일 표시 ({{hidden}} hidden)',
showFewerAttachments: '일부 첨부파일만 표시',
start: '시작',
stop: '끝',
subscribe: '구독하기',
unsubscribe: '구독 취소',
uploadNewAvatar: '새로운 프로필 사진 업로드',
uploadNewImage: '새로운 이미지 업로드',
},
},
};
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'ko',
country: 'kr',
name: '한국어',
embeddedLocale: login,
};
+22
View File
@@ -0,0 +1,22 @@
/* Translated by Park Seok Ho */
export default {
translation: {
common: {
emailOrUsername: '이메일 혹은 아이디',
invalidEmailOrUsername: '이메일이나 사용자 이름이 유효하지 않습니다.',
invalidPassword: '잘못된 비밀번호',
logInToPlanka: 'Planka에 로그인',
noInternetConnection: '인터넷에 연결되지 않음',
pageNotFound_title: '페이지를 찾을수 없습니다.',
password: '패스워드',
projectManagement: '프로젝트 관리',
serverConnectionFailed: '서버 연결 실패',
unknownError: '알 수 없는 오류가 발생하였습니다, 나중에 다시 시도하세요.',
},
action: {
logIn: '로그인',
},
},
};
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'pl',
country: 'pl',
name: 'Polski',
embeddedLocale: login,
};
+6 -1
View File
@@ -62,6 +62,7 @@ export default {
deleteTask: 'Удаление задачи', deleteTask: 'Удаление задачи',
deleteUser: 'Удаление пользователя', deleteUser: 'Удаление пользователя',
description: 'Описание', description: 'Описание',
detectAutomatically: 'Определить автоматически',
dropFileToUpload: 'Перетяните файл, чтобы загрузить', dropFileToUpload: 'Перетяните файл, чтобы загрузить',
editAttachment: 'Изменение вложения', editAttachment: 'Изменение вложения',
editAvatar: 'Изменение аватара', editAvatar: 'Изменение аватара',
@@ -88,6 +89,7 @@ export default {
hours: 'Часы', hours: 'Часы',
invalidCurrentPassword: 'Неверный текущий пароль', invalidCurrentPassword: 'Неверный текущий пароль',
labels: 'Метки', labels: 'Метки',
language: 'Язык',
list: 'Список', list: 'Список',
listActions: 'Действия со списком', listActions: 'Действия со списком',
members: 'Участники', members: 'Участники',
@@ -122,6 +124,7 @@ export default {
subscribeToMyOwnCardsByDefault: 'По умолчанию подписаться на мои собственные карточки', subscribeToMyOwnCardsByDefault: 'По умолчанию подписаться на мои собственные карточки',
taskActions: 'Действия с задачей', taskActions: 'Действия с задачей',
tasks: 'Задачи', tasks: 'Задачи',
thereIsNoPreviewAvailableForThisAttachment: 'Предпросмотр для этого вложения недоступен',
time: 'Время', time: 'Время',
timer: 'Таймер', timer: 'Таймер',
title: 'Название', title: 'Название',
@@ -175,7 +178,8 @@ export default {
editTask: 'Изменить задачу', editTask: 'Изменить задачу',
editTimer: 'Изменить таймер', editTimer: 'Изменить таймер',
editTitle: 'Изменить название', editTitle: 'Изменить название',
editUsername_title: 'Изменить имя пользователя', editUsername: 'Изменить имя пользователя',
hideDetails: 'Скрыть подробности',
logOut: 'Выйти', logOut: 'Выйти',
makeCover: 'Сделать обложкой', makeCover: 'Сделать обложкой',
move: 'Переместить', move: 'Переместить',
@@ -187,6 +191,7 @@ export default {
removeMember: 'Удалить участника', removeMember: 'Удалить участника',
save: 'Сохранить', save: 'Сохранить',
showAllAttachments: 'Показать все вложения ({{hidden}} скрыто)', showAllAttachments: 'Показать все вложения ({{hidden}} скрыто)',
showDetails: 'Показать подробности',
showFewerAttachments: 'Показать меньше вложений', showFewerAttachments: 'Показать меньше вложений',
start: 'Начать', start: 'Начать',
stop: 'Остановить', stop: 'Остановить',
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'ru',
country: 'ru',
name: 'Русский',
embeddedLocale: login,
};
+215
View File
@@ -0,0 +1,215 @@
import dateFns from 'date-fns/locale/sk';
export default {
dateFns,
format: {
date: 'd.M.yyyy',
time: 'p',
dateTime: '$t(format:date) $t(format:time)',
longDate: 'd MMM',
longDateTime: "d MMMM 'v' p",
},
translation: {
common: {
account: 'Účet',
actions: 'Akcia',
addAttachment_title: 'Pridať prílohu',
addComment: 'Pridať komentár',
addManager_title: 'Pridať správcu',
addMember_title: 'Pridať člena',
addUser_title: 'Pridať používateľa',
administrator: 'Administrátor',
all: 'Všetko',
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
'Všetky zmeny budú automaticky uložené<br />po obnovení spojenia',
areYouSureYouWantToDeleteThisAttachment: 'Naozaj chcete zmazať túto prílohu?',
areYouSureYouWantToDeleteThisBoard: 'Naozaj chcete zmazať túto tabuľu?',
areYouSureYouWantToDeleteThisCard: 'Naozaj chcete zmazať túto kartu?',
areYouSureYouWantToDeleteThisComment: 'Naozaj chcete zmazať tento komentár?',
areYouSureYouWantToDeleteThisLabel: 'Naozaj chcete zmazať tento štítok?',
areYouSureYouWantToDeleteThisList: 'Naozaj chcete zmazať tento zoznam?',
areYouSureYouWantToDeleteThisProject: 'Naozaj chcete zmazať tento projekt?',
areYouSureYouWantToDeleteThisTask: 'Naozaj chcete zmazať túto úlohu?',
areYouSureYouWantToDeleteThisUser: 'Naozaj chcete zmazať tohoto používateľa?',
areYouSureYouWantToLeaveBoard: 'Naozaj chcete opustiť túto tabuľu?',
areYouSureYouWantToLeaveProject: 'Naozaj chcete opustiť tento projekt?',
areYouSureYouWantToRemoveThisManagerFromProject:
'Naozaj chcete zmazať daného správcu tohto projektu?',
areYouSureYouWantToRemoveThisMemberFromBoard:
'Naozaj chcete odstrániť tohoto člena z tabule?',
attachment: 'Príloha',
attachments: 'Prílohy',
authentication: 'Overenie',
background: 'Pozadie',
board: 'Tabuľa',
boardNotFound_title: 'Tabuľa neexistuje',
cardActions_title: 'Akcie na karte',
cardNotFound_title: 'Karta neexistuje',
cardOrActionAreDeleted: 'Karta alebo akcia sú zmazané',
color: 'Farba',
createBoard_title: 'Vytvoriť tabuľu',
createLabel_title: 'Vytvoriť štítok',
createNewOneOrSelectExistingOne: 'Vytvoriť nový alebo vyberte<br />už existujúci',
createProject_title: 'Vytvoriť projekt',
createTextFile_title: 'Vytvoriť textový súbor',
currentPassword: 'Aktuálne heslo',
dangerZone_title: 'Nebezpečná zóna',
date: 'Dátum',
dueDate_title: 'Termín do',
deleteAttachment_title: 'Zmazať prílohu',
deleteBoard_title: 'Zmazať tabuľu',
deleteCard_title: 'Zmazať kartu',
deleteComment_title: 'Zmazať komentár',
deleteLabel_title: 'Zmazať štítok',
deleteList_title: 'Zmazať zoznam',
deleteProject_title: 'Zmazať projekt',
deleteTask_title: 'Zmazať úlohu',
deleteUser_title: 'Zmazať používateľa',
description: 'Popis',
dropFileToUpload: 'Potiahnutím nahraj súbor',
editAttachment_title: 'Upraviť prílohu',
editAvatar_title: 'Upraviť avatar',
editBoard_title: 'Upraviť tabuľu',
editDueDate_title: 'Upraviť Termín do',
editEmail_title: 'Upraviť e-mail',
editInformation_title: 'Upraviť informácie',
editLabel_title: 'Upraviť štítok',
editPassword_title: 'Upraviť heslo',
editTimer_title: 'Upraviť časovač',
editUsername_title: 'Upraviť používateľské meno',
email: 'E-mail',
emailAlreadyInUse: 'E-mail je už použitý',
enterCardTitle: 'Vlož názov karty...',
enterDescription: 'Vlož popis...',
enterFilename: 'Vlož názov súboru',
enterListTitle: 'Vlož názov zoznamu...',
enterProjectTitle: 'Vlož názov projektu',
enterTaskDescription: 'Vlož popis úlohy...',
filterByLabels_title: 'Filtruj podľa štítku',
filterByMembers_title: 'Filtruj podľa člena',
fromComputer_title: 'Z počítača',
general: 'Všeobecné',
hours: 'Hodiny',
invalidCurrentPassword: 'Neplatné aktuálne heslo',
labels: 'Štítky',
leaveBoard_title: 'Opustiť tabuľu',
leaveProject_title: 'Opustiť projekt',
list: 'Zoznam',
listActions_title: 'Zoznam akcií',
managers: 'Správcovia',
members: 'Členovia',
minutes: 'Minúty',
moveCard_title: 'Presunúť kartu',
name: 'Meno',
newEmail: 'Nový e-mail',
newPassword: 'Nové heslo',
newUsername: 'Nové používateľské meno',
noConnectionToServer: 'Nie je spojenie k serveru',
noBoards: 'Žiadne tabule',
noLists: 'Žiadne zoznamy',
noProjects: 'Žiadne projekty',
notifications: 'Oznámenia',
noUnreadNotifications: 'Žiadne neprečítané oznámenia',
openBoard_title: 'Otvoriť tabuľu',
optional_inline: 'voliteľné',
organization: 'Spoločnosť',
phone: 'Telefón',
preferences: 'Voľby',
pressPasteShortcutToAddAttachmentFromClipboard:
'Tip: stlačte Ctrl-V (Cmd-V na Mac) pre vloženie prílohy zo schránky.',
project: 'Projekt',
projectNotFound_title: 'Projekt neexistuje',
removeManager_title: 'Odstrániť správcu',
removeMember_title: 'Odstrániť člena',
seconds: 'Sekúnd',
selectBoard: 'Vybrať tabuľu',
selectList: 'Vybrať zoznam',
selectProject: 'Vybrať projekt',
settings: 'Nastavenia',
subscribeToMyOwnCardsByDefault: 'Predvolene odoberať vlastné karty',
taskActions_title: 'Akcie na úlohe',
tasks: 'Úlohy',
time: 'Čas',
timer: 'Časovač',
title: 'Názov',
userActions_title: 'Akcie na používateľovi',
userAddedThisCardToList: '<0>{{user}}</0><1> pridal kartu do {{list}}</1>',
userLeftNewCommentToCard: '{{user}} zanechal nový komentár «{{comment}}» k <2>{{card}}</2>',
userMovedCardFromListToList: '{{user}} presunul <2>{{card}}</2> z {{fromList}} do {{toList}}',
userMovedThisCardFromListToList:
'<0>{{user}}</0><1> presunul túto kartu z {{fromList}} do {{toList}}</1>',
username: 'Používateľské meno',
usernameAlreadyInUse: 'Používateľské meno je zabrané',
users: 'Používatelia',
writeComment: 'Napísať komentár...',
},
action: {
addAnotherCard: 'Pridať ďalšiu kartu',
addAnotherList: 'Pridať ďalší zoznam',
addAnotherTask: 'Pridať ďalšiu úlohu',
addCard: 'Pridať kartu',
addCard_title: 'Pridať kartu',
addComment: 'Pridať komentár',
addList: 'Pridať zoznam',
addMoreDetailedDescription: 'Pridať ďalší detailný popis',
addTask: 'Pridať úlohu',
addToCard: 'Pridať na kartu',
addUser: 'Pridať používateľa',
createBoard: 'Vytvoriť tabuľu',
createFile: 'Vytvoriť súbor',
createLabel: 'Vytvoriť štítok',
createNewLabel: 'Vytvoriť nový štítok',
createProject: 'Vytvoriť projekt',
delete: 'Zmazať',
deleteAttachment: 'Zmazať prílohu',
deleteAvatar: 'Zmazať avatar',
deleteBoard: 'Zmazať tabuľu',
deleteCard: 'Zmazať kartu',
deleteCard_title: 'Zmazať kartu',
deleteComment: 'Zmazať komentár',
deleteImage: 'Zmazať obrázok',
deleteLabel: 'Zmazať štítok',
deleteList: 'Zmazať zoznam',
deleteList_title: 'Zmazať zoznam',
deleteProject: 'Zmazať projekt',
deleteProject_title: 'Zmazať projekt',
deleteTask: 'Zmazať úlohu',
deleteTask_title: 'Zmazať úlohu',
deleteUser: 'Zmazať používateľa',
edit: 'Upraviť',
editDueDate_title: 'Upraviť termín do',
editDescription_title: 'Upraviť popis',
editEmail_title: 'Upraviť e-mail',
editInformation_title: 'Upraviť informácie',
editPassword_title: 'Upraviť heslo',
editTimer_title: 'Upraviť časovač',
editTitle_title: 'Upraviť názov',
editUsername_title: 'Upraviť používateľské meno',
leaveBoard: 'Opustiť tabuľu',
leaveProject: 'Opustiť projekt',
logOut_title: 'Odhlásiť sa',
makeCover_title: 'Vytvoriť obal',
move: 'Presunúť',
moveCard_title: 'Presunúť kartu',
remove: 'Odstrániť',
removeBackground: 'Odstrániť pozadie',
removeCover_title: 'Odstrániť obal',
removeFromBoard: 'Odstrániť z tabule',
removeFromProject: 'Odstrániť z projektu',
removeManager: 'Odstrániť správcu',
removeMember: 'Odstrániť člena',
save: 'Uložiť',
showAllAttachments: 'Zozbraziť všetky prílohy ({{hidden}} skryté)',
showFewerAttachments: 'Zobraziť menej príloh',
start: 'Start',
stop: 'Stop',
subscribe: 'Odoberať',
unsubscribe: 'Neodoberať',
uploadNewAvatar: 'Nahrať nový avatar',
uploadNewImage: 'Nahrať nový obrázok',
},
},
};
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'sk',
country: 'sk',
name: 'Slovenčina',
embeddedLocale: login,
};
+20
View File
@@ -0,0 +1,20 @@
export default {
translation: {
common: {
emailOrUsername: 'E-mail alebo používateľské meno',
invalidEmailOrUsername: 'Nesprávny e-mail alebo používateľské meno',
invalidPassword: 'Nesprávne heslo',
logInToPlanka: 'Prihlásiť sa do Planka',
noInternetConnection: 'Bez pripojenia k internetu',
pageNotFound_title: 'Stránka neexistuje',
password: 'Heslo',
projectManagement: 'Správa projektu',
serverConnectionFailed: 'Pripojenie k serveru zlyhalo',
unknownError: 'Neznáma chyba, skúste to neskôr',
},
action: {
logIn: 'Prihlásiť sa',
},
},
};
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'sv',
country: 'se',
name: 'Svenska',
embeddedLocale: login,
};
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'uz',
country: 'uz',
name: "O'zbek",
embeddedLocale: login,
};
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'zh',
country: 'cn',
name: '中文',
embeddedLocale: login,
};
+1
View File
@@ -50,6 +50,7 @@ export default class extends Model {
break; break;
case ActionTypes.ACTIONS_FETCH__SUCCESS: case ActionTypes.ACTIONS_FETCH__SUCCESS:
case ActionTypes.ACTIONS_DETAILS_TOGGLE__SUCCESS:
case ActionTypes.NOTIFICATION_CREATE_HANDLE: case ActionTypes.NOTIFICATION_CREATE_HANDLE:
payload.actions.forEach((action) => { payload.actions.forEach((action) => {
Action.upsert(action); Action.upsert(action);
+1
View File
@@ -9,6 +9,7 @@ export default class extends Model {
id: attr(), id: attr(),
url: attr(), url: attr(),
coverUrl: attr(), coverUrl: attr(),
image: attr(),
name: attr(), name: attr(),
cardId: fk({ cardId: fk({
to: 'Card', to: 'Card',
+48 -3
View File
@@ -2,6 +2,7 @@ import { Model, attr, fk, many, oneToOne } from 'redux-orm';
import ActionTypes from '../constants/ActionTypes'; import ActionTypes from '../constants/ActionTypes';
import Config from '../constants/Config'; import Config from '../constants/Config';
import { ActionTypes as ActionTypesEnum } from '../constants/Enums';
export default class extends Model { export default class extends Model {
static modelName = 'Card'; static modelName = 'Card';
@@ -22,6 +23,12 @@ export default class extends Model {
isAllActionsFetched: attr({ isAllActionsFetched: attr({
getDefault: () => false, getDefault: () => false,
}), }),
isActionsDetailsVisible: attr({
getDefault: () => false,
}),
isActionsDetailsFetching: attr({
getDefault: () => false,
}),
boardId: fk({ boardId: fk({
to: 'Board', to: 'Board',
as: 'board', as: 'board',
@@ -195,6 +202,36 @@ export default class extends Model {
}); });
break; break;
case ActionTypes.ACTIONS_DETAILS_TOGGLE: {
const cardModel = Card.withId(payload.cardId);
cardModel.isActionsDetailsVisible = payload.isVisible;
if (payload.isVisible) {
cardModel.isActionsDetailsFetching = true;
}
break;
}
case ActionTypes.ACTIONS_DETAILS_TOGGLE__SUCCESS: {
const cardModel = Card.withId(payload.cardId);
cardModel.update({
isAllActionsFetched: payload.actions.length < Config.ACTIONS_LIMIT,
isActionsDetailsFetching: false,
});
cardModel.actions.toModelArray().forEach((actionModel) => {
if (actionModel.notification) {
actionModel.update({
isInCard: false,
});
} else {
actionModel.delete();
}
});
break;
}
case ActionTypes.NOTIFICATION_CREATE_HANDLE: case ActionTypes.NOTIFICATION_CREATE_HANDLE:
payload.cards.forEach((card) => { payload.cards.forEach((card) => {
Card.upsert(card); Card.upsert(card);
@@ -206,15 +243,23 @@ export default class extends Model {
} }
getOrderedTasksQuerySet() { getOrderedTasksQuerySet() {
return this.tasks.orderBy('id'); return this.tasks.orderBy('position');
} }
getOrderedAttachmentsQuerySet() { getOrderedAttachmentsQuerySet() {
return this.attachments.orderBy('id', false); return this.attachments.orderBy('id', false);
} }
getOrderedInCardActionsQuerySet() { getFilteredOrderedInCardActionsQuerySet() {
return this.actions.orderBy('id', false); const filter = {
isInCard: true,
};
if (!this.isActionsDetailsVisible) {
filter.type = ActionTypesEnum.COMMENT_CARD;
}
return this.actions.filter(filter).orderBy('id', false);
} }
getUnreadNotificationsQuerySet() { getUnreadNotificationsQuerySet() {
+1 -1
View File
@@ -83,7 +83,7 @@ export default class extends Model {
return this.cards.orderBy('position'); return this.cards.orderBy('position');
} }
getOrderedFilteredCardsModelArray() { getFilteredOrderedCardsModelArray() {
let cardModels = this.getOrderedCardsQuerySet().toModelArray(); let cardModels = this.getOrderedCardsQuerySet().toModelArray();
const filterUserIds = this.board.filterUsers.toRefArray().map((user) => user.id); const filterUserIds = this.board.filterUsers.toRefArray().map((user) => user.id);
+5 -6
View File
@@ -1,4 +1,4 @@
import { Model, attr, fk } from 'redux-orm'; import { Model, attr, fk, oneToOne } from 'redux-orm';
import ActionTypes from '../constants/ActionTypes'; import ActionTypes from '../constants/ActionTypes';
@@ -15,16 +15,15 @@ export default class extends Model {
as: 'user', as: 'user',
relatedName: 'notifications', relatedName: 'notifications',
}), }),
actionId: fk({
to: 'Action',
as: 'action',
relatedName: 'notifications',
}),
cardId: fk({ cardId: fk({
to: 'Card', to: 'Card',
as: 'card', as: 'card',
relatedName: 'notifications', relatedName: 'notifications',
}), }),
actionId: oneToOne({
to: 'Action',
as: 'action',
}),
}; };
static reducer({ type, payload }, Notification) { static reducer({ type, payload }, Notification) {
+1
View File
@@ -7,6 +7,7 @@ export default class extends Model {
static fields = { static fields = {
id: attr(), id: attr(),
position: attr(),
name: attr(), name: attr(),
isCompleted: attr({ isCompleted: attr({
getDefault: () => false, getDefault: () => false,
+1
View File
@@ -40,6 +40,7 @@ export default class extends Model {
avatarUrl: attr(), avatarUrl: attr(),
phone: attr(), phone: attr(),
organization: attr(), organization: attr(),
language: attr(),
subscribeToOwnCards: attr(), subscribeToOwnCards: attr(),
deletedAt: attr(), deletedAt: attr(),
isAdmin: attr({ isAdmin: attr({
+33 -2
View File
@@ -1,11 +1,12 @@
import { call, put, select } from 'redux-saga/effects'; import { call, put, select } from 'redux-saga/effects';
import request from '../request'; import request from '../request';
import { lastActionIdByCardIdSelector, pathSelector } from '../../../selectors'; import { cardByIdSelector, lastActionIdByCardIdSelector, pathSelector } from '../../../selectors';
import { fetchActions } from '../../../actions'; import { fetchActions, toggleActionsDetails } from '../../../actions';
import api from '../../../api'; import api from '../../../api';
export function* fetchActionsService(cardId) { export function* fetchActionsService(cardId) {
const { isActionsDetailsVisible } = yield select(cardByIdSelector, cardId);
const lastId = yield select(lastActionIdByCardIdSelector, cardId); const lastId = yield select(lastActionIdByCardIdSelector, cardId);
yield put(fetchActions(cardId)); yield put(fetchActions(cardId));
@@ -19,6 +20,7 @@ export function* fetchActionsService(cardId) {
included: { users }, included: { users },
} = yield call(request, api.getActions, cardId, { } = yield call(request, api.getActions, cardId, {
beforeId: lastId, beforeId: lastId,
withDetails: isActionsDetailsVisible,
})); }));
} catch (error) { } catch (error) {
yield put(fetchActions.failure(cardId, error)); yield put(fetchActions.failure(cardId, error));
@@ -33,3 +35,32 @@ export function* fetchActionsInCurrentCardService() {
yield call(fetchActionsService, cardId); yield call(fetchActionsService, cardId);
} }
export function* toggleActionsDetailsService(cardId, isVisible) {
yield put(toggleActionsDetails(cardId, isVisible));
if (isVisible) {
let actions;
let users;
try {
({
items: actions,
included: { users },
} = yield call(request, api.getActions, cardId, {
withDetails: isVisible,
}));
} catch (error) {
yield put(toggleActionsDetails.failure(cardId, error));
return;
}
yield put(toggleActionsDetails.success(cardId, actions, users));
}
}
export function* toggleActionsDetailsInCurrentCardService(isVisible) {
const { cardId } = yield select(pathSelector);
yield call(toggleActionsDetailsService, cardId, isVisible);
}
+12 -1
View File
@@ -4,7 +4,6 @@ import { fetchCoreRequest } from '../requests';
import { initializeCore } from '../../../actions'; import { initializeCore } from '../../../actions';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
// eslint-disable-next-line import/prefer-default-export
export function* initializeCoreService() { export function* initializeCoreService() {
const { const {
user, user,
@@ -25,6 +24,7 @@ export function* initializeCoreService() {
notifications, notifications,
} = yield call(fetchCoreRequest); // TODO: handle error } = yield call(fetchCoreRequest); // TODO: handle error
yield call(i18n.changeLanguage, user.language);
yield call(i18n.loadCoreLocale); yield call(i18n.loadCoreLocale);
yield put( yield put(
@@ -48,3 +48,14 @@ export function* initializeCoreService() {
), ),
); );
} }
export function* changeCoreLanguageService(language) {
if (language === null) {
yield call(i18n.detectLanguage);
yield call(i18n.loadCoreLocale);
yield call(i18n.changeLanguage, i18n.resolvedLanguage);
} else {
yield call(i18n.loadCoreLocale, language);
yield call(i18n.changeLanguage, language);
}
}
+17 -3
View File
@@ -1,7 +1,7 @@
import { call, put, select } from 'redux-saga/effects'; import { call, put, select } from 'redux-saga/effects';
import request from '../request'; import request from '../request';
import { pathSelector } from '../../../selectors'; import { nextTaskPositionSelector, pathSelector, taskByIdSelector } from '../../../selectors';
import { import {
createTask, createTask,
deleteTask, deleteTask,
@@ -14,11 +14,16 @@ import api from '../../../api';
import { createLocalId } from '../../../utils/local-id'; import { createLocalId } from '../../../utils/local-id';
export function* createTaskService(cardId, data) { export function* createTaskService(cardId, data) {
const nextData = {
...data,
position: yield select(nextTaskPositionSelector, cardId),
};
const localId = yield call(createLocalId); const localId = yield call(createLocalId);
yield put( yield put(
createTask({ createTask({
...data, ...nextData,
cardId, cardId,
id: localId, id: localId,
}), }),
@@ -26,7 +31,7 @@ export function* createTaskService(cardId, data) {
let task; let task;
try { try {
({ item: task } = yield call(request, api.createTask, cardId, data)); ({ item: task } = yield call(request, api.createTask, cardId, nextData));
} catch (error) { } catch (error) {
yield put(createTask.failure(localId, error)); yield put(createTask.failure(localId, error));
return; return;
@@ -63,6 +68,15 @@ export function* handleTaskUpdateService(task) {
yield put(handleTaskUpdate(task)); yield put(handleTaskUpdate(task));
} }
export function* moveTaskService(id, index) {
const { cardId } = yield select(taskByIdSelector, id);
const position = yield select(nextTaskPositionSelector, cardId, index, id);
yield call(updateTaskService, id, {
position,
});
}
export function* deleteTaskService(id) { export function* deleteTaskService(id) {
yield put(deleteTask(id)); yield put(deleteTask(id));
+16
View File
@@ -1,6 +1,7 @@
import { call, put, select } from 'redux-saga/effects'; import { call, put, select } from 'redux-saga/effects';
import { logoutService } from './login'; import { logoutService } from './login';
import { changeCoreLanguageService } from './core';
import request from '../request'; import request from '../request';
import { currentUserIdSelector, currentUserSelector, pathSelector } from '../../../selectors'; import { currentUserIdSelector, currentUserSelector, pathSelector } from '../../../selectors';
import { import {
@@ -81,6 +82,21 @@ export function* handleUserUpdateService(user) {
yield put(handleUserUpdate(user, users, isCurrent)); yield put(handleUserUpdate(user, users, isCurrent));
} }
// TODO: add loading state
export function* updateUserLanguageService(id, language) {
yield call(changeCoreLanguageService, language);
yield call(updateUserService, id, {
language,
});
}
export function* updateCurrentUserLanguageService(language) {
const id = yield select(currentUserIdSelector);
yield call(updateUserLanguageService, id, language);
}
export function* updateUserEmailService(id, data) { export function* updateUserEmailService(id, data) {
yield put(updateUserEmail(id, data)); yield put(updateUserEmail(id, data));
+14 -5
View File
@@ -1,10 +1,19 @@
import { takeEvery } from 'redux-saga/effects'; import { all, takeEvery } from 'redux-saga/effects';
import { fetchActionsInCurrentCardService } from '../services'; import {
fetchActionsInCurrentCardService,
toggleActionsDetailsInCurrentCardService,
} from '../services';
import EntryActionTypes from '../../../constants/EntryActionTypes'; import EntryActionTypes from '../../../constants/EntryActionTypes';
export default function* actionsWatchers() { export default function* actionsWatchers() {
yield takeEvery(EntryActionTypes.ACTIONS_IN_CURRENT_CARD_FETCH, () => yield all([
fetchActionsInCurrentCardService(), takeEvery(EntryActionTypes.ACTIONS_IN_CURRENT_CARD_FETCH, () =>
); fetchActionsInCurrentCardService(),
),
takeEvery(
EntryActionTypes.ACTIONS_DETAILS_IN_CURRENT_CARD_TOGGLE,
({ payload: { isVisible } }) => toggleActionsDetailsInCurrentCardService(isVisible),
),
]);
} }
+4
View File
@@ -6,6 +6,7 @@ import {
handleTaskCreateService, handleTaskCreateService,
handleTaskDeleteService, handleTaskDeleteService,
handleTaskUpdateService, handleTaskUpdateService,
moveTaskService,
updateTaskService, updateTaskService,
} from '../services'; } from '../services';
import EntryActionTypes from '../../../constants/EntryActionTypes'; import EntryActionTypes from '../../../constants/EntryActionTypes';
@@ -24,6 +25,9 @@ export default function* taskWatchers() {
takeEvery(EntryActionTypes.TASK_UPDATE_HANDLE, ({ payload: { task } }) => takeEvery(EntryActionTypes.TASK_UPDATE_HANDLE, ({ payload: { task } }) =>
handleTaskUpdateService(task), handleTaskUpdateService(task),
), ),
takeEvery(EntryActionTypes.TASK_MOVE, ({ payload: { id, index } }) =>
moveTaskService(id, index),
),
takeEvery(EntryActionTypes.TASK_DELETE, ({ payload: { id } }) => deleteTaskService(id)), takeEvery(EntryActionTypes.TASK_DELETE, ({ payload: { id } }) => deleteTaskService(id)),
takeEvery(EntryActionTypes.TASK_DELETE_HANDLE, ({ payload: { task } }) => takeEvery(EntryActionTypes.TASK_DELETE_HANDLE, ({ payload: { task } }) =>
handleTaskDeleteService(task), handleTaskDeleteService(task),
+4
View File
@@ -24,6 +24,7 @@ import {
updateUserService, updateUserService,
updateCurrentUserAvatarService, updateCurrentUserAvatarService,
updateCurrentUserEmailService, updateCurrentUserEmailService,
updateCurrentUserLanguageService,
updateCurrentUserPasswordService, updateCurrentUserPasswordService,
updateCurrentUserService, updateCurrentUserService,
updateCurrentUserUsernameService, updateCurrentUserUsernameService,
@@ -49,6 +50,9 @@ export default function* userWatchers() {
takeEvery(EntryActionTypes.USER_UPDATE_HANDLE, ({ payload: { user } }) => takeEvery(EntryActionTypes.USER_UPDATE_HANDLE, ({ payload: { user } }) =>
handleUserUpdateService(user), handleUserUpdateService(user),
), ),
takeEvery(EntryActionTypes.CURRENT_USER_LANGUAGE_UPDATE, ({ payload: { language } }) =>
updateCurrentUserLanguageService(language),
),
takeEvery(EntryActionTypes.USER_EMAIL_UPDATE, ({ payload: { id, data } }) => takeEvery(EntryActionTypes.USER_EMAIL_UPDATE, ({ payload: { id, data } }) =>
updateUserEmailService(id, data), updateUserEmailService(id, data),
), ),
+3 -3
View File
@@ -71,7 +71,7 @@ export const makeTasksByCardIdSelector = () =>
return cardModel; return cardModel;
} }
return cardModel.tasks.toRefArray(); return cardModel.getOrderedTasksQuerySet().toRefArray();
}, },
); );
@@ -88,7 +88,7 @@ export const makeLastActionIdByCardIdSelector = () =>
return cardModel; return cardModel;
} }
const lastActionModel = cardModel.getOrderedInCardActionsQuerySet().last(); const lastActionModel = cardModel.getFilteredOrderedInCardActionsQuerySet().last();
return lastActionModel && lastActionModel.id; return lastActionModel && lastActionModel.id;
}, },
@@ -249,7 +249,7 @@ export const actionsForCurrentCardSelector = createSelector(
} }
return cardModel return cardModel
.getOrderedInCardActionsQuerySet() .getFilteredOrderedInCardActionsQuerySet()
.toModelArray() .toModelArray()
.map((actionModel) => ({ .map((actionModel) => ({
...actionModel.ref, ...actionModel.ref,
+17 -1
View File
@@ -73,6 +73,22 @@ export const nextCardPositionSelector = createSelector(
return listModel; return listModel;
} }
return nextPosition(listModel.getOrderedFilteredCardsModelArray(), index, excludedId); return nextPosition(listModel.getFilteredOrderedCardsModelArray(), index, excludedId);
},
);
export const nextTaskPositionSelector = createSelector(
orm,
(_, cardId) => cardId,
(_, __, index) => index,
(_, __, ___, excludedId) => excludedId,
({ Card }, cardId, index, excludedId) => {
const cardModel = Card.withId(cardId);
if (!cardModel) {
return cardModel;
}
return nextPosition(cardModel.getOrderedTasksQuerySet().toRefArray(), index, excludedId);
}, },
); );
+1
View File
@@ -10,4 +10,5 @@ export * from './board';
export * from './board-membership'; export * from './board-membership';
export * from './list'; export * from './list';
export * from './card'; export * from './card';
export * from './task';
export * from './attachment'; export * from './attachment';
+1 -1
View File
@@ -34,7 +34,7 @@ export const makeCardIdsByListIdSelector = () =>
return listModel; return listModel;
} }
return listModel.getOrderedFilteredCardsModelArray().map((cardModel) => cardModel.id); return listModel.getFilteredOrderedCardsModelArray().map((cardModel) => cardModel.id);
}, },
); );
+20
View File
@@ -0,0 +1,20 @@
import { createSelector } from 'redux-orm';
import orm from '../orm';
export const makeTaskByIdSelector = () =>
createSelector(
orm,
(_, id) => id,
({ Task }, id) => {
const taskModel = Task.withId(id);
if (!taskModel) {
return taskModel;
}
return taskModel.ref;
},
);
export const taskByIdSelector = makeTaskByIdSelector();
+4
View File
@@ -101,6 +101,10 @@
border-radius: 0; border-radius: 0;
} }
} }
.pswp .pswp__img--placeholder {
display: none !important;
}
} }
#root { #root {
+276 -249
View File
@@ -1,18 +1,18 @@
{ {
"name": "planka", "name": "planka",
"version": "1.1.5", "version": "1.5.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "planka", "name": "planka",
"version": "1.1.5", "version": "1.5.0",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"concurrently": "^7.1.0", "concurrently": "^7.3.0",
"husky": "^7.0.4", "husky": "^8.0.1",
"lint-staged": "^12.3.8" "lint-staged": "^13.0.3"
} }
}, },
"node_modules/aggregate-error": { "node_modules/aggregate-error": {
@@ -217,31 +217,32 @@
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
}, },
"node_modules/colorette": { "node_modules/colorette": {
"version": "2.0.16", "version": "2.0.19",
"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
"integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==" "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="
}, },
"node_modules/commander": { "node_modules/commander": {
"version": "8.3.0", "version": "9.4.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz",
"integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==",
"engines": { "engines": {
"node": ">= 12" "node": "^12.20.0 || >=14"
} }
}, },
"node_modules/concurrently": { "node_modules/concurrently": {
"version": "7.1.0", "version": "7.3.0",
"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.1.0.tgz", "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.3.0.tgz",
"integrity": "sha512-Bz0tMlYKZRUDqJlNiF/OImojMB9ruKUz6GCfmhFnSapXgPe+3xzY4byqoKG9tUZ7L2PGEUjfLPOLfIX3labnmw==", "integrity": "sha512-IiDwm+8DOcFEInca494A8V402tNTQlJaYq78RF2rijOrKEk/AOHTxhN4U1cp7GYKYX5Q6Ymh1dLTBlzIMN0ikA==",
"dependencies": { "dependencies": {
"chalk": "^4.1.0", "chalk": "^4.1.0",
"date-fns": "^2.16.1", "date-fns": "^2.16.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"rxjs": "^6.6.3", "rxjs": "^7.0.0",
"shell-quote": "^1.7.3",
"spawn-command": "^0.0.2-1", "spawn-command": "^0.0.2-1",
"supports-color": "^8.1.0", "supports-color": "^8.1.0",
"tree-kill": "^1.2.2", "tree-kill": "^1.2.2",
"yargs": "^16.2.0" "yargs": "^17.3.1"
}, },
"bin": { "bin": {
"concurrently": "dist/bin/concurrently.js" "concurrently": "dist/bin/concurrently.js"
@@ -264,9 +265,9 @@
} }
}, },
"node_modules/date-fns": { "node_modules/date-fns": {
"version": "2.28.0", "version": "2.29.1",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.1.tgz",
"integrity": "sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==", "integrity": "sha512-dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw==",
"engines": { "engines": {
"node": ">=0.11" "node": ">=0.11"
}, },
@@ -310,22 +311,22 @@
} }
}, },
"node_modules/execa": { "node_modules/execa": {
"version": "5.1.1", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz",
"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==",
"dependencies": { "dependencies": {
"cross-spawn": "^7.0.3", "cross-spawn": "^7.0.3",
"get-stream": "^6.0.0", "get-stream": "^6.0.1",
"human-signals": "^2.1.0", "human-signals": "^3.0.1",
"is-stream": "^2.0.0", "is-stream": "^3.0.0",
"merge-stream": "^2.0.0", "merge-stream": "^2.0.0",
"npm-run-path": "^4.0.1", "npm-run-path": "^5.1.0",
"onetime": "^5.1.2", "onetime": "^6.0.0",
"signal-exit": "^3.0.3", "signal-exit": "^3.0.7",
"strip-final-newline": "^2.0.0" "strip-final-newline": "^3.0.0"
}, },
"engines": { "engines": {
"node": ">=10" "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
}, },
"funding": { "funding": {
"url": "https://github.com/sindresorhus/execa?sponsor=1" "url": "https://github.com/sindresorhus/execa?sponsor=1"
@@ -370,22 +371,22 @@
} }
}, },
"node_modules/human-signals": { "node_modules/human-signals": {
"version": "2.1.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz",
"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==",
"engines": { "engines": {
"node": ">=10.17.0" "node": ">=12.20.0"
} }
}, },
"node_modules/husky": { "node_modules/husky": {
"version": "7.0.4", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz", "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
"integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==", "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
"bin": { "bin": {
"husky": "lib/bin.js" "husky": "lib/bin.js"
}, },
"engines": { "engines": {
"node": ">=12" "node": ">=14"
}, },
"funding": { "funding": {
"url": "https://github.com/sponsors/typicode" "url": "https://github.com/sponsors/typicode"
@@ -419,11 +420,11 @@
} }
}, },
"node_modules/is-stream": { "node_modules/is-stream": {
"version": "2.0.1", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
"engines": { "engines": {
"node": ">=8" "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
}, },
"funding": { "funding": {
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
@@ -432,57 +433,45 @@
"node_modules/isexe": { "node_modules/isexe": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
}, },
"node_modules/lilconfig": { "node_modules/lilconfig": {
"version": "2.0.4", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
"integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==", "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
"engines": { "engines": {
"node": ">=10" "node": ">=10"
} }
}, },
"node_modules/lint-staged": { "node_modules/lint-staged": {
"version": "12.3.8", "version": "13.0.3",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.3.8.tgz", "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.3.tgz",
"integrity": "sha512-0+UpNaqIwKRSGAFOCcpuYNIv/j5QGVC+xUVvmSdxHO+IfIGoHbFLo3XcPmV/LLnsVj5EAncNHVtlITSoY5qWGQ==", "integrity": "sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==",
"dependencies": { "dependencies": {
"cli-truncate": "^3.1.0", "cli-truncate": "^3.1.0",
"colorette": "^2.0.16", "colorette": "^2.0.17",
"commander": "^8.3.0", "commander": "^9.3.0",
"debug": "^4.3.3", "debug": "^4.3.4",
"execa": "^5.1.1", "execa": "^6.1.0",
"lilconfig": "2.0.4", "lilconfig": "2.0.5",
"listr2": "^4.0.1", "listr2": "^4.0.5",
"micromatch": "^4.0.4", "micromatch": "^4.0.5",
"normalize-path": "^3.0.0", "normalize-path": "^3.0.0",
"object-inspect": "^1.12.0", "object-inspect": "^1.12.2",
"pidtree": "^0.5.0", "pidtree": "^0.6.0",
"string-argv": "^0.3.1", "string-argv": "^0.3.1",
"supports-color": "^9.2.1", "yaml": "^2.1.1"
"yaml": "^1.10.2"
}, },
"bin": { "bin": {
"lint-staged": "bin/lint-staged.js" "lint-staged": "bin/lint-staged.js"
}, },
"engines": { "engines": {
"node": "^12.20.0 || ^14.13.1 || >=16.0.0" "node": "^14.13.1 || >=16.0.0"
}, },
"funding": { "funding": {
"url": "https://opencollective.com/lint-staged" "url": "https://opencollective.com/lint-staged"
} }
}, },
"node_modules/lint-staged/node_modules/supports-color": {
"version": "9.2.2",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.2.tgz",
"integrity": "sha512-XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA==",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/chalk/supports-color?sponsor=1"
}
},
"node_modules/listr2": { "node_modules/listr2": {
"version": "4.0.5", "version": "4.0.5",
"resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz", "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
@@ -545,14 +534,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/listr2/node_modules/rxjs": {
"version": "7.5.5",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
"integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
"dependencies": {
"tslib": "^2.1.0"
}
},
"node_modules/listr2/node_modules/slice-ansi": { "node_modules/listr2/node_modules/slice-ansi": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@@ -590,11 +571,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/listr2/node_modules/tslib": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
},
"node_modules/lodash": { "node_modules/lodash": {
"version": "4.17.21", "version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -709,11 +685,14 @@
} }
}, },
"node_modules/mimic-fn": { "node_modules/mimic-fn": {
"version": "2.1.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
"engines": { "engines": {
"node": ">=6" "node": ">=12"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/ms": { "node_modules/ms": {
@@ -730,33 +709,47 @@
} }
}, },
"node_modules/npm-run-path": { "node_modules/npm-run-path": {
"version": "4.0.1", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
"dependencies": { "dependencies": {
"path-key": "^3.0.0" "path-key": "^4.0.0"
}, },
"engines": { "engines": {
"node": ">=8" "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/npm-run-path/node_modules/path-key": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
"integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
"engines": {
"node": ">=12"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/object-inspect": { "node_modules/object-inspect": {
"version": "1.12.0", "version": "1.12.2",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
"integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
"funding": { "funding": {
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/onetime": { "node_modules/onetime": {
"version": "5.1.2", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
"dependencies": { "dependencies": {
"mimic-fn": "^2.1.0" "mimic-fn": "^4.0.0"
}, },
"engines": { "engines": {
"node": ">=6" "node": ">=12"
}, },
"funding": { "funding": {
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
@@ -796,9 +789,9 @@
} }
}, },
"node_modules/pidtree": { "node_modules/pidtree": {
"version": "0.5.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz", "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
"integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==", "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
"bin": { "bin": {
"pidtree": "bin/pidtree.js" "pidtree": "bin/pidtree.js"
}, },
@@ -809,7 +802,7 @@
"node_modules/require-directory": { "node_modules/require-directory": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
} }
@@ -826,20 +819,39 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/restore-cursor/node_modules/mimic-fn": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
"engines": {
"node": ">=6"
}
},
"node_modules/restore-cursor/node_modules/onetime": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
"dependencies": {
"mimic-fn": "^2.1.0"
},
"engines": {
"node": ">=6"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/rfdc": { "node_modules/rfdc": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
"integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
}, },
"node_modules/rxjs": { "node_modules/rxjs": {
"version": "6.6.7", "version": "7.5.6",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz",
"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
"dependencies": { "dependencies": {
"tslib": "^1.9.0" "tslib": "^2.1.0"
},
"engines": {
"npm": ">=2.0.0"
} }
}, },
"node_modules/shebang-command": { "node_modules/shebang-command": {
@@ -861,6 +873,11 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/shell-quote": {
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
"integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
},
"node_modules/signal-exit": { "node_modules/signal-exit": {
"version": "3.0.7", "version": "3.0.7",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -895,7 +912,7 @@
"node_modules/spawn-command": { "node_modules/spawn-command": {
"version": "0.0.2-1", "version": "0.0.2-1",
"resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz", "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
"integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=" "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg=="
}, },
"node_modules/string-argv": { "node_modules/string-argv": {
"version": "0.3.1", "version": "0.3.1",
@@ -936,11 +953,14 @@
} }
}, },
"node_modules/strip-final-newline": { "node_modules/strip-final-newline": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
"engines": { "engines": {
"node": ">=6" "node": ">=12"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/supports-color": { "node_modules/supports-color": {
@@ -960,7 +980,7 @@
"node_modules/through": { "node_modules/through": {
"version": "2.3.8", "version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
}, },
"node_modules/to-regex-range": { "node_modules/to-regex-range": {
"version": "5.0.1", "version": "5.0.1",
@@ -982,9 +1002,9 @@
} }
}, },
"node_modules/tslib": { "node_modules/tslib": {
"version": "1.14.1", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
}, },
"node_modules/type-fest": { "node_modules/type-fest": {
"version": "0.21.3", "version": "0.21.3",
@@ -1081,36 +1101,36 @@
} }
}, },
"node_modules/yaml": { "node_modules/yaml": {
"version": "1.10.2", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
"engines": { "engines": {
"node": ">= 6" "node": ">= 14"
} }
}, },
"node_modules/yargs": { "node_modules/yargs": {
"version": "16.2.0", "version": "17.5.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
"dependencies": { "dependencies": {
"cliui": "^7.0.2", "cliui": "^7.0.2",
"escalade": "^3.1.1", "escalade": "^3.1.1",
"get-caller-file": "^2.0.5", "get-caller-file": "^2.0.5",
"require-directory": "^2.1.1", "require-directory": "^2.1.1",
"string-width": "^4.2.0", "string-width": "^4.2.3",
"y18n": "^5.0.5", "y18n": "^5.0.5",
"yargs-parser": "^20.2.2" "yargs-parser": "^21.0.0"
}, },
"engines": { "engines": {
"node": ">=10" "node": ">=12"
} }
}, },
"node_modules/yargs-parser": { "node_modules/yargs-parser": {
"version": "20.2.9", "version": "21.0.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
"engines": { "engines": {
"node": ">=10" "node": ">=12"
} }
}, },
"node_modules/yargs/node_modules/ansi-regex": { "node_modules/yargs/node_modules/ansi-regex": {
@@ -1303,28 +1323,29 @@
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
}, },
"colorette": { "colorette": {
"version": "2.0.16", "version": "2.0.19",
"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
"integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==" "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="
}, },
"commander": { "commander": {
"version": "8.3.0", "version": "9.4.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz",
"integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==" "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="
}, },
"concurrently": { "concurrently": {
"version": "7.1.0", "version": "7.3.0",
"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.1.0.tgz", "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.3.0.tgz",
"integrity": "sha512-Bz0tMlYKZRUDqJlNiF/OImojMB9ruKUz6GCfmhFnSapXgPe+3xzY4byqoKG9tUZ7L2PGEUjfLPOLfIX3labnmw==", "integrity": "sha512-IiDwm+8DOcFEInca494A8V402tNTQlJaYq78RF2rijOrKEk/AOHTxhN4U1cp7GYKYX5Q6Ymh1dLTBlzIMN0ikA==",
"requires": { "requires": {
"chalk": "^4.1.0", "chalk": "^4.1.0",
"date-fns": "^2.16.1", "date-fns": "^2.16.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"rxjs": "^6.6.3", "rxjs": "^7.0.0",
"shell-quote": "^1.7.3",
"spawn-command": "^0.0.2-1", "spawn-command": "^0.0.2-1",
"supports-color": "^8.1.0", "supports-color": "^8.1.0",
"tree-kill": "^1.2.2", "tree-kill": "^1.2.2",
"yargs": "^16.2.0" "yargs": "^17.3.1"
} }
}, },
"cross-spawn": { "cross-spawn": {
@@ -1338,9 +1359,9 @@
} }
}, },
"date-fns": { "date-fns": {
"version": "2.28.0", "version": "2.29.1",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.1.tgz",
"integrity": "sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==" "integrity": "sha512-dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw=="
}, },
"debug": { "debug": {
"version": "4.3.4", "version": "4.3.4",
@@ -1366,19 +1387,19 @@
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
}, },
"execa": { "execa": {
"version": "5.1.1", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz",
"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==",
"requires": { "requires": {
"cross-spawn": "^7.0.3", "cross-spawn": "^7.0.3",
"get-stream": "^6.0.0", "get-stream": "^6.0.1",
"human-signals": "^2.1.0", "human-signals": "^3.0.1",
"is-stream": "^2.0.0", "is-stream": "^3.0.0",
"merge-stream": "^2.0.0", "merge-stream": "^2.0.0",
"npm-run-path": "^4.0.1", "npm-run-path": "^5.1.0",
"onetime": "^5.1.2", "onetime": "^6.0.0",
"signal-exit": "^3.0.3", "signal-exit": "^3.0.7",
"strip-final-newline": "^2.0.0" "strip-final-newline": "^3.0.0"
} }
}, },
"fill-range": { "fill-range": {
@@ -1405,14 +1426,14 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
}, },
"human-signals": { "human-signals": {
"version": "2.1.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz",
"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ=="
}, },
"husky": { "husky": {
"version": "7.0.4", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz", "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
"integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==" "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw=="
}, },
"indent-string": { "indent-string": {
"version": "4.0.0", "version": "4.0.0",
@@ -1430,46 +1451,38 @@
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
}, },
"is-stream": { "is-stream": {
"version": "2.0.1", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA=="
}, },
"isexe": { "isexe": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
}, },
"lilconfig": { "lilconfig": {
"version": "2.0.4", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
"integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==" "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg=="
}, },
"lint-staged": { "lint-staged": {
"version": "12.3.8", "version": "13.0.3",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.3.8.tgz", "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.3.tgz",
"integrity": "sha512-0+UpNaqIwKRSGAFOCcpuYNIv/j5QGVC+xUVvmSdxHO+IfIGoHbFLo3XcPmV/LLnsVj5EAncNHVtlITSoY5qWGQ==", "integrity": "sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==",
"requires": { "requires": {
"cli-truncate": "^3.1.0", "cli-truncate": "^3.1.0",
"colorette": "^2.0.16", "colorette": "^2.0.17",
"commander": "^8.3.0", "commander": "^9.3.0",
"debug": "^4.3.3", "debug": "^4.3.4",
"execa": "^5.1.1", "execa": "^6.1.0",
"lilconfig": "2.0.4", "lilconfig": "2.0.5",
"listr2": "^4.0.1", "listr2": "^4.0.5",
"micromatch": "^4.0.4", "micromatch": "^4.0.5",
"normalize-path": "^3.0.0", "normalize-path": "^3.0.0",
"object-inspect": "^1.12.0", "object-inspect": "^1.12.2",
"pidtree": "^0.5.0", "pidtree": "^0.6.0",
"string-argv": "^0.3.1", "string-argv": "^0.3.1",
"supports-color": "^9.2.1", "yaml": "^2.1.1"
"yaml": "^1.10.2"
},
"dependencies": {
"supports-color": {
"version": "9.2.2",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.2.tgz",
"integrity": "sha512-XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA=="
}
} }
}, },
"listr2": { "listr2": {
@@ -1511,14 +1524,6 @@
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
}, },
"rxjs": {
"version": "7.5.5",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
"integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
"requires": {
"tslib": "^2.1.0"
}
},
"slice-ansi": { "slice-ansi": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@@ -1546,11 +1551,6 @@
"requires": { "requires": {
"ansi-regex": "^5.0.1" "ansi-regex": "^5.0.1"
} }
},
"tslib": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
} }
} }
}, },
@@ -1640,9 +1640,9 @@
} }
}, },
"mimic-fn": { "mimic-fn": {
"version": "2.1.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw=="
}, },
"ms": { "ms": {
"version": "2.1.2", "version": "2.1.2",
@@ -1655,24 +1655,31 @@
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
}, },
"npm-run-path": { "npm-run-path": {
"version": "4.0.1", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
"requires": { "requires": {
"path-key": "^3.0.0" "path-key": "^4.0.0"
},
"dependencies": {
"path-key": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
"integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ=="
}
} }
}, },
"object-inspect": { "object-inspect": {
"version": "1.12.0", "version": "1.12.2",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
"integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
}, },
"onetime": { "onetime": {
"version": "5.1.2", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
"requires": { "requires": {
"mimic-fn": "^2.1.0" "mimic-fn": "^4.0.0"
} }
}, },
"p-map": { "p-map": {
@@ -1694,14 +1701,14 @@
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
}, },
"pidtree": { "pidtree": {
"version": "0.5.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz", "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
"integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==" "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g=="
}, },
"require-directory": { "require-directory": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
}, },
"restore-cursor": { "restore-cursor": {
"version": "3.1.0", "version": "3.1.0",
@@ -1710,6 +1717,21 @@
"requires": { "requires": {
"onetime": "^5.1.0", "onetime": "^5.1.0",
"signal-exit": "^3.0.2" "signal-exit": "^3.0.2"
},
"dependencies": {
"mimic-fn": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
},
"onetime": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
"requires": {
"mimic-fn": "^2.1.0"
}
}
} }
}, },
"rfdc": { "rfdc": {
@@ -1718,11 +1740,11 @@
"integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
}, },
"rxjs": { "rxjs": {
"version": "6.6.7", "version": "7.5.6",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz",
"integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^2.1.0"
} }
}, },
"shebang-command": { "shebang-command": {
@@ -1738,6 +1760,11 @@
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
}, },
"shell-quote": {
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
"integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
},
"signal-exit": { "signal-exit": {
"version": "3.0.7", "version": "3.0.7",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -1762,7 +1789,7 @@
"spawn-command": { "spawn-command": {
"version": "0.0.2-1", "version": "0.0.2-1",
"resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz", "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
"integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=" "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg=="
}, },
"string-argv": { "string-argv": {
"version": "0.3.1", "version": "0.3.1",
@@ -1788,9 +1815,9 @@
} }
}, },
"strip-final-newline": { "strip-final-newline": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="
}, },
"supports-color": { "supports-color": {
"version": "8.1.1", "version": "8.1.1",
@@ -1803,7 +1830,7 @@
"through": { "through": {
"version": "2.3.8", "version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
}, },
"to-regex-range": { "to-regex-range": {
"version": "5.0.1", "version": "5.0.1",
@@ -1819,9 +1846,9 @@
"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==" "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="
}, },
"tslib": { "tslib": {
"version": "1.14.1", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
}, },
"type-fest": { "type-fest": {
"version": "0.21.3", "version": "0.21.3",
@@ -1887,22 +1914,22 @@
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
}, },
"yaml": { "yaml": {
"version": "1.10.2", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==" "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw=="
}, },
"yargs": { "yargs": {
"version": "16.2.0", "version": "17.5.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
"requires": { "requires": {
"cliui": "^7.0.2", "cliui": "^7.0.2",
"escalade": "^3.1.1", "escalade": "^3.1.1",
"get-caller-file": "^2.0.5", "get-caller-file": "^2.0.5",
"require-directory": "^2.1.1", "require-directory": "^2.1.1",
"string-width": "^4.2.0", "string-width": "^4.2.3",
"y18n": "^5.0.5", "y18n": "^5.0.5",
"yargs-parser": "^20.2.2" "yargs-parser": "^21.0.0"
}, },
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
@@ -1941,9 +1968,9 @@
} }
}, },
"yargs-parser": { "yargs-parser": {
"version": "20.2.9", "version": "21.0.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
} }
} }
} }
+4 -4
View File
@@ -1,6 +1,6 @@
{ {
"name": "planka", "name": "planka",
"version": "1.1.5", "version": "1.5.1",
"private": true, "private": true,
"homepage": "https://plankanban.github.io/planka", "homepage": "https://plankanban.github.io/planka",
"repository": { "repository": {
@@ -39,8 +39,8 @@
] ]
}, },
"dependencies": { "dependencies": {
"concurrently": "^7.1.0", "concurrently": "^7.3.0",
"husky": "^7.0.4", "husky": "^8.0.1",
"lint-staged": "^12.3.8" "lint-staged": "^13.0.3"
} }
} }
+8 -1
View File
@@ -15,6 +15,9 @@ module.exports = {
type: 'string', type: 'string',
regex: /^[0-9]+$/, regex: /^[0-9]+$/,
}, },
withDetails: {
type: 'boolean',
},
}, },
exits: { exits: {
@@ -43,7 +46,11 @@ module.exports = {
} }
} }
const actions = await sails.helpers.cards.getActions(card.id, inputs.beforeId); const actions = await sails.helpers.cards.getActions(
card.id,
inputs.beforeId,
inputs.withDetails,
);
const userIds = sails.helpers.utils.mapRecords(actions, 'userId', true); const userIds = sails.helpers.utils.mapRecords(actions, 'userId', true);
const users = await sails.helpers.users.getMany(userIds, true); const users = await sails.helpers.users.getMany(userIds, true);
+1 -3
View File
@@ -54,10 +54,8 @@ module.exports = {
const attachment = await sails.helpers.attachments.createOne( const attachment = await sails.helpers.attachments.createOne(
{ {
dirname: file.extra.dirname, ...file.extra,
filename: file.filename, filename: file.filename,
isImage: file.extra.isImage,
name: file.extra.name,
}, },
currentUser, currentUser,
card, card,
@@ -14,10 +14,6 @@ module.exports = {
regex: /^[0-9]+$/, regex: /^[0-9]+$/,
required: true, required: true,
}, },
filename: {
type: 'string',
required: true,
},
}, },
exits: { exits: {
@@ -46,7 +42,7 @@ module.exports = {
} }
} }
if (!attachment.isImage) { if (!attachment.image) {
throw Errors.ATTACHMENT_NOT_FOUND; throw Errors.ATTACHMENT_NOT_FOUND;
} }
@@ -54,14 +50,14 @@ module.exports = {
sails.config.custom.attachmentsPath, sails.config.custom.attachmentsPath,
attachment.dirname, attachment.dirname,
'thumbnails', 'thumbnails',
inputs.filename, 'cover-256.jpg',
); );
if (!fs.existsSync(filePath)) { if (!fs.existsSync(filePath)) {
throw Errors.ATTACHMENT_NOT_FOUND; throw Errors.ATTACHMENT_NOT_FOUND;
} }
this.res.type(attachment.filename); this.res.type('image/jpeg');
this.res.set('Cache-Control', 'private, max-age=900'); // TODO: move to config this.res.set('Cache-Control', 'private, max-age=900'); // TODO: move to config
return exits.success(fs.createReadStream(filePath)); return exits.success(fs.createReadStream(filePath));
@@ -53,7 +53,7 @@ module.exports = {
} }
this.res.type(attachment.filename); this.res.type(attachment.filename);
if (!attachment.isImage && path.extname(attachment.filename) !== '.pdf') { if (!attachment.image && path.extname(attachment.filename) !== '.pdf') {
this.res.set('Content-Disposition', 'attachment'); this.res.set('Content-Disposition', 'attachment');
} }
this.res.set('Cache-Control', 'private, max-age=900'); // TODO: move to config this.res.set('Cache-Control', 'private, max-age=900'); // TODO: move to config
+3 -6
View File
@@ -33,11 +33,6 @@ module.exports = {
}, },
async fn(inputs) { async fn(inputs) {
// TODO: allow over HTTP without subscription
if (!this.req.isSocket) {
return this.res.badRequest();
}
const { currentUser } = this.req; const { currentUser } = this.req;
const project = await Project.findOne(inputs.projectId); const project = await Project.findOne(inputs.projectId);
@@ -61,7 +56,9 @@ module.exports = {
this.req, this.req,
); );
sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed if (this.req.isSocket) {
sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed
}
return { return {
item: board, item: board,
+3 -6
View File
@@ -20,11 +20,6 @@ module.exports = {
}, },
async fn(inputs) { async fn(inputs) {
// TODO: allow over HTTP without subscription
if (!this.req.isSocket) {
return this.res.badRequest();
}
const { currentUser } = this.req; const { currentUser } = this.req;
const { board, project } = await sails.helpers.boards const { board, project } = await sails.helpers.boards
@@ -77,7 +72,9 @@ module.exports = {
card.isSubscribed = isSubscribedByCardId[card.id] || false; // eslint-disable-line no-param-reassign card.isSubscribed = isSubscribedByCardId[card.id] || false; // eslint-disable-line no-param-reassign
}); });
sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed if (this.req.isSocket) {
sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed
}
return { return {
item: board, item: board,
+5 -1
View File
@@ -11,6 +11,10 @@ module.exports = {
regex: /^[0-9]+$/, regex: /^[0-9]+$/,
required: true, required: true,
}, },
position: {
type: 'number',
required: true,
},
name: { name: {
type: 'string', type: 'string',
required: true, required: true,
@@ -39,7 +43,7 @@ module.exports = {
throw Errors.CARD_NOT_FOUND; // Forbidden throw Errors.CARD_NOT_FOUND; // Forbidden
} }
const values = _.pick(inputs, ['name', 'isCompleted']); const values = _.pick(inputs, ['position', 'name', 'isCompleted']);
const task = await sails.helpers.tasks.createOne(values, card, this.req); const task = await sails.helpers.tasks.createOne(values, card, this.req);
return { return {
+4 -1
View File
@@ -11,6 +11,9 @@ module.exports = {
regex: /^[0-9]+$/, regex: /^[0-9]+$/,
required: true, required: true,
}, },
position: {
type: 'number',
},
name: { name: {
type: 'string', type: 'string',
isNotEmptyString: true, isNotEmptyString: true,
@@ -42,7 +45,7 @@ module.exports = {
throw Errors.TASK_NOT_FOUND; // Forbidden throw Errors.TASK_NOT_FOUND; // Forbidden
} }
const values = _.pick(inputs, ['name', 'isCompleted']); const values = _.pick(inputs, ['position', 'name', 'isCompleted']);
task = await sails.helpers.tasks.updateOne(task, values, board, this.req); task = await sails.helpers.tasks.updateOne(task, values, board, this.req);
if (!task) { if (!task) {
+6
View File
@@ -40,6 +40,11 @@ module.exports = {
isNotEmptyString: true, isNotEmptyString: true,
allowNull: true, allowNull: true,
}, },
language: {
type: 'string',
isNotEmptyString: true,
allowNull: true,
},
subscribeToOwnCards: { subscribeToOwnCards: {
type: 'boolean', type: 'boolean',
}, },
@@ -62,6 +67,7 @@ module.exports = {
'username', 'username',
'phone', 'phone',
'organization', 'organization',
'language',
'subscribeToOwnCards', 'subscribeToOwnCards',
]); ]);

Some files were not shown because too many files have changed in this diff Show More