starred/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-12-25 17:25:01 +03:00
Code Issues 418 Packages Projects Releases 12 Wiki Activity

ref: Remove board types, refactoring

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

52
client/src/selectors/boards.js
View File

@@ -69,6 +69,31 @@ export const selectMembershipsForCurrentBoard = createSelector(
},
);
export const selectCurrentUserMembershipForCurrentBoard = createSelector(
orm,
(state) => selectPath(state).boardId,
(state) => selectCurrentUserId(state),
({ Board }, id, currentUserId) => {
if (!id) {
return id;
}
const boardModel = Board.withId(id);
if (!boardModel) {
return boardModel;
}
const boardMembershipModel = boardModel.getMembershipModelForUser(currentUserId);
if (!boardMembershipModel) {
return boardMembershipModel;
}
return boardMembershipModel.ref;
},
);
export const selectLabelsForCurrentBoard = createSelector(
orm,
(state) => selectPath(state).boardId,
@@ -147,31 +172,6 @@ export const selectFilterLabelsForCurrentBoard = createSelector(
},
);
export const selectCurrentUserMembershipForCurrentBoard = createSelector(
orm,
(state) => selectPath(state).boardId,
(state) => selectCurrentUserId(state),
({ Board }, id, currentUserId) => {
if (!id) {
return id;
}
const boardModel = Board.withId(id);
if (!boardModel) {
return boardModel;
}
const boardMembershipModel = boardModel.getMembershipModel(currentUserId);
if (!boardMembershipModel) {
return boardMembershipModel;
}
return boardMembershipModel.ref;
},
);
export const selectIsBoardWithIdExists = createSelector(
orm,
(_, id) => id,
@@ -183,10 +183,10 @@ export default {
selectBoardById,
selectCurrentBoard,
selectMembershipsForCurrentBoard,
selectCurrentUserMembershipForCurrentBoard,
selectLabelsForCurrentBoard,
selectListIdsForCurrentBoard,
selectFilterUsersForCurrentBoard,
selectFilterLabelsForCurrentBoard,
selectCurrentUserMembershipForCurrentBoard,
selectIsBoardWithIdExists,
};

2
client/src/selectors/index.js
View File

@@ -1,4 +1,5 @@
import router from './router';
import socket from './socket';
import core from './core';
import modals from './modals';
import users from './users';
@@ -13,6 +14,7 @@ import attachments from './attachments';
export default {
...router,
...socket,
...core,
...modals,
...users,

12
client/src/selectors/projects.js
View File

@@ -67,10 +67,12 @@ export const selectBoardsForCurrentProject = createSelector(
return projectModel;
}
return projectModel.getOrderedAvailableBoardsModelArray(currentUserId).map((boardModel) => ({
...boardModel.ref,
isPersisted: !isLocalId(boardModel.id),
}));
return projectModel
.getOrderedBoardsModelArrayAvailableForUser(currentUserId)
.map((boardModel) => ({
...boardModel.ref,
isPersisted: !isLocalId(boardModel.id),
}));
},
);
@@ -89,7 +91,7 @@ export const selectIsCurrentUserManagerForCurrentProject = createSelector(
return false;
}
return projectModel.hasManagerUser(currentUserId);
return projectModel.hasManagerForUser(currentUserId);
},
);

42
client/src/selectors/router.js
View File

@@ -26,55 +26,35 @@ export const selectPath = createReduxOrmSelector(
case Paths.PROJECTS: {
const projectModel = Project.withId(pathsMatch.params.id);
if (!projectModel) {
if (!projectModel || !projectModel.isAvailableForUser(currentUserId)) {
return {
projectId: null,
};
}
if (!projectModel.hasManagerUser(currentUserId)) {
if (!projectModel.hasMemberUserForAnyBoard(currentUserId)) {
return {
projectId: null,
};
}
}
return {
projectId: projectModel.id,
};
}
case Paths.BOARDS: {
const boardModel = Board.withId(pathsMatch.params.id);
const projectModel = boardModel && boardModel.project;
if (!projectModel) {
if (!boardModel || !boardModel.isAvailableForUser(currentUserId)) {
return {
boardId: null,
projectId: null,
};
}
if (!projectModel.hasManagerUser(currentUserId)) {
if (!boardModel.hasMemberUser(currentUserId)) {
return {
boardId: null,
projectId: null,
};
}
}
return {
boardId: boardModel.id,
projectId: projectModel.id,
projectId: boardModel.projectId,
};
}
case Paths.CARDS: {
const cardModel = Card.withId(pathsMatch.params.id);
const boardModel = cardModel && cardModel.board;
const projectModel = boardModel && boardModel.project;
if (!projectModel) {
if (!cardModel || !cardModel.isAvailableForUser(currentUserId)) {
return {
cardId: null,
boardId: null,
@@ -82,20 +62,10 @@ export const selectPath = createReduxOrmSelector(
};
}
if (!projectModel.hasManagerUser(currentUserId)) {
if (!boardModel.hasMemberUser(currentUserId)) {
return {
cardId: null,
boardId: null,
projectId: null,
};
}
}
return {
cardId: cardModel.id,
boardId: boardModel.id,
projectId: projectModel.id,
boardId: cardModel.boardId,
projectId: cardModel.board.projectId,
};
}
default:

5
client/src/selectors/socket.js Normal file
View File

@@ -0,0 +1,5 @@
export const selectIsSocketDisconnected = ({ socket: { isDisconnected } }) => isDisconnected;
export default {
selectIsSocketDisconnected,
};

4
client/src/selectors/users.js
View File

@@ -52,7 +52,7 @@ export const selectProjectsForCurrentUser = createSelector(
}
return userModel.getOrderedAvailableProjectsModelArray().map((projectModel) => {
const boardsModels = projectModel.getOrderedAvailableBoardsModelArray(userModel.id);
const boardsModels = projectModel.getOrderedBoardsModelArrayAvailableForUser(userModel.id);
let notificationsTotal = 0;
boardsModels.forEach((boardModel) => {
@@ -86,7 +86,7 @@ export const selectProjectsToListsForCurrentUser = createSelector(
return userModel.getOrderedAvailableProjectsModelArray().map((projectModel) => ({
...projectModel.ref,
boards: projectModel.getOrderedMemberBoardsModelArray(id).map((boardModel) => ({
boards: projectModel.getOrderedBoardsModelArrayForUser(id).map((boardModel) => ({
...boardModel.ref,
lists: boardModel.getOrderedListsQuerySet().toRefArray(),
})),