1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-19 05:09:43 +02:00

ref: Remove board types, refactoring

This commit is contained in:
Maksim Eltyshev 2022-12-26 21:10:50 +01:00
parent d39da61295
commit 5cd025ffb7
182 changed files with 1573 additions and 1239 deletions

View file

@ -1,92 +1,75 @@
const valuesValidator = (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (!_.isFinite(value.position)) {
return false;
}
if (!_.isPlainObject(value.list)) {
return false;
}
if (!_.isPlainObject(value.creatorUser)) {
return false;
}
return true;
};
module.exports = {
inputs: {
values: {
type: 'json',
custom: (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
return false;
}
return true;
},
required: true,
},
user: {
type: 'ref',
custom: valuesValidator,
required: true,
},
board: {
type: 'ref',
required: true,
},
list: {
type: 'ref',
},
request: {
type: 'ref',
},
},
exits: {
listMustBePresent: {},
listMustBelongToBoard: {},
positionMustBeInValues: {},
},
async fn(inputs) {
const { values } = inputs;
if (inputs.board.type === Board.Types.KANBAN) {
if (!inputs.list) {
throw 'listMustBePresent';
}
if (_.isUndefined(values.position)) {
throw 'positionMustBeInValues';
}
if (inputs.list.boardId !== inputs.board.id) {
throw 'listMustBelongToBoard';
}
const cards = await sails.helpers.lists.getCards(values.list.id);
values.listId = inputs.list.id;
const { position, repositions } = sails.helpers.utils.insertToPositionables(
values.position,
cards,
);
if (_.isUndefined(values.position)) {
throw 'positionMustBeInValues';
}
const cards = await sails.helpers.lists.getCards(inputs.list.id);
const { position, repositions } = sails.helpers.utils.insertToPositionables(
inputs.values.position,
cards,
);
repositions.forEach(async ({ id, position: nextPosition }) => {
await Card.update({
id,
listId: inputs.list.id,
}).set({
position: nextPosition,
});
sails.sockets.broadcast(`board:${inputs.board.id}`, 'cardUpdate', {
item: {
id,
position: nextPosition,
},
});
repositions.forEach(async ({ id, position: nextPosition }) => {
await Card.update({
id,
listId: values.list.id,
}).set({
position: nextPosition,
});
values.position = position;
} else if (inputs.board.type === Board.Types.COLLECTION) {
delete values.position;
}
sails.sockets.broadcast(`board:${values.list.boardId}`, 'cardUpdate', {
item: {
id,
position: nextPosition,
},
});
});
const card = await Card.create({
...values,
boardId: inputs.board.id,
creatorUserId: inputs.user.id,
position,
boardId: values.list.boardId,
listId: values.list.id,
creatorUserId: values.creatorUser.id,
}).fetch();
sails.sockets.broadcast(
@ -98,13 +81,13 @@ module.exports = {
inputs.request,
);
if (inputs.user.subscribeToOwnCards) {
if (values.creatorUser.subscribeToOwnCards) {
await CardSubscription.create({
cardId: card.id,
userId: inputs.user.id,
userId: card.creatorUserId,
}).tolerate('E_UNIQUE');
sails.sockets.broadcast(`user:${inputs.user.id}`, 'cardUpdate', {
sails.sockets.broadcast(`user:${card.creatorUserId}`, 'cardUpdate', {
item: {
id: card.id,
isSubscribed: true,
@ -112,16 +95,16 @@ module.exports = {
});
}
await sails.helpers.actions.createOne(
{
await sails.helpers.actions.createOne.with({
values: {
card,
type: Action.Types.CREATE_CARD,
data: {
list: _.pick(inputs.list, ['id', 'name']),
list: _.pick(values.list, ['id', 'name']),
},
user: values.creatorUser,
},
inputs.user,
card,
);
});
return card;
},

View file

@ -1,10 +1,12 @@
const LIMIT = 50;
const idOrIdsValidator = (value) => _.isString(value) || _.every(value, _.isString);
module.exports = {
inputs: {
idOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
required: true,
},
beforeId: {

View file

@ -1,8 +1,10 @@
const idOrIdsValidator = (value) => _.isString(value) || _.every(value, _.isString);
module.exports = {
inputs: {
idOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
required: true,
},
},

View file

@ -1,8 +1,10 @@
const idOrIdsValidator = (value) => _.isString(value) || _.every(value, _.isString);
module.exports = {
inputs: {
idOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
required: true,
},
},

View file

@ -1,8 +1,10 @@
const idOrIdsValidator = (value) => _.isString(value) || _.every(value, _.isString);
module.exports = {
inputs: {
idOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
required: true,
},
},

View file

@ -1,13 +1,15 @@
const idOrIdsValidator = (value) => _.isString(value) || _.every(value, _.isString);
module.exports = {
inputs: {
idOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
required: true,
},
exceptUserIdOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
},
},

View file

@ -1,8 +1,10 @@
const idOrIdsValidator = (value) => _.isString(value) || _.every(value, _.isString);
module.exports = {
inputs: {
idOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
required: true,
},
},

View file

@ -1,8 +1,10 @@
const idOrIdsValidator = (value) => _.isString(value) || _.every(value, _.isString);
module.exports = {
inputs: {
idOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
required: true,
},
},

View file

@ -1,19 +1,14 @@
const criteriaValidator = (value) => _.isArray(value) || _.isPlainObject(value);
module.exports = {
inputs: {
criteria: {
type: 'json',
custom: (value) => _.isArray(value) || _.isPlainObject(value),
},
sort: {
type: 'json',
defaultsTo: 'id DESC',
},
limit: {
type: 'number',
custom: criteriaValidator,
},
},
async fn(inputs) {
return Card.find(inputs.criteria).sort(inputs.sort).limit(inputs.limit);
return Card.find(inputs.criteria).sort('position');
},
};

View file

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

View file

@ -1,13 +1,15 @@
const idOrIdsValidator = (value) => _.isString(value) || _.every(value, _.isString);
module.exports = {
inputs: {
idOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
required: true,
},
exceptUserIdOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
},
},

View file

@ -1,13 +1,15 @@
const idOrIdsValidator = (value) => _.isString(value) || _.every(value, _.isString);
module.exports = {
inputs: {
idOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
required: true,
},
exceptTaskIdOrIds: {
type: 'json',
custom: (value) => _.isString(value) || _.every(value, _.isString),
custom: idOrIdsValidator,
},
},

View file

@ -1,3 +1,23 @@
const valuesValidator = (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
return false;
}
if (!_.isUndefined(value.board) && !_.isPlainObject(value.board)) {
return false;
}
if (!_.isUndefined(value.list) && !_.isPlainObject(value.list)) {
return false;
}
return true;
};
module.exports = {
inputs: {
record: {
@ -5,25 +25,9 @@ module.exports = {
required: true,
},
values: {
type: 'json',
custom: (value) => {
if (!_.isPlainObject(value)) {
return false;
}
if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
return false;
}
return true;
},
defaultsTo: {},
},
nextBoard: {
type: 'ref',
},
nextList: {
type: 'ref',
custom: valuesValidator,
required: true,
},
user: {
type: 'ref',
@ -40,68 +44,58 @@ module.exports = {
},
exits: {
positionMustBeInValues: {},
listMustBeInValues: {},
listInValuesMustBelongToBoard: {},
userMustBePresent: {},
boardMustBePresent: {},
listMustBePresent: {},
nextListMustBelongToBoard: {},
nextListMustBePresent: {},
positionMustBeInValues: {},
userMustBePresent: {},
},
async fn(inputs) {
const { isSubscribed, ...values } = inputs.values;
if (inputs.nextBoard || inputs.nextList || !_.isUndefined(values.position)) {
if (values.board || values.list || !_.isUndefined(values.position)) {
if (!inputs.board) {
throw 'boardMustBePresent';
}
if (inputs.nextBoard) {
if (inputs.nextBoard.id === inputs.board.id) {
delete inputs.nextBoard; // eslint-disable-line no-param-reassign
if (values.board) {
if (values.board.id === inputs.board.id) {
delete values.board;
} else {
values.boardId = inputs.nextBoard.id;
values.boardId = values.board.id;
}
}
const board = inputs.nextBoard || inputs.board;
const board = values.board || inputs.board;
if (inputs.nextList) {
if (inputs.board.type === Board.Types.KANBAN && !inputs.list) {
if (values.list) {
if (!inputs.list) {
throw 'listMustBePresent';
}
if (inputs.nextList.boardId !== board.id) {
throw 'nextListMustBelongToBoard';
if (values.list.boardId !== board.id) {
throw 'listInValuesMustBelongToBoard';
}
if (
board.type === Board.Types.COLLECTION ||
(inputs.board.type === Board.Types.KANBAN && inputs.nextList.id === inputs.list.id)
) {
delete inputs.nextList; // eslint-disable-line no-param-reassign
if (values.list.id === inputs.list.id) {
delete values.list;
} else {
values.listId = inputs.nextList.id;
values.listId = values.list.id;
}
}
if (inputs.nextList) {
if (values.list) {
if (_.isUndefined(values.position)) {
throw 'positionMustBeInValues';
}
} else if (inputs.nextBoard) {
if (inputs.nextBoard.type === Board.Types.KANBAN) {
throw 'nextListMustBePresent';
}
if (inputs.board.type === Board.Types.KANBAN) {
values.listId = null;
values.position = null;
}
} else if (values.board) {
throw 'listMustBeInValues';
}
}
if ((!_.isUndefined(isSubscribed) || inputs.nextBoard || inputs.nextList) && !inputs.user) {
if ((!_.isUndefined(isSubscribed) || values.board || values.list) && !inputs.user) {
throw 'userMustBePresent';
}
@ -116,6 +110,8 @@ module.exports = {
cards,
);
values.position = position;
repositions.forEach(async ({ id, position: nextPosition }) => {
await Card.update({
id,
@ -131,31 +127,29 @@ module.exports = {
},
});
});
values.position = position;
}
let card;
if (!_.isEmpty(values)) {
if (_.isEmpty(values)) {
card = inputs.record;
} else {
let prevLabels;
if (inputs.nextBoard) {
if (inputs.nextBoard.projectId !== inputs.board.projectId) {
const memberUserIds = await sails.helpers.boards.getMemberUserIds(inputs.nextBoard.id);
if (values.board) {
const boardMemberUserIds = await sails.helpers.boards.getMemberUserIds(values.board.id);
await CardSubscription.destroy({
cardId: inputs.record.id,
userId: {
'!=': memberUserIds,
},
});
await CardSubscription.destroy({
cardId: inputs.record.id,
userId: {
'!=': boardMemberUserIds,
},
});
await CardMembership.destroy({
cardId: inputs.record.id,
userId: {
'!=': memberUserIds,
},
});
}
await CardMembership.destroy({
cardId: inputs.record.id,
userId: {
'!=': boardMemberUserIds,
},
});
prevLabels = await sails.helpers.cards.getLabels(inputs.record.id);
@ -164,26 +158,28 @@ module.exports = {
});
}
card = await Card.updateOne(inputs.record.id).set(values);
card = await Card.updateOne(inputs.record.id).set({ ...values });
if (!card) {
return card;
}
if (inputs.nextBoard) {
if (values.board) {
const labels = await sails.helpers.boards.getLabels(card.boardId);
const labelByNameMap = _.keyBy(labels, 'name');
const labelByName = _.keyBy(labels, 'name');
const labelIds = await Promise.all(
prevLabels.map(async (prevLabel) => {
if (labelByNameMap[prevLabel.name]) {
return labelByNameMap[prevLabel.name].id;
prevLabels.map(async (label) => {
if (labelByName[label.name]) {
return labelByName[label.name].id;
}
const { id } = await sails.helpers.labels.createOne(
_.omit(prevLabel, ['id', 'boardId']),
inputs.nextBoard,
);
const { id } = await sails.helpers.labels.createOne.with({
values: {
..._.omit(label, ['id', 'boardId']),
board: values.board,
},
});
return id;
}),
@ -225,31 +221,27 @@ module.exports = {
);
}
if (!inputs.nextBoard && inputs.nextList) {
// TODO: add transfer action
await sails.helpers.actions.createOne(
{
if (!values.board && values.list) {
await sails.helpers.actions.createOne.with({
values: {
card,
user: inputs.user,
type: Action.Types.MOVE_CARD,
data: {
fromList: _.pick(inputs.list, ['id', 'name']),
toList: _.pick(inputs.nextList, ['id', 'name']),
toList: _.pick(values.list, ['id', 'name']),
},
},
inputs.user,
card,
);
});
}
} else {
card = inputs.record;
// TODO: add transfer action
}
if (!_.isUndefined(isSubscribed)) {
const cardSubscription = await CardSubscription.findOne({
cardId: card.id,
userId: inputs.user.id,
});
const prevIsSubscribed = await sails.helpers.users.isCardSubscriber(inputs.user.id, card.id);
if (isSubscribed !== !!cardSubscription) {
if (isSubscribed !== prevIsSubscribed) {
if (isSubscribed) {
await CardSubscription.create({
cardId: card.id,