Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-18 20:59:44 +02:00
Code Issues Releases Activity

Fix timer counting, fix flickering on comment creation, update dependencies

Browse source
This commit is contained in:
Maksim Eltyshev 2019-10-19 17:11:37 +05:00
parent 680d664279
commit be6158afe5
5 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/package-lock.json generated
View file

@ -4197,9 +4197,9 @@
} }
}, },
"date-fns": { "date-fns": {
"version": "2.5.0", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.5.0.tgz", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.5.1.tgz",
"integrity": "sha512-I6Tkis01//nRcmvMQw/MRE1HAtcuA5Ie6jGPb8bJZJub7494LGOObqkV3ParnsSVviAjk5C8mNKDqYVBzCopWg==" "integrity": "sha512-ZBrQmuaqH9YqIejbgu8f09ki7wdD2JxWsRTZ/+HnnLNmkI56ty0evnWzKY+ihLT0xX5VdUX0vDNZCxJJGKX2+Q=="
}, },
"date-now": { "date-now": {
"version": "0.1.4", "version": "0.1.4",
@ -11223,9 +11223,9 @@
} }
}, },
"redux-orm": { "redux-orm": {
"version": "0.14.1", "version": "0.15.0",
"resolved": "https://registry.npmjs.org/redux-orm/-/redux-orm-0.14.1.tgz", "resolved": "https://registry.npmjs.org/redux-orm/-/redux-orm-0.15.0.tgz",
"integrity": "sha512-0bh1nFxEmdV1SvYfYRmXx9KKhOURCR+Gl8GSGl+Hc7ePjF3v8mCVDIhQlANgdbs/8fXte7ZpOoVb0Syl+0i8pw==", "integrity": "sha512-/QPZrCWU712pJzwOvWnwCm+5oCygN8i2T6ZxBiGwDBrm+FSHOMxdmaHA+M1e0iEE+pwiYow6EnqsMNuFwtTpew==",
"requires": { "requires": {
"@babel/runtime": "^7.6.0", "@babel/runtime": "^7.6.0",
"immutable-ops": "^0.7.0", "immutable-ops": "^0.7.0",

4
client/package.json
View file

@ -34,7 +34,7 @@
"axios": "^0.19.0", "axios": "^0.19.0",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"connected-react-router": "^6.5.2", "connected-react-router": "^6.5.2",
"date-fns": "^2.5.0", "date-fns": "^2.5.1",
"dequal": "^1.0.0", "dequal": "^1.0.0",
"history": "^4.10.1", "history": "^4.10.1",
"i18next": "^17.2.0", "i18next": "^17.2.0",
@ -55,7 +55,7 @@
"react-textarea-autosize": "^7.1.0", "react-textarea-autosize": "^7.1.0",
"redux": "^4.0.4", "redux": "^4.0.4",
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",
"redux-orm": "^0.14.1", "redux-orm": "^0.15.0",
"redux-saga": "^1.1.1", "redux-saga": "^1.1.1",
"reselect": "^4.0.0", "reselect": "^4.0.0",
"sails.io.js": "^1.2.1", "sails.io.js": "^1.2.1",

2
client/src/hooks/use-previous.js
View file

@ -1,7 +1,7 @@
import { useEffect, useRef } from 'react'; import { useEffect, useRef } from 'react';
export default (value) => { export default (value) => {
const prevValue = useRef(value); const prevValue = useRef();
useEffect(() => { useEffect(() => {
prevValue.current = value; prevValue.current = value;

2
server/api/controllers/comment-actions/create.js
View file

@ -44,7 +44,7 @@ module.exports = {
data: _.pick(inputs, ['text']) data: _.pick(inputs, ['text'])
}; };
const action = await sails.helpers.createAction(card, currentUser, values); const action = await sails.helpers.createAction(card, currentUser, values, this.req);
return exits.success({ return exits.success({
item: action item: action

14
server/api/helpers/create-action.js
View file

@ -11,6 +11,9 @@ module.exports = {
values: { values: {
type: 'json', type: 'json',
required: true required: true
},
request: {
type: 'ref'
} }
}, },
@ -21,9 +24,14 @@ module.exports = {
userId: inputs.user.id userId: inputs.user.id
}).fetch(); }).fetch();
sails.sockets.broadcast(`board:${inputs.card.boardId}`, 'actionCreate', { sails.sockets.broadcast(
item: action `board:${inputs.card.boardId}`,
}); 'actionCreate',
{
item: action
},
inputs.request
);
const userIds = await sails.helpers.getSubscriptionUserIdsForCard( const userIds = await sails.helpers.getSubscriptionUserIdsForCard(
action.cardId, action.cardId,