Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-24 07:39:44 +02:00
Code Issues Releases Activity

Prepare for collection board type, refactoring, update dependencies

Browse source
This commit is contained in:
Maksim Eltyshev 2020-08-04 01:32:46 +05:00
parent 2d92ade8dc
commit c6ee7d54bb
190 changed files with 2144 additions and 1817 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/api/helpers/create-card-membership.js
View file

@ -6,7 +6,7 @@ module.exports = {
},
userOrUserId: {
type: 'ref',
custom: (value) => _.isPlainObject(value) || _.isString(value),
custom: (value) => _.isObjectLike(value) || _.isString(value),
required: true,
},
request: {

95
server/api/helpers/create-card.js
View file

@ -1,12 +1,25 @@
module.exports = {
inputs: {
list: {
board: {
type: 'ref',
required: true,
},
list: {
type: 'ref',
},
values: {
type: 'json',
custom: (value) => _.isPlainObject(value) && _.isFinite(value.position),
custom: (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
return false;
}
return true;
},
required: true,
},
user: {
@ -18,36 +31,61 @@ module.exports = {
},
},
exits: {
listMustBePresent: {},
listMustBelongToBoard: {},
positionMustBeInValues: {},
},
async fn(inputs, exits) {
const cards = await sails.helpers.getCardsForList(inputs.list.id);
const { values } = inputs;
const { position, repositions } = sails.helpers.insertToPositionables(
inputs.values.position,
cards,
);
values.boardId = inputs.board.id;
repositions.forEach(async ({ id, position: nextPosition }) => {
await Card.update({
id,
listId: inputs.list.id,
}).set({
position: nextPosition,
});
if (inputs.board.type === 'kanban') {
if (!inputs.list) {
throw 'listMustBePresent';
}
sails.sockets.broadcast(`board:${list.boardId}`, 'cardUpdate', {
item: {
if (inputs.list.boardId !== inputs.board.id) {
throw 'listMustBelongToBoard';
}
values.listId = inputs.list.id;
if (_.isUndefined(values.position)) {
throw 'positionMustBeInValues';
}
const cards = await sails.helpers.getCardsForList(inputs.list.id);
const { position, repositions } = sails.helpers.insertToPositionables(
inputs.values.position,
cards,
);
repositions.forEach(async ({ id, position: nextPosition }) => {
await Card.update({
id,
listId: inputs.list.id,
}).set({
position: nextPosition,
},
});
});
});
const card = await Card.create({
...inputs.values,
position,
listId: inputs.list.id,
boardId: inputs.list.boardId,
}).fetch();
sails.sockets.broadcast(`board:${inputs.board.id}`, 'cardUpdate', {
item: {
id,
position: nextPosition,
},
});
});
values.position = position;
} else if (inputs.board.type === 'collection') {
delete values.position;
}
const card = await Card.create(values).fetch();
if (inputs.user.subscribeToOwnCards) {
await CardSubscription.create({
@ -60,6 +98,7 @@ module.exports = {
card.isSubscribed = false;
}
// FIXME: broadcast subscription separately
sails.sockets.broadcast(
`board:${card.boardId}`,
'cardCreate',
@ -75,14 +114,12 @@ module.exports = {
inputs.request,
);
const values = {
await sails.helpers.createAction(card, inputs.user, {
type: 'createCard',
data: {
list: _.pick(inputs.list, ['id', 'name']),
},
};
await sails.helpers.createAction(card, inputs.user, values);
});
return exits.success(card);
},

1
server/api/helpers/create-project-membership.js
View file

@ -47,7 +47,6 @@ module.exports = {
});
const users = await sails.helpers.getUsers(userIds);
const boards = await sails.helpers.getBoardsForProject(projectMembership.projectId);
sails.sockets.broadcast(`user:${projectMembership.userId}`, 'projectCreate', {

8
server/api/helpers/create-project.js
View file

@ -1,13 +1,13 @@
module.exports = {
inputs: {
values: {
type: 'json',
required: true,
},
user: {
type: 'ref',
required: true,
},
values: {
type: 'json',
required: true,
},
request: {
type: 'ref',
},

24
server/api/helpers/create-user.js
View file

@ -4,11 +4,25 @@ module.exports = {
inputs: {
values: {
type: 'json',
custom: (value) =>
_.isPlainObject(value) &&
_.isString(value.email) &&
_.isString(value.password) &&
(!value.username || _.isString(value.username)),
custom: (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (!_.isString(value.email)) {
return false;
}
if (!_.isString(value.password)) {
return false;
}
if (value.username && !_.isString(value.username)) {
return false;
}
return true;
},
required: true,
},
request: {

1
server/api/helpers/delete-project-membership.js
View file

@ -11,7 +11,6 @@ module.exports = {
async fn(inputs, exits) {
const boards = await sails.helpers.getBoardsForProject(inputs.record.projectId);
const boardIds = sails.helpers.mapRecords(boards);
const cards = await sails.helpers.getCardsForBoard(boardIds);

3
server/api/helpers/delete-user.js
View file

@ -31,11 +31,8 @@ module.exports = {
if (user) {
const adminUserIds = await sails.helpers.getAdminUserIds();
const projectIds = await sails.helpers.getMembershipProjectIdsForUser(user.id);
const userIdsForProject = await sails.helpers.getMembershipUserIdsForProject(projectIds);
const userIds = _.union([user.id], adminUserIds, userIdsForProject);
userIds.forEach((userId) => {

28
server/api/helpers/get-card-to-project-path.js
View file

@ -17,14 +17,26 @@ module.exports = {
throw 'pathNotFound';
}
const path = await sails.helpers
.getListToProjectPath(card.listId)
.intercept('pathNotFound', (nodes) => ({
pathNotFound: {
card,
...nodes,
},
}));
let path;
if (card.listId) {
path = await sails.helpers
.getListToProjectPath(card.listId)
.intercept('pathNotFound', (nodes) => ({
pathNotFound: {
card,
...nodes,
},
}));
} else {
path = await sails.helpers
.getBoardToProjectPath(card.boardId)
.intercept('pathNotFound', (nodes) => ({
pathNotFound: {
card,
...nodes,
},
}));
}
return exits.success({
card,

38
server/api/helpers/get-cards-for-board.js
View file

@ -1,16 +1,42 @@
const LIMIT = 10;
module.exports = {
inputs: {
id: {
type: 'json',
custom: (value) => _.isString(value) || _.isArray(value),
recordOrId: {
type: 'ref',
custom: (value) => _.isObjectLike(value) || _.isString(value) || _.every(value, _.isString),
required: true,
},
beforeId: {
type: 'string',
},
},
async fn(inputs, exits) {
const cards = await sails.helpers.getCards({
boardId: inputs.id,
});
const criteria = {};
let sort;
let limit;
if (_.isObjectLike(inputs.recordOrId)) {
criteria.boardId = inputs.recordOrId.id;
if (inputs.recordOrId.type === 'kanban') {
sort = 'position';
} else if (inputs.recordOrId.type === 'collection') {
if (inputs.beforeId) {
criteria.id = {
'<': inputs.beforeId,
};
}
limit = LIMIT;
}
} else {
criteria.boardId = inputs.recordOrId;
}
const cards = await sails.helpers.getCards(criteria, sort, limit);
return exits.success(cards);
},

9
server/api/helpers/get-cards.js
View file

@ -4,10 +4,17 @@ module.exports = {
type: 'json',
custom: (value) => _.isArray(value) || _.isPlainObject(value),
},
sort: {
type: 'json',
defaultsTo: 'id DESC',
},
limit: {
type: 'number',
},
},
async fn(inputs, exits) {
const cards = await Card.find(inputs.criteria).sort('position');
const cards = await Card.find(inputs.criteria).sort(inputs.sort).limit(inputs.limit);
return exits.success(cards);
},

1
server/api/helpers/get-label-ids-for-card.js
View file

@ -9,7 +9,6 @@ module.exports = {
async fn(inputs, exits) {
const cardLabels = await sails.helpers.getCardLabelsForCard(inputs.id);
const labelIds = sails.helpers.mapRecords(cardLabels, 'labelId', _.isArray(inputs.id));
return exits.success(labelIds);

1
server/api/helpers/get-labels-for-card.js
View file

@ -9,7 +9,6 @@ module.exports = {
async fn(inputs, exits) {
const labelIds = await sails.helpers.getLabelIdsForCard(inputs.id);
const labels = await sails.helpers.getLabels(labelIds);
return exits.success(labels);

1
server/api/helpers/get-membership-user-ids-for-project.js
View file

@ -13,7 +13,6 @@ module.exports = {
async fn(inputs, exits) {
const projectMemberships = await sails.helpers.getMembershipsForProject(inputs.id);
const userIds = sails.helpers.mapRecords(projectMemberships, 'userId', _.isArray(inputs.id));
return exits.success(

13
server/api/helpers/update-board.js
View file

@ -6,8 +6,17 @@ module.exports = {
},
values: {
type: 'json',
custom: (value) =>
_.isPlainObject(value) && (_.isUndefined(value.position) || _.isFinite(value.position)),
custom: (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
return false;
}
return true;
},
required: true,
},
request: {

110
server/api/helpers/update-card.js
View file

@ -4,24 +4,33 @@ module.exports = {
type: 'ref',
required: true,
},
values: {
type: 'json',
custom: (value) =>
_.isPlainObject(value) && (_.isUndefined(value.position) || _.isFinite(value.position)),
required: true,
toBoard: {
type: 'ref',
},
toList: {
type: 'ref',
},
toBoard: {
values: {
type: 'json',
custom: (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
return false;
}
return true;
},
required: true,
},
board: {
type: 'ref',
},
list: {
type: 'ref',
},
board: {
type: 'ref',
},
user: {
type: 'ref',
},
@ -31,41 +40,72 @@ module.exports = {
},
exits: {
invalidParams: {},
boardMustBePresent: {},
listMustBePresent: {},
toListMustBelongToBoard: {},
toListMustBePresent: {},
positionMustBeInValues: {},
userMustBePresent: {},
},
async fn(inputs, exits) {
const { isSubscribed, ...values } = inputs.values;
if (inputs.toList) {
if (!inputs.list || !inputs.user) {
throw 'invalidParams';
if (inputs.toBoard || inputs.toList || !_.isUndefined(values.position)) {
if (!inputs.board) {
throw 'boardMustBePresent';
}
if (inputs.toList.id === inputs.list.id) {
delete inputs.toList; // eslint-disable-line no-param-reassign
} else {
values.listId = inputs.toList.id;
if (inputs.toBoard) {
if (inputs.toBoard.id === inputs.board.id) {
delete inputs.toBoard; // eslint-disable-line no-param-reassign
} else {
values.boardId = inputs.toBoard.id;
}
}
if (inputs.toBoard) {
if (!inputs.board) {
throw 'invalidParams';
}
const board = inputs.toBoard || inputs.board;
if (inputs.toBoard.id === inputs.board.id) {
delete inputs.toBoard; // eslint-disable-line no-param-reassign
} else {
values.boardId = inputs.toBoard.id;
}
if (inputs.toList) {
if (inputs.board.type === 'kanban' && !inputs.list) {
throw 'listMustBePresent';
}
if (inputs.toList.boardId !== board.id) {
throw 'toListMustBelongToBoard';
}
if (
board.type === 'collection' ||
(inputs.board.type === 'kanban' && inputs.toList.id === inputs.list.id)
) {
delete inputs.toList; // eslint-disable-line no-param-reassign
} else {
values.listId = inputs.toList.id;
}
}
if (inputs.toList) {
if (_.isUndefined(values.position)) {
throw 'positionMustBeInValues';
}
} else if (inputs.toBoard) {
if (inputs.toBoard.type === 'kanban') {
throw 'toListMustBePresent';
}
if (inputs.board.type === 'kanban') {
values.listId = null;
values.position = null;
}
}
}
if (!_.isUndefined(isSubscribed) && !inputs.user) {
throw 'invalidParams';
if ((!_.isUndefined(isSubscribed) || inputs.toBoard || inputs.toList) && !inputs.user) {
throw 'userMustBePresent';
}
if (!_.isUndefined(values.position)) {
if (!_.isNil(values.position)) {
const cards = await sails.helpers.getCardsForList(
values.listId || inputs.record.listId,
inputs.record.id,
@ -73,8 +113,6 @@ module.exports = {
const { position, repositions } = sails.helpers.insertToPositionables(values.position, cards);
values.position = position;
repositions.forEach(async ({ id, position: nextPosition }) => {
await Card.update({
id,
@ -83,19 +121,21 @@ module.exports = {
position: nextPosition,
});
sails.sockets.broadcast(`board:${inputs.record.boardId}`, 'cardUpdate', {
sails.sockets.broadcast(`board:${values.boardId || inputs.record.boardId}`, 'cardUpdate', {
item: {
id,
position: nextPosition,
},
});
});
values.position = position;
}
let card;
if (!_.isEmpty(values)) {
let prevLabels;
if (inputs.toList && inputs.toBoard) {
if (inputs.toBoard) {
if (inputs.toBoard.projectId !== inputs.board.projectId) {
const userIds = await sails.helpers.getMembershipUserIdsForProject(
inputs.toBoard.projectId,
@ -129,7 +169,7 @@ module.exports = {
return exits.success(card);
}
if (inputs.toList && inputs.toBoard) {
if (inputs.toBoard) {
sails.sockets.broadcast(
`board:${inputs.board.id}`,
'cardDelete',
@ -204,7 +244,7 @@ module.exports = {
);
}
if (inputs.toList) {
if (!inputs.toBoard && inputs.toList) {
// TODO: add transfer action
await sails.helpers.createAction(card, inputs.user, {
type: 'moveCard',

13
server/api/helpers/update-list.js
View file

@ -6,8 +6,17 @@ module.exports = {
},
values: {
type: 'json',
custom: (value) =>
_.isPlainObject(value) && (_.isUndefined(value.position) || _.isFinite(value.position)),
custom: (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
return false;
}
return true;
},
required: true,
},
request: {

29
server/api/helpers/update-project.js
View file

@ -9,12 +9,25 @@ module.exports = {
},
values: {
type: 'json',
custom: (value) =>
_.isPlainObject(value) &&
(_.isUndefined(value.background) ||
_.isNull(value.background) ||
_.isPlainObject(value.background)) &&
(_.isUndefined(value.backgroundImage) || _.isNull(value.backgroundImage)),
custom: (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (
!_.isUndefined(value.background) &&
!_.isNull(value.background) &&
!_.isPlainObject(value.background)
) {
return false;
}
if (!_.isUndefined(value.backgroundImage) && !_.isNull(value.backgroundImage)) {
return false;
}
return true;
},
required: true,
},
request: {
@ -23,7 +36,7 @@ module.exports = {
},
exits: {
invalidParams: {},
backgroundImageDirnameMustBeNotNullInValues: {},
},
async fn(inputs, exits) {
@ -50,7 +63,7 @@ module.exports = {
let project;
if (inputs.values.background && inputs.values.background.type === 'image') {
if (_.isNull(inputs.values.backgroundImageDirname)) {
throw 'invalidParams';
throw 'backgroundImageDirnameMustBeNotNullInValues';
}
if (_.isUndefined(inputs.values.backgroundImageDirname)) {

32
server/api/helpers/update-user.js
View file

@ -10,12 +10,29 @@ module.exports = {
},
values: {
type: 'json',
custom: (value) =>
_.isPlainObject(value) &&
(_.isUndefined(value.email) || _.isString(value.email)) &&
(_.isUndefined(value.password) || _.isString(value.password)) &&
(!value.username || _.isString(value.username)) &&
(_.isUndefined(value.avatarUrl) || _.isNull(value.avatarUrl)),
custom: (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (!_.isUndefined(value.email) && !_.isString(value.email)) {
return false;
}
if (!_.isUndefined(value.password) && !_.isString(value.password)) {
return false;
}
if (value.username && !_.isString(value.username)) {
return false;
}
if (!_.isUndefined(value.avatarUrl) && !_.isNull(value.avatarUrl)) {
return false;
}
return true;
},
required: true,
},
request: {
@ -88,11 +105,8 @@ module.exports = {
if (!isOnlyPasswordChange) {
const adminUserIds = await sails.helpers.getAdminUserIds();
const projectIds = await sails.helpers.getMembershipProjectIdsForUser(user.id);
const userIdsForProject = await sails.helpers.getMembershipUserIdsForProject(projectIds);
const userIds = _.union([user.id], adminUserIds, userIdsForProject);
userIds.forEach((userId) => {