Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-19 05:09:43 +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 402645bc99
commit 30ed77af59
190 changed files with 2144 additions and 1817 deletions
Download patch file Download diff file Expand all files Collapse all files

1
server/api/controllers/attachments/update.js
View file

@ -43,7 +43,6 @@ module.exports = {
}
const values = _.pick(inputs, ['name']);
attachment = await sails.helpers.updateAttachment(attachment, values, board, this.req);
if (!attachment) {

8
server/api/controllers/boards/create.js
View file

@ -11,6 +11,11 @@ module.exports = {
regex: /^[0-9]+$/,
required: true,
},
type: {
type: 'string',
isIn: Board.TYPES,
required: true,
},
position: {
type: 'number',
required: true,
@ -39,8 +44,7 @@ module.exports = {
throw Errors.PROJECT_NOT_FOUND;
}
const values = _.pick(inputs, ['position', 'name']);
const values = _.pick(inputs, ['type', 'position', 'name']);
const board = await sails.helpers.createBoard(project, values, this.req);
sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed

6
server/api/controllers/boards/show.js
View file

@ -40,10 +40,10 @@ module.exports = {
throw Errors.BOARD_NOT_FOUND; // Forbidden
}
const lists = await sails.helpers.getListsForBoard(board.id);
const labels = await sails.helpers.getLabelsForBoard(board.id);
const lists = await sails.helpers.getListsForBoard(board.id);
const cards = await sails.helpers.getCardsForBoard(board.id);
const cards = await sails.helpers.getCardsForBoard(board);
const cardIds = sails.helpers.mapRecords(cards);
const cardSubscriptions = await sails.helpers.getSubscriptionsByUserForCard(
@ -75,8 +75,8 @@ module.exports = {
return exits.success({
item: board,
included: {
lists,
labels,
lists,
cards,
cardMemberships,
cardLabels,

1
server/api/controllers/boards/update.js
View file

@ -34,7 +34,6 @@ module.exports = {
}
const values = _.pick(inputs, ['position', 'name']);
board = await sails.helpers.updateBoard(board, values, this.req);
if (!board) {

72
server/api/controllers/cards/create.js
View file

@ -1,21 +1,33 @@
const moment = require('moment');
const Errors = {
BOARD_NOT_FOUND: {
boardNotFound: 'Board not found',
},
LIST_NOT_FOUND: {
listNotFound: 'List not found',
},
LIST_MUST_BE_PRESENT: {
listMustBePresent: 'List must be present',
},
POSITION_MUST_BE_PRESENT: {
positionMustBePresent: 'Position must be present',
},
};
module.exports = {
inputs: {
listId: {
boardId: {
type: 'string',
regex: /^[0-9]+$/,
required: true,
},
listId: {
type: 'string',
regex: /^[0-9]+$/,
},
position: {
type: 'number',
required: true,
},
name: {
type: 'string',
@ -32,26 +44,49 @@ module.exports = {
},
timer: {
type: 'json',
custom: (value) =>
_.isPlainObject(value) &&
_.size(value) === 2 &&
(_.isNull(value.startedAt) || moment(value.startedAt, moment.ISO_8601, true).isValid()) &&
_.isFinite(value.total),
custom: (value) => {
if (!_.isPlainObject(value) || _.size(value) !== 2) {
return false;
}
if (
!_.isNull(value.startedAt) &&
_.isString(value.startedAt) &&
!moment(value.startedAt, moment.ISO_8601, true).isValid()
) {
return false;
}
if (!_.isFinite(value.total)) {
return false;
}
return true;
},
},
},
exits: {
boardNotFound: {
responseType: 'notFound',
},
listNotFound: {
responseType: 'notFound',
},
listMustBePresent: {
responseType: 'unprocessableEntity',
},
positionMustBePresent: {
responseType: 'unprocessableEntity',
},
},
async fn(inputs, exits) {
const { currentUser } = this.req;
const { list, project } = await sails.helpers
.getListToProjectPath(inputs.listId)
.intercept('pathNotFound', () => Errors.LIST_NOT_FOUND);
const { board, project } = await sails.helpers
.getBoardToProjectPath(inputs.boardId)
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
project.id,
@ -62,9 +97,24 @@ module.exports = {
throw Errors.LIST_NOT_FOUND; // Forbidden
}
let list;
if (!_.isUndefined(inputs.listId)) {
list = await List.findOne({
id: inputs.listId,
boardId: board.id,
});
if (!list) {
throw Errors.LIST_NOT_FOUND;
}
}
const values = _.pick(inputs, ['position', 'name', 'description', 'dueDate', 'timer']);
const card = await sails.helpers.createCard(list, values, currentUser, this.req);
const card = await sails.helpers
.createCard(board, list, values, currentUser, this.req)
.intercept('listMustBePresent', () => Errors.LIST_MUST_BE_PRESENT)
.intercept('positionMustBeInValues', () => Errors.POSITION_MUST_BE_PRESENT);
return exits.success({
item: card,

79
server/api/controllers/cards/index.js Normal file
View file

@ -0,0 +1,79 @@
const Errors = {
BOARD_NOT_FOUND: {
boardNotFound: 'Board not found',
},
};
module.exports = {
inputs: {
boardId: {
type: 'string',
regex: /^[0-9]+$/,
required: true,
},
beforeId: {
type: 'string',
regex: /^[0-9]+$/,
},
},
exits: {
boardNotFound: {
responseType: 'notFound',
},
},
async fn(inputs, exits) {
const { currentUser } = this.req;
const { board, project } = await sails.helpers
.getBoardToProjectPath(inputs.boardId)
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
project.id,
currentUser.id,
);
if (!isUserMemberForProject) {
throw Errors.BOARD_NOT_FOUND; // Forbidden
}
const cards = await sails.helpers.getCardsForBoard(board, inputs.beforeId);
const cardIds = sails.helpers.mapRecords(cards);
const cardSubscriptions = await sails.helpers.getSubscriptionsByUserForCard(
cardIds,
currentUser.id,
);
const cardMemberships = await sails.helpers.getMembershipsForCard(cardIds);
const cardLabels = await sails.helpers.getCardLabelsForCard(cardIds);
const tasks = await sails.helpers.getTasksForCard(cardIds);
const attachments = await sails.helpers.getAttachmentsForCard(cardIds);
const isSubscribedByCardId = cardSubscriptions.reduce(
(result, cardSubscription) => ({
...result,
[cardSubscription.cardId]: true,
}),
{},
);
cards.map((card) => ({
...card,
isSubscribed: isSubscribedByCardId[card.id] || false,
}));
return exits.success({
items: cards,
included: {
cardMemberships,
cardLabels,
tasks,
attachments,
},
});
},
};

89
server/api/controllers/cards/update.js
View file

@ -4,9 +4,18 @@ const Errors = {
CARD_NOT_FOUND: {
cardNotFound: 'Card not found',
},
BOARD_NOT_FOUND: {
boardNotFound: 'Board not found',
},
LIST_NOT_FOUND: {
listNotFound: 'List not found',
},
LIST_MUST_BE_PRESENT: {
listMustBePresent: 'List must be present',
},
POSITION_MUST_BE_PRESENT: {
positionMustBePresent: 'Position must be present',
},
};
module.exports = {
@ -16,11 +25,11 @@ module.exports = {
regex: /^[0-9]+$/,
required: true,
},
listId: {
boardId: {
type: 'string',
regex: /^[0-9]+$/,
},
boardId: {
listId: {
type: 'string',
regex: /^[0-9]+$/,
},
@ -48,11 +57,25 @@ module.exports = {
},
timer: {
type: 'json',
custom: (value) =>
_.isPlainObject(value) &&
_.size(value) === 2 &&
(_.isNull(value.startedAt) || moment(value.startedAt, moment.ISO_8601, true).isValid()) &&
_.isFinite(value.total),
custom: (value) => {
if (!_.isPlainObject(value) || _.size(value) !== 2) {
return false;
}
if (
!_.isNull(value.startedAt) &&
_.isString(value.startedAt) &&
!moment(value.startedAt, moment.ISO_8601, true).isValid()
) {
return false;
}
if (!_.isFinite(value.total)) {
return false;
}
return true;
},
},
isSubscribed: {
type: 'boolean',
@ -63,9 +86,18 @@ module.exports = {
cardNotFound: {
responseType: 'notFound',
},
boardNotFound: {
responseType: 'notFound',
},
listNotFound: {
responseType: 'notFound',
},
listMustBePresent: {
responseType: 'unprocessableEntity',
},
positionMustBePresent: {
responseType: 'unprocessableEntity',
},
},
async fn(inputs, exits) {
@ -87,22 +119,11 @@ module.exports = {
throw Errors.CARD_NOT_FOUND; // Forbidden
}
let toList;
let toBoard;
if (!_.isUndefined(inputs.listId) && inputs.listId !== list.id) {
toList = await List.findOne({
id: inputs.listId,
boardId: inputs.boardId || card.boardId,
});
if (!toList) {
throw Errors.LIST_NOT_FOUND;
}
if (!_.isUndefined(inputs.boardId)) {
({ board: toBoard, project } = await sails.helpers
.getListToProjectPath(toList.id)
.intercept('pathNotFound', () => Errors.LIST_NOT_FOUND));
.getBoardToProjectPath(inputs.boardId)
.intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND));
isUserMemberForProject = await sails.helpers.isUserMemberForProject(
project.id,
@ -110,6 +131,18 @@ module.exports = {
);
if (!isUserMemberForProject) {
throw Errors.BOARD_NOT_FOUND; // Forbidden
}
}
let toList;
if (!_.isUndefined(inputs.listId)) {
toList = await List.findOne({
id: inputs.listId,
boardId: (toBoard || board).id,
});
if (!toList) {
throw Errors.LIST_NOT_FOUND; // Forbidden
}
}
@ -124,16 +157,10 @@ module.exports = {
'isSubscribed',
]);
card = await sails.helpers.updateCard(
card,
values,
toList,
toBoard,
list,
board,
currentUser,
this.req,
);
card = await sails.helpers
.updateCard(card, toBoard, toList, values, board, list, currentUser, this.req)
.intercept('toListMustBePresent', () => Errors.LIST_MUST_BE_PRESENT)
.intercept('positionMustBeInValues', () => Errors.POSITION_MUST_BE_PRESENT);
if (!card) {
throw Errors.CARD_NOT_FOUND;

1
server/api/controllers/labels/create.js
View file

@ -46,7 +46,6 @@ module.exports = {
}
const values = _.pick(inputs, ['name', 'color']);
const label = await sails.helpers.createLabel(board, values, this.req);
return exits.success({

1
server/api/controllers/labels/update.js
View file

@ -49,7 +49,6 @@ module.exports = {
}
const values = _.pick(inputs, ['name', 'color']);
label = await sails.helpers.updateLabel(label, values, this.req);
return exits.success({

1
server/api/controllers/lists/create.js
View file

@ -44,7 +44,6 @@ module.exports = {
}
const values = _.pick(inputs, ['position', 'name']);
const list = await sails.helpers.createList(board, values, this.req);
return exits.success({

1
server/api/controllers/lists/update.js
View file

@ -46,7 +46,6 @@ module.exports = {
}
const values = _.pick(inputs, ['position', 'name']);
list = await sails.helpers.updateList(list, values, this.req);
if (!list) {

2
server/api/controllers/projects/create.js
View file

@ -12,8 +12,8 @@ module.exports = {
const values = _.pick(inputs, ['name']);
const { project, projectMembership } = await sails.helpers.createProject(
values,
currentUser,
values,
this.req,
true,
);

2
server/api/controllers/projects/index.js
View file

@ -3,7 +3,6 @@ module.exports = {
const { currentUser } = this.req;
const projectIds = await sails.helpers.getMembershipProjectIdsForUser(currentUser.id);
const projects = await sails.helpers.getProjects(projectIds);
const { userIds, projectMemberships } = await sails.helpers.getMembershipUserIdsForProject(
@ -12,7 +11,6 @@ module.exports = {
);
const users = await sails.helpers.getUsers(userIds);
const boards = await sails.helpers.getBoardsForProject(projectIds);
return exits.success({

1
server/api/controllers/projects/update.js
View file

@ -65,7 +65,6 @@ module.exports = {
}
const values = _.pick(inputs, ['name', 'background', 'backgroundImage']);
project = await sails.helpers.updateProject(project, values, this.req);
if (!project) {

1
server/api/controllers/tasks/create.js
View file

@ -43,7 +43,6 @@ module.exports = {
}
const values = _.pick(inputs, ['name', 'isCompleted']);
const task = await sails.helpers.createTask(card, values, this.req);
return exits.success({

1
server/api/controllers/tasks/update.js
View file

@ -46,7 +46,6 @@ module.exports = {
}
const values = _.pick(inputs, ['name', 'isCompleted']);
task = await sails.helpers.updateTask(task, values, board, this.req);
if (!task) {

1
server/api/controllers/users/update-password.js
View file

@ -60,7 +60,6 @@ module.exports = {
}
const values = _.pick(inputs, ['password']);
user = await sails.helpers.updateUser(user, values, this.req);
if (!user) {