Mute socket messages in production, fix max-len, update dependencies

This commit is contained in:
Maksim Eltyshev
2019-09-25 02:26:31 +05:00
parent 7bd12cd8b8
commit 6eb431f721
26 changed files with 1157 additions and 1192 deletions

View File

@@ -1,18 +1,15 @@
import { createSelector } from 'redux-orm';
import orm from '../orm';
import { dbSelector } from './common';
import { currentUserIdSelector } from './current';
export const allUsersSelector = createSelector(
orm,
dbSelector,
({ User }) => User.getOrderedUndeletedQuerySet().toRefArray(),
);
export const allUsersExceptCurrentSelector = createSelector(
orm,
dbSelector,
(state) => currentUserIdSelector(state),
({ User }, currentUserId) => User.getOrderedUndeletedQuerySet()
.exclude({

View File

@@ -1,12 +1,10 @@
import { createSelector } from 'redux-orm';
import orm from '../orm';
import { dbSelector } from './common';
import { isLocalId } from '../utils/local-id';
export const makeBoardByIdSelector = () => createSelector(
orm,
dbSelector,
(_, id) => id,
({ Board }, id) => {
const boardModel = Board.withId(id);
@@ -21,7 +19,6 @@ export const makeBoardByIdSelector = () => createSelector(
export const makeListByIdSelector = () => createSelector(
orm,
dbSelector,
(_, id) => id,
({ List }, id) => {
const listModel = List.withId(id);
@@ -39,7 +36,6 @@ export const makeListByIdSelector = () => createSelector(
export const makeCardIdsByListIdSelector = () => createSelector(
orm,
dbSelector,
(_, id) => id,
({ List }, id) => {
const listModel = List.withId(id);
@@ -54,7 +50,6 @@ export const makeCardIdsByListIdSelector = () => createSelector(
export const makeCardByIdSelector = () => createSelector(
orm,
dbSelector,
(_, id) => id,
({ Card }, id) => {
const cardModel = Card.withId(id);
@@ -72,7 +67,6 @@ export const makeCardByIdSelector = () => createSelector(
export const makeUsersByCardIdSelector = () => createSelector(
orm,
dbSelector,
(_, id) => id,
({ Card }, id) => {
const cardModel = Card.withId(id);
@@ -87,7 +81,6 @@ export const makeUsersByCardIdSelector = () => createSelector(
export const makeLabelsByCardIdSelector = () => createSelector(
orm,
dbSelector,
(_, id) => id,
({ Card }, id) => {
const cardModel = Card.withId(id);
@@ -102,7 +95,6 @@ export const makeLabelsByCardIdSelector = () => createSelector(
export const makeTasksByCardIdSelector = () => createSelector(
orm,
dbSelector,
(_, id) => id,
({ Card }, id) => {
const cardModel = Card.withId(id);
@@ -117,7 +109,6 @@ export const makeTasksByCardIdSelector = () => createSelector(
export const makeLastActionIdByCardIdSelector = () => createSelector(
orm,
dbSelector,
(_, id) => id,
({ Card }, id) => {
const cardModel = Card.withId(id);
@@ -134,7 +125,6 @@ export const makeLastActionIdByCardIdSelector = () => createSelector(
export const makeNotificationsTotalByCardIdSelector = () => createSelector(
orm,
dbSelector,
(_, id) => id,
({ Card }, id) => {
const cardModel = Card.withId(id);

View File

@@ -1,5 +1,3 @@
export const dbSelector = ({ db }) => db;
export const maxIdSelector = ({ db }, modelName) => db[modelName].meta.maxId;
export const accessTokenSelector = ({ auth: { accessToken } }) => accessToken;

View File

@@ -1,7 +1,6 @@
import { createSelector } from 'redux-orm';
import orm from '../orm';
import { dbSelector } from './common';
import { pathSelector } from './path';
import { isLocalId } from '../utils/local-id';
@@ -11,7 +10,6 @@ export const currentUserIdSelector = ({ auth: { userId } }) => userId;
export const currentUserSelector = createSelector(
orm,
dbSelector,
(state) => currentUserIdSelector(state),
({ User }, id) => {
if (!id) {
@@ -30,7 +28,6 @@ export const currentUserSelector = createSelector(
export const projectsForCurrentUserSelector = createSelector(
orm,
dbSelector,
(state) => currentUserIdSelector(state),
({ User }, id) => {
if (!id) {
@@ -68,7 +65,6 @@ export const projectsForCurrentUserSelector = createSelector(
export const notificationsForCurrentUserSelector = createSelector(
orm,
dbSelector,
(state) => currentUserIdSelector(state),
({ User }, id) => {
if (!id) {
@@ -97,7 +93,6 @@ export const notificationsForCurrentUserSelector = createSelector(
export const currentProjectSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).projectId,
({ Project }, id) => {
if (!id) {
@@ -116,7 +111,6 @@ export const currentProjectSelector = createSelector(
export const membershipsForCurrentProjectSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).projectId,
(state) => currentUserIdSelector(state),
({ Project }, id, currentUserId) => {
@@ -146,7 +140,6 @@ export const membershipsForCurrentProjectSelector = createSelector(
export const boardsForCurrentProjectSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).projectId,
({ Project }, id) => {
if (!id) {
@@ -171,7 +164,6 @@ export const boardsForCurrentProjectSelector = createSelector(
export const currentBoardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).boardId,
({ Board }, id) => {
if (!id) {
@@ -190,7 +182,6 @@ export const currentBoardSelector = createSelector(
export const listIdsForCurrentBoardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).boardId,
({ Board }, id) => {
if (!id) {
@@ -212,7 +203,6 @@ export const listIdsForCurrentBoardSelector = createSelector(
export const labelsForCurrentBoardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).boardId,
({ Board }, id) => {
if (!id) {
@@ -234,7 +224,6 @@ export const labelsForCurrentBoardSelector = createSelector(
export const filterUsersForCurrentBoardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).boardId,
({ Board }, id) => {
if (!id) {
@@ -253,7 +242,6 @@ export const filterUsersForCurrentBoardSelector = createSelector(
export const filterLabelsForCurrentBoardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).boardId,
({ Board }, id) => {
if (!id) {
@@ -272,7 +260,6 @@ export const filterLabelsForCurrentBoardSelector = createSelector(
export const currentCardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).cardId,
({ Card }, id) => {
if (!id) {
@@ -291,7 +278,6 @@ export const currentCardSelector = createSelector(
export const usersForCurrentCardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).cardId,
({ Card }, id) => {
if (!id) {
@@ -310,7 +296,6 @@ export const usersForCurrentCardSelector = createSelector(
export const labelsForCurrentCardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).cardId,
({ Card }, id) => {
if (!id) {
@@ -329,7 +314,6 @@ export const labelsForCurrentCardSelector = createSelector(
export const tasksForCurrentCardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).cardId,
({ Card }, id) => {
if (!id) {
@@ -354,7 +338,6 @@ export const tasksForCurrentCardSelector = createSelector(
export const actionsForCurrentCardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).cardId,
(state) => currentUserIdSelector(state),
({ Card }, id, currentUserId) => {
@@ -384,7 +367,6 @@ export const actionsForCurrentCardSelector = createSelector(
export const notificationIdsForCurrentCardSelector = createSelector(
orm,
dbSelector,
(state) => pathSelector(state).cardId,
({ Card }, id) => {
if (!id) {

View File

@@ -2,7 +2,6 @@ import { createSelector } from 'redux-orm';
import isUndefined from 'lodash/isUndefined';
import orm from '../orm';
import { dbSelector } from './common';
import Config from '../constants/Config';
const nextPosition = (items, index, excludedId) => {
@@ -30,7 +29,6 @@ const nextPosition = (items, index, excludedId) => {
export const nextBoardPositionSelector = createSelector(
orm,
dbSelector,
(_, projectId) => projectId,
(_, __, index) => index,
(_, __, ___, excludedId) => excludedId,
@@ -47,7 +45,6 @@ export const nextBoardPositionSelector = createSelector(
export const nextListPositionSelector = createSelector(
orm,
dbSelector,
(_, boardId) => boardId,
(_, __, index) => index,
(_, __, ___, excludedId) => excludedId,
@@ -64,7 +61,6 @@ export const nextListPositionSelector = createSelector(
export const nextCardPositionSelector = createSelector(
orm,
dbSelector,
(_, listId) => listId,
(_, __, index) => index,
(_, __, ___, excludedId) => excludedId,

View File

@@ -2,7 +2,6 @@ import { createSelector as createReselectSelector } from 'reselect';
import { createSelector as createReduxOrmSelector } from 'redux-orm';
import orm from '../orm';
import { dbSelector } from './common';
import matchPaths from '../utils/match-paths';
import Paths from '../constants/Paths';
@@ -12,12 +11,13 @@ export const pathnameSelector = ({
},
}) => pathname;
// eslint-disable-next-line max-len
export const pathsMatchSelector = createReselectSelector(pathnameSelector, (pathname) => matchPaths(pathname, Object.values(Paths)));
export const pathsMatchSelector = createReselectSelector(
pathnameSelector,
(pathname) => matchPaths(pathname, Object.values(Paths)),
);
export const pathSelector = createReduxOrmSelector(
orm,
dbSelector,
pathsMatchSelector,
({ Project, Board, Card }, pathsMatch) => {
if (pathsMatch) {