Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9cde4e63f9 | ||
|
|
95738ee7d3 | ||
|
|
bb7cdf5dd4 | ||
|
|
253af55790 | ||
|
|
62c3cca9a7 | ||
|
|
b476a19b79 | ||
|
|
3379c65a87 | ||
|
|
1a6fc40804 | ||
|
|
42092efcd2 | ||
|
|
5c91bddfe7 | ||
|
|
fd8f40f1b0 | ||
|
|
5b64d465e2 | ||
|
|
212fb8ac8c | ||
|
|
cece2254d7 | ||
|
|
c940805f14 | ||
|
|
052ab7f653 | ||
|
|
5a38805588 | ||
|
|
2dbbead2e9 | ||
|
|
039eee0aac | ||
|
|
07867fc0b2 | ||
|
|
55d07b4560 | ||
|
|
289d2bf5ae | ||
|
|
6429e22d59 | ||
|
|
21ef850913 | ||
|
|
e4769220da | ||
|
|
378e02c0a4 | ||
|
|
51fa7df69c | ||
|
|
68806b9080 | ||
|
|
d80a538857 | ||
|
|
78669da01d |
@@ -7,4 +7,5 @@
|
|||||||
|
|
||||||
server/public/*
|
server/public/*
|
||||||
server/views/*
|
server/views/*
|
||||||
|
server/logs
|
||||||
client/build
|
client/build
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
# These are supported funding model platforms
|
||||||
|
|
||||||
|
github: meltyshev
|
||||||
|
patreon: # Replace with a single Patreon username
|
||||||
|
open_collective: # Replace with a single Open Collective username
|
||||||
|
ko_fi: # Replace with a single Ko-fi username
|
||||||
|
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||||
|
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||||
|
liberapay: # Replace with a single Liberapay username
|
||||||
|
issuehunt: # Replace with a single IssueHunt username
|
||||||
|
otechie: # Replace with a single Otechie username
|
||||||
|
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
|
||||||
|
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
||||||
@@ -44,6 +44,79 @@ docker-compose up -d
|
|||||||
|
|
||||||
Demo user: demo@demo.demo demo
|
Demo user: demo@demo.demo demo
|
||||||
|
|
||||||
|
### Logging
|
||||||
|
|
||||||
|
Planka currently allows you to expose the applciation's logfile directory to the host machine via a shared volume. This feature is not enabled by default.
|
||||||
|
|
||||||
|
To expose the logfile director to the host machine, add the item `./logs/:/app/logs/` under `services.planka.volumes`.
|
||||||
|
|
||||||
|
Note that the directory to the left of the semicolon is regarding the host machine while the directory to the right of the semicolon is regarding the Docker container.
|
||||||
|
|
||||||
|
For example, in the above step, `./logs/:/app/logs/` will create the folder `logs` in the same directory where the `docker-compose.yml` file lives.
|
||||||
|
|
||||||
|
### Rotating Logs
|
||||||
|
|
||||||
|
Logrotate is designed to ease administration of systems that generate large numbers of log files. It allows automatic rotation, compression, removal, and mailing of log files. Each log file may be handled daily, weekly, monthly, or when it grows too large.
|
||||||
|
|
||||||
|
#### Setup logrotate for Planka logs
|
||||||
|
|
||||||
|
Create a file in `/etc/logrotate.d` named `planka` with the following contents:
|
||||||
|
|
||||||
|
```
|
||||||
|
/path/to/planka/logs/planka.log {
|
||||||
|
daily
|
||||||
|
missingok
|
||||||
|
rotate 14
|
||||||
|
compress
|
||||||
|
delaycompress
|
||||||
|
notifempty
|
||||||
|
create 640 root adm
|
||||||
|
sharedscripts
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Ensure to replace logfile directory with your installation’s `/logs/planka.log` location.
|
||||||
|
|
||||||
|
Restart the logrotate service.
|
||||||
|
|
||||||
|
### Fail2ban
|
||||||
|
|
||||||
|
Fail2ban is a service that uses iptables to automatically drop connections for a pre-defined amount of time from IPs that continuously failed to authenticate to the configured services.
|
||||||
|
|
||||||
|
#### Setup a filter and a jail for Planka
|
||||||
|
|
||||||
|
A filter defines regex rules to identify when users fail to authenticate on Planka's user interface.
|
||||||
|
|
||||||
|
Create a file in `/etc/fail2ban/filter.d` named `planka.conf` with the following contents:
|
||||||
|
|
||||||
|
```conf
|
||||||
|
[Definition]
|
||||||
|
failregex = ^(.*) Invalid (email or username:|password!) (\"(.*)\"!)? ?\(IP: <ADDR>\)$
|
||||||
|
ignoreregex =
|
||||||
|
```
|
||||||
|
|
||||||
|
The jail file defines how to handle the failed authentication attempts found by the Planka filter.
|
||||||
|
|
||||||
|
Create a file in `/etc/fail2ban/jail.d` named `planka.local` with the following contents:
|
||||||
|
|
||||||
|
```conf
|
||||||
|
[planka]
|
||||||
|
enabled = true
|
||||||
|
port = http,https
|
||||||
|
filter = planka
|
||||||
|
logpath = /path/to/planka/logs/planka.log
|
||||||
|
maxretry = 5
|
||||||
|
bantime = 900
|
||||||
|
```
|
||||||
|
|
||||||
|
Ensure to replace `logpath`'s value with your installation’s `/logs/planka.log` location. If you are using ports other than 80 and 443 for your Web server you should replace those too. The bantime and findtime are defined in seconds.
|
||||||
|
|
||||||
|
Restart the fail2ban service. You can check the status of your Planka jail by running:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
fail2ban-client status planka
|
||||||
|
```
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
|
|
||||||
Clone the repository and install dependencies:
|
Clone the repository and install dependencies:
|
||||||
|
|||||||
@@ -69,6 +69,36 @@ handleBoardMembershipCreate.fetchProject = (id, currentUserId, currentBoardId) =
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const updateBoardMembership = (id, data) => ({
|
||||||
|
type: ActionTypes.BOARD_MEMBERSHIP_UPDATE,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
data,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
updateBoardMembership.success = (boardMembership) => ({
|
||||||
|
type: ActionTypes.BOARD_MEMBERSHIP_UPDATE__SUCCESS,
|
||||||
|
payload: {
|
||||||
|
boardMembership,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
updateBoardMembership.failure = (id, error) => ({
|
||||||
|
type: ActionTypes.BOARD_MEMBERSHIP_UPDATE__FAILURE,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
error,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleBoardMembershipUpdate = (boardMembership) => ({
|
||||||
|
type: ActionTypes.BOARD_MEMBERSHIP_UPDATE_HANDLE,
|
||||||
|
payload: {
|
||||||
|
boardMembership,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const deleteBoardMembership = (id) => ({
|
const deleteBoardMembership = (id) => ({
|
||||||
type: ActionTypes.BOARD_MEMBERSHIP_DELETE,
|
type: ActionTypes.BOARD_MEMBERSHIP_DELETE,
|
||||||
payload: {
|
payload: {
|
||||||
@@ -101,6 +131,8 @@ const handleBoardMembershipDelete = (boardMembership) => ({
|
|||||||
export default {
|
export default {
|
||||||
createBoardMembership,
|
createBoardMembership,
|
||||||
handleBoardMembershipCreate,
|
handleBoardMembershipCreate,
|
||||||
|
updateBoardMembership,
|
||||||
|
handleBoardMembershipUpdate,
|
||||||
deleteBoardMembership,
|
deleteBoardMembership,
|
||||||
handleBoardMembershipDelete,
|
handleBoardMembershipDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,10 +5,14 @@ import socket from './socket';
|
|||||||
const createBoardMembership = (boardId, data, headers) =>
|
const createBoardMembership = (boardId, data, headers) =>
|
||||||
socket.post(`/boards/${boardId}/memberships`, data, headers);
|
socket.post(`/boards/${boardId}/memberships`, data, headers);
|
||||||
|
|
||||||
|
const updateBoardMembership = (id, data, headers) =>
|
||||||
|
socket.patch(`/board-memberships/${id}`, data, headers);
|
||||||
|
|
||||||
const deleteBoardMembership = (id, headers) =>
|
const deleteBoardMembership = (id, headers) =>
|
||||||
socket.delete(`/board-memberships/${id}`, undefined, headers);
|
socket.delete(`/board-memberships/${id}`, undefined, headers);
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createBoardMembership,
|
createBoardMembership,
|
||||||
|
updateBoardMembership,
|
||||||
deleteBoardMembership,
|
deleteBoardMembership,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
|
|||||||
|
|
||||||
import Filters from './Filters';
|
import Filters from './Filters';
|
||||||
import Memberships from '../Memberships';
|
import Memberships from '../Memberships';
|
||||||
|
import BoardMembershipPermissionsSelectStep from '../BoardMembershipPermissionsSelectStep';
|
||||||
|
|
||||||
import styles from './BoardActions.module.scss';
|
import styles from './BoardActions.module.scss';
|
||||||
|
|
||||||
@@ -15,6 +16,7 @@ const BoardActions = React.memo(
|
|||||||
allUsers,
|
allUsers,
|
||||||
canEditMemberships,
|
canEditMemberships,
|
||||||
onMembershipCreate,
|
onMembershipCreate,
|
||||||
|
onMembershipUpdate,
|
||||||
onMembershipDelete,
|
onMembershipDelete,
|
||||||
onUserToFilterAdd,
|
onUserToFilterAdd,
|
||||||
onUserFromFilterRemove,
|
onUserFromFilterRemove,
|
||||||
@@ -30,8 +32,10 @@ const BoardActions = React.memo(
|
|||||||
<Memberships
|
<Memberships
|
||||||
items={memberships}
|
items={memberships}
|
||||||
allUsers={allUsers}
|
allUsers={allUsers}
|
||||||
|
permissionsSelectStep={BoardMembershipPermissionsSelectStep}
|
||||||
canEdit={canEditMemberships}
|
canEdit={canEditMemberships}
|
||||||
onCreate={onMembershipCreate}
|
onCreate={onMembershipCreate}
|
||||||
|
onUpdate={onMembershipUpdate}
|
||||||
onDelete={onMembershipDelete}
|
onDelete={onMembershipDelete}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -65,6 +69,7 @@ BoardActions.propTypes = {
|
|||||||
/* eslint-enable react/forbid-prop-types */
|
/* eslint-enable react/forbid-prop-types */
|
||||||
canEditMemberships: PropTypes.bool.isRequired,
|
canEditMemberships: PropTypes.bool.isRequired,
|
||||||
onMembershipCreate: PropTypes.func.isRequired,
|
onMembershipCreate: PropTypes.func.isRequired,
|
||||||
|
onMembershipUpdate: PropTypes.func.isRequired,
|
||||||
onMembershipDelete: PropTypes.func.isRequired,
|
onMembershipDelete: PropTypes.func.isRequired,
|
||||||
onUserToFilterAdd: PropTypes.func.isRequired,
|
onUserToFilterAdd: PropTypes.func.isRequired,
|
||||||
onUserFromFilterRemove: PropTypes.func.isRequired,
|
onUserFromFilterRemove: PropTypes.func.isRequired,
|
||||||
|
|||||||
+101
@@ -0,0 +1,101 @@
|
|||||||
|
import omit from 'lodash/omit';
|
||||||
|
import React, { useCallback, useState } from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Button, Form, Menu, Radio, Segment } from 'semantic-ui-react';
|
||||||
|
import { Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
|
import { BoardMembershipRoles } from '../../constants/Enums';
|
||||||
|
|
||||||
|
import styles from './BoardMembershipPermissionsSelectStep.module.scss';
|
||||||
|
|
||||||
|
const BoardMembershipPermissionsSelectStep = React.memo(
|
||||||
|
({ defaultData, title, buttonContent, onSelect, onBack }) => {
|
||||||
|
const [t] = useTranslation();
|
||||||
|
|
||||||
|
const [data, setData] = useState(() => ({
|
||||||
|
role: BoardMembershipRoles.EDITOR,
|
||||||
|
canComment: null,
|
||||||
|
...defaultData,
|
||||||
|
}));
|
||||||
|
|
||||||
|
const handleRoleSelectClick = useCallback((role) => {
|
||||||
|
setData((prevData) => ({
|
||||||
|
...prevData,
|
||||||
|
role,
|
||||||
|
canComment: role === BoardMembershipRoles.EDITOR ? null : !!prevData.canComment,
|
||||||
|
}));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleSettingChange = useCallback((_, { name: fieldName, checked: value }) => {
|
||||||
|
setData((prevData) => ({
|
||||||
|
...prevData,
|
||||||
|
[fieldName]: value,
|
||||||
|
}));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleSubmit = useCallback(() => {
|
||||||
|
onSelect(data.role === BoardMembershipRoles.EDITOR ? omit(data, 'canComment') : data);
|
||||||
|
}, [onSelect, data]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Popup.Header onBack={onBack}>
|
||||||
|
{t(title, {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Popup.Header>
|
||||||
|
<Popup.Content>
|
||||||
|
<Form onSubmit={handleSubmit}>
|
||||||
|
<Menu secondary vertical className={styles.menu}>
|
||||||
|
<Menu.Item
|
||||||
|
active={data.role === BoardMembershipRoles.EDITOR}
|
||||||
|
onClick={() => handleRoleSelectClick(BoardMembershipRoles.EDITOR)}
|
||||||
|
>
|
||||||
|
<div className={styles.menuItemTitle}>{t('common.editor')}</div>
|
||||||
|
<div className={styles.menuItemDescription}>
|
||||||
|
{t('common.canEditContentOfBoard')}
|
||||||
|
</div>
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Item
|
||||||
|
active={data.role === BoardMembershipRoles.VIEWER}
|
||||||
|
onClick={() => handleRoleSelectClick(BoardMembershipRoles.VIEWER)}
|
||||||
|
>
|
||||||
|
<div className={styles.menuItemTitle}>{t('common.viewer')}</div>
|
||||||
|
<div className={styles.menuItemDescription}>{t('common.canOnlyViewBoard')}</div>
|
||||||
|
</Menu.Item>
|
||||||
|
</Menu>
|
||||||
|
{data.role !== BoardMembershipRoles.EDITOR && (
|
||||||
|
<Segment basic className={styles.settings}>
|
||||||
|
<Radio
|
||||||
|
toggle
|
||||||
|
name="canComment"
|
||||||
|
checked={data.canComment}
|
||||||
|
label={t('common.canComment')}
|
||||||
|
onChange={handleSettingChange}
|
||||||
|
/>
|
||||||
|
</Segment>
|
||||||
|
)}
|
||||||
|
<Button positive content={t(buttonContent)} />
|
||||||
|
</Form>
|
||||||
|
</Popup.Content>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
BoardMembershipPermissionsSelectStep.propTypes = {
|
||||||
|
defaultData: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||||
|
title: PropTypes.string,
|
||||||
|
buttonContent: PropTypes.string,
|
||||||
|
onSelect: PropTypes.func.isRequired,
|
||||||
|
onBack: PropTypes.func.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
BoardMembershipPermissionsSelectStep.defaultProps = {
|
||||||
|
defaultData: undefined,
|
||||||
|
title: 'common.selectPermissions',
|
||||||
|
buttonContent: 'action.selectPermissions',
|
||||||
|
};
|
||||||
|
|
||||||
|
export default BoardMembershipPermissionsSelectStep;
|
||||||
+18
@@ -0,0 +1,18 @@
|
|||||||
|
:global(#app) {
|
||||||
|
.menu {
|
||||||
|
margin: 0 auto 8px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuItemDescription {
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuItemTitle {
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings {
|
||||||
|
margin: 0 0 8px;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
import BoardMembershipPermissionsSelectStep from './BoardMembershipPermissionsSelectStep';
|
||||||
|
|
||||||
|
export default BoardMembershipPermissionsSelectStep;
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
import React, { useCallback } from 'react';
|
import React, { useCallback, useEffect, useMemo, useRef } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Menu } from 'semantic-ui-react';
|
import { Menu } from 'semantic-ui-react';
|
||||||
import { Popup } from '../../lib/custom-ui';
|
import { Input, Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
|
import { useField } from '../../hooks';
|
||||||
import Item from './Item';
|
import Item from './Item';
|
||||||
|
|
||||||
import styles from './BoardMembershipsStep.module.scss';
|
import styles from './BoardMembershipsStep.module.scss';
|
||||||
@@ -11,6 +12,21 @@ import styles from './BoardMembershipsStep.module.scss';
|
|||||||
const BoardMembershipsStep = React.memo(
|
const BoardMembershipsStep = React.memo(
|
||||||
({ items, currentUserIds, title, onUserSelect, onUserDeselect, onBack }) => {
|
({ items, currentUserIds, title, onUserSelect, onUserDeselect, onBack }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
const [search, handleSearchChange] = useField('');
|
||||||
|
const cleanSearch = useMemo(() => search.trim().toLowerCase(), [search]);
|
||||||
|
|
||||||
|
const filteredItems = useMemo(
|
||||||
|
() =>
|
||||||
|
items.filter(
|
||||||
|
({ user }) =>
|
||||||
|
user.email.includes(cleanSearch) ||
|
||||||
|
user.name.toLowerCase().includes(cleanSearch) ||
|
||||||
|
(user.username && user.username.includes(cleanSearch)),
|
||||||
|
),
|
||||||
|
[items, cleanSearch],
|
||||||
|
);
|
||||||
|
|
||||||
|
const searchField = useRef(null);
|
||||||
|
|
||||||
const handleUserSelect = useCallback(
|
const handleUserSelect = useCallback(
|
||||||
(id) => {
|
(id) => {
|
||||||
@@ -26,12 +42,29 @@ const BoardMembershipsStep = React.memo(
|
|||||||
[onUserDeselect],
|
[onUserDeselect],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
searchField.current.focus();
|
||||||
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Popup.Header onBack={onBack}>{t(title)}</Popup.Header>
|
<Popup.Header onBack={onBack}>
|
||||||
|
{t(title, {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Popup.Header>
|
||||||
<Popup.Content>
|
<Popup.Content>
|
||||||
|
<Input
|
||||||
|
fluid
|
||||||
|
ref={searchField}
|
||||||
|
value={search}
|
||||||
|
placeholder={t('common.searchMembers')}
|
||||||
|
icon="search"
|
||||||
|
onChange={handleSearchChange}
|
||||||
|
/>
|
||||||
|
{filteredItems.length > 0 && (
|
||||||
<Menu secondary vertical className={styles.menu}>
|
<Menu secondary vertical className={styles.menu}>
|
||||||
{items.map((item) => (
|
{filteredItems.map((item) => (
|
||||||
<Item
|
<Item
|
||||||
key={item.id}
|
key={item.id}
|
||||||
isPersisted={item.isPersisted}
|
isPersisted={item.isPersisted}
|
||||||
@@ -42,6 +75,7 @@ const BoardMembershipsStep = React.memo(
|
|||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</Menu>
|
</Menu>
|
||||||
|
)}
|
||||||
</Popup.Content>
|
</Popup.Content>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,6 +1,22 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.menu {
|
.menu {
|
||||||
margin: -7px auto -5px;
|
margin: 8px auto 0;
|
||||||
|
max-height: 320px;
|
||||||
|
overflow-x: hidden;
|
||||||
|
overflow-y: auto;
|
||||||
|
scrollbar-width: thin;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
|
&::-webkit-scrollbar {
|
||||||
|
width: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-track {
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-thumb {
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
.menuItem {
|
.menuItem {
|
||||||
display: block;
|
display: block;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
overflow: hidden;
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import styles from './Attachments.module.scss';
|
|||||||
const INITIALLY_VISIBLE = 4;
|
const INITIALLY_VISIBLE = 4;
|
||||||
|
|
||||||
const Attachments = React.memo(
|
const Attachments = React.memo(
|
||||||
({ items, onUpdate, onDelete, onCoverUpdate, onGalleryOpen, onGalleryClose }) => {
|
({ items, canEdit, onUpdate, onDelete, onCoverUpdate, onGalleryOpen, onGalleryClose }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const [isAllVisible, toggleAllVisible] = useToggle();
|
const [isAllVisible, toggleAllVisible] = useToggle();
|
||||||
|
|
||||||
@@ -99,6 +99,7 @@ const Attachments = React.memo(
|
|||||||
createdAt={item.createdAt}
|
createdAt={item.createdAt}
|
||||||
isCover={item.isCover}
|
isCover={item.isCover}
|
||||||
isPersisted={item.isPersisted}
|
isPersisted={item.isPersisted}
|
||||||
|
canEdit={canEdit}
|
||||||
onClick={item.image || isPdf ? open : undefined}
|
onClick={item.image || isPdf ? open : undefined}
|
||||||
onCoverSelect={() => handleCoverSelect(item.id)}
|
onCoverSelect={() => handleCoverSelect(item.id)}
|
||||||
onCoverDeselect={handleCoverDeselect}
|
onCoverDeselect={handleCoverDeselect}
|
||||||
@@ -151,6 +152,7 @@ const Attachments = React.memo(
|
|||||||
|
|
||||||
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
|
||||||
|
canEdit: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
onCoverUpdate: PropTypes.func.isRequired,
|
onCoverUpdate: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ const Item = React.forwardRef(
|
|||||||
createdAt,
|
createdAt,
|
||||||
isCover,
|
isCover,
|
||||||
isPersisted,
|
isPersisted,
|
||||||
|
canEdit,
|
||||||
onCoverSelect,
|
onCoverSelect,
|
||||||
onCoverDeselect,
|
onCoverDeselect,
|
||||||
onClick,
|
onClick,
|
||||||
@@ -96,7 +97,7 @@ const Item = React.forwardRef(
|
|||||||
value: createdAt,
|
value: createdAt,
|
||||||
})}
|
})}
|
||||||
</span>
|
</span>
|
||||||
{coverUrl && (
|
{coverUrl && canEdit && (
|
||||||
<span className={styles.options}>
|
<span className={styles.options}>
|
||||||
<button type="button" className={styles.option} onClick={handleToggleCoverClick}>
|
<button type="button" className={styles.option} onClick={handleToggleCoverClick}>
|
||||||
<Icon
|
<Icon
|
||||||
@@ -118,6 +119,7 @@ const Item = React.forwardRef(
|
|||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
{canEdit && (
|
||||||
<EditPopup
|
<EditPopup
|
||||||
defaultData={{
|
defaultData={{
|
||||||
name,
|
name,
|
||||||
@@ -129,6 +131,7 @@ const Item = React.forwardRef(
|
|||||||
<Icon fitted name="pencil" size="small" />
|
<Icon fitted name="pencil" size="small" />
|
||||||
</Button>
|
</Button>
|
||||||
</EditPopup>
|
</EditPopup>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -141,6 +144,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,
|
||||||
|
canEdit: PropTypes.bool.isRequired,
|
||||||
onClick: PropTypes.func,
|
onClick: PropTypes.func,
|
||||||
onCoverSelect: PropTypes.func.isRequired,
|
onCoverSelect: PropTypes.func.isRequired,
|
||||||
onCoverDeselect: PropTypes.func.isRequired,
|
onCoverDeselect: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ const CardModal = React.memo(
|
|||||||
allBoardMemberships,
|
allBoardMemberships,
|
||||||
allLabels,
|
allLabels,
|
||||||
canEdit,
|
canEdit,
|
||||||
|
canEditCommentActivities,
|
||||||
canEditAllCommentActivities,
|
canEditAllCommentActivities,
|
||||||
onUpdate,
|
onUpdate,
|
||||||
onMove,
|
onMove,
|
||||||
@@ -302,7 +303,10 @@ const CardModal = React.memo(
|
|||||||
{canEdit ? (
|
{canEdit ? (
|
||||||
<DescriptionEdit defaultValue={description} onUpdate={handleDescriptionUpdate}>
|
<DescriptionEdit defaultValue={description} onUpdate={handleDescriptionUpdate}>
|
||||||
{description ? (
|
{description ? (
|
||||||
<button type="button" className={styles.descriptionText}>
|
<button
|
||||||
|
type="button"
|
||||||
|
className={classNames(styles.descriptionText, styles.cursorPointer)}
|
||||||
|
>
|
||||||
<Markdown linkStopPropagation linkTarget="_blank">
|
<Markdown linkStopPropagation linkTarget="_blank">
|
||||||
{description}
|
{description}
|
||||||
</Markdown>
|
</Markdown>
|
||||||
@@ -348,6 +352,7 @@ const CardModal = React.memo(
|
|||||||
<div className={styles.moduleHeader}>{t('common.attachments')}</div>
|
<div className={styles.moduleHeader}>{t('common.attachments')}</div>
|
||||||
<Attachments
|
<Attachments
|
||||||
items={attachments}
|
items={attachments}
|
||||||
|
canEdit={canEdit}
|
||||||
onUpdate={onAttachmentUpdate}
|
onUpdate={onAttachmentUpdate}
|
||||||
onDelete={onAttachmentDelete}
|
onDelete={onAttachmentDelete}
|
||||||
onCoverUpdate={handleCoverUpdate}
|
onCoverUpdate={handleCoverUpdate}
|
||||||
@@ -363,7 +368,7 @@ const CardModal = React.memo(
|
|||||||
isAllFetched={isAllActivitiesFetched}
|
isAllFetched={isAllActivitiesFetched}
|
||||||
isDetailsVisible={isActivitiesDetailsVisible}
|
isDetailsVisible={isActivitiesDetailsVisible}
|
||||||
isDetailsFetching={isActivitiesDetailsFetching}
|
isDetailsFetching={isActivitiesDetailsFetching}
|
||||||
canEdit={canEdit}
|
canEdit={canEditCommentActivities}
|
||||||
canEditAllComments={canEditAllCommentActivities}
|
canEditAllComments={canEditAllCommentActivities}
|
||||||
onFetch={onActivitiesFetch}
|
onFetch={onActivitiesFetch}
|
||||||
onDetailsToggle={onActivitiesDetailsToggle}
|
onDetailsToggle={onActivitiesDetailsToggle}
|
||||||
@@ -508,6 +513,7 @@ CardModal.propTypes = {
|
|||||||
allLabels: PropTypes.array.isRequired,
|
allLabels: PropTypes.array.isRequired,
|
||||||
/* eslint-enable react/forbid-prop-types */
|
/* eslint-enable react/forbid-prop-types */
|
||||||
canEdit: PropTypes.bool.isRequired,
|
canEdit: PropTypes.bool.isRequired,
|
||||||
|
canEditCommentActivities: PropTypes.bool.isRequired,
|
||||||
canEditAllCommentActivities: PropTypes.bool.isRequired,
|
canEditAllCommentActivities: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onMove: PropTypes.func.isRequired,
|
onMove: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -64,6 +64,10 @@
|
|||||||
padding: 8px 8px 0 16px;
|
padding: 8px 8px 0 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cursorPointer {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
.dueDate {
|
.dueDate {
|
||||||
background: rgba(9, 30, 66, 0.04);
|
background: rgba(9, 30, 66, 0.04);
|
||||||
border: none;
|
border: none;
|
||||||
@@ -114,7 +118,6 @@
|
|||||||
background: transparent;
|
background: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
color: #17394d;
|
color: #17394d;
|
||||||
cursor: pointer;
|
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
margin-bottom: 8px;
|
margin-bottom: 8px;
|
||||||
outline: none;
|
outline: none;
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ const CardMoveStep = React.memo(
|
|||||||
[selectedBoard, path.listId],
|
[selectedBoard, path.listId],
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleBoardIdFieldChange = useCallback(
|
const handleBoardIdChange = useCallback(
|
||||||
(event, data) => {
|
(event, data) => {
|
||||||
if (selectedProject.boards.find((board) => board.id === data.value).isFetching === null) {
|
if (selectedProject.boards.find((board) => board.id === data.value).isFetching === null) {
|
||||||
onBoardFetch(data.value);
|
onBoardFetch(data.value);
|
||||||
@@ -102,7 +102,7 @@ const CardMoveStep = React.memo(
|
|||||||
}
|
}
|
||||||
disabled={selectedProject.boards.length === 0}
|
disabled={selectedProject.boards.length === 0}
|
||||||
className={styles.field}
|
className={styles.field}
|
||||||
onChange={handleBoardIdFieldChange}
|
onChange={handleBoardIdChange}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -74,7 +74,11 @@ const NotificationsStep = React.memo(({ items, onDelete, onClose }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Popup.Header>{t('common.notifications')}</Popup.Header>
|
<Popup.Header>
|
||||||
|
{t('common.notifications', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Popup.Header>
|
||||||
<Popup.Content>
|
<Popup.Content>
|
||||||
{items.length > 0
|
{items.length > 0
|
||||||
? items.map((item) => (
|
? items.map((item) => (
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import pick from 'lodash/pick';
|
import pick from 'lodash/pick';
|
||||||
import React, { useCallback } from 'react';
|
import React, { useCallback, useEffect, useMemo, useRef } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Button } from 'semantic-ui-react';
|
import { Button } from 'semantic-ui-react';
|
||||||
import { Popup } from '../../lib/custom-ui';
|
import { Input, Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import { useSteps } from '../../hooks';
|
import { useField, useSteps } from '../../hooks';
|
||||||
import AddStep from './AddStep';
|
import AddStep from './AddStep';
|
||||||
import EditStep from './EditStep';
|
import EditStep from './EditStep';
|
||||||
import Item from './Item';
|
import Item from './Item';
|
||||||
@@ -21,6 +21,20 @@ const LabelsStep = React.memo(
|
|||||||
({ items, currentIds, title, onSelect, onDeselect, onCreate, onUpdate, onDelete, onBack }) => {
|
({ items, currentIds, title, onSelect, onDeselect, onCreate, onUpdate, onDelete, onBack }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const [step, openStep, handleBack] = useSteps();
|
const [step, openStep, handleBack] = useSteps();
|
||||||
|
const [search, handleSearchChange] = useField('');
|
||||||
|
const cleanSearch = useMemo(() => search.trim().toLowerCase(), [search]);
|
||||||
|
|
||||||
|
const filteredItems = useMemo(
|
||||||
|
() =>
|
||||||
|
items.filter(
|
||||||
|
(label) =>
|
||||||
|
(label.name && label.name.toLowerCase().includes(cleanSearch)) ||
|
||||||
|
label.color.includes(cleanSearch),
|
||||||
|
),
|
||||||
|
[items, cleanSearch],
|
||||||
|
);
|
||||||
|
|
||||||
|
const searchField = useRef(null);
|
||||||
|
|
||||||
const handleAddClick = useCallback(() => {
|
const handleAddClick = useCallback(() => {
|
||||||
openStep(StepTypes.ADD);
|
openStep(StepTypes.ADD);
|
||||||
@@ -63,6 +77,10 @@ const LabelsStep = React.memo(
|
|||||||
[onDelete],
|
[onDelete],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
searchField.current.focus();
|
||||||
|
}, []);
|
||||||
|
|
||||||
if (step) {
|
if (step) {
|
||||||
switch (step.type) {
|
switch (step.type) {
|
||||||
case StepTypes.ADD:
|
case StepTypes.ADD:
|
||||||
@@ -91,9 +109,23 @@ const LabelsStep = React.memo(
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Popup.Header onBack={onBack}>{t(title)}</Popup.Header>
|
<Popup.Header onBack={onBack}>
|
||||||
|
{t(title, {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Popup.Header>
|
||||||
<Popup.Content>
|
<Popup.Content>
|
||||||
{items.map((item) => (
|
<Input
|
||||||
|
fluid
|
||||||
|
ref={searchField}
|
||||||
|
value={search}
|
||||||
|
placeholder={t('common.searchLabels')}
|
||||||
|
icon="search"
|
||||||
|
onChange={handleSearchChange}
|
||||||
|
/>
|
||||||
|
{filteredItems.length > 0 && (
|
||||||
|
<div className={styles.items}>
|
||||||
|
{filteredItems.map((item) => (
|
||||||
<Item
|
<Item
|
||||||
key={item.id}
|
key={item.id}
|
||||||
name={item.name}
|
name={item.name}
|
||||||
@@ -105,6 +137,8 @@ const LabelsStep = React.memo(
|
|||||||
onEdit={() => handleEdit(item.id)}
|
onEdit={() => handleEdit(item.id)}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<Button
|
<Button
|
||||||
fluid
|
fluid
|
||||||
content={t('action.createNewLabel')}
|
content={t('action.createNewLabel')}
|
||||||
|
|||||||
@@ -14,4 +14,24 @@
|
|||||||
background: #e9e9e9;
|
background: #e9e9e9;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.items {
|
||||||
|
margin-top: 8px;
|
||||||
|
max-height: 320px;
|
||||||
|
overflow-x: hidden;
|
||||||
|
overflow-y: auto;
|
||||||
|
scrollbar-width: thin;
|
||||||
|
|
||||||
|
&::-webkit-scrollbar {
|
||||||
|
width: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-track {
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-thumb {
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import pick from 'lodash/pick';
|
||||||
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';
|
||||||
@@ -11,12 +12,14 @@ import DeleteStep from '../DeleteStep';
|
|||||||
import styles from './ActionsPopup.module.scss';
|
import styles from './ActionsPopup.module.scss';
|
||||||
|
|
||||||
const StepTypes = {
|
const StepTypes = {
|
||||||
|
EDIT_PERMISSIONS: 'EDIT_PERMISSIONS',
|
||||||
DELETE: 'DELETE',
|
DELETE: 'DELETE',
|
||||||
};
|
};
|
||||||
|
|
||||||
const ActionsStep = React.memo(
|
const ActionsStep = React.memo(
|
||||||
({
|
({
|
||||||
user,
|
membership,
|
||||||
|
permissionsSelectStep,
|
||||||
leaveButtonContent,
|
leaveButtonContent,
|
||||||
leaveConfirmationTitle,
|
leaveConfirmationTitle,
|
||||||
leaveConfirmationContent,
|
leaveConfirmationContent,
|
||||||
@@ -26,63 +29,115 @@ const ActionsStep = React.memo(
|
|||||||
deleteConfirmationContent,
|
deleteConfirmationContent,
|
||||||
deleteConfirmationButtonContent,
|
deleteConfirmationButtonContent,
|
||||||
canLeave,
|
canLeave,
|
||||||
canDelete,
|
canEdit,
|
||||||
|
onUpdate,
|
||||||
onDelete,
|
onDelete,
|
||||||
|
onClose,
|
||||||
}) => {
|
}) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const [step, openStep, handleBack] = useSteps();
|
const [step, openStep, handleBack] = useSteps();
|
||||||
|
|
||||||
|
const handleEditPermissionsClick = useCallback(() => {
|
||||||
|
openStep(StepTypes.EDIT_PERMISSIONS);
|
||||||
|
}, [openStep]);
|
||||||
|
|
||||||
const handleDeleteClick = useCallback(() => {
|
const handleDeleteClick = useCallback(() => {
|
||||||
openStep(StepTypes.DELETE);
|
openStep(StepTypes.DELETE);
|
||||||
}, [openStep]);
|
}, [openStep]);
|
||||||
|
|
||||||
if (step && step.type === StepTypes.DELETE) {
|
const handleRoleSelect = useCallback(
|
||||||
|
(data) => {
|
||||||
|
if (onUpdate) {
|
||||||
|
onUpdate(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
onClose();
|
||||||
|
},
|
||||||
|
[onUpdate, onClose],
|
||||||
|
);
|
||||||
|
|
||||||
|
if (step) {
|
||||||
|
switch (step.type) {
|
||||||
|
case StepTypes.EDIT_PERMISSIONS: {
|
||||||
|
const PermissionsSelectStep = permissionsSelectStep;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<PermissionsSelectStep
|
||||||
|
defaultData={pick(membership, ['role', 'canComment'])}
|
||||||
|
title="common.editPermissions"
|
||||||
|
buttonContent="action.save"
|
||||||
|
onSelect={handleRoleSelect}
|
||||||
|
onBack={handleBack}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
case StepTypes.DELETE:
|
||||||
return (
|
return (
|
||||||
<DeleteStep
|
<DeleteStep
|
||||||
title={t(user.isCurrent ? leaveConfirmationTitle : deleteConfirmationTitle, {
|
title={t(
|
||||||
|
membership.user.isCurrent ? leaveConfirmationTitle : deleteConfirmationTitle,
|
||||||
|
{
|
||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
},
|
||||||
content={t(user.isCurrent ? leaveConfirmationContent : deleteConfirmationContent)}
|
)}
|
||||||
|
content={t(
|
||||||
|
membership.user.isCurrent ? leaveConfirmationContent : deleteConfirmationContent,
|
||||||
|
)}
|
||||||
buttonContent={t(
|
buttonContent={t(
|
||||||
user.isCurrent ? leaveConfirmationButtonContent : deleteConfirmationButtonContent,
|
membership.user.isCurrent
|
||||||
|
? leaveConfirmationButtonContent
|
||||||
|
: deleteConfirmationButtonContent,
|
||||||
)}
|
)}
|
||||||
onConfirm={onDelete}
|
onConfirm={onDelete}
|
||||||
onBack={handleBack}
|
onBack={handleBack}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
default:
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<span className={styles.user}>
|
<span className={styles.user}>
|
||||||
<User name={user.name} avatarUrl={user.avatarUrl} size="large" />
|
<User name={membership.user.name} avatarUrl={membership.user.avatarUrl} size="large" />
|
||||||
</span>
|
</span>
|
||||||
<span className={styles.content}>
|
<span className={styles.content}>
|
||||||
<div className={styles.name}>{user.name}</div>
|
<div className={styles.name}>{membership.user.name}</div>
|
||||||
<div className={styles.email}>{user.email}</div>
|
<div className={styles.email}>{membership.user.email}</div>
|
||||||
{user.isCurrent
|
</span>
|
||||||
|
{permissionsSelectStep && canEdit && (
|
||||||
|
<Button
|
||||||
|
fluid
|
||||||
|
content={t('action.editPermissions')}
|
||||||
|
className={styles.button}
|
||||||
|
onClick={handleEditPermissionsClick}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{membership.user.isCurrent
|
||||||
? canLeave && (
|
? canLeave && (
|
||||||
<Button
|
<Button
|
||||||
|
fluid
|
||||||
content={t(leaveButtonContent)}
|
content={t(leaveButtonContent)}
|
||||||
className={styles.deleteButton}
|
className={styles.button}
|
||||||
onClick={handleDeleteClick}
|
onClick={handleDeleteClick}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
: canDelete && (
|
: canEdit && (
|
||||||
<Button
|
<Button
|
||||||
|
fluid
|
||||||
content={t(deleteButtonContent)}
|
content={t(deleteButtonContent)}
|
||||||
className={styles.deleteButton}
|
className={styles.button}
|
||||||
onClick={handleDeleteClick}
|
onClick={handleDeleteClick}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</span>
|
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
ActionsStep.propTypes = {
|
ActionsStep.propTypes = {
|
||||||
user: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
membership: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
|
permissionsSelectStep: PropTypes.elementType,
|
||||||
leaveButtonContent: PropTypes.string,
|
leaveButtonContent: PropTypes.string,
|
||||||
leaveConfirmationTitle: PropTypes.string,
|
leaveConfirmationTitle: PropTypes.string,
|
||||||
leaveConfirmationContent: PropTypes.string,
|
leaveConfirmationContent: PropTypes.string,
|
||||||
@@ -92,11 +147,14 @@ ActionsStep.propTypes = {
|
|||||||
deleteConfirmationContent: PropTypes.string,
|
deleteConfirmationContent: PropTypes.string,
|
||||||
deleteConfirmationButtonContent: PropTypes.string,
|
deleteConfirmationButtonContent: PropTypes.string,
|
||||||
canLeave: PropTypes.bool.isRequired,
|
canLeave: PropTypes.bool.isRequired,
|
||||||
canDelete: PropTypes.bool.isRequired,
|
canEdit: PropTypes.bool.isRequired,
|
||||||
|
onUpdate: PropTypes.func,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
|
onClose: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
ActionsStep.defaultProps = {
|
ActionsStep.defaultProps = {
|
||||||
|
permissionsSelectStep: undefined,
|
||||||
leaveButtonContent: 'action.leaveBoard',
|
leaveButtonContent: 'action.leaveBoard',
|
||||||
leaveConfirmationTitle: 'common.leaveBoard',
|
leaveConfirmationTitle: 'common.leaveBoard',
|
||||||
leaveConfirmationContent: 'common.areYouSureYouWantToLeaveBoard',
|
leaveConfirmationContent: 'common.areYouSureYouWantToLeaveBoard',
|
||||||
@@ -105,6 +163,7 @@ ActionsStep.defaultProps = {
|
|||||||
deleteConfirmationTitle: 'common.removeMember',
|
deleteConfirmationTitle: 'common.removeMember',
|
||||||
deleteConfirmationContent: 'common.areYouSureYouWantToRemoveThisMemberFromBoard',
|
deleteConfirmationContent: 'common.areYouSureYouWantToRemoveThisMemberFromBoard',
|
||||||
deleteConfirmationButtonContent: 'action.removeMember',
|
deleteConfirmationButtonContent: 'action.removeMember',
|
||||||
|
onUpdate: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default withPopup(ActionsStep);
|
export default withPopup(ActionsStep);
|
||||||
|
|||||||
@@ -1,28 +1,31 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
|
.button {
|
||||||
|
background: transparent;
|
||||||
|
box-shadow: none;
|
||||||
|
color: #6b808c;
|
||||||
|
font-weight: normal;
|
||||||
|
margin-top: 8px;
|
||||||
|
padding: 6px 11px;
|
||||||
|
text-align: left;
|
||||||
|
text-decoration: underline;
|
||||||
|
transition: none;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: rgba(9, 30, 66, 0.08);
|
||||||
|
color: #092d42;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: calc(100% - 44px);
|
width: calc(100% - 44px);
|
||||||
}
|
}
|
||||||
|
|
||||||
.deleteButton {
|
|
||||||
background: transparent;
|
|
||||||
box-shadow: none;
|
|
||||||
flex: 0 0 auto;
|
|
||||||
font-weight: normal;
|
|
||||||
margin: 0 0 0 -10px;
|
|
||||||
padding: 11px 10px;
|
|
||||||
text-decoration: underline;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background: #e9e9e9;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.email {
|
.email {
|
||||||
color: #888888;
|
color: #888888;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
line-height: 1.2;
|
line-height: 1.2;
|
||||||
padding: 4px 0 4px 2px;
|
padding: 2px 0 2px 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.name {
|
.name {
|
||||||
@@ -36,7 +39,7 @@
|
|||||||
.user {
|
.user {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
padding-right: 8px;
|
padding-right: 8px;
|
||||||
padding-top: 8px;
|
padding-top: 10px;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,27 +1,96 @@
|
|||||||
import React, { useCallback } from 'react';
|
import React, { useCallback, useEffect, useMemo, useRef } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { withPopup } from '../../../lib/popup';
|
import { withPopup } from '../../../lib/popup';
|
||||||
import { Popup } from '../../../lib/custom-ui';
|
import { Input, Popup } from '../../../lib/custom-ui';
|
||||||
|
|
||||||
|
import { useField, useSteps } from '../../../hooks';
|
||||||
import UserItem from './UserItem';
|
import UserItem from './UserItem';
|
||||||
|
|
||||||
import styles from './AddPopup.module.scss';
|
import styles from './AddPopup.module.scss';
|
||||||
|
|
||||||
const AddStep = React.memo(({ users, currentUserIds, title, onCreate, onClose }) => {
|
const StepTypes = {
|
||||||
|
SELECT_PERMISSIONS: 'SELECT_PERMISSIONS',
|
||||||
|
};
|
||||||
|
|
||||||
|
const AddStep = React.memo(
|
||||||
|
({ users, currentUserIds, permissionsSelectStep, title, onCreate, onClose }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
const [step, openStep, handleBack] = useSteps();
|
||||||
|
const [search, handleSearchChange] = useField('');
|
||||||
|
const cleanSearch = useMemo(() => search.trim().toLowerCase(), [search]);
|
||||||
|
|
||||||
|
const filteredUsers = useMemo(
|
||||||
|
() =>
|
||||||
|
users.filter(
|
||||||
|
(user) =>
|
||||||
|
user.email.includes(cleanSearch) ||
|
||||||
|
user.name.toLowerCase().includes(cleanSearch) ||
|
||||||
|
(user.username && user.username.includes(cleanSearch)),
|
||||||
|
),
|
||||||
|
[users, cleanSearch],
|
||||||
|
);
|
||||||
|
|
||||||
|
const searchField = useRef(null);
|
||||||
|
|
||||||
const handleUserSelect = useCallback(
|
const handleUserSelect = useCallback(
|
||||||
(id) => {
|
(id) => {
|
||||||
|
if (permissionsSelectStep) {
|
||||||
|
openStep(StepTypes.SELECT_PERMISSIONS, {
|
||||||
|
userId: id,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
onCreate({
|
onCreate({
|
||||||
userId: id,
|
userId: id,
|
||||||
});
|
});
|
||||||
|
|
||||||
onClose();
|
onClose();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
[onCreate, onClose],
|
[permissionsSelectStep, onCreate, onClose, openStep],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const handleRoleSelect = useCallback(
|
||||||
|
(data) => {
|
||||||
|
onCreate({
|
||||||
|
userId: step.params.userId,
|
||||||
|
...data,
|
||||||
|
});
|
||||||
|
|
||||||
|
onClose();
|
||||||
|
},
|
||||||
|
[onCreate, onClose, step],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
searchField.current.focus();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
if (step) {
|
||||||
|
switch (step.type) {
|
||||||
|
case StepTypes.SELECT_PERMISSIONS: {
|
||||||
|
const currentUser = users.find((user) => user.id === step.params.userId);
|
||||||
|
|
||||||
|
if (currentUser) {
|
||||||
|
const PermissionsSelectStep = permissionsSelectStep;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<PermissionsSelectStep
|
||||||
|
buttonContent="action.addMember"
|
||||||
|
onSelect={handleRoleSelect}
|
||||||
|
onBack={handleBack}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
openStep(null);
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Popup.Header>
|
<Popup.Header>
|
||||||
@@ -30,8 +99,17 @@ const AddStep = React.memo(({ users, currentUserIds, title, onCreate, onClose })
|
|||||||
})}
|
})}
|
||||||
</Popup.Header>
|
</Popup.Header>
|
||||||
<Popup.Content>
|
<Popup.Content>
|
||||||
<div className={styles.menu}>
|
<Input
|
||||||
{users.map((user) => (
|
fluid
|
||||||
|
ref={searchField}
|
||||||
|
value={search}
|
||||||
|
placeholder={t('common.searchUsers')}
|
||||||
|
icon="search"
|
||||||
|
onChange={handleSearchChange}
|
||||||
|
/>
|
||||||
|
{filteredUsers.length > 0 && (
|
||||||
|
<div className={styles.users}>
|
||||||
|
{filteredUsers.map((user) => (
|
||||||
<UserItem
|
<UserItem
|
||||||
key={user.id}
|
key={user.id}
|
||||||
name={user.name}
|
name={user.name}
|
||||||
@@ -41,22 +119,26 @@ const AddStep = React.memo(({ users, currentUserIds, title, onCreate, onClose })
|
|||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
</Popup.Content>
|
</Popup.Content>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
});
|
},
|
||||||
|
);
|
||||||
|
|
||||||
AddStep.propTypes = {
|
AddStep.propTypes = {
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
users: PropTypes.array.isRequired,
|
users: PropTypes.array.isRequired,
|
||||||
currentUserIds: PropTypes.array.isRequired,
|
currentUserIds: PropTypes.array.isRequired,
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
|
permissionsSelectStep: PropTypes.elementType,
|
||||||
title: PropTypes.string,
|
title: PropTypes.string,
|
||||||
onCreate: PropTypes.func.isRequired,
|
onCreate: PropTypes.func.isRequired,
|
||||||
onClose: PropTypes.func.isRequired,
|
onClose: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
AddStep.defaultProps = {
|
AddStep.defaultProps = {
|
||||||
|
permissionsSelectStep: undefined,
|
||||||
title: 'common.addMember',
|
title: 'common.addMember',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,21 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.menu {
|
.users {
|
||||||
border: none;
|
margin-top: 8px;
|
||||||
margin: -7px auto -5px;
|
max-height: 320px;
|
||||||
width: 100%;
|
overflow-x: hidden;
|
||||||
|
overflow-y: auto;
|
||||||
|
scrollbar-width: thin;
|
||||||
|
|
||||||
|
&::-webkit-scrollbar {
|
||||||
|
width: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-track {
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-thumb {
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,12 @@
|
|||||||
.menuItem {
|
.menuItem {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
|
border-radius: 0.28571429rem;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
display: block;
|
display: block;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
outline: 0;
|
outline: 0;
|
||||||
|
overflow: hidden;
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ const Memberships = React.memo(
|
|||||||
({
|
({
|
||||||
items,
|
items,
|
||||||
allUsers,
|
allUsers,
|
||||||
|
permissionsSelectStep,
|
||||||
addTitle,
|
addTitle,
|
||||||
leaveButtonContent,
|
leaveButtonContent,
|
||||||
leaveConfirmationTitle,
|
leaveConfirmationTitle,
|
||||||
@@ -24,6 +25,7 @@ const Memberships = React.memo(
|
|||||||
canEdit,
|
canEdit,
|
||||||
canLeaveIfLast,
|
canLeaveIfLast,
|
||||||
onCreate,
|
onCreate,
|
||||||
|
onUpdate,
|
||||||
onDelete,
|
onDelete,
|
||||||
}) => {
|
}) => {
|
||||||
return (
|
return (
|
||||||
@@ -32,7 +34,8 @@ const Memberships = React.memo(
|
|||||||
{items.map((item) => (
|
{items.map((item) => (
|
||||||
<span key={item.id} className={styles.user}>
|
<span key={item.id} className={styles.user}>
|
||||||
<ActionsPopup
|
<ActionsPopup
|
||||||
user={item.user}
|
membership={item}
|
||||||
|
permissionsSelectStep={permissionsSelectStep}
|
||||||
leaveButtonContent={leaveButtonContent}
|
leaveButtonContent={leaveButtonContent}
|
||||||
leaveConfirmationTitle={leaveConfirmationTitle}
|
leaveConfirmationTitle={leaveConfirmationTitle}
|
||||||
leaveConfirmationContent={leaveConfirmationContent}
|
leaveConfirmationContent={leaveConfirmationContent}
|
||||||
@@ -42,7 +45,8 @@ const Memberships = React.memo(
|
|||||||
deleteConfirmationContent={deleteConfirmationContent}
|
deleteConfirmationContent={deleteConfirmationContent}
|
||||||
deleteConfirmationButtonContent={deleteConfirmationButtonContent}
|
deleteConfirmationButtonContent={deleteConfirmationButtonContent}
|
||||||
canLeave={items.length > 1 || canLeaveIfLast}
|
canLeave={items.length > 1 || canLeaveIfLast}
|
||||||
canDelete={canEdit}
|
canEdit={canEdit}
|
||||||
|
onUpdate={(data) => onUpdate(item.id, data)}
|
||||||
onDelete={() => onDelete(item.id)}
|
onDelete={() => onDelete(item.id)}
|
||||||
>
|
>
|
||||||
<User
|
<User
|
||||||
@@ -59,6 +63,7 @@ const Memberships = React.memo(
|
|||||||
<AddPopup
|
<AddPopup
|
||||||
users={allUsers}
|
users={allUsers}
|
||||||
currentUserIds={items.map((item) => item.user.id)}
|
currentUserIds={items.map((item) => item.user.id)}
|
||||||
|
permissionsSelectStep={permissionsSelectStep}
|
||||||
title={addTitle}
|
title={addTitle}
|
||||||
onCreate={onCreate}
|
onCreate={onCreate}
|
||||||
>
|
>
|
||||||
@@ -75,6 +80,7 @@ Memberships.propTypes = {
|
|||||||
items: PropTypes.array.isRequired,
|
items: PropTypes.array.isRequired,
|
||||||
allUsers: PropTypes.array.isRequired,
|
allUsers: PropTypes.array.isRequired,
|
||||||
/* eslint-enable react/forbid-prop-types */
|
/* eslint-enable react/forbid-prop-types */
|
||||||
|
permissionsSelectStep: PropTypes.elementType,
|
||||||
addTitle: PropTypes.string,
|
addTitle: PropTypes.string,
|
||||||
leaveButtonContent: PropTypes.string,
|
leaveButtonContent: PropTypes.string,
|
||||||
leaveConfirmationTitle: PropTypes.string,
|
leaveConfirmationTitle: PropTypes.string,
|
||||||
@@ -87,10 +93,12 @@ Memberships.propTypes = {
|
|||||||
canEdit: PropTypes.bool,
|
canEdit: PropTypes.bool,
|
||||||
canLeaveIfLast: PropTypes.bool,
|
canLeaveIfLast: PropTypes.bool,
|
||||||
onCreate: PropTypes.func.isRequired,
|
onCreate: PropTypes.func.isRequired,
|
||||||
|
onUpdate: PropTypes.func,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
Memberships.defaultProps = {
|
Memberships.defaultProps = {
|
||||||
|
permissionsSelectStep: undefined,
|
||||||
addTitle: undefined,
|
addTitle: undefined,
|
||||||
leaveButtonContent: undefined,
|
leaveButtonContent: undefined,
|
||||||
leaveConfirmationTitle: undefined,
|
leaveConfirmationTitle: undefined,
|
||||||
@@ -102,6 +110,7 @@ Memberships.defaultProps = {
|
|||||||
deleteConfirmationButtonContent: undefined,
|
deleteConfirmationButtonContent: undefined,
|
||||||
canEdit: true,
|
canEdit: true,
|
||||||
canLeaveIfLast: true,
|
canLeaveIfLast: true,
|
||||||
|
onUpdate: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Memberships;
|
export default Memberships;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.action {
|
.action {
|
||||||
border: none;
|
border: none;
|
||||||
|
border-radius: 0.28571429rem;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.action {
|
.action {
|
||||||
border: none;
|
border: none;
|
||||||
|
border-radius: 0.28571429rem;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { withPopup } from '../../lib/popup';
|
|||||||
import { Input, Popup } from '../../lib/custom-ui';
|
import { Input, Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import { useForm } from '../../hooks';
|
import { useForm } from '../../hooks';
|
||||||
import { isUsername } from '../../utils/validator';
|
import { isPassword, isUsername } from '../../utils/validator';
|
||||||
|
|
||||||
import styles from './UserAddPopup.module.scss';
|
import styles from './UserAddPopup.module.scss';
|
||||||
|
|
||||||
@@ -69,7 +69,7 @@ const UserAddStep = React.memo(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cleanData.password) {
|
if (!cleanData.password || !isPassword(cleanData.password)) {
|
||||||
passwordField.current.focus();
|
passwordField.current.focus();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -142,15 +142,19 @@ const UserAddStep = React.memo(
|
|||||||
onChange={handleFieldChange}
|
onChange={handleFieldChange}
|
||||||
/>
|
/>
|
||||||
<div className={styles.text}>{t('common.password')}</div>
|
<div className={styles.text}>{t('common.password')}</div>
|
||||||
|
<div className={styles.field}>
|
||||||
<Input.Password
|
<Input.Password
|
||||||
fluid
|
fluid
|
||||||
ref={passwordField}
|
ref={passwordField}
|
||||||
name="password"
|
name="password"
|
||||||
value={data.password}
|
value={data.password}
|
||||||
readOnly={isSubmitting}
|
readOnly={isSubmitting}
|
||||||
className={styles.field}
|
|
||||||
onChange={handleFieldChange}
|
onChange={handleFieldChange}
|
||||||
/>
|
/>
|
||||||
|
<div className={styles.note}>
|
||||||
|
{t('common.mustBeAtLeast6CharactersLongAndContainAtLeastOneLetterAndNumber')}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div className={styles.text}>{t('common.name')}</div>
|
<div className={styles.text}>{t('common.name')}</div>
|
||||||
<Input
|
<Input
|
||||||
fluid
|
fluid
|
||||||
|
|||||||
@@ -3,6 +3,12 @@
|
|||||||
margin-bottom: 8px;
|
margin-bottom: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.note {
|
||||||
|
font-size: 11px;
|
||||||
|
margin-top: 4px;
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
.text {
|
.text {
|
||||||
color: #444444;
|
color: #444444;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { useDidUpdate, usePrevious, useToggle } from '../../lib/hooks';
|
|||||||
import { Input, Popup } from '../../lib/custom-ui';
|
import { Input, Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import { useForm } from '../../hooks';
|
import { useForm } from '../../hooks';
|
||||||
|
import { isPassword } from '../../utils/validator';
|
||||||
|
|
||||||
import styles from './UserPasswordEditStep.module.scss';
|
import styles from './UserPasswordEditStep.module.scss';
|
||||||
|
|
||||||
@@ -56,7 +57,7 @@ const UserPasswordEditStep = React.memo(
|
|||||||
const currentPasswordField = useRef(null);
|
const currentPasswordField = useRef(null);
|
||||||
|
|
||||||
const handleSubmit = useCallback(() => {
|
const handleSubmit = useCallback(() => {
|
||||||
if (!data.password) {
|
if (!data.password || !isPassword(data.password)) {
|
||||||
passwordField.current.select();
|
passwordField.current.select();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -112,14 +113,18 @@ const UserPasswordEditStep = React.memo(
|
|||||||
)}
|
)}
|
||||||
<Form onSubmit={handleSubmit}>
|
<Form onSubmit={handleSubmit}>
|
||||||
<div className={styles.text}>{t('common.newPassword')}</div>
|
<div className={styles.text}>{t('common.newPassword')}</div>
|
||||||
|
<div className={styles.field}>
|
||||||
<Input.Password
|
<Input.Password
|
||||||
fluid
|
fluid
|
||||||
ref={passwordField}
|
ref={passwordField}
|
||||||
name="password"
|
name="password"
|
||||||
value={data.password}
|
value={data.password}
|
||||||
className={styles.field}
|
|
||||||
onChange={handleFieldChange}
|
onChange={handleFieldChange}
|
||||||
/>
|
/>
|
||||||
|
<div className={styles.note}>
|
||||||
|
{t('common.mustBeAtLeast6CharactersLongAndContainAtLeastOneLetterAndNumber')}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
{usePasswordConfirmation && (
|
{usePasswordConfirmation && (
|
||||||
<>
|
<>
|
||||||
<div className={styles.text}>{t('common.currentPassword')}</div>
|
<div className={styles.text}>{t('common.currentPassword')}</div>
|
||||||
|
|||||||
@@ -3,6 +3,12 @@
|
|||||||
margin-bottom: 8px;
|
margin-bottom: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.note {
|
||||||
|
font-size: 11px;
|
||||||
|
margin-top: 4px;
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
.text {
|
.text {
|
||||||
color: #444444;
|
color: #444444;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.action {
|
.action {
|
||||||
border: none;
|
border: none;
|
||||||
|
border-radius: 0.28571429rem;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.action {
|
.action {
|
||||||
border: none;
|
border: none;
|
||||||
|
border-radius: 0.28571429rem;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
|
|||||||
import { Button, Icon, Radio, Table } from 'semantic-ui-react';
|
import { Button, Icon, Radio, Table } from 'semantic-ui-react';
|
||||||
|
|
||||||
import ActionsPopup from './ActionsPopup';
|
import ActionsPopup from './ActionsPopup';
|
||||||
|
import User from '../../User';
|
||||||
|
|
||||||
import styles from './Item.module.scss';
|
import styles from './Item.module.scss';
|
||||||
|
|
||||||
@@ -11,6 +12,7 @@ const Item = React.memo(
|
|||||||
email,
|
email,
|
||||||
username,
|
username,
|
||||||
name,
|
name,
|
||||||
|
avatarUrl,
|
||||||
organization,
|
organization,
|
||||||
phone,
|
phone,
|
||||||
isAdmin,
|
isAdmin,
|
||||||
@@ -34,13 +36,16 @@ const Item = React.memo(
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Table.Row>
|
<Table.Row>
|
||||||
|
<Table.Cell>
|
||||||
|
<User name={name} avatarUrl={avatarUrl} />
|
||||||
|
</Table.Cell>
|
||||||
<Table.Cell>{name}</Table.Cell>
|
<Table.Cell>{name}</Table.Cell>
|
||||||
<Table.Cell>{username || '-'}</Table.Cell>
|
<Table.Cell>{username || '-'}</Table.Cell>
|
||||||
<Table.Cell>{email}</Table.Cell>
|
<Table.Cell>{email}</Table.Cell>
|
||||||
<Table.Cell collapsing>
|
<Table.Cell>
|
||||||
<Radio toggle checked={isAdmin} onChange={handleIsAdminChange} />
|
<Radio toggle checked={isAdmin} onChange={handleIsAdminChange} />
|
||||||
</Table.Cell>
|
</Table.Cell>
|
||||||
<Table.Cell collapsing>
|
<Table.Cell textAlign="right">
|
||||||
<ActionsPopup
|
<ActionsPopup
|
||||||
user={{
|
user={{
|
||||||
email,
|
email,
|
||||||
@@ -76,6 +81,7 @@ Item.propTypes = {
|
|||||||
email: PropTypes.string.isRequired,
|
email: PropTypes.string.isRequired,
|
||||||
username: PropTypes.string,
|
username: PropTypes.string,
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
|
avatarUrl: PropTypes.string,
|
||||||
organization: PropTypes.string,
|
organization: PropTypes.string,
|
||||||
phone: PropTypes.string,
|
phone: PropTypes.string,
|
||||||
isAdmin: PropTypes.bool.isRequired,
|
isAdmin: PropTypes.bool.isRequired,
|
||||||
@@ -96,6 +102,7 @@ Item.propTypes = {
|
|||||||
|
|
||||||
Item.defaultProps = {
|
Item.defaultProps = {
|
||||||
username: undefined,
|
username: undefined,
|
||||||
|
avatarUrl: undefined,
|
||||||
organization: undefined,
|
organization: undefined,
|
||||||
phone: undefined,
|
phone: undefined,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -84,10 +84,11 @@ const UsersModal = React.memo(
|
|||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Modal.Header>
|
</Modal.Header>
|
||||||
<Modal.Content>
|
<Modal.Content scrolling>
|
||||||
<Table basic="very">
|
<Table unstackable basic="very">
|
||||||
<Table.Header>
|
<Table.Header>
|
||||||
<Table.Row>
|
<Table.Row>
|
||||||
|
<Table.HeaderCell />
|
||||||
<Table.HeaderCell width={4}>{t('common.name')}</Table.HeaderCell>
|
<Table.HeaderCell width={4}>{t('common.name')}</Table.HeaderCell>
|
||||||
<Table.HeaderCell width={4}>{t('common.username')}</Table.HeaderCell>
|
<Table.HeaderCell width={4}>{t('common.username')}</Table.HeaderCell>
|
||||||
<Table.HeaderCell width={4}>{t('common.email')}</Table.HeaderCell>
|
<Table.HeaderCell width={4}>{t('common.email')}</Table.HeaderCell>
|
||||||
@@ -102,6 +103,7 @@ const UsersModal = React.memo(
|
|||||||
email={item.email}
|
email={item.email}
|
||||||
username={item.username}
|
username={item.username}
|
||||||
name={item.name}
|
name={item.name}
|
||||||
|
avatarUrl={item.avatarUrl}
|
||||||
organization={item.organization}
|
organization={item.organization}
|
||||||
phone={item.phone}
|
phone={item.phone}
|
||||||
isAdmin={item.isAdmin}
|
isAdmin={item.isAdmin}
|
||||||
|
|||||||
@@ -123,6 +123,10 @@ export default {
|
|||||||
BOARD_MEMBERSHIP_CREATE__FAILURE: 'BOARD_MEMBERSHIP_CREATE__FAILURE',
|
BOARD_MEMBERSHIP_CREATE__FAILURE: 'BOARD_MEMBERSHIP_CREATE__FAILURE',
|
||||||
BOARD_MEMBERSHIP_CREATE_HANDLE: 'BOARD_MEMBERSHIP_CREATE_HANDLE',
|
BOARD_MEMBERSHIP_CREATE_HANDLE: 'BOARD_MEMBERSHIP_CREATE_HANDLE',
|
||||||
BOARD_MEMBERSHIP_CREATE_HANDLE__PROJECT_FETCH: 'BOARD_MEMBERSHIP_CREATE_HANDLE__PROJECT_FETCH',
|
BOARD_MEMBERSHIP_CREATE_HANDLE__PROJECT_FETCH: 'BOARD_MEMBERSHIP_CREATE_HANDLE__PROJECT_FETCH',
|
||||||
|
BOARD_MEMBERSHIP_UPDATE: 'BOARD_MEMBERSHIP_UPDATE',
|
||||||
|
BOARD_MEMBERSHIP_UPDATE__SUCCESS: 'BOARD_MEMBERSHIP_UPDATE__SUCCESS',
|
||||||
|
BOARD_MEMBERSHIP_UPDATE__FAILURE: 'BOARD_MEMBERSHIP_UPDATE__FAILURE',
|
||||||
|
BOARD_MEMBERSHIP_UPDATE_HANDLE: 'BOARD_MEMBERSHIP_UPDATE_HANDLE',
|
||||||
BOARD_MEMBERSHIP_DELETE: 'BOARD_MEMBERSHIP_DELETE',
|
BOARD_MEMBERSHIP_DELETE: 'BOARD_MEMBERSHIP_DELETE',
|
||||||
BOARD_MEMBERSHIP_DELETE__SUCCESS: 'BOARD_MEMBERSHIP_DELETE__SUCCESS',
|
BOARD_MEMBERSHIP_DELETE__SUCCESS: 'BOARD_MEMBERSHIP_DELETE__SUCCESS',
|
||||||
BOARD_MEMBERSHIP_DELETE__FAILURE: 'BOARD_MEMBERSHIP_DELETE__FAILURE',
|
BOARD_MEMBERSHIP_DELETE__FAILURE: 'BOARD_MEMBERSHIP_DELETE__FAILURE',
|
||||||
|
|||||||
@@ -88,6 +88,8 @@ export default {
|
|||||||
|
|
||||||
MEMBERSHIP_IN_CURRENT_BOARD_CREATE: `${PREFIX}/MEMBERSHIP_IN_CURRENT_BOARD_CREATE`,
|
MEMBERSHIP_IN_CURRENT_BOARD_CREATE: `${PREFIX}/MEMBERSHIP_IN_CURRENT_BOARD_CREATE`,
|
||||||
BOARD_MEMBERSHIP_CREATE_HANDLE: `${PREFIX}/BOARD_MEMBERSHIP_CREATE_HANDLE`,
|
BOARD_MEMBERSHIP_CREATE_HANDLE: `${PREFIX}/BOARD_MEMBERSHIP_CREATE_HANDLE`,
|
||||||
|
BOARD_MEMBERSHIP_UPDATE: `${PREFIX}/BOARD_MEMBERSHIP_UPDATE`,
|
||||||
|
BOARD_MEMBERSHIP_UPDATE_HANDLE: `${PREFIX}/BOARD_MEMBERSHIP_UPDATE_HANDLE`,
|
||||||
BOARD_MEMBERSHIP_DELETE: `${PREFIX}/BOARD_MEMBERSHIP_DELETE`,
|
BOARD_MEMBERSHIP_DELETE: `${PREFIX}/BOARD_MEMBERSHIP_DELETE`,
|
||||||
BOARD_MEMBERSHIP_DELETE_HANDLE: `${PREFIX}/BOARD_MEMBERSHIP_DELETE_HANDLE`,
|
BOARD_MEMBERSHIP_DELETE_HANDLE: `${PREFIX}/BOARD_MEMBERSHIP_DELETE_HANDLE`,
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,11 @@ export const BoardTypes = {
|
|||||||
KANBAN: 'kanban',
|
KANBAN: 'kanban',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const BoardMembershipRoles = {
|
||||||
|
EDITOR: 'editor',
|
||||||
|
VIEWER: 'viewer',
|
||||||
|
};
|
||||||
|
|
||||||
export const ActivityTypes = {
|
export const ActivityTypes = {
|
||||||
CREATE_CARD: 'createCard',
|
CREATE_CARD: 'createCard',
|
||||||
MOVE_CARD: 'moveCard',
|
MOVE_CARD: 'moveCard',
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ const mapDispatchToProps = (dispatch) =>
|
|||||||
bindActionCreators(
|
bindActionCreators(
|
||||||
{
|
{
|
||||||
onMembershipCreate: entryActions.createMembershipInCurrentBoard,
|
onMembershipCreate: entryActions.createMembershipInCurrentBoard,
|
||||||
|
onMembershipUpdate: entryActions.updateBoardMembership,
|
||||||
onMembershipDelete: entryActions.deleteBoardMembership,
|
onMembershipDelete: entryActions.deleteBoardMembership,
|
||||||
onUserToFilterAdd: entryActions.addUserToFilterInCurrentBoard,
|
onUserToFilterAdd: entryActions.addUserToFilterInCurrentBoard,
|
||||||
onUserFromFilterRemove: entryActions.removeUserFromFilterInCurrentBoard,
|
onUserFromFilterRemove: entryActions.removeUserFromFilterInCurrentBoard,
|
||||||
|
|||||||
@@ -3,17 +3,18 @@ import { connect } from 'react-redux';
|
|||||||
|
|
||||||
import selectors from '../selectors';
|
import selectors from '../selectors';
|
||||||
import entryActions from '../entry-actions';
|
import entryActions from '../entry-actions';
|
||||||
|
import { BoardMembershipRoles } from '../constants/Enums';
|
||||||
import BoardKanban from '../components/BoardKanban';
|
import BoardKanban from '../components/BoardKanban';
|
||||||
|
|
||||||
const mapStateToProps = (state) => {
|
const mapStateToProps = (state) => {
|
||||||
const { cardId } = selectors.selectPath(state);
|
const { cardId } = selectors.selectPath(state);
|
||||||
const isCurrentUserMember = selectors.selectIsCurrentUserMemberForCurrentBoard(state);
|
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||||
const listIds = selectors.selectListIdsForCurrentBoard(state);
|
const listIds = selectors.selectListIdsForCurrentBoard(state);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
listIds,
|
listIds,
|
||||||
isCardModalOpened: !!cardId,
|
isCardModalOpened: !!cardId,
|
||||||
canEdit: isCurrentUserMember,
|
canEdit: !!currentUserMembership && currentUserMembership.role === BoardMembershipRoles.EDITOR,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
|
|||||||
|
|
||||||
import selectors from '../selectors';
|
import selectors from '../selectors';
|
||||||
import entryActions from '../entry-actions';
|
import entryActions from '../entry-actions';
|
||||||
|
import { BoardMembershipRoles } from '../constants/Enums';
|
||||||
import Card from '../components/Card';
|
import Card from '../components/Card';
|
||||||
|
|
||||||
const makeMapStateToProps = () => {
|
const makeMapStateToProps = () => {
|
||||||
@@ -17,7 +18,7 @@ const makeMapStateToProps = () => {
|
|||||||
const allProjectsToLists = selectors.selectProjectsToListsForCurrentUser(state);
|
const allProjectsToLists = selectors.selectProjectsToListsForCurrentUser(state);
|
||||||
const allBoardMemberships = selectors.selectMembershipsForCurrentBoard(state);
|
const allBoardMemberships = selectors.selectMembershipsForCurrentBoard(state);
|
||||||
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
||||||
const isCurrentUserMember = selectors.selectIsCurrentUserMemberForCurrentBoard(state);
|
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||||
|
|
||||||
const { name, dueDate, timer, coverUrl, boardId, listId, isPersisted } = selectCardById(
|
const { name, dueDate, timer, coverUrl, boardId, listId, isPersisted } = selectCardById(
|
||||||
state,
|
state,
|
||||||
@@ -47,7 +48,8 @@ const makeMapStateToProps = () => {
|
|||||||
allProjectsToLists,
|
allProjectsToLists,
|
||||||
allBoardMemberships,
|
allBoardMemberships,
|
||||||
allLabels,
|
allLabels,
|
||||||
canEdit: isCurrentUserMember,
|
canEdit:
|
||||||
|
!!currentUserMembership && currentUserMembership.role === BoardMembershipRoles.EDITOR,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import omit from 'lodash/omit';
|
|||||||
import selectors from '../selectors';
|
import selectors from '../selectors';
|
||||||
import entryActions from '../entry-actions';
|
import entryActions from '../entry-actions';
|
||||||
import Paths from '../constants/Paths';
|
import Paths from '../constants/Paths';
|
||||||
|
import { BoardMembershipRoles } from '../constants/Enums';
|
||||||
import CardModal from '../components/CardModal';
|
import CardModal from '../components/CardModal';
|
||||||
|
|
||||||
const mapStateToProps = (state) => {
|
const mapStateToProps = (state) => {
|
||||||
@@ -14,7 +15,7 @@ const mapStateToProps = (state) => {
|
|||||||
const isCurrentUserManager = selectors.selectIsCurrentUserManagerForCurrentProject(state);
|
const isCurrentUserManager = selectors.selectIsCurrentUserManagerForCurrentProject(state);
|
||||||
const allBoardMemberships = selectors.selectMembershipsForCurrentBoard(state);
|
const allBoardMemberships = selectors.selectMembershipsForCurrentBoard(state);
|
||||||
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
||||||
const isCurrentUserMember = selectors.selectIsCurrentUserMemberForCurrentBoard(state);
|
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
name,
|
name,
|
||||||
@@ -57,7 +58,11 @@ const mapStateToProps = (state) => {
|
|||||||
allProjectsToLists,
|
allProjectsToLists,
|
||||||
allBoardMemberships,
|
allBoardMemberships,
|
||||||
allLabels,
|
allLabels,
|
||||||
canEdit: isCurrentUserMember,
|
canEdit: !!currentUserMembership && currentUserMembership.role === BoardMembershipRoles.EDITOR,
|
||||||
|
canEditCommentActivities:
|
||||||
|
!!currentUserMembership &&
|
||||||
|
(currentUserMembership.role === BoardMembershipRoles.EDITOR ||
|
||||||
|
currentUserMembership.canComment),
|
||||||
canEditAllCommentActivities: isCurrentUserManager,
|
canEditAllCommentActivities: isCurrentUserManager,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
|
|||||||
|
|
||||||
import selectors from '../selectors';
|
import selectors from '../selectors';
|
||||||
import entryActions from '../entry-actions';
|
import entryActions from '../entry-actions';
|
||||||
|
import { BoardMembershipRoles } from '../constants/Enums';
|
||||||
import List from '../components/List';
|
import List from '../components/List';
|
||||||
|
|
||||||
const makeMapStateToProps = () => {
|
const makeMapStateToProps = () => {
|
||||||
@@ -12,7 +13,7 @@ const makeMapStateToProps = () => {
|
|||||||
return (state, { id, index }) => {
|
return (state, { id, index }) => {
|
||||||
const { name, isPersisted } = selectListById(state, id);
|
const { name, isPersisted } = selectListById(state, id);
|
||||||
const cardIds = selectCardIdsByListId(state, id);
|
const cardIds = selectCardIdsByListId(state, id);
|
||||||
const isCurrentUserMember = selectors.selectIsCurrentUserMemberForCurrentBoard(state);
|
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id,
|
id,
|
||||||
@@ -20,7 +21,8 @@ const makeMapStateToProps = () => {
|
|||||||
name,
|
name,
|
||||||
isPersisted,
|
isPersisted,
|
||||||
cardIds,
|
cardIds,
|
||||||
canEdit: isCurrentUserMember,
|
canEdit:
|
||||||
|
!!currentUserMembership && currentUserMembership.role === BoardMembershipRoles.EDITOR,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -14,6 +14,21 @@ const handleBoardMembershipCreate = (boardMembership) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const updateBoardMembership = (id, data) => ({
|
||||||
|
type: EntryActionTypes.BOARD_MEMBERSHIP_UPDATE,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
data,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleBoardMembershipUpdate = (boardMembership) => ({
|
||||||
|
type: EntryActionTypes.BOARD_MEMBERSHIP_UPDATE_HANDLE,
|
||||||
|
payload: {
|
||||||
|
boardMembership,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const deleteBoardMembership = (id) => ({
|
const deleteBoardMembership = (id) => ({
|
||||||
type: EntryActionTypes.BOARD_MEMBERSHIP_DELETE,
|
type: EntryActionTypes.BOARD_MEMBERSHIP_DELETE,
|
||||||
payload: {
|
payload: {
|
||||||
@@ -31,6 +46,8 @@ const handleBoardMembershipDelete = (boardMembership) => ({
|
|||||||
export default {
|
export default {
|
||||||
createMembershipInCurrentBoard,
|
createMembershipInCurrentBoard,
|
||||||
handleBoardMembershipCreate,
|
handleBoardMembershipCreate,
|
||||||
|
updateBoardMembership,
|
||||||
|
handleBoardMembershipUpdate,
|
||||||
deleteBoardMembership,
|
deleteBoardMembership,
|
||||||
handleBoardMembershipDelete,
|
handleBoardMembershipDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import remarkBreaks from 'remark-breaks';
|
|||||||
|
|
||||||
import './Markdown.module.scss'; // FIXME: import as styles?
|
import './Markdown.module.scss'; // FIXME: import as styles?
|
||||||
|
|
||||||
|
const ABSOLUTE_URL_REGEX = /^(?:https?:)?\/\//i;
|
||||||
|
|
||||||
const Markdown = React.memo(({ linkStopPropagation, ...props }) => {
|
const Markdown = React.memo(({ linkStopPropagation, ...props }) => {
|
||||||
const handleLinkClick = useCallback((event) => {
|
const handleLinkClick = useCallback((event) => {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
@@ -16,25 +18,30 @@ const Markdown = React.memo(({ linkStopPropagation, ...props }) => {
|
|||||||
jsx-a11y/click-events-have-key-events,
|
jsx-a11y/click-events-have-key-events,
|
||||||
jsx-a11y/no-static-element-interactions,
|
jsx-a11y/no-static-element-interactions,
|
||||||
react/jsx-props-no-spreading */
|
react/jsx-props-no-spreading */
|
||||||
({ node, ...linkProps }) => <a {...linkProps} onClick={handleLinkClick} />,
|
({ node, ...linkProps }) => (
|
||||||
|
<a
|
||||||
|
{...linkProps}
|
||||||
|
rel={
|
||||||
|
ABSOLUTE_URL_REGEX.test(linkProps.href) && linkProps.target === '_blank'
|
||||||
|
? 'noreferrer'
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
|
onClick={linkStopPropagation ? handleLinkClick : undefined}
|
||||||
|
/>
|
||||||
|
),
|
||||||
/* eslint-enable jsx-a11y/anchor-has-content,
|
/* eslint-enable jsx-a11y/anchor-has-content,
|
||||||
jsx-a11y/click-events-have-key-events,
|
jsx-a11y/click-events-have-key-events,
|
||||||
jsx-a11y/no-static-element-interactions,
|
jsx-a11y/no-static-element-interactions,
|
||||||
react/jsx-props-no-spreading */
|
react/jsx-props-no-spreading */
|
||||||
[handleLinkClick],
|
[linkStopPropagation, handleLinkClick],
|
||||||
);
|
);
|
||||||
|
|
||||||
let components;
|
|
||||||
if (linkStopPropagation) {
|
|
||||||
components = {
|
|
||||||
a: linkRenderer,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ReactMarkdown
|
<ReactMarkdown
|
||||||
{...props} // eslint-disable-line react/jsx-props-no-spreading
|
{...props} // eslint-disable-line react/jsx-props-no-spreading
|
||||||
components={components}
|
components={{
|
||||||
|
a: linkRenderer,
|
||||||
|
}}
|
||||||
remarkPlugins={[remarkGfm, remarkBreaks]}
|
remarkPlugins={[remarkGfm, remarkBreaks]}
|
||||||
className="markdown-body"
|
className="markdown-body"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ export default {
|
|||||||
phone: 'Telefon',
|
phone: 'Telefon',
|
||||||
preferences: 'Volby',
|
preferences: 'Volby',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tip: dejte Ctrl-V (Cmd-V na Mac) pro vložení přílohy ze schránky.',
|
'Tip: dejte Ctrl-V (Cmd-V na Mac) pro vložení přílohy ze schránky',
|
||||||
project: 'Projekt',
|
project: 'Projekt',
|
||||||
projectNotFound_title: 'Projekt nenalezen',
|
projectNotFound_title: 'Projekt nenalezen',
|
||||||
removeManager_title: 'Odstranit vedoucího',
|
removeManager_title: 'Odstranit vedoucího',
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export default {
|
|||||||
administrator: 'Administrator',
|
administrator: 'Administrator',
|
||||||
all: 'Alle',
|
all: 'Alle',
|
||||||
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
'Alle Änderungen werden automatisch gespeichert,<br />sobald die Verbindung wiederhergestellt wurde.',
|
'Alle Änderungen werden automatisch gespeichert,<br />sobald die Verbindung wiederhergestellt wurde',
|
||||||
areYouSureYouWantToDeleteThisAttachment:
|
areYouSureYouWantToDeleteThisAttachment:
|
||||||
'Sind Sie sicher, dass Sie diesen Anhang löschen möchten?',
|
'Sind Sie sicher, dass Sie diesen Anhang löschen möchten?',
|
||||||
areYouSureYouWantToDeleteThisBoard: 'Sind Sie sicher, dass Sie dieses Board löschen möchten?',
|
areYouSureYouWantToDeleteThisBoard: 'Sind Sie sicher, dass Sie dieses Board löschen möchten?',
|
||||||
@@ -123,7 +123,7 @@ export default {
|
|||||||
phone: 'Telefon',
|
phone: 'Telefon',
|
||||||
preferences: 'Voreinstellungen',
|
preferences: 'Voreinstellungen',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tipp: Drücken Sie STRG-V (Cmd-V auf Mac), um einen Anhang aus der Zwischenablage hinzuzufügen.',
|
'Tipp: Drücken Sie STRG-V (Cmd-V auf Mac), um einen Anhang aus der Zwischenablage hinzuzufügen',
|
||||||
project: 'Projekt',
|
project: 'Projekt',
|
||||||
projectNotFound_title: 'Projekt nicht gefunden',
|
projectNotFound_title: 'Projekt nicht gefunden',
|
||||||
removeManager_title: 'Manager entfernen',
|
removeManager_title: 'Manager entfernen',
|
||||||
|
|||||||
@@ -41,6 +41,9 @@ export default {
|
|||||||
background: 'Background',
|
background: 'Background',
|
||||||
board: 'Board',
|
board: 'Board',
|
||||||
boardNotFound_title: 'Board Not Found',
|
boardNotFound_title: 'Board Not Found',
|
||||||
|
canComment: 'Can comment',
|
||||||
|
canEditContentOfBoard: 'Can edit the content of the board',
|
||||||
|
canOnlyViewBoard: 'Can only view the board',
|
||||||
cardActions_title: 'Card Actions',
|
cardActions_title: 'Card Actions',
|
||||||
cardNotFound_title: 'Card Not Found',
|
cardNotFound_title: 'Card Not Found',
|
||||||
cardOrActionAreDeleted: 'Card or action are deleted',
|
cardOrActionAreDeleted: 'Card or action are deleted',
|
||||||
@@ -66,6 +69,7 @@ export default {
|
|||||||
description: 'Description',
|
description: 'Description',
|
||||||
detectAutomatically: 'Detect automatically',
|
detectAutomatically: 'Detect automatically',
|
||||||
dropFileToUpload: 'Drop file to upload',
|
dropFileToUpload: 'Drop file to upload',
|
||||||
|
editor: 'Editor',
|
||||||
editAttachment_title: 'Edit Attachment',
|
editAttachment_title: 'Edit Attachment',
|
||||||
editAvatar_title: 'Edit Avatar',
|
editAvatar_title: 'Edit Avatar',
|
||||||
editBoard_title: 'Edit Board',
|
editBoard_title: 'Edit Board',
|
||||||
@@ -74,6 +78,7 @@ export default {
|
|||||||
editInformation_title: 'Edit Information',
|
editInformation_title: 'Edit Information',
|
||||||
editLabel_title: 'Edit Label',
|
editLabel_title: 'Edit Label',
|
||||||
editPassword_title: 'Edit Password',
|
editPassword_title: 'Edit Password',
|
||||||
|
editPermissions_title: 'Edit Permissions',
|
||||||
editTimer_title: 'Edit Timer',
|
editTimer_title: 'Edit Timer',
|
||||||
editUsername_title: 'Edit Username',
|
editUsername_title: 'Edit Username',
|
||||||
email: 'E-mail',
|
email: 'E-mail',
|
||||||
@@ -100,6 +105,8 @@ export default {
|
|||||||
members: 'Members',
|
members: 'Members',
|
||||||
minutes: 'Minutes',
|
minutes: 'Minutes',
|
||||||
moveCard_title: 'Move Card',
|
moveCard_title: 'Move Card',
|
||||||
|
mustBeAtLeast6CharactersLongAndContainAtLeastOneLetterAndNumber:
|
||||||
|
'Must be at least 6 characters long and contain at least one letter and number',
|
||||||
name: 'Name',
|
name: 'Name',
|
||||||
newEmail: 'New e-mail',
|
newEmail: 'New e-mail',
|
||||||
newPassword: 'New password',
|
newPassword: 'New password',
|
||||||
@@ -116,14 +123,18 @@ export default {
|
|||||||
phone: 'Phone',
|
phone: 'Phone',
|
||||||
preferences: 'Preferences',
|
preferences: 'Preferences',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tip: press Ctrl-V (Cmd-V on Mac) to add an attachment from the clipboard.',
|
'Tip: press Ctrl-V (Cmd-V on Mac) to add an attachment from the clipboard',
|
||||||
project: 'Project',
|
project: 'Project',
|
||||||
projectNotFound_title: 'Project Not Found',
|
projectNotFound_title: 'Project Not Found',
|
||||||
removeManager_title: 'Remove Manager',
|
removeManager_title: 'Remove Manager',
|
||||||
removeMember_title: 'Remove Member',
|
removeMember_title: 'Remove Member',
|
||||||
|
searchLabels: 'Search labels...',
|
||||||
|
searchMembers: 'Search members...',
|
||||||
|
searchUsers: 'Search users...',
|
||||||
seconds: 'Seconds',
|
seconds: 'Seconds',
|
||||||
selectBoard: 'Select board',
|
selectBoard: 'Select board',
|
||||||
selectList: 'Select list',
|
selectList: 'Select list',
|
||||||
|
selectPermissions_title: 'Select Permissions',
|
||||||
selectProject: 'Select project',
|
selectProject: 'Select project',
|
||||||
settings: 'Settings',
|
settings: 'Settings',
|
||||||
subscribeToMyOwnCardsByDefault: 'Subscribe to my own cards by default',
|
subscribeToMyOwnCardsByDefault: 'Subscribe to my own cards by default',
|
||||||
@@ -143,6 +154,7 @@ export default {
|
|||||||
username: 'Username',
|
username: 'Username',
|
||||||
usernameAlreadyInUse: 'Username already in use',
|
usernameAlreadyInUse: 'Username already in use',
|
||||||
users: 'Users',
|
users: 'Users',
|
||||||
|
viewer: 'Viewer',
|
||||||
writeComment: 'Write a comment...',
|
writeComment: 'Write a comment...',
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -154,6 +166,7 @@ export default {
|
|||||||
addCard_title: 'Add Card',
|
addCard_title: 'Add Card',
|
||||||
addComment: 'Add comment',
|
addComment: 'Add comment',
|
||||||
addList: 'Add list',
|
addList: 'Add list',
|
||||||
|
addMember: 'Add member',
|
||||||
addMoreDetailedDescription: 'Add more detailed description',
|
addMoreDetailedDescription: 'Add more detailed description',
|
||||||
addTask: 'Add task',
|
addTask: 'Add task',
|
||||||
addToCard: 'Add to card',
|
addToCard: 'Add to card',
|
||||||
@@ -185,6 +198,7 @@ export default {
|
|||||||
editEmail_title: 'Edit E-mail',
|
editEmail_title: 'Edit E-mail',
|
||||||
editInformation_title: 'Edit Information',
|
editInformation_title: 'Edit Information',
|
||||||
editPassword_title: 'Edit Password',
|
editPassword_title: 'Edit Password',
|
||||||
|
editPermissions: 'Edit permissions',
|
||||||
editTimer_title: 'Edit Timer',
|
editTimer_title: 'Edit Timer',
|
||||||
editTitle_title: 'Edit Title',
|
editTitle_title: 'Edit Title',
|
||||||
editUsername_title: 'Edit Username',
|
editUsername_title: 'Edit Username',
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ export default {
|
|||||||
phone: 'Teléfono',
|
phone: 'Teléfono',
|
||||||
preferences: 'Preferencias',
|
preferences: 'Preferencias',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tip: presiona Ctrl-V (Cmd-V en Mac) para añadir adjuntos desde el portapapeles.',
|
'Tip: presiona Ctrl-V (Cmd-V en Mac) para añadir adjuntos desde el portapapeles',
|
||||||
project: 'Proyecto',
|
project: 'Proyecto',
|
||||||
projectNotFound_title: 'Proyecto no encontrado',
|
projectNotFound_title: 'Proyecto no encontrado',
|
||||||
removeMember_title: 'Remover Miembro',
|
removeMember_title: 'Remover Miembro',
|
||||||
@@ -115,7 +115,7 @@ export default {
|
|||||||
selectList: 'Seleccionar Lista',
|
selectList: 'Seleccionar Lista',
|
||||||
selectProject: 'Seleccionar Proyecto',
|
selectProject: 'Seleccionar Proyecto',
|
||||||
settings: 'Configuraciones',
|
settings: 'Configuraciones',
|
||||||
subscribeToMyOwnCardsByDefault: 'Suscribirme a mis propias tarjetas por defecto.',
|
subscribeToMyOwnCardsByDefault: 'Suscribirme a mis propias tarjetas por defecto',
|
||||||
taskActions_title: 'Acciones de Tareas',
|
taskActions_title: 'Acciones de Tareas',
|
||||||
tasks: 'Tareas',
|
tasks: 'Tareas',
|
||||||
time: 'Tiempo',
|
time: 'Tiempo',
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import de from './de';
|
|||||||
import en from './en';
|
import en from './en';
|
||||||
import es from './es';
|
import es from './es';
|
||||||
import fr from './fr';
|
import fr from './fr';
|
||||||
|
import it from './it';
|
||||||
import ja from './ja';
|
import ja from './ja';
|
||||||
import ko from './ko';
|
import ko from './ko';
|
||||||
import pl from './pl';
|
import pl from './pl';
|
||||||
@@ -13,7 +14,7 @@ import sv from './sv';
|
|||||||
import uz from './uz';
|
import uz from './uz';
|
||||||
import zh from './zh';
|
import zh from './zh';
|
||||||
|
|
||||||
const locales = [cs, da, de, en, es, fr, ja, ko, pl, ru, sk, sv, uz, zh];
|
const locales = [cs, da, de, en, es, fr, it, ja, ko, pl, ru, sk, sv, uz, zh];
|
||||||
|
|
||||||
export default locales;
|
export default locales;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,230 @@
|
|||||||
|
export default {
|
||||||
|
format: {
|
||||||
|
date: 'd/M/yyyy',
|
||||||
|
time: 'p',
|
||||||
|
dateTime: '$t(format:date) $t(format:time)',
|
||||||
|
longDate: 'MMM d',
|
||||||
|
longDateTime: "MMMM d 'at' p",
|
||||||
|
},
|
||||||
|
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
account: 'Account',
|
||||||
|
actions: 'Azioni',
|
||||||
|
addAttachment_title: 'Aggiungi Allegato',
|
||||||
|
addComment: 'Aggiungi commento',
|
||||||
|
addManager_title: 'Aggiungi Manager',
|
||||||
|
addMember_title: 'Aggiungi Membro',
|
||||||
|
addUser_title: 'Aggiungi Utente',
|
||||||
|
administrator: 'Amministratore',
|
||||||
|
all: 'tutto',
|
||||||
|
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||||
|
'All changes will be automatically saved<br />after connection restored',
|
||||||
|
areYouSureYouWantToDeleteThisAttachment: 'Sei sicuro di voler eliminare questo allegato?',
|
||||||
|
areYouSureYouWantToDeleteThisBoard: 'Sei sicuro di voler eliminare questa bacheca?',
|
||||||
|
areYouSureYouWantToDeleteThisCard: 'Sei sicuro di voler eliminare questa card?',
|
||||||
|
areYouSureYouWantToDeleteThisComment: 'Sei sicuro di voler eliminare questo commento?',
|
||||||
|
areYouSureYouWantToDeleteThisLabel: 'Sei sicuro di voler eliminare questa etichetta?',
|
||||||
|
areYouSureYouWantToDeleteThisList: 'Sei sicuro di voler eliminare questo elenco?',
|
||||||
|
areYouSureYouWantToDeleteThisProject: 'Sei sicuro di voler eliminare questo progetto?',
|
||||||
|
areYouSureYouWantToDeleteThisTask: 'Sei sicuro di voler eliminare questo task?',
|
||||||
|
areYouSureYouWantToDeleteThisUser: 'Sei sicuro di voler eliminare questo utente?',
|
||||||
|
areYouSureYouWantToLeaveBoard: 'Sei sicuro di voler abbandonare la bacheca?',
|
||||||
|
areYouSureYouWantToLeaveProject: 'Sei sicuro di voler abbandonare il progetto?',
|
||||||
|
areYouSureYouWantToRemoveThisManagerFromProject:
|
||||||
|
'Sei sicuro di voler rimuovere questo amministratore dal progetto?',
|
||||||
|
areYouSureYouWantToRemoveThisMemberFromBoard:
|
||||||
|
'Sei sicuro di voler rimuovere questo membro dalla bacheca?',
|
||||||
|
attachment: 'Allegato',
|
||||||
|
attachments: 'Allegati',
|
||||||
|
authentication: 'Autenticazione',
|
||||||
|
background: 'Background',
|
||||||
|
board: 'Bacheca',
|
||||||
|
boardNotFound_title: 'Bacheca non trovata',
|
||||||
|
canComment: 'Può commentare',
|
||||||
|
canEditContentOfBoard: 'Può modificare il contenuto della bacheca',
|
||||||
|
canOnlyViewBoard: 'Può solo vedere la bacheca',
|
||||||
|
cardActions_title: 'Card Azioni',
|
||||||
|
cardNotFound_title: 'Card non trovata',
|
||||||
|
cardOrActionAreDeleted: "La card o l'azione vengono eliminate",
|
||||||
|
color: 'Colore',
|
||||||
|
createBoard_title: 'Crea Bacheca',
|
||||||
|
createLabel_title: 'Crea Etichetta',
|
||||||
|
createNewOneOrSelectExistingOne: 'Crea nuovo o seleziona <br /> esistente',
|
||||||
|
createProject_title: 'Crea Progetto',
|
||||||
|
createTextFile_title: 'Create File di Testo',
|
||||||
|
currentPassword: 'Password corrente',
|
||||||
|
dangerZone_title: 'Danger Zone',
|
||||||
|
date: 'Data',
|
||||||
|
dueDate_title: 'Data di scadenza',
|
||||||
|
deleteAttachment_title: 'Elimina Allegato',
|
||||||
|
deleteBoard_title: 'Elimina Bacheca',
|
||||||
|
deleteCard_title: 'Elimina card',
|
||||||
|
deleteComment_title: 'Elimina Commento',
|
||||||
|
deleteLabel_title: 'Elimina Etichetta',
|
||||||
|
deleteList_title: 'Elimina Elenco',
|
||||||
|
deleteProject_title: 'Elimina Progetto',
|
||||||
|
deleteTask_title: 'Elimina Task',
|
||||||
|
deleteUser_title: 'Elimina Utente',
|
||||||
|
description: 'Descrizione',
|
||||||
|
detectAutomatically: 'Rileva automaticamente',
|
||||||
|
dropFileToUpload: 'Trascina il file da caricare',
|
||||||
|
editor: 'Editor',
|
||||||
|
editAttachment_title: 'Modifica Allegato',
|
||||||
|
editAvatar_title: 'Modifica Avatar',
|
||||||
|
editBoard_title: 'Modifica Board',
|
||||||
|
editDueDate_title: 'Modifica Data di Scadenza',
|
||||||
|
editEmail_title: 'Modifica E-mail',
|
||||||
|
editInformation_title: 'Modifica Informazioni',
|
||||||
|
editLabel_title: 'Modifica Etichetta',
|
||||||
|
editPassword_title: 'Modifica Password',
|
||||||
|
editPermissions_title: 'Modifica Permessi',
|
||||||
|
editTimer_title: 'Modifica Timer',
|
||||||
|
editUsername_title: 'Modifica Username',
|
||||||
|
email: 'E-mail',
|
||||||
|
emailAlreadyInUse: 'E-mail già in uso',
|
||||||
|
enterCardTitle: 'Inserire titolo della card...',
|
||||||
|
enterDescription: 'Inserire descrizione...',
|
||||||
|
enterFilename: 'Inserire nome del file',
|
||||||
|
enterListTitle: 'Inserire titolo della lista...',
|
||||||
|
enterProjectTitle: 'Inserire titolo del progetto',
|
||||||
|
enterTaskDescription: 'Inserire descrizione del task...',
|
||||||
|
filterByLabels_title: 'Filtra per Etichetta',
|
||||||
|
filterByMembers_title: 'Filtra per Membro',
|
||||||
|
fromComputer_title: 'Dal Computer',
|
||||||
|
general: 'Generale',
|
||||||
|
hours: 'Ore',
|
||||||
|
invalidCurrentPassword: 'Password corrente non valida',
|
||||||
|
labels: 'Etichette',
|
||||||
|
language: 'Lingua',
|
||||||
|
leaveBoard_title: 'Lascia Bacheca',
|
||||||
|
leaveProject_title: 'Lascia Progetto',
|
||||||
|
list: 'Lista',
|
||||||
|
listActions_title: 'Lista delle Azioni',
|
||||||
|
managers: 'Managers',
|
||||||
|
members: 'Membri',
|
||||||
|
minutes: 'Minuti',
|
||||||
|
moveCard_title: 'Sposta card',
|
||||||
|
name: 'Nome',
|
||||||
|
newEmail: 'Nuova e-mail',
|
||||||
|
newPassword: 'Nuova password',
|
||||||
|
newUsername: 'Nuovo username',
|
||||||
|
noConnectionToServer: 'Nessuna connessione al server',
|
||||||
|
noBoards: 'No bacheche',
|
||||||
|
noLists: 'No liste',
|
||||||
|
noProjects: 'No progetti',
|
||||||
|
notifications: 'Notifiche',
|
||||||
|
noUnreadNotifications: 'Nessuna notifica non letta',
|
||||||
|
openBoard_title: 'Bacheca aperta',
|
||||||
|
optional_inline: 'opzionale',
|
||||||
|
organization: 'Organizazzione',
|
||||||
|
phone: 'Telefono',
|
||||||
|
preferences: 'Preferenze',
|
||||||
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
|
'Tip: prmi Ctrl-V (Cmd-V on Mac) per aggiungere un allegato dalla clipboard',
|
||||||
|
project: 'Progetto',
|
||||||
|
projectNotFound_title: 'Progetto non trovato',
|
||||||
|
removeManager_title: 'Rimuovi Manager',
|
||||||
|
removeMember_title: 'Rimuovi Membro',
|
||||||
|
searchLabels: 'Cerca etichette...',
|
||||||
|
searchMembers: 'Cerca membri...',
|
||||||
|
searchUsers: 'Cerca utenti...',
|
||||||
|
seconds: 'Secondi',
|
||||||
|
selectBoard: 'Seleziona bacheca',
|
||||||
|
selectList: 'Seleziona lista',
|
||||||
|
selectPermissions_title: 'Seleziona Permessi',
|
||||||
|
selectProject: 'Seleziona progetto',
|
||||||
|
settings: 'Impostazioni',
|
||||||
|
subscribeToMyOwnCardsByDefault: 'Abbonati alle mie card per impostazione predefinita',
|
||||||
|
taskActions_title: 'Task Azioni',
|
||||||
|
tasks: 'Tasks',
|
||||||
|
thereIsNoPreviewAvailableForThisAttachment:
|
||||||
|
'Non è disponibile alcuna anteprima per questo allegato',
|
||||||
|
time: 'Tempo',
|
||||||
|
timer: 'Timer',
|
||||||
|
title: 'Titolo',
|
||||||
|
userActions_title: 'Azioni Utente',
|
||||||
|
userAddedThisCardToList: '<0>{{user}}</0><1> ha aggiunto questa card a {{list}}</1>',
|
||||||
|
userLeftNewCommentToCard:
|
||||||
|
'{{user}} ha lasciato un nuovo commento «{{comment}}» a <2>{{card}}</2>',
|
||||||
|
userMovedCardFromListToList: '{{user}} ha mosso <2>{{card}}</2> da {{fromList}} a {{toList}}',
|
||||||
|
userMovedThisCardFromListToList:
|
||||||
|
'<0>{{user}}</0><1> ha mosso questa card da {{fromList}} a {{toList}}</1>',
|
||||||
|
username: 'Username',
|
||||||
|
usernameAlreadyInUse: 'Username già in uso',
|
||||||
|
users: 'Utenti',
|
||||||
|
viewer: 'Viewer',
|
||||||
|
writeComment: 'Scrivi un commento...',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
addAnotherCard: "Aggiungi un'altra card",
|
||||||
|
addAnotherList: "Aggiungi un'altra lista",
|
||||||
|
addAnotherTask: 'Aggiungi un altro task',
|
||||||
|
addCard: 'Aggiungi card',
|
||||||
|
addCard_title: 'Aggiungi Card',
|
||||||
|
addComment: 'Aggiungi commento',
|
||||||
|
addList: 'Aggiungi lista',
|
||||||
|
addMember: 'Add membro',
|
||||||
|
addMoreDetailedDescription: 'Aggiungi una descrizione più dettagliata',
|
||||||
|
addTask: 'Aggiungi task',
|
||||||
|
addToCard: 'Aggiungi alla card',
|
||||||
|
addUser: 'Aggiungi utente',
|
||||||
|
createBoard: 'Crea bacheca',
|
||||||
|
createFile: 'Crea file',
|
||||||
|
createLabel: 'Crea etichetta',
|
||||||
|
createNewLabel: 'Crea nuova etichetta',
|
||||||
|
createProject: 'Crea progetto',
|
||||||
|
delete: 'Elimina',
|
||||||
|
deleteAttachment: 'Elimina allegato',
|
||||||
|
deleteAvatar: 'Elimina avatar',
|
||||||
|
deleteBoard: 'Elimina bacheca',
|
||||||
|
deleteCard: 'Elimina card',
|
||||||
|
deleteCard_title: 'Elimina Card',
|
||||||
|
deleteComment: 'Elimina commento',
|
||||||
|
deleteImage: 'Elimina immagine',
|
||||||
|
deleteLabel: 'Elimina etichetta',
|
||||||
|
deleteList: 'Elimina lista',
|
||||||
|
deleteList_title: 'Elimina Lista',
|
||||||
|
deleteProject: 'Elimina progetto',
|
||||||
|
deleteProject_title: 'Elimina Progetto',
|
||||||
|
deleteTask: 'Elimina task',
|
||||||
|
deleteTask_title: 'Elimina Task',
|
||||||
|
deleteUser: 'Elimina utente',
|
||||||
|
edit: 'Modifica',
|
||||||
|
editDueDate_title: 'Modifica data di scadenza',
|
||||||
|
editDescription_title: 'Modifica Descrizione',
|
||||||
|
editEmail_title: 'Modifica E-mail',
|
||||||
|
editInformation_title: 'Modifca Informazioni',
|
||||||
|
editPassword_title: 'Modifica Password',
|
||||||
|
editPermissions: 'Modifica permessi',
|
||||||
|
editTimer_title: 'Modifica Timer',
|
||||||
|
editTitle_title: 'Modifica Titolo',
|
||||||
|
editUsername_title: 'Modifica Username',
|
||||||
|
hideDetails: 'Nascondi dettagli',
|
||||||
|
leaveBoard: 'Lascia bacheca',
|
||||||
|
leaveProject: 'Lascia progetto',
|
||||||
|
logOut_title: 'Log Out',
|
||||||
|
makeCover_title: 'Crea Cover',
|
||||||
|
move: 'Muovi',
|
||||||
|
moveCard_title: 'Muovi Card',
|
||||||
|
remove: 'Rimuovi',
|
||||||
|
removeBackground: 'Rimuovi background',
|
||||||
|
removeCover_title: 'Rimuovi Cover',
|
||||||
|
removeFromBoard: 'Rimuovi dalla bacheca',
|
||||||
|
removeFromProject: 'Rimuovi dal Progetto',
|
||||||
|
removeManager: 'Rimuovi manager',
|
||||||
|
removeMember: 'Rimuovi membro',
|
||||||
|
save: 'Salva',
|
||||||
|
showAllAttachments: 'Mostra tutti gli allegati ({{hidden}} hidden)',
|
||||||
|
showDetails: 'Mostra dettagli',
|
||||||
|
showFewerAttachments: 'Mostra meno allegati',
|
||||||
|
start: 'Start',
|
||||||
|
stop: 'Stop',
|
||||||
|
subscribe: 'Subscribe',
|
||||||
|
unsubscribe: 'Unsubscribe',
|
||||||
|
uploadNewAvatar: 'Carica nuovo avatar',
|
||||||
|
uploadNewImage: 'Carica nuova immagine',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
import login from './login';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
language: 'it',
|
||||||
|
country: 'it',
|
||||||
|
name: 'Italiano',
|
||||||
|
embeddedLocale: login,
|
||||||
|
};
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
export default {
|
||||||
|
translation: {
|
||||||
|
common: {
|
||||||
|
emailOrUsername: 'E-mail o username',
|
||||||
|
invalidEmailOrUsername: 'E-mail or username invalido',
|
||||||
|
invalidPassword: 'Password non valida',
|
||||||
|
logInToPlanka: 'Log in Planka',
|
||||||
|
noInternetConnection: 'Nessuna connessione internet',
|
||||||
|
pageNotFound_title: 'Pagina non trovata',
|
||||||
|
password: 'Password',
|
||||||
|
projectManagement: 'Project management',
|
||||||
|
serverConnectionFailed: 'Connesione al server fallita',
|
||||||
|
unknownError: 'Errore sconosciuto, prova ancora',
|
||||||
|
},
|
||||||
|
|
||||||
|
action: {
|
||||||
|
logIn: 'Log in',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -117,7 +117,7 @@ export default {
|
|||||||
phone: '電話番号',
|
phone: '電話番号',
|
||||||
preferences: '環境設定',
|
preferences: '環境設定',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'ヒント: Ctrl-V(MacではCmd-V)を押して、クリップボードから添付ファイルを追加します。',
|
'ヒント: Ctrl-V(MacではCmd-V)を押して、クリップボードから添付ファイルを追加します',
|
||||||
project: 'プロジェクト',
|
project: 'プロジェクト',
|
||||||
projectNotFound_title: 'プロジェクトがありません',
|
projectNotFound_title: 'プロジェクトがありません',
|
||||||
removeManager_title: 'マネージャーを削除',
|
removeManager_title: 'マネージャーを削除',
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ export default {
|
|||||||
phone: 'Telefon',
|
phone: 'Telefon',
|
||||||
preferences: 'Preferencje',
|
preferences: 'Preferencje',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Podpowiedź: naciśnij Ctrl-V (Cmd-V na Macu) aby dodać załącznik ze schowka.',
|
'Podpowiedź: naciśnij Ctrl-V (Cmd-V na Macu) aby dodać załącznik ze schowka',
|
||||||
project: 'Projekt',
|
project: 'Projekt',
|
||||||
projectNotFound_title: 'Projekt Nie Znaleziony',
|
projectNotFound_title: 'Projekt Nie Znaleziony',
|
||||||
removeMember_title: 'Usuń Członka',
|
removeMember_title: 'Usuń Członka',
|
||||||
|
|||||||
@@ -39,6 +39,9 @@ export default {
|
|||||||
authentication: 'Аутентификация',
|
authentication: 'Аутентификация',
|
||||||
board: 'Доска',
|
board: 'Доска',
|
||||||
boardNotFound: 'Доска не найдена',
|
boardNotFound: 'Доска не найдена',
|
||||||
|
canComment: 'Может комментировать',
|
||||||
|
canEditContentOfBoard: 'Может редактировать содержимое доски',
|
||||||
|
canOnlyViewBoard: 'Может только просматривать доску',
|
||||||
cardActions: 'Действия с карточкой',
|
cardActions: 'Действия с карточкой',
|
||||||
cardNotFound: 'Карточка не найдена',
|
cardNotFound: 'Карточка не найдена',
|
||||||
cardOrActionAreDeleted: 'Карточка или действие удалены',
|
cardOrActionAreDeleted: 'Карточка или действие удалены',
|
||||||
@@ -64,6 +67,7 @@ export default {
|
|||||||
description: 'Описание',
|
description: 'Описание',
|
||||||
detectAutomatically: 'Определить автоматически',
|
detectAutomatically: 'Определить автоматически',
|
||||||
dropFileToUpload: 'Перетяните файл, чтобы загрузить',
|
dropFileToUpload: 'Перетяните файл, чтобы загрузить',
|
||||||
|
editor: 'Редактор',
|
||||||
editAttachment: 'Изменение вложения',
|
editAttachment: 'Изменение вложения',
|
||||||
editAvatar: 'Изменение аватара',
|
editAvatar: 'Изменение аватара',
|
||||||
editBoard: 'Изменение доски',
|
editBoard: 'Изменение доски',
|
||||||
@@ -72,6 +76,7 @@ export default {
|
|||||||
editEmail: 'Изменение e-mail',
|
editEmail: 'Изменение e-mail',
|
||||||
editLabel: 'Изменения метки',
|
editLabel: 'Изменения метки',
|
||||||
editPassword: 'Изменение пароля',
|
editPassword: 'Изменение пароля',
|
||||||
|
editPermissions: 'Редактирование разрешений',
|
||||||
editTimer: 'Изменение таймера',
|
editTimer: 'Изменение таймера',
|
||||||
editTitle: 'Изменение названия',
|
editTitle: 'Изменение названия',
|
||||||
editUsername: 'Изменение имени пользователя',
|
editUsername: 'Изменение имени пользователя',
|
||||||
@@ -95,6 +100,8 @@ export default {
|
|||||||
members: 'Участники',
|
members: 'Участники',
|
||||||
minutes: 'Минуты',
|
minutes: 'Минуты',
|
||||||
moveCard: 'Перемещение карточки',
|
moveCard: 'Перемещение карточки',
|
||||||
|
mustBeAtLeast6CharactersLongAndContainAtLeastOneLetterAndNumber:
|
||||||
|
'Должен быть не менее 6 символов и содержать хотя бы одну букву и цифру',
|
||||||
name: 'Имя',
|
name: 'Имя',
|
||||||
newEmail: 'Новый e-mail',
|
newEmail: 'Новый e-mail',
|
||||||
newPassword: 'Новый пароль',
|
newPassword: 'Новый пароль',
|
||||||
@@ -111,14 +118,18 @@ export default {
|
|||||||
phone: 'Телефон',
|
phone: 'Телефон',
|
||||||
preferences: 'Предпочтения',
|
preferences: 'Предпочтения',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Совет: нажмите Ctrl-V (Cmd-V на Mac), чтобы добавить вложение из буфера обмена.',
|
'Совет: нажмите Ctrl-V (Cmd-V на Mac), чтобы добавить вложение из буфера обмена',
|
||||||
project: 'Проект',
|
project: 'Проект',
|
||||||
projectActions: 'Действия с проектом',
|
projectActions: 'Действия с проектом',
|
||||||
projectNotFound: 'Проект не найден',
|
projectNotFound: 'Проект не найден',
|
||||||
removeMember: 'Удаление участника',
|
removeMember: 'Удаление участника',
|
||||||
|
searchLabels: 'Поиск меток...',
|
||||||
|
searchMembers: 'Поиск участников...',
|
||||||
|
searchUsers: 'Поиск пользователей...',
|
||||||
seconds: 'Секунды',
|
seconds: 'Секунды',
|
||||||
selectBoard: 'Выберите доску',
|
selectBoard: 'Выберите доску',
|
||||||
selectList: 'Выберите список',
|
selectList: 'Выберите список',
|
||||||
|
selectPermissions: 'Выбор разрешений',
|
||||||
selectProject: 'Выберите проект',
|
selectProject: 'Выберите проект',
|
||||||
settings: 'Настройки',
|
settings: 'Настройки',
|
||||||
subscribeToMyOwnCardsByDefault: 'По умолчанию подписаться на мои собственные карточки',
|
subscribeToMyOwnCardsByDefault: 'По умолчанию подписаться на мои собственные карточки',
|
||||||
@@ -128,7 +139,7 @@ export default {
|
|||||||
time: 'Время',
|
time: 'Время',
|
||||||
timer: 'Таймер',
|
timer: 'Таймер',
|
||||||
title: 'Название',
|
title: 'Название',
|
||||||
userActions_title: 'Действия с пользователем',
|
userActions: 'Действия с пользователем',
|
||||||
userAddedThisCardToList: '<0>{{user}}</0><1> добавил(а) эту карточку в {{list}}</1>',
|
userAddedThisCardToList: '<0>{{user}}</0><1> добавил(а) эту карточку в {{list}}</1>',
|
||||||
userLeftNewCommentToCard: '{{user}} оставил(а) комментарий «{{comment}}» к <2>{{card}}</2>',
|
userLeftNewCommentToCard: '{{user}} оставил(а) комментарий «{{comment}}» к <2>{{card}}</2>',
|
||||||
userMovedCardFromListToList:
|
userMovedCardFromListToList:
|
||||||
@@ -138,6 +149,7 @@ export default {
|
|||||||
username: 'Имя пользователя',
|
username: 'Имя пользователя',
|
||||||
usernameAlreadyInUse: 'Имя пользователя уже занято',
|
usernameAlreadyInUse: 'Имя пользователя уже занято',
|
||||||
users: 'Пользователи',
|
users: 'Пользователи',
|
||||||
|
viewer: 'Читатель',
|
||||||
writeComment: 'Напишите комментарий...',
|
writeComment: 'Напишите комментарий...',
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -148,6 +160,7 @@ export default {
|
|||||||
addCard: 'Добавить карточку',
|
addCard: 'Добавить карточку',
|
||||||
addComment: 'Добавить комментарий',
|
addComment: 'Добавить комментарий',
|
||||||
addList: 'Добавить список',
|
addList: 'Добавить список',
|
||||||
|
addMember: 'Добавить участника',
|
||||||
addMoreDetailedDescription: 'Добавить более подробное описание',
|
addMoreDetailedDescription: 'Добавить более подробное описание',
|
||||||
addTask: 'Добавить задачу',
|
addTask: 'Добавить задачу',
|
||||||
addToCard: 'Добавить на карточку',
|
addToCard: 'Добавить на карточку',
|
||||||
@@ -175,6 +188,7 @@ export default {
|
|||||||
editDescription: 'Изменить описание',
|
editDescription: 'Изменить описание',
|
||||||
editEmail: 'Изменить e-mail',
|
editEmail: 'Изменить e-mail',
|
||||||
editPassword: 'Изменить пароль',
|
editPassword: 'Изменить пароль',
|
||||||
|
editPermissions: 'Изменить разрешения',
|
||||||
editTask: 'Изменить задачу',
|
editTask: 'Изменить задачу',
|
||||||
editTimer: 'Изменить таймер',
|
editTimer: 'Изменить таймер',
|
||||||
editTitle: 'Изменить название',
|
editTitle: 'Изменить название',
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ export default {
|
|||||||
phone: 'Telefón',
|
phone: 'Telefón',
|
||||||
preferences: 'Voľby',
|
preferences: 'Voľby',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tip: stlačte Ctrl-V (Cmd-V na Mac) pre vloženie prílohy zo schránky.',
|
'Tip: stlačte Ctrl-V (Cmd-V na Mac) pre vloženie prílohy zo schránky',
|
||||||
project: 'Projekt',
|
project: 'Projekt',
|
||||||
projectNotFound_title: 'Projekt neexistuje',
|
projectNotFound_title: 'Projekt neexistuje',
|
||||||
removeManager_title: 'Odstrániť správcu',
|
removeManager_title: 'Odstrániť správcu',
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ export default {
|
|||||||
phone: 'Telefon',
|
phone: 'Telefon',
|
||||||
preferences: 'Preferenser',
|
preferences: 'Preferenser',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'Tips: tryck på Ctrl-V (Cmd-V på Mac) för att lägga till en bilaga från urklipp.',
|
'Tips: tryck på Ctrl-V (Cmd-V på Mac) för att lägga till en bilaga från urklipp',
|
||||||
project: 'Projekt',
|
project: 'Projekt',
|
||||||
projectNotFound_title: 'Projekt Ej Funnet',
|
projectNotFound_title: 'Projekt Ej Funnet',
|
||||||
removeManager_title: 'Ta Bort Projektledare',
|
removeManager_title: 'Ta Bort Projektledare',
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ export default {
|
|||||||
phone: 'Telefon',
|
phone: 'Telefon',
|
||||||
preferences: 'Afzalliklar',
|
preferences: 'Afzalliklar',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
"Tip: Buferdan ilova qo'shish uchun Ctrl-V (Mac da Cmd-V) ni bosing.",
|
"Tip: Buferdan ilova qo'shish uchun Ctrl-V (Mac da Cmd-V) ni bosing",
|
||||||
project: 'Loyiha',
|
project: 'Loyiha',
|
||||||
projectNotFound_title: 'Loyiha Topilmadi',
|
projectNotFound_title: 'Loyiha Topilmadi',
|
||||||
removeManager_title: "Boshqaruvchini O'chirish",
|
removeManager_title: "Boshqaruvchini O'chirish",
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ export default {
|
|||||||
phone: '电话',
|
phone: '电话',
|
||||||
preferences: '偏好',
|
preferences: '偏好',
|
||||||
pressPasteShortcutToAddAttachmentFromClipboard:
|
pressPasteShortcutToAddAttachmentFromClipboard:
|
||||||
'提示: 点击 Ctrl-V (Mac: Cmd-V) 从剪切板添加附件.',
|
'提示: 点击 Ctrl-V (Mac: Cmd-V) 从剪切板添加附件',
|
||||||
project: '项目',
|
project: '项目',
|
||||||
projectNotFound_title: '项目未找到',
|
projectNotFound_title: '项目未找到',
|
||||||
removeManager_title: '删除管理员',
|
removeManager_title: '删除管理员',
|
||||||
|
|||||||
@@ -175,6 +175,14 @@ export default class extends Model {
|
|||||||
return this.lists.orderBy('position');
|
return this.lists.orderBy('position');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getMembershipModel(userId) {
|
||||||
|
return this.memberships
|
||||||
|
.filter({
|
||||||
|
userId,
|
||||||
|
})
|
||||||
|
.first();
|
||||||
|
}
|
||||||
|
|
||||||
hasMemberUser(userId) {
|
hasMemberUser(userId) {
|
||||||
return this.memberships
|
return this.memberships
|
||||||
.filter({
|
.filter({
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ export default class extends Model {
|
|||||||
|
|
||||||
static fields = {
|
static fields = {
|
||||||
id: attr(),
|
id: attr(),
|
||||||
|
role: attr(),
|
||||||
|
canComment: attr(),
|
||||||
boardId: fk({
|
boardId: fk({
|
||||||
to: 'Board',
|
to: 'Board',
|
||||||
as: 'board',
|
as: 'board',
|
||||||
@@ -65,6 +67,15 @@ export default class extends Model {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
case ActionTypes.BOARD_MEMBERSHIP_UPDATE:
|
||||||
|
BoardMembership.withId(payload.id).update(payload.data);
|
||||||
|
|
||||||
|
break;
|
||||||
|
case ActionTypes.BOARD_MEMBERSHIP_UPDATE__SUCCESS:
|
||||||
|
case ActionTypes.BOARD_MEMBERSHIP_UPDATE_HANDLE:
|
||||||
|
BoardMembership.upsert(payload.boardMembership);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case ActionTypes.BOARD_MEMBERSHIP_DELETE:
|
case ActionTypes.BOARD_MEMBERSHIP_DELETE:
|
||||||
BoardMembership.withId(payload.id).deleteWithRelated();
|
BoardMembership.withId(payload.id).deleteWithRelated();
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ export function* handleBoardMembershipCreate(boardMembership) {
|
|||||||
|
|
||||||
let body;
|
let body;
|
||||||
try {
|
try {
|
||||||
body = yield call(requests.fetchBoardByCurrentPathRequest);
|
body = yield call(requests.fetchBoardByCurrentPath);
|
||||||
} catch {} // eslint-disable-line no-empty
|
} catch {} // eslint-disable-line no-empty
|
||||||
|
|
||||||
if (body && body.project && body.project.id === board2.projectId) {
|
if (body && body.project && body.project.id === board2.projectId) {
|
||||||
@@ -135,6 +135,24 @@ export function* handleBoardMembershipCreate(boardMembership) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function* updateBoardMembership(id, data) {
|
||||||
|
yield put(actions.updateBoardMembership(id, data));
|
||||||
|
|
||||||
|
let boardMembership;
|
||||||
|
try {
|
||||||
|
({ item: boardMembership } = yield call(request, api.updateBoardMembership, id, data));
|
||||||
|
} catch (error) {
|
||||||
|
yield put(actions.updateBoardMembership.failure(id, error));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
yield put(actions.updateBoardMembership.success(boardMembership));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function* handleBoardMembershipUpdate(boardMembership) {
|
||||||
|
yield put(actions.handleBoardMembershipUpdate(boardMembership));
|
||||||
|
}
|
||||||
|
|
||||||
export function* deleteBoardMembership(id) {
|
export function* deleteBoardMembership(id) {
|
||||||
let boardMembership = yield select(selectors.selectBoardMembershipById, id);
|
let boardMembership = yield select(selectors.selectBoardMembershipById, id);
|
||||||
|
|
||||||
@@ -184,6 +202,8 @@ export default {
|
|||||||
createBoardMembership,
|
createBoardMembership,
|
||||||
createMembershipInCurrentBoard,
|
createMembershipInCurrentBoard,
|
||||||
handleBoardMembershipCreate,
|
handleBoardMembershipCreate,
|
||||||
|
updateBoardMembership,
|
||||||
|
handleBoardMembershipUpdate,
|
||||||
deleteBoardMembership,
|
deleteBoardMembership,
|
||||||
handleBoardMembershipDelete,
|
handleBoardMembershipDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -11,6 +11,12 @@ export default function* boardMembershipsWatchers() {
|
|||||||
takeEvery(EntryActionTypes.BOARD_MEMBERSHIP_CREATE_HANDLE, ({ payload: { boardMembership } }) =>
|
takeEvery(EntryActionTypes.BOARD_MEMBERSHIP_CREATE_HANDLE, ({ payload: { boardMembership } }) =>
|
||||||
services.handleBoardMembershipCreate(boardMembership),
|
services.handleBoardMembershipCreate(boardMembership),
|
||||||
),
|
),
|
||||||
|
takeEvery(EntryActionTypes.BOARD_MEMBERSHIP_UPDATE, ({ payload: { id, data } }) =>
|
||||||
|
services.updateBoardMembership(id, data),
|
||||||
|
),
|
||||||
|
takeEvery(EntryActionTypes.BOARD_MEMBERSHIP_UPDATE_HANDLE, ({ payload: { boardMembership } }) =>
|
||||||
|
services.handleBoardMembershipUpdate(boardMembership),
|
||||||
|
),
|
||||||
takeEvery(EntryActionTypes.BOARD_MEMBERSHIP_DELETE, ({ payload: { id } }) =>
|
takeEvery(EntryActionTypes.BOARD_MEMBERSHIP_DELETE, ({ payload: { id } }) =>
|
||||||
services.deleteBoardMembership(id),
|
services.deleteBoardMembership(id),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -64,6 +64,10 @@ const createSocketEventsChannel = () =>
|
|||||||
emit(entryActions.handleBoardMembershipCreate(item));
|
emit(entryActions.handleBoardMembershipCreate(item));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleBoardMembershipUpdate = ({ item }) => {
|
||||||
|
emit(entryActions.handleBoardMembershipUpdate(item));
|
||||||
|
};
|
||||||
|
|
||||||
const handleBoardMembershipDelete = ({ item }) => {
|
const handleBoardMembershipDelete = ({ item }) => {
|
||||||
emit(entryActions.handleBoardMembershipDelete(item));
|
emit(entryActions.handleBoardMembershipDelete(item));
|
||||||
};
|
};
|
||||||
@@ -183,6 +187,7 @@ const createSocketEventsChannel = () =>
|
|||||||
socket.on('boardDelete', handleBoardDelete);
|
socket.on('boardDelete', handleBoardDelete);
|
||||||
|
|
||||||
socket.on('boardMembershipCreate', handleBoardMembershipCreate);
|
socket.on('boardMembershipCreate', handleBoardMembershipCreate);
|
||||||
|
socket.on('boardMembershipUpdate', handleBoardMembershipUpdate);
|
||||||
socket.on('boardMembershipDelete', handleBoardMembershipDelete);
|
socket.on('boardMembershipDelete', handleBoardMembershipDelete);
|
||||||
|
|
||||||
socket.on('listCreate', handleListCreate);
|
socket.on('listCreate', handleListCreate);
|
||||||
@@ -238,6 +243,7 @@ const createSocketEventsChannel = () =>
|
|||||||
socket.off('boardDelete', handleBoardDelete);
|
socket.off('boardDelete', handleBoardDelete);
|
||||||
|
|
||||||
socket.off('boardMembershipCreate', handleBoardMembershipCreate);
|
socket.off('boardMembershipCreate', handleBoardMembershipCreate);
|
||||||
|
socket.off('boardMembershipUpdate', handleBoardMembershipUpdate);
|
||||||
socket.off('boardMembershipDelete', handleBoardMembershipDelete);
|
socket.off('boardMembershipDelete', handleBoardMembershipDelete);
|
||||||
|
|
||||||
socket.off('listCreate', handleListCreate);
|
socket.off('listCreate', handleListCreate);
|
||||||
|
|||||||
@@ -147,22 +147,28 @@ export const selectFilterLabelsForCurrentBoard = createSelector(
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
export const selectIsCurrentUserMemberForCurrentBoard = createSelector(
|
export const selectCurrentUserMembershipForCurrentBoard = createSelector(
|
||||||
orm,
|
orm,
|
||||||
(state) => selectPath(state).boardId,
|
(state) => selectPath(state).boardId,
|
||||||
(state) => selectCurrentUserId(state),
|
(state) => selectCurrentUserId(state),
|
||||||
({ Board }, id, currentUserId) => {
|
({ Board }, id, currentUserId) => {
|
||||||
if (!id) {
|
if (!id) {
|
||||||
return false;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
const boardModel = Board.withId(id);
|
const boardModel = Board.withId(id);
|
||||||
|
|
||||||
if (!boardModel) {
|
if (!boardModel) {
|
||||||
return false;
|
return boardModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
return boardModel.hasMemberUser(currentUserId);
|
const boardMembershipModel = boardModel.getMembershipModel(currentUserId);
|
||||||
|
|
||||||
|
if (!boardMembershipModel) {
|
||||||
|
return boardMembershipModel;
|
||||||
|
}
|
||||||
|
|
||||||
|
return boardMembershipModel.ref;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -175,5 +181,5 @@ export default {
|
|||||||
selectListIdsForCurrentBoard,
|
selectListIdsForCurrentBoard,
|
||||||
selectFilterUsersForCurrentBoard,
|
selectFilterUsersForCurrentBoard,
|
||||||
selectFilterLabelsForCurrentBoard,
|
selectFilterLabelsForCurrentBoard,
|
||||||
selectIsCurrentUserMemberForCurrentBoard,
|
selectCurrentUserMembershipForCurrentBoard,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
|
const PASSWORD_REGEX = /^(?=.*[A-Za-z])(?=.*\d).+$/;
|
||||||
const USERNAME_REGEX = /^[a-zA-Z0-9]+((_|\.)?[a-zA-Z0-9])*$/;
|
const USERNAME_REGEX = /^[a-zA-Z0-9]+((_|\.)?[a-zA-Z0-9])*$/;
|
||||||
|
|
||||||
// eslint-disable-next-line import/prefer-default-export
|
export const isPassword = (string) => {
|
||||||
|
return string.length >= 6 && PASSWORD_REGEX.test(string);
|
||||||
|
};
|
||||||
|
|
||||||
export const isUsername = (string) => {
|
export const isUsername = (string) => {
|
||||||
return string.length >= 3 && string.length <= 16 && USERNAME_REGEX.test(string);
|
return string.length >= 3 && string.length <= 16 && USERNAME_REGEX.test(string);
|
||||||
};
|
};
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "planka",
|
"name": "planka",
|
||||||
"version": "1.6.0",
|
"version": "1.7.6",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "planka",
|
"name": "planka",
|
||||||
"version": "1.6.0",
|
"version": "1.7.6",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "planka",
|
"name": "planka",
|
||||||
"version": "1.6.0",
|
"version": "1.7.6",
|
||||||
"private": true,
|
"private": true,
|
||||||
"homepage": "https://plankanban.github.io/planka",
|
"homepage": "https://plankanban.github.io/planka",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
@@ -143,3 +143,5 @@ private/attachments/*
|
|||||||
|
|
||||||
views/*
|
views/*
|
||||||
!views/.gitkeep
|
!views/.gitkeep
|
||||||
|
|
||||||
|
logs
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
const bcrypt = require('bcrypt');
|
const bcrypt = require('bcrypt');
|
||||||
const validator = require('validator');
|
const validator = require('validator');
|
||||||
|
|
||||||
|
const { getRemoteAddress } = require('../../../utils/remoteAddress');
|
||||||
|
|
||||||
const Errors = {
|
const Errors = {
|
||||||
INVALID_EMAIL_OR_USERNAME: {
|
INVALID_EMAIL_OR_USERNAME: {
|
||||||
invalidEmailOrUsername: 'Invalid email or username',
|
invalidEmailOrUsername: 'Invalid email or username',
|
||||||
@@ -41,10 +43,16 @@ module.exports = {
|
|||||||
const user = await sails.helpers.users.getOneByEmailOrUsername(inputs.emailOrUsername);
|
const user = await sails.helpers.users.getOneByEmailOrUsername(inputs.emailOrUsername);
|
||||||
|
|
||||||
if (!user) {
|
if (!user) {
|
||||||
|
sails.log.warn(
|
||||||
|
`Invalid email or username: "${inputs.emailOrUsername}"! (IP: ${getRemoteAddress(
|
||||||
|
this.req,
|
||||||
|
)})`,
|
||||||
|
);
|
||||||
throw Errors.INVALID_EMAIL_OR_USERNAME;
|
throw Errors.INVALID_EMAIL_OR_USERNAME;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!bcrypt.compareSync(inputs.password, user.password)) {
|
if (!bcrypt.compareSync(inputs.password, user.password)) {
|
||||||
|
sails.log.warn(`Invalid password! (IP: ${getRemoteAddress(this.req)})`);
|
||||||
throw Errors.INVALID_PASSWORD;
|
throw Errors.INVALID_PASSWORD;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,16 @@
|
|||||||
|
const util = require('util');
|
||||||
|
const { v4: uuid } = require('uuid');
|
||||||
|
|
||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
CARD_NOT_FOUND: {
|
CARD_NOT_FOUND: {
|
||||||
cardNotFound: 'Card not found',
|
cardNotFound: 'Card not found',
|
||||||
},
|
},
|
||||||
|
NO_FILE_WAS_UPLOADED: {
|
||||||
|
noFileWasUploaded: 'No file was uploaded',
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
@@ -18,9 +27,15 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
cardNotFound: {
|
cardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
|
noFileWasUploaded: {
|
||||||
|
responseType: 'unprocessableEntity',
|
||||||
|
},
|
||||||
uploadError: {
|
uploadError: {
|
||||||
responseType: 'unprocessableEntity',
|
responseType: 'unprocessableEntity',
|
||||||
},
|
},
|
||||||
@@ -33,30 +48,42 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.cardId)
|
.getProjectPath(inputs.cardId)
|
||||||
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, card.boardId);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: card.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.CARD_NOT_FOUND; // Forbidden
|
throw Errors.CARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
this.req
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
.file('file')
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
.upload(sails.helpers.utils.createAttachmentReceiver(), async (error, files) => {
|
}
|
||||||
if (error) {
|
|
||||||
return exits.uploadError(error.message);
|
const upload = util.promisify((options, callback) =>
|
||||||
|
this.req.file('file').upload(options, (error, files) => callback(error, files)),
|
||||||
|
);
|
||||||
|
|
||||||
|
let files;
|
||||||
|
try {
|
||||||
|
files = await upload({
|
||||||
|
saveAs: uuid(),
|
||||||
|
maxBytes: null,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
return exits.uploadError(error.message); // TODO: add error
|
||||||
}
|
}
|
||||||
|
|
||||||
if (files.length === 0) {
|
if (files.length === 0) {
|
||||||
return exits.uploadError('No file was uploaded');
|
throw Errors.NO_FILE_WAS_UPLOADED;
|
||||||
}
|
}
|
||||||
|
|
||||||
const file = files[0];
|
const file = _.last(files);
|
||||||
|
const fileData = await sails.helpers.attachments.processUploadedFile(file);
|
||||||
|
|
||||||
const attachment = await sails.helpers.attachments.createOne(
|
const attachment = await sails.helpers.attachments.createOne(
|
||||||
{
|
fileData,
|
||||||
...file.extra,
|
|
||||||
filename: file.filename,
|
|
||||||
},
|
|
||||||
currentUser,
|
currentUser,
|
||||||
card,
|
card,
|
||||||
inputs.requestId,
|
inputs.requestId,
|
||||||
@@ -64,8 +91,7 @@ module.exports = {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return exits.success({
|
return exits.success({
|
||||||
item: attachment.toJSON(),
|
item: attachment,
|
||||||
});
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
ATTACHMENT_NOT_FOUND: {
|
ATTACHMENT_NOT_FOUND: {
|
||||||
attachmentNotFound: 'Attachment not found',
|
attachmentNotFound: 'Attachment not found',
|
||||||
},
|
},
|
||||||
@@ -14,6 +17,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
attachmentNotFound: {
|
attachmentNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -29,12 +35,19 @@ module.exports = {
|
|||||||
let { attachment } = path;
|
let { attachment } = path;
|
||||||
const { card, board } = path;
|
const { card, board } = path;
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.ATTACHMENT_NOT_FOUND; // Forbidden
|
throw Errors.ATTACHMENT_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
attachment = await sails.helpers.attachments.deleteOne(attachment, board, card, this.req);
|
attachment = await sails.helpers.attachments.deleteOne(attachment, board, card, this.req);
|
||||||
|
|
||||||
if (!attachment) {
|
if (!attachment) {
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
ATTACHMENT_NOT_FOUND: {
|
ATTACHMENT_NOT_FOUND: {
|
||||||
attachmentNotFound: 'Attachment not found',
|
attachmentNotFound: 'Attachment not found',
|
||||||
},
|
},
|
||||||
@@ -18,6 +21,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
attachmentNotFound: {
|
attachmentNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -33,12 +39,19 @@ module.exports = {
|
|||||||
let { attachment } = path;
|
let { attachment } = path;
|
||||||
const { board } = path;
|
const { board } = path;
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.ATTACHMENT_NOT_FOUND; // Forbidden
|
throw Errors.ATTACHMENT_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
const values = _.pick(inputs, ['name']);
|
const values = _.pick(inputs, ['name']);
|
||||||
attachment = await sails.helpers.attachments.updateOne(attachment, values, board, this.req);
|
attachment = await sails.helpers.attachments.updateOne(attachment, values, board, this.req);
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,14 @@ module.exports = {
|
|||||||
regex: /^[0-9]+$/,
|
regex: /^[0-9]+$/,
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
role: {
|
||||||
|
type: 'string',
|
||||||
|
isIn: Object.values(BoardMembership.Roles),
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
canComment: {
|
||||||
|
type: 'boolean',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
@@ -58,8 +66,10 @@ module.exports = {
|
|||||||
throw Error.USER_NOT_FOUND;
|
throw Error.USER_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const values = _.pick(inputs, ['role', 'canComment']);
|
||||||
|
|
||||||
const boardMembership = await sails.helpers.boardMemberships
|
const boardMembership = await sails.helpers.boardMemberships
|
||||||
.createOne(user, board, this.req)
|
.createOne(values, user, board, this.req)
|
||||||
.intercept('userAlreadyBoardMember', () => Errors.USER_ALREADY_BOARD_MEMBER);
|
.intercept('userAlreadyBoardMember', () => Errors.USER_ALREADY_BOARD_MEMBER);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
const Errors = {
|
||||||
|
BOARD_MEMBERSHIP_NOT_FOUND: {
|
||||||
|
boardMembershipNotFound: 'Board membership not found',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
inputs: {
|
||||||
|
id: {
|
||||||
|
type: 'string',
|
||||||
|
regex: /^[0-9]+$/,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
role: {
|
||||||
|
type: 'string',
|
||||||
|
isIn: Object.values(BoardMembership.Roles),
|
||||||
|
},
|
||||||
|
canComment: {
|
||||||
|
type: 'boolean',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
exits: {
|
||||||
|
boardMembershipNotFound: {
|
||||||
|
responseType: 'notFound',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async fn(inputs) {
|
||||||
|
const { currentUser } = this.req;
|
||||||
|
|
||||||
|
const path = await sails.helpers.boardMemberships
|
||||||
|
.getProjectPath(inputs.id)
|
||||||
|
.intercept('pathNotFound', () => Errors.BOARD_MEMBERSHIP_NOT_FOUND);
|
||||||
|
|
||||||
|
let { boardMembership } = path;
|
||||||
|
const { project } = path;
|
||||||
|
|
||||||
|
const isProjectManager = await sails.helpers.users.isProjectManager(currentUser.id, project.id);
|
||||||
|
|
||||||
|
if (!isProjectManager) {
|
||||||
|
throw Errors.BOARD_MEMBERSHIP_NOT_FOUND; // Forbidden
|
||||||
|
}
|
||||||
|
|
||||||
|
const values = _.pick(inputs, ['role', 'canComment']);
|
||||||
|
|
||||||
|
boardMembership = await sails.helpers.boardMemberships.updateOne(
|
||||||
|
boardMembership,
|
||||||
|
values,
|
||||||
|
this.req,
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
item: boardMembership,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
CARD_NOT_FOUND: {
|
CARD_NOT_FOUND: {
|
||||||
cardNotFound: 'Card not found',
|
cardNotFound: 'Card not found',
|
||||||
},
|
},
|
||||||
@@ -25,6 +28,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
cardNotFound: {
|
cardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -43,12 +49,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.cardId)
|
.getProjectPath(inputs.cardId)
|
||||||
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, card.boardId);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: card.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.CARD_NOT_FOUND; // Forbidden
|
throw Errors.CARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
const label = await Label.findOne({
|
const label = await Label.findOne({
|
||||||
id: inputs.labelId,
|
id: inputs.labelId,
|
||||||
boardId: card.boardId,
|
boardId: card.boardId,
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
CARD_NOT_FOUND: {
|
CARD_NOT_FOUND: {
|
||||||
cardNotFound: 'Card not found',
|
cardNotFound: 'Card not found',
|
||||||
},
|
},
|
||||||
@@ -22,6 +25,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
cardNotFound: {
|
cardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -37,12 +43,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.cardId)
|
.getProjectPath(inputs.cardId)
|
||||||
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.CARD_NOT_FOUND; // Forbidden
|
throw Errors.CARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
let cardLabel = await CardLabel.findOne({
|
let cardLabel = await CardLabel.findOne({
|
||||||
cardId: inputs.cardId,
|
cardId: inputs.cardId,
|
||||||
labelId: inputs.labelId,
|
labelId: inputs.labelId,
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
CARD_NOT_FOUND: {
|
CARD_NOT_FOUND: {
|
||||||
cardNotFound: 'Card not found',
|
cardNotFound: 'Card not found',
|
||||||
},
|
},
|
||||||
@@ -25,6 +28,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
cardNotFound: {
|
cardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -43,13 +49,20 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.cardId)
|
.getProjectPath(inputs.cardId)
|
||||||
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
||||||
|
|
||||||
let isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, card.boardId);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: card.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.CARD_NOT_FOUND; // Forbidden
|
throw Errors.CARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
isBoardMember = await sails.helpers.users.isBoardMember(inputs.userId, card.boardId);
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
|
const isBoardMember = await sails.helpers.users.isBoardMember(inputs.userId, card.boardId);
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!isBoardMember) {
|
||||||
throw Errors.USER_NOT_FOUND;
|
throw Errors.USER_NOT_FOUND;
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
CARD_NOT_FOUND: {
|
CARD_NOT_FOUND: {
|
||||||
cardNotFound: 'Card not found',
|
cardNotFound: 'Card not found',
|
||||||
},
|
},
|
||||||
@@ -22,6 +25,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
cardNotFound: {
|
cardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -37,12 +43,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.cardId)
|
.getProjectPath(inputs.cardId)
|
||||||
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.CARD_NOT_FOUND; // Forbidden
|
throw Errors.CARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
let cardMembership = await CardMembership.findOne({
|
let cardMembership = await CardMembership.findOne({
|
||||||
cardId: inputs.cardId,
|
cardId: inputs.cardId,
|
||||||
userId: inputs.userId,
|
userId: inputs.userId,
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
const moment = require('moment');
|
const moment = require('moment');
|
||||||
|
|
||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
BOARD_NOT_FOUND: {
|
BOARD_NOT_FOUND: {
|
||||||
boardNotFound: 'Board not found',
|
boardNotFound: 'Board not found',
|
||||||
},
|
},
|
||||||
@@ -67,6 +70,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
boardNotFound: {
|
boardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -88,12 +94,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.boardId)
|
.getProjectPath(inputs.boardId)
|
||||||
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.BOARD_NOT_FOUND; // Forbidden
|
throw Errors.BOARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
let list;
|
let list;
|
||||||
if (!_.isUndefined(inputs.listId)) {
|
if (!_.isUndefined(inputs.listId)) {
|
||||||
list = await List.findOne({
|
list = await List.findOne({
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
CARD_NOT_FOUND: {
|
CARD_NOT_FOUND: {
|
||||||
cardNotFound: 'Card not found',
|
cardNotFound: 'Card not found',
|
||||||
},
|
},
|
||||||
@@ -14,6 +17,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
cardNotFound: {
|
cardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -26,12 +32,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.id)
|
.getProjectPath(inputs.id)
|
||||||
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, card.boardId);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: card.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.CARD_NOT_FOUND; // Forbidden
|
throw Errors.CARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
card = await sails.helpers.cards.deleteOne(card, this.req);
|
card = await sails.helpers.cards.deleteOne(card, this.req);
|
||||||
|
|
||||||
if (!card) {
|
if (!card) {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
async fn(inputs, exits) {
|
async fn(inputs) {
|
||||||
const { currentUser } = this.req;
|
const { currentUser } = this.req;
|
||||||
|
|
||||||
const { board } = await sails.helpers.boards
|
const { board } = await sails.helpers.boards
|
||||||
@@ -61,7 +61,7 @@ module.exports = {
|
|||||||
const tasks = await sails.helpers.cards.getTasks(cardIds);
|
const tasks = await sails.helpers.cards.getTasks(cardIds);
|
||||||
const attachments = await sails.helpers.cards.getAttachments(cardIds);
|
const attachments = await sails.helpers.cards.getAttachments(cardIds);
|
||||||
|
|
||||||
return exits.success({
|
return {
|
||||||
items: cards,
|
items: cards,
|
||||||
included: {
|
included: {
|
||||||
cardMemberships,
|
cardMemberships,
|
||||||
@@ -69,6 +69,6 @@ module.exports = {
|
|||||||
tasks,
|
tasks,
|
||||||
attachments,
|
attachments,
|
||||||
},
|
},
|
||||||
});
|
};
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
const moment = require('moment');
|
const moment = require('moment');
|
||||||
|
|
||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
CARD_NOT_FOUND: {
|
CARD_NOT_FOUND: {
|
||||||
cardNotFound: 'Card not found',
|
cardNotFound: 'Card not found',
|
||||||
},
|
},
|
||||||
@@ -83,6 +86,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
cardNotFound: {
|
cardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -110,23 +116,37 @@ module.exports = {
|
|||||||
let { card } = path;
|
let { card } = path;
|
||||||
const { list, board } = path;
|
const { list, board } = path;
|
||||||
|
|
||||||
let isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
let boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.CARD_NOT_FOUND; // Forbidden
|
throw Errors.CARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
let nextBoard;
|
let nextBoard;
|
||||||
if (!_.isUndefined(inputs.boardId)) {
|
if (!_.isUndefined(inputs.boardId)) {
|
||||||
({ board: nextBoard } = await sails.helpers.boards
|
({ board: nextBoard } = await sails.helpers.boards
|
||||||
.getProjectPath(inputs.boardId)
|
.getProjectPath(inputs.boardId)
|
||||||
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND));
|
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND));
|
||||||
|
|
||||||
isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, nextBoard.id);
|
boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: nextBoard.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.BOARD_NOT_FOUND; // Forbidden
|
throw Errors.BOARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let nextList;
|
let nextList;
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
CARD_NOT_FOUND: {
|
CARD_NOT_FOUND: {
|
||||||
cardNotFound: 'Card not found',
|
cardNotFound: 'Card not found',
|
||||||
},
|
},
|
||||||
@@ -18,6 +21,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
cardNotFound: {
|
cardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -30,12 +36,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.cardId)
|
.getProjectPath(inputs.cardId)
|
||||||
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, card.boardId);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: card.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.CARD_NOT_FOUND; // Forbidden
|
throw Errors.CARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR && !boardMembership.canComment) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
const values = {
|
const values = {
|
||||||
type: Action.Types.COMMENT_CARD,
|
type: Action.Types.COMMENT_CARD,
|
||||||
data: _.pick(inputs, ['text']),
|
data: _.pick(inputs, ['text']),
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
COMMENT_ACTION_NOT_FOUND: {
|
COMMENT_ACTION_NOT_FOUND: {
|
||||||
commentActionNotFound: 'Comment action not found',
|
commentActionNotFound: 'Comment action not found',
|
||||||
},
|
},
|
||||||
@@ -14,6 +17,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
commentActionNotFound: {
|
commentActionNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -39,11 +45,18 @@ module.exports = {
|
|||||||
throw Errors.COMMENT_ACTION_NOT_FOUND; // Forbidden
|
throw Errors.COMMENT_ACTION_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.COMMENT_ACTION_NOT_FOUND; // Forbidden
|
throw Errors.COMMENT_ACTION_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR && !boardMembership.canComment) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
action = await sails.helpers.actions.deleteOne(action, board, this.req);
|
action = await sails.helpers.actions.deleteOne(action, board, this.req);
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
COMMENT_ACTION_NOT_FOUND: {
|
COMMENT_ACTION_NOT_FOUND: {
|
||||||
commentActionNotFound: 'Comment action not found',
|
commentActionNotFound: 'Comment action not found',
|
||||||
},
|
},
|
||||||
@@ -18,6 +21,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
commentActionNotFound: {
|
commentActionNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -43,11 +49,18 @@ module.exports = {
|
|||||||
throw Errors.COMMENT_ACTION_NOT_FOUND; // Forbidden
|
throw Errors.COMMENT_ACTION_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.COMMENT_ACTION_NOT_FOUND; // Forbidden
|
throw Errors.COMMENT_ACTION_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR && !boardMembership.canComment) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const values = {
|
const values = {
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
BOARD_NOT_FOUND: {
|
BOARD_NOT_FOUND: {
|
||||||
boardNotFound: 'Board not found',
|
boardNotFound: 'Board not found',
|
||||||
},
|
},
|
||||||
@@ -24,6 +27,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
boardNotFound: {
|
boardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -36,12 +42,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.boardId)
|
.getProjectPath(inputs.boardId)
|
||||||
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.BOARD_NOT_FOUND; // Forbidden
|
throw Errors.BOARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
const values = _.pick(inputs, ['name', 'color']);
|
const values = _.pick(inputs, ['name', 'color']);
|
||||||
const label = await sails.helpers.labels.createOne(values, board, this.req);
|
const label = await sails.helpers.labels.createOne(values, board, this.req);
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
LABEL_NOT_FOUND: {
|
LABEL_NOT_FOUND: {
|
||||||
labelNotFound: 'Label not found',
|
labelNotFound: 'Label not found',
|
||||||
},
|
},
|
||||||
@@ -14,6 +17,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
labelNotFound: {
|
labelNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -26,12 +32,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.id)
|
.getProjectPath(inputs.id)
|
||||||
.intercept('pathNotFound', () => Errors.LABEL_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.LABEL_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, label.boardId);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: label.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.LABEL_NOT_FOUND; // Forbidden
|
throw Errors.LABEL_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
label = await sails.helpers.labels.deleteOne(label, this.req);
|
label = await sails.helpers.labels.deleteOne(label, this.req);
|
||||||
|
|
||||||
if (!label) {
|
if (!label) {
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
LABEL_NOT_FOUND: {
|
LABEL_NOT_FOUND: {
|
||||||
labelNotFound: 'Label not found',
|
labelNotFound: 'Label not found',
|
||||||
},
|
},
|
||||||
@@ -24,6 +27,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
labelNotFound: {
|
labelNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -36,12 +42,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.id)
|
.getProjectPath(inputs.id)
|
||||||
.intercept('pathNotFound', () => Errors.LABEL_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.LABEL_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, label.boardId);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: label.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.LABEL_NOT_FOUND; // Forbidden
|
throw Errors.LABEL_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
const values = _.pick(inputs, ['name', 'color']);
|
const values = _.pick(inputs, ['name', 'color']);
|
||||||
label = await sails.helpers.labels.updateOne(label, values, this.req);
|
label = await sails.helpers.labels.updateOne(label, values, this.req);
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
BOARD_NOT_FOUND: {
|
BOARD_NOT_FOUND: {
|
||||||
boardNotFound: 'Board not found',
|
boardNotFound: 'Board not found',
|
||||||
},
|
},
|
||||||
@@ -22,6 +25,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
boardNotFound: {
|
boardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -34,12 +40,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.boardId)
|
.getProjectPath(inputs.boardId)
|
||||||
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.BOARD_NOT_FOUND; // Forbidden
|
throw Errors.BOARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
const values = _.pick(inputs, ['position', 'name']);
|
const values = _.pick(inputs, ['position', 'name']);
|
||||||
const list = await sails.helpers.lists.createOne(values, board, this.req);
|
const list = await sails.helpers.lists.createOne(values, board, this.req);
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
LIST_NOT_FOUND: {
|
LIST_NOT_FOUND: {
|
||||||
listNotFound: 'List not found',
|
listNotFound: 'List not found',
|
||||||
},
|
},
|
||||||
@@ -14,6 +17,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
listNotFound: {
|
listNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -26,12 +32,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.id)
|
.getProjectPath(inputs.id)
|
||||||
.intercept('pathNotFound', () => Errors.LIST_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.LIST_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, list.boardId);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: list.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.LIST_NOT_FOUND; // Forbidden
|
throw Errors.LIST_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
list = await sails.helpers.lists.deleteOne(list, this.req);
|
list = await sails.helpers.lists.deleteOne(list, this.req);
|
||||||
|
|
||||||
if (!list) {
|
if (!list) {
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
LIST_NOT_FOUND: {
|
LIST_NOT_FOUND: {
|
||||||
listNotFound: 'List not found',
|
listNotFound: 'List not found',
|
||||||
},
|
},
|
||||||
@@ -21,6 +24,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
listNotFound: {
|
listNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -33,12 +39,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.id)
|
.getProjectPath(inputs.id)
|
||||||
.intercept('pathNotFound', () => Errors.LIST_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.LIST_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, list.boardId);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: list.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.LIST_NOT_FOUND; // Forbidden
|
throw Errors.LIST_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
const values = _.pick(inputs, ['position', 'name']);
|
const values = _.pick(inputs, ['position', 'name']);
|
||||||
list = await sails.helpers.lists.updateOne(list, values, this.req);
|
list = await sails.helpers.lists.updateOne(list, values, this.req);
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,17 @@
|
|||||||
|
const util = require('util');
|
||||||
|
const rimraf = require('rimraf');
|
||||||
|
const { v4: uuid } = require('uuid');
|
||||||
|
|
||||||
const Errors = {
|
const Errors = {
|
||||||
PROJECT_NOT_FOUND: {
|
PROJECT_NOT_FOUND: {
|
||||||
projectNotFound: 'Project not found',
|
projectNotFound: 'Project not found',
|
||||||
},
|
},
|
||||||
|
NO_FILE_WAS_UPLOADED: {
|
||||||
|
noFileWasUploaded: 'No file was uploaded',
|
||||||
|
},
|
||||||
|
FILE_IS_NOT_IMAGE: {
|
||||||
|
fileIsNotImage: 'File is not image',
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
@@ -17,6 +27,12 @@ module.exports = {
|
|||||||
projectNotFound: {
|
projectNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
|
noFileWasUploaded: {
|
||||||
|
responseType: 'unprocessableEntity',
|
||||||
|
},
|
||||||
|
fileIsNotImage: {
|
||||||
|
responseType: 'unprocessableEntity',
|
||||||
|
},
|
||||||
uploadError: {
|
uploadError: {
|
||||||
responseType: 'unprocessableEntity',
|
responseType: 'unprocessableEntity',
|
||||||
},
|
},
|
||||||
@@ -37,21 +53,42 @@ module.exports = {
|
|||||||
throw Errors.PROJECT_NOT_FOUND; // Forbidden
|
throw Errors.PROJECT_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
this.req
|
const upload = util.promisify((options, callback) =>
|
||||||
.file('file')
|
this.req.file('file').upload(options, (error, files) => callback(error, files)),
|
||||||
.upload(sails.helpers.utils.createProjectBackgroundImageReceiver(), async (error, files) => {
|
);
|
||||||
if (error) {
|
|
||||||
return exits.uploadError(error.message);
|
let files;
|
||||||
|
try {
|
||||||
|
files = await upload({
|
||||||
|
saveAs: uuid(),
|
||||||
|
maxBytes: null,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
return exits.uploadError(error.message); // TODO: add error
|
||||||
}
|
}
|
||||||
|
|
||||||
if (files.length === 0) {
|
if (files.length === 0) {
|
||||||
return exits.uploadError('No file was uploaded');
|
throw Errors.NO_FILE_WAS_UPLOADED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const file = _.last(files);
|
||||||
|
|
||||||
|
const fileData = await sails.helpers.projects
|
||||||
|
.processUploadedBackgroundImageFile(file)
|
||||||
|
.intercept('fileIsNotImage', () => {
|
||||||
|
try {
|
||||||
|
rimraf.sync(file.fd);
|
||||||
|
} catch (error) {
|
||||||
|
console.warn(error.stack); // eslint-disable-line no-console
|
||||||
|
}
|
||||||
|
|
||||||
|
return Errors.FILE_IS_NOT_IMAGE;
|
||||||
|
});
|
||||||
|
|
||||||
project = await sails.helpers.projects.updateOne(
|
project = await sails.helpers.projects.updateOne(
|
||||||
project,
|
project,
|
||||||
{
|
{
|
||||||
backgroundImageDirname: files[0].extra.dirname,
|
backgroundImageDirname: fileData.dirname,
|
||||||
},
|
},
|
||||||
this.req,
|
this.req,
|
||||||
);
|
);
|
||||||
@@ -61,8 +98,7 @@ module.exports = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return exits.success({
|
return exits.success({
|
||||||
item: project.toJSON(),
|
item: project,
|
||||||
});
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
CARD_NOT_FOUND: {
|
CARD_NOT_FOUND: {
|
||||||
cardNotFound: 'Card not found',
|
cardNotFound: 'Card not found',
|
||||||
},
|
},
|
||||||
@@ -25,6 +28,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
cardNotFound: {
|
cardNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -37,12 +43,19 @@ module.exports = {
|
|||||||
.getProjectPath(inputs.cardId)
|
.getProjectPath(inputs.cardId)
|
||||||
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
.intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, card.boardId);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: card.boardId,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.CARD_NOT_FOUND; // Forbidden
|
throw Errors.CARD_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
const values = _.pick(inputs, ['position', '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);
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
TASK_NOT_FOUND: {
|
TASK_NOT_FOUND: {
|
||||||
taskNotFound: 'Task not found',
|
taskNotFound: 'Task not found',
|
||||||
},
|
},
|
||||||
@@ -14,6 +17,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
taskNotFound: {
|
taskNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -29,12 +35,19 @@ module.exports = {
|
|||||||
let { task } = path;
|
let { task } = path;
|
||||||
const { board } = path;
|
const { board } = path;
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.TASK_NOT_FOUND; // Forbidden
|
throw Errors.TASK_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
task = await sails.helpers.tasks.deleteOne(task, board, this.req);
|
task = await sails.helpers.tasks.deleteOne(task, board, this.req);
|
||||||
|
|
||||||
if (!task) {
|
if (!task) {
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
const Errors = {
|
const Errors = {
|
||||||
|
NOT_ENOUGH_RIGHTS: {
|
||||||
|
notEnoughRights: 'Not enough rights',
|
||||||
|
},
|
||||||
TASK_NOT_FOUND: {
|
TASK_NOT_FOUND: {
|
||||||
taskNotFound: 'Task not found',
|
taskNotFound: 'Task not found',
|
||||||
},
|
},
|
||||||
@@ -24,6 +27,9 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
exits: {
|
exits: {
|
||||||
|
notEnoughRights: {
|
||||||
|
responseType: 'forbidden',
|
||||||
|
},
|
||||||
taskNotFound: {
|
taskNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
@@ -39,12 +45,19 @@ module.exports = {
|
|||||||
let { task } = path;
|
let { task } = path;
|
||||||
const { board } = path;
|
const { board } = path;
|
||||||
|
|
||||||
const isBoardMember = await sails.helpers.users.isBoardMember(currentUser.id, board.id);
|
const boardMembership = await BoardMembership.findOne({
|
||||||
|
boardId: board.id,
|
||||||
|
userId: currentUser.id,
|
||||||
|
});
|
||||||
|
|
||||||
if (!isBoardMember) {
|
if (!boardMembership) {
|
||||||
throw Errors.TASK_NOT_FOUND; // Forbidden
|
throw Errors.TASK_NOT_FOUND; // Forbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (boardMembership.role !== BoardMembership.Roles.EDITOR) {
|
||||||
|
throw Errors.NOT_ENOUGH_RIGHTS;
|
||||||
|
}
|
||||||
|
|
||||||
const values = _.pick(inputs, ['position', '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);
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
password: {
|
password: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
|
minLength: 6,
|
||||||
|
regex: /^(?=.*[A-Za-z])(?=.*\d).+$/,
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
name: {
|
name: {
|
||||||
|
|||||||
@@ -1,7 +1,17 @@
|
|||||||
|
const util = require('util');
|
||||||
|
const rimraf = require('rimraf');
|
||||||
|
const { v4: uuid } = require('uuid');
|
||||||
|
|
||||||
const Errors = {
|
const Errors = {
|
||||||
USER_NOT_FOUND: {
|
USER_NOT_FOUND: {
|
||||||
userNotFound: 'User not found',
|
userNotFound: 'User not found',
|
||||||
},
|
},
|
||||||
|
NO_FILE_WAS_UPLOADED: {
|
||||||
|
noFileWasUploaded: 'No file was uploaded',
|
||||||
|
},
|
||||||
|
FILE_IS_NOT_IMAGE: {
|
||||||
|
fileIsNotImage: 'File is not image',
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
@@ -17,6 +27,12 @@ module.exports = {
|
|||||||
userNotFound: {
|
userNotFound: {
|
||||||
responseType: 'notFound',
|
responseType: 'notFound',
|
||||||
},
|
},
|
||||||
|
noFileWasUploaded: {
|
||||||
|
responseType: 'unprocessableEntity',
|
||||||
|
},
|
||||||
|
fileIsNotImage: {
|
||||||
|
responseType: 'unprocessableEntity',
|
||||||
|
},
|
||||||
uploadError: {
|
uploadError: {
|
||||||
responseType: 'unprocessableEntity',
|
responseType: 'unprocessableEntity',
|
||||||
},
|
},
|
||||||
@@ -38,21 +54,42 @@ module.exports = {
|
|||||||
user = currentUser;
|
user = currentUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.req
|
const upload = util.promisify((options, callback) =>
|
||||||
.file('file')
|
this.req.file('file').upload(options, (error, files) => callback(error, files)),
|
||||||
.upload(sails.helpers.utils.createUserAvatarReceiver(), async (error, files) => {
|
);
|
||||||
if (error) {
|
|
||||||
return exits.uploadError(error.message);
|
let files;
|
||||||
|
try {
|
||||||
|
files = await upload({
|
||||||
|
saveAs: uuid(),
|
||||||
|
maxBytes: null,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
return exits.uploadError(error.message); // TODO: add error
|
||||||
}
|
}
|
||||||
|
|
||||||
if (files.length === 0) {
|
if (files.length === 0) {
|
||||||
return exits.uploadError('No file was uploaded');
|
throw Errors.NO_FILE_WAS_UPLOADED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const file = _.last(files);
|
||||||
|
|
||||||
|
const fileData = await sails.helpers.users
|
||||||
|
.processUploadedAvatarFile(file)
|
||||||
|
.intercept('fileIsNotImage', () => {
|
||||||
|
try {
|
||||||
|
rimraf.sync(file.fd);
|
||||||
|
} catch (error) {
|
||||||
|
console.warn(error.stack); // eslint-disable-line no-console
|
||||||
|
}
|
||||||
|
|
||||||
|
return Errors.FILE_IS_NOT_IMAGE;
|
||||||
|
});
|
||||||
|
|
||||||
user = await sails.helpers.users.updateOne(
|
user = await sails.helpers.users.updateOne(
|
||||||
user,
|
user,
|
||||||
{
|
{
|
||||||
avatarDirname: files[0].extra.dirname,
|
avatarDirname: fileData.dirname,
|
||||||
},
|
},
|
||||||
currentUser,
|
currentUser,
|
||||||
this.req,
|
this.req,
|
||||||
@@ -63,8 +100,7 @@ module.exports = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return exits.success({
|
return exits.success({
|
||||||
item: user.toJSON(),
|
item: user,
|
||||||
});
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user