ref: Refactoring

2025-12-27 01:11:50 +03:00 · 2022-08-04 13:31:14 +02:00
parent 1f569bdb61
commit 3714bbc06f
189 changed files with 3781 additions and 3486 deletions
--- a/client/src/containers/BoardActionsContainer.js
+++ b/client/src/containers/BoardActionsContainer.js
@@ -1,34 +1,17 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import {
-  filterLabelsForCurrentBoardSelector,
-  filterUsersForCurrentBoardSelector,
-  isCurrentUserManagerForCurrentProjectSelector,
-  labelsForCurrentBoardSelector,
-  membershipsForCurrentBoardSelector,
-  usersSelector,
-} from '../selectors';
-import {
-  addLabelToFilterInCurrentBoard,
-  addUserToFilterInCurrentBoard,
-  createLabelInCurrentBoard,
-  createMembershipInCurrentBoard,
-  deleteBoardMembership,
-  deleteLabel,
-  removeLabelFromFilterInCurrentBoard,
-  removeUserFromFilterInCurrentBoard,
-  updateLabel,
-} from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import BoardActions from '../components/BoardActions';

 const mapStateToProps = (state) => {
-  const allUsers = usersSelector(state);
-  const isCurrentUserManager = isCurrentUserManagerForCurrentProjectSelector(state);
-  const memberships = membershipsForCurrentBoardSelector(state);
-  const labels = labelsForCurrentBoardSelector(state);
-  const filterUsers = filterUsersForCurrentBoardSelector(state);
-  const filterLabels = filterLabelsForCurrentBoardSelector(state);
+  const allUsers = selectors.selectUsers(state);
+  const isCurrentUserManager = selectors.selectIsCurrentUserManagerForCurrentProject(state);
+  const memberships = selectors.selectMembershipsForCurrentBoard(state);
+  const labels = selectors.selectLabelsForCurrentBoard(state);
+  const filterUsers = selectors.selectFilterUsersForCurrentBoard(state);
+  const filterLabels = selectors.selectFilterLabelsForCurrentBoard(state);

  return {
    memberships,
@@ -43,15 +26,15 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onMembershipCreate: createMembershipInCurrentBoard,
-      onMembershipDelete: deleteBoardMembership,
-      onUserToFilterAdd: addUserToFilterInCurrentBoard,
-      onUserFromFilterRemove: removeUserFromFilterInCurrentBoard,
-      onLabelToFilterAdd: addLabelToFilterInCurrentBoard,
-      onLabelFromFilterRemove: removeLabelFromFilterInCurrentBoard,
-      onLabelCreate: createLabelInCurrentBoard,
-      onLabelUpdate: updateLabel,
-      onLabelDelete: deleteLabel,
+      onMembershipCreate: entryActions.createMembershipInCurrentBoard,
+      onMembershipDelete: entryActions.deleteBoardMembership,
+      onUserToFilterAdd: entryActions.addUserToFilterInCurrentBoard,
+      onUserFromFilterRemove: entryActions.removeUserFromFilterInCurrentBoard,
+      onLabelToFilterAdd: entryActions.addLabelToFilterInCurrentBoard,
+      onLabelFromFilterRemove: entryActions.removeLabelFromFilterInCurrentBoard,
+      onLabelCreate: entryActions.createLabelInCurrentBoard,
+      onLabelUpdate: entryActions.updateLabel,
+      onLabelDelete: entryActions.deleteLabel,
    },
    dispatch,
  );
--- a/client/src/containers/BoardKanbanContainer.js
+++ b/client/src/containers/BoardKanbanContainer.js
@@ -1,18 +1,14 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import {
-  isCurrentUserMemberForCurrentBoardSelector,
-  listIdsForCurrentBoardSelector,
-  pathSelector,
-} from '../selectors';
-import { createListInCurrentBoard, moveCard, moveList } from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import BoardKanban from '../components/BoardKanban';

 const mapStateToProps = (state) => {
-  const { cardId } = pathSelector(state);
-  const isCurrentUserMember = isCurrentUserMemberForCurrentBoardSelector(state);
-  const listIds = listIdsForCurrentBoardSelector(state);
+  const { cardId } = selectors.selectPath(state);
+  const isCurrentUserMember = selectors.selectIsCurrentUserMemberForCurrentBoard(state);
+  const listIds = selectors.selectListIdsForCurrentBoard(state);

  return {
    listIds,
@@ -24,9 +20,9 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onListCreate: createListInCurrentBoard,
-      onListMove: moveList,
-      onCardMove: moveCard,
+      onListCreate: entryActions.createListInCurrentBoard,
+      onListMove: entryActions.moveList,
+      onCardMove: entryActions.moveCard,
    },
    dispatch,
  );
