Compare commits

...
9 Commits
75 changed files with 874 additions and 156 deletions
+25 -1
View File
@@ -1,6 +1,5 @@
import ActionTypes from '../constants/ActionTypes';
// eslint-disable-next-line import/prefer-default-export
export const fetchActions = (cardId) => ({
type: ActionTypes.ACTIONS_FETCH,
payload: {
@@ -24,3 +23,28 @@ fetchActions.failure = (cardId, 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';
// eslint-disable-next-line import/prefer-default-export
export const fetchActionsInCurrentCard = () => ({
type: EntryActionTypes.ACTIONS_IN_CURRENT_CARD_FETCH,
payload: {},
});
export const toggleActionsDetailsInCurrentCard = (isVisible) => ({
type: EntryActionTypes.ACTIONS_DETAILS_IN_CURRENT_CARD_TOGGLE,
payload: {
isVisible,
},
});
+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) => ({
type: EntryActionTypes.USER_EMAIL_UPDATE,
payload: {
@@ -15,7 +15,7 @@ const DEFAULT_DATA = {
const ListAdd = React.memo(({ onCreate, onClose }) => {
const [t] = useTranslation();
const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
const [selectNameFieldState, selectNameField] = useToggle();
const [focusNameFieldState, focusNameField] = useToggle();
const nameField = useRef(null);
@@ -44,16 +44,16 @@ const ListAdd = React.memo(({ onCreate, onClose }) => {
onCreate(cleanData);
setData(DEFAULT_DATA);
selectNameField();
}, [onCreate, data, setData, selectNameField]);
focusNameField();
}, [onCreate, data, setData, focusNameField]);
useEffect(() => {
nameField.current.select();
nameField.current.focus();
}, []);
useDidUpdate(() => {
nameField.current.select();
}, [selectNameFieldState]);
nameField.current.focus();
}, [focusNameFieldState]);
return (
<Form className={styles.wrapper} onSubmit={handleSubmit}>
+1 -1
View File
@@ -35,7 +35,7 @@ const AddStep = React.memo(({ onCreate, onClose }) => {
}, [onCreate, onClose, data]);
useEffect(() => {
nameField.current.select();
nameField.current.focus();
}, []);
return (
@@ -77,6 +77,7 @@
.cover {
border-radius: 3px 3px 0 0;
margin-bottom: 2px;
vertical-align: middle;
}
+1 -1
View File
@@ -79,7 +79,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
useEffect(() => {
if (isOpened) {
field.current.ref.current.select();
field.current.ref.current.focus();
}
}, [isOpened]);
@@ -1,7 +1,7 @@
import React, { useCallback } from 'react';
import PropTypes from 'prop-types';
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 CommentAdd from './CommentAdd';
@@ -14,15 +14,22 @@ const Actions = React.memo(
items,
isFetching,
isAllFetched,
isDetailsVisible,
isDetailsFetching,
canEdit,
canEditAllComments,
onFetch,
onDetailsToggle,
onCommentCreate,
onCommentUpdate,
onCommentDelete,
}) => {
const [t] = useTranslation();
const handleToggleDetailsClick = useCallback(() => {
onDetailsToggle(!isDetailsVisible);
}, [isDetailsVisible, onDetailsToggle]);
const handleCommentUpdate = useCallback(
(id, data) => {
onCommentUpdate(id, data);
@@ -38,54 +45,51 @@ const Actions = React.memo(
);
return (
<>
{canEdit && (
<div className={styles.contentModule}>
<div className={styles.moduleWrapper}>
<Icon name="comment outline" className={styles.moduleIcon} />
<div className={styles.moduleHeader}>{t('common.addComment')}</div>
<CommentAdd onCreate={onCommentCreate} />
</div>
<div className={styles.contentModule}>
<div className={styles.moduleWrapper}>
<Icon name="list ul" className={styles.moduleIcon} />
<div className={styles.moduleHeader}>
{t('common.actions')}
<Button
content={isDetailsVisible ? t('action.hideDetails') : t('action.showDetails')}
className={styles.toggleButton}
onClick={handleToggleDetailsClick}
/>
</div>
)}
<div className={styles.contentModule}>
<div className={styles.moduleWrapper}>
<Icon name="list ul" className={styles.moduleIcon} />
<div className={styles.moduleHeader}>{t('common.actions')}</div>
<div className={styles.wrapper}>
<Comment.Group>
{items.map((item) =>
item.type === ActionTypes.COMMENT_CARD ? (
<Item.Comment
key={item.id}
data={item.data}
createdAt={item.createdAt}
isPersisted={item.isPersisted}
user={item.user}
canEdit={(item.user.isCurrent && canEdit) || canEditAllComments}
onUpdate={(data) => handleCommentUpdate(item.id, data)}
onDelete={() => handleCommentDelete(item.id)}
/>
) : (
<Item
key={item.id}
type={item.type}
data={item.data}
createdAt={item.createdAt}
user={item.user}
/>
),
)}
</Comment.Group>
</div>
{isFetching ? (
<Loader active inverted inline="centered" size="small" className={styles.loader} />
) : (
!isAllFetched && <Visibility fireOnMount onOnScreen={onFetch} />
)}
{canEdit && <CommentAdd onCreate={onCommentCreate} />}
<div className={styles.wrapper}>
<Comment.Group>
{items.map((item) =>
item.type === ActionTypes.COMMENT_CARD ? (
<Item.Comment
key={item.id}
data={item.data}
createdAt={item.createdAt}
isPersisted={item.isPersisted}
user={item.user}
canEdit={(item.user.isCurrent && canEdit) || canEditAllComments}
onUpdate={(data) => handleCommentUpdate(item.id, data)}
onDelete={() => handleCommentDelete(item.id)}
/>
) : (
<Item
key={item.id}
type={item.type}
data={item.data}
createdAt={item.createdAt}
user={item.user}
/>
),
)}
</Comment.Group>
</div>
{isFetching || isDetailsFetching ? (
<Loader active inverted inline="centered" size="small" className={styles.loader} />
) : (
!isAllFetched && <Visibility fireOnMount onOnScreen={onFetch} />
)}
</div>
</>
</div>
);
},
);
@@ -94,9 +98,12 @@ Actions.propTypes = {
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
isFetching: PropTypes.bool.isRequired,
isAllFetched: PropTypes.bool.isRequired,
isDetailsVisible: PropTypes.bool.isRequired,
isDetailsFetching: PropTypes.bool.isRequired,
canEdit: PropTypes.bool.isRequired,
canEditAllComments: PropTypes.bool.isRequired,
onFetch: PropTypes.func.isRequired,
onDetailsToggle: PropTypes.func.isRequired,
onCommentCreate: PropTypes.func.isRequired,
onCommentUpdate: PropTypes.func.isRequired,
onCommentDelete: PropTypes.func.isRequired,
@@ -8,12 +8,14 @@
}
.moduleHeader {
align-items: center;
color: #17394d;
display: flex;
font-size: 16px;
font-weight: bold;
line-height: 20px;
height: 36px;
justify-content: space-between;
margin: 0 0 4px;
padding: 8px 0;
}
.moduleIcon {
@@ -33,6 +35,24 @@
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 {
margin-left: -40px;
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 { useTranslation } from 'react-i18next';
import TextareaAutosize from 'react-textarea-autosize';
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';
@@ -14,10 +15,16 @@ const DEFAULT_DATA = {
const CommentAdd = React.memo(({ onCreate }) => {
const [t] = useTranslation();
const [isOpened, setIsOpened] = useState(false);
const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
const [selectTextFieldState, selectTextField] = useToggle();
const textField = useRef(null);
const close = useCallback(() => {
setIsOpened(false);
}, []);
const submit = useCallback(() => {
const cleanData = {
...data,
@@ -32,7 +39,12 @@ const CommentAdd = React.memo(({ onCreate }) => {
onCreate(cleanData);
setData(DEFAULT_DATA);
}, [onCreate, data, setData]);
selectTextField();
}, [onCreate, data, setData, selectTextField]);
const handleFieldFocus = useCallback(() => {
setIsOpened(true);
}, []);
const handleFieldKeyDown = useCallback(
(event) => {
@@ -43,10 +55,16 @@ const CommentAdd = React.memo(({ onCreate }) => {
[submit],
);
const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(close);
const handleSubmit = useCallback(() => {
submit();
}, [submit]);
useDidUpdate(() => {
textField.current.ref.current.focus();
}, [selectTextFieldState]);
return (
<Form onSubmit={handleSubmit}>
<TextArea
@@ -55,15 +73,24 @@ const CommentAdd = React.memo(({ onCreate }) => {
name="text"
value={data.text}
placeholder={t('common.writeComment')}
minRows={3}
minRows={isOpened ? 3 : 1}
spellCheck={false}
className={styles.field}
onFocus={handleFieldFocus}
onKeyDown={handleFieldKeyDown}
onChange={handleFieldChange}
onBlur={handleFieldBlur}
/>
<div className={styles.controls}>
<Button positive content={t('action.addComment')} disabled={!data.text} />
</div>
{isOpened && (
<div className={styles.controls}>
<Button
positive
content={t('action.addComment')}
onMouseOver={handleControlMouseOver}
onMouseOut={handleControlMouseOut}
/>
</div>
)}
</Form>
);
});
@@ -76,7 +76,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
useEffect(() => {
if (isOpened) {
textField.current.ref.current.select();
textField.current.ref.current.focus();
}
}, [isOpened]);
@@ -37,7 +37,7 @@ const TextFileAddModal = React.memo(({ content, onCreate, onClose }) => {
}, [content, onCreate, onClose, data]);
useEffect(() => {
nameField.current.select();
nameField.current.focus();
}, []);
return (
+10 -1
View File
@@ -34,6 +34,8 @@ const CardModal = React.memo(
isSubscribed,
isActionsFetching,
isAllActionsFetched,
isActionsDetailsVisible,
isActionsDetailsFetching,
listId,
boardId,
projectId,
@@ -67,6 +69,7 @@ const CardModal = React.memo(
onAttachmentUpdate,
onAttachmentDelete,
onActionsFetch,
onActionsDetailsToggle,
onCommentActionCreate,
onCommentActionUpdate,
onCommentActionDelete,
@@ -358,9 +361,12 @@ const CardModal = React.memo(
items={actions}
isFetching={isActionsFetching}
isAllFetched={isAllActionsFetched}
isDetailsVisible={isActionsDetailsVisible}
isDetailsFetching={isActionsDetailsFetching}
canEdit={canEdit}
canEditAllComments={canEditAllCommentActions}
onFetch={onActionsFetch}
onDetailsToggle={onActionsDetailsToggle}
onCommentCreate={onCommentActionCreate}
onCommentUpdate={onCommentActionUpdate}
onCommentDelete={onCommentActionDelete}
@@ -467,7 +473,7 @@ const CardModal = React.memo(
);
return (
<Modal open closeIcon size="small" centered={false} onClose={handleClose}>
<Modal open closeIcon centered={false} onClose={handleClose} className={styles.wrapper}>
{canEdit ? (
<AttachmentAddZone onCreate={onAttachmentCreate}>{contentNode}</AttachmentAddZone>
) : (
@@ -486,6 +492,8 @@ CardModal.propTypes = {
isSubscribed: PropTypes.bool.isRequired,
isActionsFetching: PropTypes.bool.isRequired,
isAllActionsFetched: PropTypes.bool.isRequired,
isActionsDetailsVisible: PropTypes.bool.isRequired,
isActionsDetailsFetching: PropTypes.bool.isRequired,
listId: PropTypes.string.isRequired,
boardId: PropTypes.string.isRequired,
projectId: PropTypes.string.isRequired,
@@ -521,6 +529,7 @@ CardModal.propTypes = {
onAttachmentUpdate: PropTypes.func.isRequired,
onAttachmentDelete: PropTypes.func.isRequired,
onActionsFetch: PropTypes.func.isRequired,
onActionsDetailsToggle: PropTypes.func.isRequired,
onCommentActionCreate: PropTypes.func.isRequired,
onCommentActionUpdate: PropTypes.func.isRequired,
onCommentActionDelete: PropTypes.func.isRequired,
@@ -193,4 +193,14 @@
margin: 0 8px 4px 0;
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(() => {
if (isOpened) {
field.current.ref.current.select();
field.current.ref.current.focus();
}
}, [isOpened]);
@@ -17,7 +17,7 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
const [t] = useTranslation();
const [isOpened, setIsOpened] = useState(false);
const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
const [selectNameFieldState, selectNameField] = useToggle();
const [focusNameFieldState, focusNameField] = useToggle();
const nameField = useRef(null);
@@ -43,8 +43,8 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
onCreate(cleanData);
setData(DEFAULT_DATA);
selectNameField();
}, [onCreate, data, setData, selectNameField]);
focusNameField();
}, [onCreate, data, setData, focusNameField]);
useImperativeHandle(
ref,
@@ -81,13 +81,13 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
useEffect(() => {
if (isOpened) {
nameField.current.ref.current.select();
nameField.current.ref.current.focus();
}
}, [isOpened]);
useDidUpdate(() => {
nameField.current.ref.current.select();
}, [selectNameFieldState]);
nameField.current.ref.current.focus();
}, [focusNameFieldState]);
if (!isOpened) {
return React.cloneElement(children, {
@@ -71,7 +71,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
useEffect(() => {
if (isOpened) {
field.current.ref.current.select();
field.current.ref.current.focus();
}
}, [isOpened]);
@@ -13,7 +13,6 @@
border-radius: 3px;
box-sizing: border-box;
color: #fff;
display: inline-block;
font-weight: 400;
outline: none;
overflow: hidden;
+6 -6
View File
@@ -17,7 +17,7 @@ const DEFAULT_DATA = {
const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => {
const [t] = useTranslation();
const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
const [selectNameFieldState, selectNameField] = useToggle();
const [focusNameFieldState, focusNameField] = useToggle();
const nameField = useRef(null);
@@ -35,8 +35,8 @@ const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => {
onCreate(cleanData);
setData(DEFAULT_DATA);
selectNameField();
}, [onCreate, data, setData, selectNameField]);
focusNameField();
}, [onCreate, data, setData, focusNameField]);
const handleFieldKeyDown = useCallback(
(event) => {
@@ -65,13 +65,13 @@ const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => {
useEffect(() => {
if (isOpened) {
nameField.current.ref.current.select();
nameField.current.ref.current.focus();
}
}, [isOpened]);
useDidUpdate(() => {
nameField.current.ref.current.select();
}, [selectNameFieldState]);
nameField.current.ref.current.focus();
}, [focusNameFieldState]);
return (
<Form
+1 -1
View File
@@ -83,7 +83,7 @@ const Login = React.memo(
}, [onAuthenticate, data]);
useEffect(() => {
emailOrUsernameField.current.select();
emailOrUsernameField.current.focus();
}, []);
useEffect(() => {
@@ -33,7 +33,7 @@ const ProjectAddModal = React.memo(({ defaultData, isSubmitting, onCreate, onClo
}, [onCreate, data]);
useEffect(() => {
nameField.current.select();
nameField.current.focus();
}, []);
return (
@@ -88,7 +88,7 @@ const UserAddStep = React.memo(
}, [onCreate, data]);
useEffect(() => {
emailField.current.select();
emailField.current.focus();
}, []);
useEffect(() => {
@@ -87,7 +87,7 @@ const UserEmailEditStep = React.memo(
}, [email, usePasswordConfirmation, onUpdate, onClose, data]);
useEffect(() => {
emailField.current.select();
emailField.current.focus();
}, []);
useEffect(() => {
@@ -70,7 +70,7 @@ const UserPasswordEditStep = React.memo(
}, [usePasswordConfirmation, onUpdate, data]);
useEffect(() => {
passwordField.current.select();
passwordField.current.focus();
}, []);
useEffect(() => {
@@ -1,8 +1,9 @@
import React, { useCallback } from 'react';
import PropTypes from 'prop-types';
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 User from '../../User';
import UserInformationEdit from '../../UserInformationEdit';
@@ -20,12 +21,14 @@ const AccountPane = React.memo(
avatarUrl,
phone,
organization,
language,
isAvatarUpdating,
usernameUpdateForm,
emailUpdateForm,
passwordUpdateForm,
onUpdate,
onAvatarUpdate,
onLanguageUpdate,
onUsernameUpdate,
onUsernameUpdateMessageDismiss,
onEmailUpdate,
@@ -41,6 +44,13 @@ const AccountPane = React.memo(
});
}, [onUpdate]);
const handleLanguageChange = useCallback(
(_, { value }) => {
onLanguageUpdate(value === 'auto' ? null : value); // FIXME: hack
},
[onLanguageUpdate],
);
return (
<Tab.Pane attached={false} className={styles.wrapper}>
<AvatarEditPopup
@@ -60,6 +70,32 @@ const AccountPane = React.memo(
}}
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>
<Header as="h4">
{t('common.authentication', {
@@ -129,6 +165,7 @@ AccountPane.propTypes = {
avatarUrl: PropTypes.string,
phone: PropTypes.string,
organization: PropTypes.string,
language: PropTypes.string,
isAvatarUpdating: PropTypes.bool.isRequired,
/* eslint-disable react/forbid-prop-types */
usernameUpdateForm: PropTypes.object.isRequired,
@@ -137,6 +174,7 @@ AccountPane.propTypes = {
/* eslint-enable react/forbid-prop-types */
onUpdate: PropTypes.func.isRequired,
onAvatarUpdate: PropTypes.func.isRequired,
onLanguageUpdate: PropTypes.func.isRequired,
onUsernameUpdate: PropTypes.func.isRequired,
onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
onEmailUpdate: PropTypes.func.isRequired,
@@ -150,6 +188,7 @@ AccountPane.defaultProps = {
avatarUrl: undefined,
phone: undefined,
organization: undefined,
language: undefined,
};
export default AccountPane;
@@ -14,6 +14,7 @@ const UserSettingsModal = React.memo(
avatarUrl,
phone,
organization,
language,
subscribeToOwnCards,
isAvatarUpdating,
usernameUpdateForm,
@@ -21,6 +22,7 @@ const UserSettingsModal = React.memo(
passwordUpdateForm,
onUpdate,
onAvatarUpdate,
onLanguageUpdate,
onUsernameUpdate,
onUsernameUpdateMessageDismiss,
onEmailUpdate,
@@ -44,12 +46,14 @@ const UserSettingsModal = React.memo(
avatarUrl={avatarUrl}
phone={phone}
organization={organization}
language={language}
isAvatarUpdating={isAvatarUpdating}
usernameUpdateForm={usernameUpdateForm}
emailUpdateForm={emailUpdateForm}
passwordUpdateForm={passwordUpdateForm}
onUpdate={onUpdate}
onAvatarUpdate={onAvatarUpdate}
onLanguageUpdate={onLanguageUpdate}
onUsernameUpdate={onUsernameUpdate}
onUsernameUpdateMessageDismiss={onUsernameUpdateMessageDismiss}
onEmailUpdate={onEmailUpdate}
@@ -92,6 +96,7 @@ UserSettingsModal.propTypes = {
avatarUrl: PropTypes.string,
phone: PropTypes.string,
organization: PropTypes.string,
language: PropTypes.string,
subscribeToOwnCards: PropTypes.bool.isRequired,
isAvatarUpdating: PropTypes.bool.isRequired,
/* eslint-disable react/forbid-prop-types */
@@ -101,6 +106,7 @@ UserSettingsModal.propTypes = {
/* eslint-enable react/forbid-prop-types */
onUpdate: PropTypes.func.isRequired,
onAvatarUpdate: PropTypes.func.isRequired,
onLanguageUpdate: PropTypes.func.isRequired,
onUsernameUpdate: PropTypes.func.isRequired,
onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
onEmailUpdate: PropTypes.func.isRequired,
@@ -115,6 +121,7 @@ UserSettingsModal.defaultProps = {
avatarUrl: undefined,
phone: undefined,
organization: undefined,
language: undefined,
};
export default UserSettingsModal;
@@ -87,7 +87,7 @@ const UserUsernameEditStep = React.memo(
}, [username, usePasswordConfirmation, onUpdate, onClose, data]);
useEffect(() => {
usernameField.current.select();
usernameField.current.focus();
}, []);
useEffect(() => {
+3
View File
@@ -225,6 +225,9 @@ export default {
ACTIONS_FETCH: 'ACTIONS_FETCH',
ACTIONS_FETCH__SUCCESS: 'ACTIONS_FETCH__SUCCESS',
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 */
+1 -1
View File
@@ -13,7 +13,7 @@ const ACCESS_TOKEN_KEY = 'accessToken';
const ACCESS_TOKEN_EXPIRES = 365;
const POSITION_GAP = 65535;
const ACTIONS_LIMIT = 10;
const ACTIONS_LIMIT = 50;
export default {
SERVER_BASE_URL,
+2
View File
@@ -31,6 +31,7 @@ export default {
USER_UPDATE: `${PREFIX}/USER_UPDATE`,
CURRENT_USER_UPDATE: `${PREFIX}/CURRENT_USER_UPDATE`,
USER_UPDATE_HANDLE: `${PREFIX}/USER_UPDATE_HANDLE`,
CURRENT_USER_LANGUAGE_UPDATE: `${PREFIX}/CURRENT_USER_LANGUAGE_UPDATE`,
USER_EMAIL_UPDATE: `${PREFIX}/USER_EMAIL_UPDATE`,
CURRENT_USER_EMAIL_UPDATE: `${PREFIX}/CURRENT_USER_EMAIL_UPDATE`,
USER_EMAIL_UPDATE_ERROR_CLEAR: `${PREFIX}/USER_EMAIL_UPDATE_ERROR_CLEAR`,
@@ -154,6 +155,7 @@ export default {
/* Actions */
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 */
@@ -35,6 +35,7 @@ import {
moveTask,
removeLabelFromCurrentCard,
removeUserFromCurrentCard,
toggleActionsDetailsInCurrentCard,
transferCurrentCard,
updateAttachment,
updateCommentAction,
@@ -60,6 +61,8 @@ const mapStateToProps = (state) => {
timer,
isSubscribed,
isActionsFetching,
isActionsDetailsVisible,
isActionsDetailsFetching,
isAllActionsFetched,
boardId,
listId,
@@ -79,6 +82,8 @@ const mapStateToProps = (state) => {
isSubscribed,
isActionsFetching,
isAllActionsFetched,
isActionsDetailsVisible,
isActionsDetailsFetching,
listId,
boardId,
projectId,
@@ -118,6 +123,7 @@ const mapDispatchToProps = (dispatch) =>
onAttachmentUpdate: updateAttachment,
onAttachmentDelete: deleteAttachment,
onActionsFetch: fetchActionsInCurrentCard,
onActionsDetailsToggle: toggleActionsDetailsInCurrentCard,
onCommentActionCreate: createCommentActionInCurrentCard,
onCommentActionUpdate: updateCommentAction,
onCommentActionDelete: deleteCommentAction,
@@ -10,6 +10,7 @@ import {
updateCurrentUser,
updateCurrentUserAvatar,
updateCurrentUserEmail,
updateCurrentUserLanguage,
updateCurrentUserPassword,
updateCurrentUserUsername,
} from '../actions/entry';
@@ -23,6 +24,7 @@ const mapStateToProps = (state) => {
avatarUrl,
phone,
organization,
language,
subscribeToOwnCards,
isAvatarUpdating,
emailUpdateForm,
@@ -37,6 +39,7 @@ const mapStateToProps = (state) => {
avatarUrl,
phone,
organization,
language,
subscribeToOwnCards,
isAvatarUpdating,
emailUpdateForm,
@@ -50,6 +53,7 @@ const mapDispatchToProps = (dispatch) =>
{
onUpdate: updateCurrentUser,
onAvatarUpdate: updateCurrentUserAvatar,
onLanguageUpdate: updateCurrentUserLanguage,
onUsernameUpdate: updateCurrentUserUsername,
onUsernameUpdateMessageDismiss: clearCurrentUserUsernameUpdateError,
onEmailUpdate: updateCurrentUserEmail,
+21 -5
View File
@@ -1,11 +1,11 @@
import i18n from 'i18next';
import languageDetector from 'i18next-browser-languagedetector';
import LanguageDetector from 'i18next-browser-languagedetector';
import { initReactI18next } from 'react-i18next';
import formatDate from 'date-fns/format';
import parseDate from 'date-fns/parse';
import { registerLocale, setDefaultLocale } from 'react-datepicker';
import { embedLocales, languages } from './locales';
import { embeddedLocales, languages } from './locales';
i18n.dateFns = {
locales: {},
@@ -52,12 +52,12 @@ const parseDatePostProcessor = {
};
i18n
.use(languageDetector)
.use(LanguageDetector)
.use(formatDatePostProcessor)
.use(parseDatePostProcessor)
.use(initReactI18next)
.init({
resources: embedLocales,
resources: embeddedLocales,
fallbackLng: 'en',
supportedLngs: languages,
load: 'languageOnly',
@@ -74,7 +74,7 @@ i18n
},
},
react: {
useSuspense: false,
useSuspense: true,
},
debug: process.env.NODE_ENV !== 'production',
});
@@ -95,4 +95,20 @@ i18n.loadCoreLocale = async (language = i18n.resolvedLanguage) => {
});
};
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;
+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,
};
+4
View File
@@ -72,6 +72,7 @@ export default {
deleteTask_title: 'Aufgabe löschen',
deleteUser_title: 'Benutzer löschen',
description: 'Beschreibung',
detectAutomatically: 'Automatische Erkennung',
dropFileToUpload: 'Datei ablegen, um hochzuladen',
editAttachment_title: 'Anhang bearbieten',
editAvatar_title: 'Avatar bearbeiten',
@@ -97,6 +98,7 @@ export default {
hours: 'Stunden',
invalidCurrentPassword: 'Das aktuelle Passwort ist falsch',
labels: 'Labels',
language: 'Sprache',
leaveBoard_title: 'Board verlassen',
leaveProject_title: 'Projekt verlassen',
list: 'Listen',
@@ -193,6 +195,7 @@ export default {
editTimer_title: 'Timer bearbeiten',
editTitle_title: 'Titel bearbeiten',
editUsername_title: 'Benutzername ändern',
hideDetails: 'Details ausblenden',
leaveBoard: 'Board verlassen',
leaveProject: 'Projekt verlassen',
logOut_title: 'Ausloggen',
@@ -208,6 +211,7 @@ export default {
removeMember: 'Mitglied entfernen',
save: 'Speichern',
showAllAttachments: 'Alle Anhänge anzeigen ({{hidden}} versteckt)',
showDetails: 'Details anzeigen',
showFewerAttachments: 'Weniger Anhänge anzeigen',
start: 'Start',
stop: 'Stopp',
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'de',
country: 'de',
name: 'Deutsch',
embeddedLocale: login,
};
+4
View File
@@ -64,6 +64,7 @@ export default {
deleteTask_title: 'Delete Task',
deleteUser_title: 'Delete User',
description: 'Description',
detectAutomatically: 'Detect automatically',
dropFileToUpload: 'Drop file to upload',
editAttachment_title: 'Edit Attachment',
editAvatar_title: 'Edit Avatar',
@@ -90,6 +91,7 @@ export default {
hours: 'Hours',
invalidCurrentPassword: 'Invalid current password',
labels: 'Labels',
language: 'Language',
leaveBoard_title: 'Leave Board',
leaveProject_title: 'Leave Project',
list: 'List',
@@ -186,6 +188,7 @@ export default {
editTimer_title: 'Edit Timer',
editTitle_title: 'Edit Title',
editUsername_title: 'Edit Username',
hideDetails: 'Hide details',
leaveBoard: 'Leave board',
leaveProject: 'Leave project',
logOut_title: 'Log Out',
@@ -201,6 +204,7 @@ export default {
removeMember: 'Remove member',
save: 'Save',
showAllAttachments: 'Show all attachments ({{hidden}} hidden)',
showDetails: 'Show details',
showFewerAttachments: 'Show fewer attachments',
start: 'Start',
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 -33
View File
@@ -1,37 +1,28 @@
import merge from 'lodash/merge';
import fromPairs from 'lodash/fromPairs';
import cs from './cs';
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';
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 skLogin from './sk/login';
import svLogin from './sv/login';
import uzLogin from './uz/login';
import zhLogin from './zh/login';
const locales = [cs, da, de, en, es, fr, ja, ko, pl, ru, sk, sv, uz, zh];
const localePairs = [
['cs', csLogin],
['da', daLogin],
['de', deLogin],
['en', merge(enLogin, enCore)],
['es', esLogin],
['fr', frLogin],
['ja', jaLogin],
['pl', plLogin],
['ru', ruLogin],
['sk', skLogin],
['sv', svLogin],
['uz', uzLogin],
['zh', zhLogin],
];
export default locales;
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,
};
+5 -1
View File
@@ -62,6 +62,7 @@ export default {
deleteTask: 'Удаление задачи',
deleteUser: 'Удаление пользователя',
description: 'Описание',
detectAutomatically: 'Определить автоматически',
dropFileToUpload: 'Перетяните файл, чтобы загрузить',
editAttachment: 'Изменение вложения',
editAvatar: 'Изменение аватара',
@@ -88,6 +89,7 @@ export default {
hours: 'Часы',
invalidCurrentPassword: 'Неверный текущий пароль',
labels: 'Метки',
language: 'Язык',
list: 'Список',
listActions: 'Действия со списком',
members: 'Участники',
@@ -176,7 +178,8 @@ export default {
editTask: 'Изменить задачу',
editTimer: 'Изменить таймер',
editTitle: 'Изменить название',
editUsername_title: 'Изменить имя пользователя',
editUsername: 'Изменить имя пользователя',
hideDetails: 'Скрыть подробности',
logOut: 'Выйти',
makeCover: 'Сделать обложкой',
move: 'Переместить',
@@ -188,6 +191,7 @@ export default {
removeMember: 'Удалить участника',
save: 'Сохранить',
showAllAttachments: 'Показать все вложения ({{hidden}} скрыто)',
showDetails: 'Показать подробности',
showFewerAttachments: 'Показать меньше вложений',
start: 'Начать',
stop: 'Остановить',
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'ru',
country: 'ru',
name: 'Русский',
embeddedLocale: login,
};
+8
View File
@@ -0,0 +1,8 @@
import login from './login';
export default {
language: 'sk',
country: 'sk',
name: 'Slovenčina',
embeddedLocale: login,
};
+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;
case ActionTypes.ACTIONS_FETCH__SUCCESS:
case ActionTypes.ACTIONS_DETAILS_TOGGLE__SUCCESS:
case ActionTypes.NOTIFICATION_CREATE_HANDLE:
payload.actions.forEach((action) => {
Action.upsert(action);
+47 -2
View File
@@ -2,6 +2,7 @@ import { Model, attr, fk, many, oneToOne } from 'redux-orm';
import ActionTypes from '../constants/ActionTypes';
import Config from '../constants/Config';
import { ActionTypes as ActionTypesEnum } from '../constants/Enums';
export default class extends Model {
static modelName = 'Card';
@@ -22,6 +23,12 @@ export default class extends Model {
isAllActionsFetched: attr({
getDefault: () => false,
}),
isActionsDetailsVisible: attr({
getDefault: () => false,
}),
isActionsDetailsFetching: attr({
getDefault: () => false,
}),
boardId: fk({
to: 'Board',
as: 'board',
@@ -195,6 +202,36 @@ export default class extends Model {
});
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:
payload.cards.forEach((card) => {
Card.upsert(card);
@@ -213,8 +250,16 @@ export default class extends Model {
return this.attachments.orderBy('id', false);
}
getOrderedInCardActionsQuerySet() {
return this.actions.orderBy('id', false);
getFilteredOrderedInCardActionsQuerySet() {
const filter = {
isInCard: true,
};
if (!this.isActionsDetailsVisible) {
filter.type = ActionTypesEnum.COMMENT_CARD;
}
return this.actions.filter(filter).orderBy('id', false);
}
getUnreadNotificationsQuerySet() {
+1 -1
View File
@@ -83,7 +83,7 @@ export default class extends Model {
return this.cards.orderBy('position');
}
getOrderedFilteredCardsModelArray() {
getFilteredOrderedCardsModelArray() {
let cardModels = this.getOrderedCardsQuerySet().toModelArray();
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';
@@ -15,16 +15,15 @@ export default class extends Model {
as: 'user',
relatedName: 'notifications',
}),
actionId: fk({
to: 'Action',
as: 'action',
relatedName: 'notifications',
}),
cardId: fk({
to: 'Card',
as: 'card',
relatedName: 'notifications',
}),
actionId: oneToOne({
to: 'Action',
as: 'action',
}),
};
static reducer({ type, payload }, Notification) {
+1
View File
@@ -40,6 +40,7 @@ export default class extends Model {
avatarUrl: attr(),
phone: attr(),
organization: attr(),
language: attr(),
subscribeToOwnCards: attr(),
deletedAt: attr(),
isAdmin: attr({
+33 -2
View File
@@ -1,11 +1,12 @@
import { call, put, select } from 'redux-saga/effects';
import request from '../request';
import { lastActionIdByCardIdSelector, pathSelector } from '../../../selectors';
import { fetchActions } from '../../../actions';
import { cardByIdSelector, lastActionIdByCardIdSelector, pathSelector } from '../../../selectors';
import { fetchActions, toggleActionsDetails } from '../../../actions';
import api from '../../../api';
export function* fetchActionsService(cardId) {
const { isActionsDetailsVisible } = yield select(cardByIdSelector, cardId);
const lastId = yield select(lastActionIdByCardIdSelector, cardId);
yield put(fetchActions(cardId));
@@ -19,6 +20,7 @@ export function* fetchActionsService(cardId) {
included: { users },
} = yield call(request, api.getActions, cardId, {
beforeId: lastId,
withDetails: isActionsDetailsVisible,
}));
} catch (error) {
yield put(fetchActions.failure(cardId, error));
@@ -33,3 +35,32 @@ export function* fetchActionsInCurrentCardService() {
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 i18n from '../../../i18n';
// eslint-disable-next-line import/prefer-default-export
export function* initializeCoreService() {
const {
user,
@@ -25,6 +24,7 @@ export function* initializeCoreService() {
notifications,
} = yield call(fetchCoreRequest); // TODO: handle error
yield call(i18n.changeLanguage, user.language);
yield call(i18n.loadCoreLocale);
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);
}
}
+16
View File
@@ -1,6 +1,7 @@
import { call, put, select } from 'redux-saga/effects';
import { logoutService } from './login';
import { changeCoreLanguageService } from './core';
import request from '../request';
import { currentUserIdSelector, currentUserSelector, pathSelector } from '../../../selectors';
import {
@@ -81,6 +82,21 @@ export function* handleUserUpdateService(user) {
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) {
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';
export default function* actionsWatchers() {
yield takeEvery(EntryActionTypes.ACTIONS_IN_CURRENT_CARD_FETCH, () =>
fetchActionsInCurrentCardService(),
);
yield all([
takeEvery(EntryActionTypes.ACTIONS_IN_CURRENT_CARD_FETCH, () =>
fetchActionsInCurrentCardService(),
),
takeEvery(
EntryActionTypes.ACTIONS_DETAILS_IN_CURRENT_CARD_TOGGLE,
({ payload: { isVisible } }) => toggleActionsDetailsInCurrentCardService(isVisible),
),
]);
}
+4
View File
@@ -24,6 +24,7 @@ import {
updateUserService,
updateCurrentUserAvatarService,
updateCurrentUserEmailService,
updateCurrentUserLanguageService,
updateCurrentUserPasswordService,
updateCurrentUserService,
updateCurrentUserUsernameService,
@@ -49,6 +50,9 @@ export default function* userWatchers() {
takeEvery(EntryActionTypes.USER_UPDATE_HANDLE, ({ payload: { user } }) =>
handleUserUpdateService(user),
),
takeEvery(EntryActionTypes.CURRENT_USER_LANGUAGE_UPDATE, ({ payload: { language } }) =>
updateCurrentUserLanguageService(language),
),
takeEvery(EntryActionTypes.USER_EMAIL_UPDATE, ({ payload: { id, data } }) =>
updateUserEmailService(id, data),
),
+2 -2
View File
@@ -88,7 +88,7 @@ export const makeLastActionIdByCardIdSelector = () =>
return cardModel;
}
const lastActionModel = cardModel.getOrderedInCardActionsQuerySet().last();
const lastActionModel = cardModel.getFilteredOrderedInCardActionsQuerySet().last();
return lastActionModel && lastActionModel.id;
},
@@ -249,7 +249,7 @@ export const actionsForCurrentCardSelector = createSelector(
}
return cardModel
.getOrderedInCardActionsQuerySet()
.getFilteredOrderedInCardActionsQuerySet()
.toModelArray()
.map((actionModel) => ({
...actionModel.ref,
+1 -1
View File
@@ -73,7 +73,7 @@ export const nextCardPositionSelector = createSelector(
return listModel;
}
return nextPosition(listModel.getOrderedFilteredCardsModelArray(), index, excludedId);
return nextPosition(listModel.getFilteredOrderedCardsModelArray(), index, excludedId);
},
);
+1 -1
View File
@@ -34,7 +34,7 @@ export const makeCardIdsByListIdSelector = () =>
return listModel;
}
return listModel.getOrderedFilteredCardsModelArray().map((cardModel) => cardModel.id);
return listModel.getFilteredOrderedCardsModelArray().map((cardModel) => cardModel.id);
},
);
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "planka",
"version": "1.4.0",
"version": "1.5.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "planka",
"version": "1.4.0",
"version": "1.5.0",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "planka",
"version": "1.4.0",
"version": "1.5.0",
"private": true,
"homepage": "https://plankanban.github.io/planka",
"repository": {
+8 -1
View File
@@ -15,6 +15,9 @@ module.exports = {
type: 'string',
regex: /^[0-9]+$/,
},
withDetails: {
type: 'boolean',
},
},
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 users = await sails.helpers.users.getMany(userIds, true);
+6
View File
@@ -40,6 +40,11 @@ module.exports = {
isNotEmptyString: true,
allowNull: true,
},
language: {
type: 'string',
isNotEmptyString: true,
allowNull: true,
},
subscribeToOwnCards: {
type: 'boolean',
},
@@ -62,6 +67,7 @@ module.exports = {
'username',
'phone',
'organization',
'language',
'subscribeToOwnCards',
]);
+6
View File
@@ -32,6 +32,11 @@ module.exports = {
isNotEmptyString: true,
allowNull: true,
},
language: {
type: 'string',
isNotEmptyString: true,
allowNull: true,
},
subscribeToOwnCards: {
type: 'boolean',
},
@@ -66,6 +71,7 @@ module.exports = {
'avatarUrl',
'phone',
'organization',
'language',
'subscribeToOwnCards',
]);
+9 -1
View File
@@ -1,4 +1,4 @@
const LIMIT = 10;
const LIMIT = 50;
module.exports = {
inputs: {
@@ -10,6 +10,10 @@ module.exports = {
beforeId: {
type: 'string',
},
withDetails: {
type: 'boolean',
defaultsTo: false,
},
},
async fn(inputs) {
@@ -23,6 +27,10 @@ module.exports = {
};
}
if (!inputs.withDetails) {
criteria.type = Action.Types.COMMENT_CARD;
}
return sails.helpers.actions.getMany(criteria, LIMIT);
},
};
+5
View File
@@ -53,6 +53,11 @@ module.exports = {
isNotEmptyString: true,
allowNull: true,
},
language: {
type: 'string',
isNotEmptyString: true,
allowNull: true,
},
subscribeToOwnCards: {
type: 'boolean',
defaultsTo: false,
@@ -0,0 +1,11 @@
module.exports.up = async (knex) =>
knex.schema.table('user_account', (table) => {
/* Columns */
table.text('language');
});
module.exports.down = async (knex) =>
knex.schema.table('user_account', (table) => {
table.dropColumn('language');
});
@@ -0,0 +1,11 @@
module.exports.up = (knex) =>
knex.schema.table('action', (table) => {
/* Indexes */
table.index('type');
});
module.exports.down = (knex) =>
knex.schema.table('action', (table) => {
table.dropIndex('type');
});