--- a/client/src/containers/BoardWrapperContainer.js
+++ b/client/src/containers/BoardWrapperContainer.js
@@ -1,10 +1,10 @@
 import { connect } from 'react-redux';

-import { currentBoardSelector } from '../selectors';
+import selectors from '../selectors';
 import BoardWrapper from '../components/BoardWrapper';

 const mapStateToProps = (state) => {
-  const { type, isFetching } = currentBoardSelector(state);
+  const { type, isFetching } = selectors.selectCurrentBoard(state);

  return {
    type,
--- a/client/src/containers/BoardsContainer.js
+++ b/client/src/containers/BoardsContainer.js
@@ -1,18 +1,14 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import {
-  boardsForCurrentProjectSelector,
-  isCurrentUserManagerForCurrentProjectSelector,
-  pathSelector,
-} from '../selectors';
-import { createBoardInCurrentProject, deleteBoard, moveBoard, updateBoard } from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import Boards from '../components/Boards';

 const mapStateToProps = (state) => {
-  const { boardId } = pathSelector(state);
-  const boards = boardsForCurrentProjectSelector(state);
-  const isCurrentUserManager = isCurrentUserManagerForCurrentProjectSelector(state);
+  const { boardId } = selectors.selectPath(state);
+  const boards = selectors.selectBoardsForCurrentProject(state);
+  const isCurrentUserManager = selectors.selectIsCurrentUserManagerForCurrentProject(state);

  return {
    items: boards,
@@ -24,10 +20,10 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onCreate: createBoardInCurrentProject,
-      onUpdate: updateBoard,
-      onMove: moveBoard,
-      onDelete: deleteBoard,
+      onCreate: entryActions.createBoardInCurrentProject,
+      onUpdate: entryActions.updateBoard,
+      onMove: entryActions.moveBoard,
+      onDelete: entryActions.deleteBoard,
    },
    dispatch,
  );
--- a/client/src/containers/CardContainer.js
+++ b/client/src/containers/CardContainer.js
@@ -1,57 +1,33 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import {
-  isCurrentUserMemberForCurrentBoardSelector,
-  labelsForCurrentBoardSelector,
-  makeCardByIdSelector,
-  makeLabelsByCardIdSelector,
-  makeNotificationsTotalByCardIdSelector,
-  makeTasksByCardIdSelector,
-  makeUsersByCardIdSelector,
-  membershipsForCurrentBoardSelector,
-  pathSelector,
-  projectsToListsForCurrentUserSelector,
-} from '../selectors';
-import {
-  addLabelToCard,
-  addUserToCard,
-  createLabelInCurrentBoard,
-  deleteCard,
-  deleteLabel,
-  fetchBoard,
-  moveCard,
-  removeLabelFromCard,
-  removeUserFromCard,
-  transferCard,
-  updateLabel,
-  updateCard,
-} from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import Card from '../components/Card';

 const makeMapStateToProps = () => {
-  const cardByIdSelector = makeCardByIdSelector();
-  const usersByCardIdSelector = makeUsersByCardIdSelector();
-  const labelsByCardIdSelector = makeLabelsByCardIdSelector();
-  const tasksByCardIdSelector = makeTasksByCardIdSelector();
-  const notificationsTotalByCardIdSelector = makeNotificationsTotalByCardIdSelector();
+  const selectCardById = selectors.makeSelectCardById();
+  const selectUsersByCardId = selectors.makeSelectUsersByCardId();
+  const selectLabelsByCardId = selectors.makeSelectLabelsByCardId();
+  const selectTasksByCardId = selectors.makeSelectTasksByCardId();
+  const selectNotificationsTotalByCardId = selectors.makeSelectNotificationsTotalByCardId();

  return (state, { id, index }) => {
-    const { projectId } = pathSelector(state);
-    const allProjectsToLists = projectsToListsForCurrentUserSelector(state);
-    const allBoardMemberships = membershipsForCurrentBoardSelector(state);
-    const allLabels = labelsForCurrentBoardSelector(state);
-    const isCurrentUserMember = isCurrentUserMemberForCurrentBoardSelector(state);
+    const { projectId } = selectors.selectPath(state);
+    const allProjectsToLists = selectors.selectProjectsToListsForCurrentUser(state);
+    const allBoardMemberships = selectors.selectMembershipsForCurrentBoard(state);
+    const allLabels = selectors.selectLabelsForCurrentBoard(state);
+    const isCurrentUserMember = selectors.selectIsCurrentUserMemberForCurrentBoard(state);

-    const { name, dueDate, timer, coverUrl, boardId, listId, isPersisted } = cardByIdSelector(
+    const { name, dueDate, timer, coverUrl, boardId, listId, isPersisted } = selectCardById(
      state,
      id,
    );

-    const users = usersByCardIdSelector(state, id);
-    const labels = labelsByCardIdSelector(state, id);
-    const tasks = tasksByCardIdSelector(state, id);
-    const notificationsTotal = notificationsTotalByCardIdSelector(state, id);
+    const users = selectUsersByCardId(state, id);
+    const labels = selectLabelsByCardId(state, id);
+    const tasks = selectTasksByCardId(state, id);
+    const notificationsTotal = selectNotificationsTotalByCardId(state, id);

    return {
      id,
@@ -79,18 +55,18 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { id }) =>
  bindActionCreators(
    {
-      onUpdate: (data) => updateCard(id, data),
-      onMove: (listId, index) => moveCard(id, listId, index),
-      onTransfer: (boardId, listId) => transferCard(id, boardId, listId),
-      onDelete: () => deleteCard(id),
-      onUserAdd: (userId) => addUserToCard(userId, id),
-      onUserRemove: (userId) => removeUserFromCard(userId, id),
-      onBoardFetch: fetchBoard,
-      onLabelAdd: (labelId) => addLabelToCard(labelId, id),
-      onLabelRemove: (labelId) => removeLabelFromCard(labelId, id),
-      onLabelCreate: (data) => createLabelInCurrentBoard(data),
-      onLabelUpdate: (labelId, data) => updateLabel(labelId, data),
-      onLabelDelete: (labelId) => deleteLabel(labelId),
+      onUpdate: (data) => entryActions.updateCard(id, data),
+      onMove: (listId, index) => entryActions.moveCard(id, listId, index),
+      onTransfer: (boardId, listId) => entryActions.transferCard(id, boardId, listId),
+      onDelete: () => entryActions.deleteCard(id),
+      onUserAdd: (userId) => entryActions.addUserToCard(userId, id),
+      onUserRemove: (userId) => entryActions.removeUserFromCard(userId, id),
+      onBoardFetch: entryActions.fetchBoard,
+      onLabelAdd: (labelId) => entryActions.addLabelToCard(labelId, id),
+      onLabelRemove: (labelId) => entryActions.removeLabelFromCard(labelId, id),
+      onLabelCreate: (data) => entryActions.createLabelInCurrentBoard(data),
+      onLabelUpdate: (labelId, data) => entryActions.updateLabel(labelId, data),
+      onLabelDelete: (labelId) => entryActions.deleteLabel(labelId),
    },
    dispatch,
  );
--- a/client/src/containers/CardModalContainer.js
+++ b/client/src/containers/CardModalContainer.js
@@ -3,56 +3,18 @@ import { connect } from 'react-redux';
 import { push } from 'connected-react-router';
 import omit from 'lodash/omit';

-import {
-  actionsForCurrentCardSelector,
-  attachmentsForCurrentCardSelector,
-  currentCardSelector,
-  isCurrentUserManagerForCurrentProjectSelector,
-  isCurrentUserMemberForCurrentBoardSelector,
-  labelsForCurrentBoardSelector,
-  labelsForCurrentCardSelector,
-  membershipsForCurrentBoardSelector,
-  pathSelector,
-  projectsToListsForCurrentUserSelector,
-  tasksForCurrentCardSelector,
-  usersForCurrentCardSelector,
-} from '../selectors';
-import {
-  addLabelToCurrentCard,
-  addUserToCurrentCard,
-  createAttachmentInCurrentCard,
-  createCommentActionInCurrentCard,
-  createLabelInCurrentBoard,
-  createTaskInCurrentCard,
-  deleteAttachment,
-  deleteCommentAction,
-  deleteCurrentCard,
-  deleteLabel,
-  deleteTask,
-  fetchActionsInCurrentCard,
-  fetchBoard,
-  moveCurrentCard,
-  moveTask,
-  removeLabelFromCurrentCard,
-  removeUserFromCurrentCard,
-  toggleActionsDetailsInCurrentCard,
-  transferCurrentCard,
-  updateAttachment,
-  updateCommentAction,
-  updateCurrentCard,
-  updateLabel,
-  updateTask,
-} from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import Paths from '../constants/Paths';
 import CardModal from '../components/CardModal';

 const mapStateToProps = (state) => {
-  const { projectId } = pathSelector(state);
-  const allProjectsToLists = projectsToListsForCurrentUserSelector(state);
-  const isCurrentUserManager = isCurrentUserManagerForCurrentProjectSelector(state);
-  const allBoardMemberships = membershipsForCurrentBoardSelector(state);
-  const allLabels = labelsForCurrentBoardSelector(state);
-  const isCurrentUserMember = isCurrentUserMemberForCurrentBoardSelector(state);
+  const { projectId } = selectors.selectPath(state);
+  const allProjectsToLists = selectors.selectProjectsToListsForCurrentUser(state);
+  const isCurrentUserManager = selectors.selectIsCurrentUserManagerForCurrentProject(state);
+  const allBoardMemberships = selectors.selectMembershipsForCurrentBoard(state);
+  const allLabels = selectors.selectLabelsForCurrentBoard(state);
+  const isCurrentUserMember = selectors.selectIsCurrentUserMemberForCurrentBoard(state);

  const {
    name,
@@ -60,19 +22,19 @@ const mapStateToProps = (state) => {
    dueDate,
    timer,
    isSubscribed,
-    isActionsFetching,
-    isActionsDetailsVisible,
-    isActionsDetailsFetching,
-    isAllActionsFetched,
+    isActivitiesFetching,
+    isAllActivitiesFetched,
+    isActivitiesDetailsVisible,
+    isActivitiesDetailsFetching,
    boardId,
    listId,
-  } = currentCardSelector(state);
+  } = selectors.selectCurrentCard(state);

-  const users = usersForCurrentCardSelector(state);
-  const labels = labelsForCurrentCardSelector(state);
-  const tasks = tasksForCurrentCardSelector(state);
-  const attachments = attachmentsForCurrentCardSelector(state);
-  const actions = actionsForCurrentCardSelector(state);
+  const users = selectors.selectUsersForCurrentCard(state);
+  const labels = selectors.selectLabelsForCurrentCard(state);
+  const tasks = selectors.selectTasksForCurrentCard(state);
+  const attachments = selectors.selectAttachmentsForCurrentCard(state);
+  const activities = selectors.selectActivitiesForCurrentCard(state);

  return {
    name,
@@ -80,10 +42,10 @@ const mapStateToProps = (state) => {
    dueDate,
    timer,
    isSubscribed,
-    isActionsFetching,
-    isAllActionsFetched,
-    isActionsDetailsVisible,
-    isActionsDetailsFetching,
+    isActivitiesFetching,
+    isAllActivitiesFetched,
+    isActivitiesDetailsVisible,
+    isActivitiesDetailsFetching,
    listId,
    boardId,
    projectId,
@@ -91,42 +53,42 @@ const mapStateToProps = (state) => {
    labels,
    tasks,
    attachments,
-    actions,
+    activities,
    allProjectsToLists,
    allBoardMemberships,
    allLabels,
    canEdit: isCurrentUserMember,
-    canEditAllCommentActions: isCurrentUserManager,
+    canEditAllCommentActivities: isCurrentUserManager,
  };
 };

 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onUpdate: updateCurrentCard,
-      onMove: moveCurrentCard,
-      onTransfer: transferCurrentCard,
-      onDelete: deleteCurrentCard,
-      onUserAdd: addUserToCurrentCard,
-      onUserRemove: removeUserFromCurrentCard,
-      onBoardFetch: fetchBoard,
-      onLabelAdd: addLabelToCurrentCard,
-      onLabelRemove: removeLabelFromCurrentCard,
-      onLabelCreate: createLabelInCurrentBoard,
-      onLabelUpdate: updateLabel,
-      onLabelDelete: deleteLabel,
-      onTaskCreate: createTaskInCurrentCard,
-      onTaskUpdate: updateTask,
-      onTaskMove: moveTask,
-      onTaskDelete: deleteTask,
-      onAttachmentCreate: createAttachmentInCurrentCard,
-      onAttachmentUpdate: updateAttachment,
-      onAttachmentDelete: deleteAttachment,
-      onActionsFetch: fetchActionsInCurrentCard,
-      onActionsDetailsToggle: toggleActionsDetailsInCurrentCard,
-      onCommentActionCreate: createCommentActionInCurrentCard,
-      onCommentActionUpdate: updateCommentAction,
-      onCommentActionDelete: deleteCommentAction,
+      onUpdate: entryActions.updateCurrentCard,
+      onMove: entryActions.moveCurrentCard,
+      onTransfer: entryActions.transferCurrentCard,
+      onDelete: entryActions.deleteCurrentCard,
+      onUserAdd: entryActions.addUserToCurrentCard,
+      onUserRemove: entryActions.removeUserFromCurrentCard,
+      onBoardFetch: entryActions.fetchBoard,
+      onLabelAdd: entryActions.addLabelToCurrentCard,
+      onLabelRemove: entryActions.removeLabelFromCurrentCard,
+      onLabelCreate: entryActions.createLabelInCurrentBoard,
+      onLabelUpdate: entryActions.updateLabel,
+      onLabelDelete: entryActions.deleteLabel,
+      onTaskCreate: entryActions.createTaskInCurrentCard,
+      onTaskUpdate: entryActions.updateTask,
+      onTaskMove: entryActions.moveTask,
+      onTaskDelete: entryActions.deleteTask,
+      onAttachmentCreate: entryActions.createAttachmentInCurrentCard,
+      onAttachmentUpdate: entryActions.updateAttachment,
+      onAttachmentDelete: entryActions.deleteAttachment,
+      onActivitiesFetch: entryActions.fetchActivitiesInCurrentCard,
+      onActivitiesDetailsToggle: entryActions.toggleActivitiesDetailsInCurrentCard,
+      onCommentActivityCreate: entryActions.createCommentActivityInCurrentCard,
+      onCommentActivityUpdate: entryActions.updateCommentActivity,
+      onCommentActivityDelete: entryActions.deleteCommentActivity,
      push,
    },
    dispatch,
--- a/client/src/containers/CoreContainer.js
+++ b/client/src/containers/CoreContainer.js
@@ -1,11 +1,11 @@
 import { connect } from 'react-redux';

-import { currentModalSelector, currentProjectSelector } from '../selectors';
+import selectors from '../selectors';
 import Core from '../components/Core';

 const mapStateToProps = (state) => {
-  const currentModal = currentModalSelector(state);
-  const currentProject = currentProjectSelector(state);
+  const currentModal = selectors.selectCurrentModal(state);
+  const currentProject = selectors.selectCurrentProject(state);

  return {
    currentModal,
--- a/client/src/containers/CoreWrapperContainer.js
+++ b/client/src/containers/CoreWrapperContainer.js
@@ -1,10 +1,10 @@
 import { connect } from 'react-redux';

-import { isCoreInitializingSelector } from '../selectors';
+import selectors from '../selectors';
 import CoreWrapper from '../components/CoreWrapper';

 const mapStateToProps = (state) => {
-  const isCoreInitializing = isCoreInitializingSelector(state);
+  const isCoreInitializing = selectors.selectIsCoreInitializing(state);

  return {
    isInitializing: isCoreInitializing,
--- a/client/src/containers/FixedContainer.js
+++ b/client/src/containers/FixedContainer.js
@@ -1,11 +1,11 @@
 import { connect } from 'react-redux';

-import { currentBoardSelector, pathSelector } from '../selectors';
+import selectors from '../selectors';
 import Fixed from '../components/Fixed';

 const mapStateToProps = (state) => {
-  const { projectId } = pathSelector(state);
-  const currentBoard = currentBoardSelector(state);
+  const { projectId } = selectors.selectPath(state);
+  const currentBoard = selectors.selectCurrentBoard(state);

  return {
    projectId,
--- a/client/src/containers/HeaderContainer.js
+++ b/client/src/containers/HeaderContainer.js
@@ -1,26 +1,15 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import {
-  currentProjectSelector,
-  currentUserSelector,
-  isCurrentUserManagerForCurrentProjectSelector,
-  notificationsForCurrentUserSelector,
-} from '../selectors';
-import {
-  deleteNotification,
-  logout,
-  openProjectSettingsModal,
-  openUserSettingsModal,
-  openUsersModal,
-} from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import Header from '../components/Header';

 const mapStateToProps = (state) => {
-  const currentUser = currentUserSelector(state);
-  const currentProject = currentProjectSelector(state);
-  const notifications = notificationsForCurrentUserSelector(state);
-  const isCurrentUserManager = isCurrentUserManagerForCurrentProjectSelector(state);
+  const currentUser = selectors.selectCurrentUser(state);
+  const currentProject = selectors.selectCurrentProject(state);
+  const notifications = selectors.selectNotificationsForCurrentUser(state);
+  const isCurrentUserManager = selectors.selectIsCurrentUserManagerForCurrentProject(state);

  return {
    notifications,
@@ -34,11 +23,11 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onProjectSettingsClick: openProjectSettingsModal,
-      onUsersClick: openUsersModal,
-      onNotificationDelete: deleteNotification,
-      onUserSettingsClick: openUserSettingsModal,
-      onLogout: logout,
+      onProjectSettingsClick: entryActions.openProjectSettingsModal,
+      onUsersClick: entryActions.openUsersModal,
+      onNotificationDelete: entryActions.deleteNotification,
+      onUserSettingsClick: entryActions.openUserSettingsModal,
+      onLogout: entryActions.logout,
    },
    dispatch,
  );
--- a/client/src/containers/ListContainer.js
+++ b/client/src/containers/ListContainer.js
@@ -1,22 +1,18 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import {
-  isCurrentUserMemberForCurrentBoardSelector,
-  makeCardIdsByListIdSelector,
-  makeListByIdSelector,
-} from '../selectors';
-import { createCard, deleteList, updateList } from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import List from '../components/List';

 const makeMapStateToProps = () => {
-  const listByIdSelector = makeListByIdSelector();
-  const cardIdsByListIdSelector = makeCardIdsByListIdSelector();
+  const selectListById = selectors.makeSelectListById();
+  const selectCardIdsByListId = selectors.makeSelectCardIdsByListId();

  return (state, { id, index }) => {
-    const { name, isPersisted } = listByIdSelector(state, id);
-    const cardIds = cardIdsByListIdSelector(state, id);
-    const isCurrentUserMember = isCurrentUserMemberForCurrentBoardSelector(state);
+    const { name, isPersisted } = selectListById(state, id);
+    const cardIds = selectCardIdsByListId(state, id);
+    const isCurrentUserMember = selectors.selectIsCurrentUserMemberForCurrentBoard(state);

    return {
      id,
@@ -32,9 +28,9 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { id }) =>
  bindActionCreators(
    {
-      onUpdate: (data) => updateList(id, data),
-      onDelete: () => deleteList(id),
-      onCardCreate: (data) => createCard(id, data),
+      onUpdate: (data) => entryActions.updateList(id, data),
+      onDelete: () => entryActions.deleteList(id),
+      onCardCreate: (data) => entryActions.createCard(id, data),
    },
    dispatch,
  );
--- a/client/src/containers/LoginContainer.js
+++ b/client/src/containers/LoginContainer.js
@@ -1,7 +1,7 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import { authenticate, clearAuthenticateError } from '../actions/entry';
+import entryActions from '../entry-actions';
 import Login from '../components/Login';

 const mapStateToProps = ({
@@ -17,8 +17,8 @@ const mapStateToProps = ({
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onAuthenticate: authenticate,
-      onMessageDismiss: clearAuthenticateError,
+      onAuthenticate: entryActions.authenticate,
+      onMessageDismiss: entryActions.clearAuthenticateError,
    },
    dispatch,
  );
--- a/client/src/containers/ProjectAddModalContainer.js
+++ b/client/src/containers/ProjectAddModalContainer.js
@@ -1,7 +1,7 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import { closeModal, createProject } from '../actions/entry';
+import entryActions from '../entry-actions';
 import ProjectAddModal from '../components/ProjectAddModal';

 const mapStateToProps = ({
@@ -16,8 +16,8 @@ const mapStateToProps = ({
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onCreate: createProject,
-      onClose: closeModal,
+      onCreate: entryActions.createProject,
+      onClose: entryActions.closeModal,
    },
    dispatch,
  );
--- a/client/src/containers/ProjectContainer.js
+++ b/client/src/containers/ProjectContainer.js
@@ -1,11 +1,11 @@
 import { connect } from 'react-redux';

-import { currentModalSelector } from '../selectors';
+import selectors from '../selectors';
 import ModalTypes from '../constants/ModalTypes';
 import Project from '../components/Project';

 const mapStateToProps = (state) => {
-  const currentModal = currentModalSelector(state);
+  const currentModal = selectors.selectCurrentModal(state);

  return {
    isSettingsModalOpened: currentModal === ModalTypes.PROJECT_SETTINGS,
--- a/client/src/containers/ProjectSettingsModalContainer.js
+++ b/client/src/containers/ProjectSettingsModalContainer.js
@@ -1,28 +1,17 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import {
-  currentProjectSelector,
-  managersForCurrentProjectSelector,
-  usersSelector,
-} from '../selectors';
-import {
-  closeModal,
-  createManagerInCurrentProject,
-  deleteCurrentProject,
-  deleteProjectManager,
-  updateCurrentProject,
-  updateCurrentProjectBackgroundImage,
-} from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import ProjectSettingsModal from '../components/ProjectSettingsModal';

 const mapStateToProps = (state) => {
-  const users = usersSelector(state);
+  const users = selectors.selectUsers(state);

  const { name, background, backgroundImage, isBackgroundImageUpdating } =
-    currentProjectSelector(state);
+    selectors.selectCurrentProject(state);

-  const managers = managersForCurrentProjectSelector(state);
+  const managers = selectors.selectManagersForCurrentProject(state);

  return {
    name,
@@ -37,12 +26,12 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onUpdate: updateCurrentProject,
-      onBackgroundImageUpdate: updateCurrentProjectBackgroundImage,
-      onDelete: deleteCurrentProject,
-      onManagerCreate: createManagerInCurrentProject,
-      onManagerDelete: deleteProjectManager,
-      onClose: closeModal,
+      onUpdate: entryActions.updateCurrentProject,
+      onBackgroundImageUpdate: entryActions.updateCurrentProjectBackgroundImage,
+      onDelete: entryActions.deleteCurrentProject,
+      onManagerCreate: entryActions.createManagerInCurrentProject,
+      onManagerDelete: entryActions.deleteProjectManager,
+      onClose: entryActions.closeModal,
    },
    dispatch,
  );
--- a/client/src/containers/ProjectsContainer.js
+++ b/client/src/containers/ProjectsContainer.js
@@ -1,16 +1,16 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import { currentUserSelector, projectsForCurrentUserSelector } from '../selectors';
-import { openProjectAddModal } from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import Projects from '../components/Projects';

 const mapStateToProps = (state) => {
-  const { isAdmin } = currentUserSelector(state);
-  const project = projectsForCurrentUserSelector(state);
+  const { isAdmin } = selectors.selectCurrentUser(state);
+  const projects = selectors.selectProjectsForCurrentUser(state);

  return {
-    items: project,
+    items: projects,
    canAdd: isAdmin,
  };
 };
@@ -18,7 +18,7 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onAdd: openProjectAddModal,
+      onAdd: entryActions.openProjectAddModal,
    },
    dispatch,
  );
--- a/client/src/containers/StaticContainer.js
+++ b/client/src/containers/StaticContainer.js
@@ -1,10 +1,10 @@
 import { connect } from 'react-redux';

-import { pathSelector } from '../selectors';
+import selectors from '../selectors';
 import Static from '../components/Static';

 const mapStateToProps = (state) => {
-  const { cardId, boardId, projectId } = pathSelector(state);
+  const { cardId, boardId, projectId } = selectors.selectPath(state);

  return {
    cardId,
--- a/client/src/containers/UserAddPopupContainer.js
+++ b/client/src/containers/UserAddPopupContainer.js
@@ -1,7 +1,7 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import { clearUserCreateError, createUser } from '../actions/entry';
+import entryActions from '../entry-actions';
 import UserAddPopup from '../components/UserAddPopup';

 const mapStateToProps = ({
@@ -17,8 +17,8 @@ const mapStateToProps = ({
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onCreate: createUser,
-      onMessageDismiss: clearUserCreateError,
+      onCreate: entryActions.createUser,
+      onMessageDismiss: entryActions.clearUserCreateError,
    },
    dispatch,
  );
--- a/client/src/containers/UserSettingsModalContainer.js
+++ b/client/src/containers/UserSettingsModalContainer.js
@@ -1,19 +1,8 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import { currentUserSelector } from '../selectors';
-import {
-  clearCurrentUserEmailUpdateError,
-  clearCurrentUserPasswordUpdateError,
-  clearCurrentUserUsernameUpdateError,
-  closeModal,
-  updateCurrentUser,
-  updateCurrentUserAvatar,
-  updateCurrentUserEmail,
-  updateCurrentUserLanguage,
-  updateCurrentUserPassword,
-  updateCurrentUserUsername,
-} from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import UserSettingsModal from '../components/UserSettingsModal';

 const mapStateToProps = (state) => {
@@ -30,7 +19,7 @@ const mapStateToProps = (state) => {
    emailUpdateForm,
    passwordUpdateForm,
    usernameUpdateForm,
-  } = currentUserSelector(state);
+  } = selectors.selectCurrentUser(state);

  return {
    email,
@@ -51,16 +40,16 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onUpdate: updateCurrentUser,
-      onAvatarUpdate: updateCurrentUserAvatar,
-      onLanguageUpdate: updateCurrentUserLanguage,
-      onUsernameUpdate: updateCurrentUserUsername,
-      onUsernameUpdateMessageDismiss: clearCurrentUserUsernameUpdateError,
-      onEmailUpdate: updateCurrentUserEmail,
-      onEmailUpdateMessageDismiss: clearCurrentUserEmailUpdateError,
-      onPasswordUpdate: updateCurrentUserPassword,
-      onPasswordUpdateMessageDismiss: clearCurrentUserPasswordUpdateError,
-      onClose: closeModal,
+      onUpdate: entryActions.updateCurrentUser,
+      onAvatarUpdate: entryActions.updateCurrentUserAvatar,
+      onLanguageUpdate: entryActions.updateCurrentUserLanguage,
+      onUsernameUpdate: entryActions.updateCurrentUserUsername,
+      onUsernameUpdateMessageDismiss: entryActions.clearCurrentUserUsernameUpdateError,
+      onEmailUpdate: entryActions.updateCurrentUserEmail,
+      onEmailUpdateMessageDismiss: entryActions.clearCurrentUserEmailUpdateError,
+      onPasswordUpdate: entryActions.updateCurrentUserPassword,
+      onPasswordUpdateMessageDismiss: entryActions.clearCurrentUserPasswordUpdateError,
+      onClose: entryActions.closeModal,
    },
    dispatch,
  );
--- a/client/src/containers/UsersModalContainer.js
+++ b/client/src/containers/UsersModalContainer.js
@@ -1,22 +1,12 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';

-import { usersExceptCurrentSelector } from '../selectors';
-import {
-  clearUserEmailUpdateError,
-  clearUserPasswordUpdateError,
-  clearUserUsernameUpdateError,
-  closeModal,
-  deleteUser,
-  updateUser,
-  updateUserEmail,
-  updateUserPassword,
-  updateUserUsername,
-} from '../actions/entry';
+import selectors from '../selectors';
+import entryActions from '../entry-actions';
 import UsersModal from '../components/UsersModal';

 const mapStateToProps = (state) => {
-  const users = usersExceptCurrentSelector(state);
+  const users = selectors.selectUsersExceptCurrent(state);

  return {
    items: users,
@@ -26,15 +16,15 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = (dispatch) =>
  bindActionCreators(
    {
-      onUpdate: updateUser,
-      onUsernameUpdate: updateUserUsername,
-      onUsernameUpdateMessageDismiss: clearUserUsernameUpdateError,
-      onEmailUpdate: updateUserEmail,
-      onEmailUpdateMessageDismiss: clearUserEmailUpdateError,
-      onPasswordUpdate: updateUserPassword,
-      onPasswordUpdateMessageDismiss: clearUserPasswordUpdateError,
-      onDelete: deleteUser,
-      onClose: closeModal,
+      onUpdate: entryActions.updateUser,
+      onUsernameUpdate: entryActions.updateUserUsername,
+      onUsernameUpdateMessageDismiss: entryActions.clearUserUsernameUpdateError,
+      onEmailUpdate: entryActions.updateUserEmail,
+      onEmailUpdateMessageDismiss: entryActions.clearUserEmailUpdateError,
+      onPasswordUpdate: entryActions.updateUserPassword,
+      onPasswordUpdateMessageDismiss: entryActions.clearUserPasswordUpdateError,
+      onDelete: entryActions.deleteUser,
+      onClose: entryActions.closeModal,
    },
    dispatch,
  );