@@ -54,9 +54,11 @@ import {
54
54
import * as listType from '../../constants/listTypes' ;
55
55
import { assignRepresentationToComp } from '../../components/nglView/generatingObjects' ;
56
56
import { deleteObject } from '../../../js/reducers/ngl/dispatchActions' ;
57
- import { appendToSendActionList , setSendActionsList , setIsActionsSending } from './actions' ;
58
- import { api , getCsrfToken , METHOD } from '../../../js/utils/api' ;
57
+ import { setSendActionsList , setIsActionsSending } from './actions' ;
58
+ import { api , METHOD } from '../../../js/utils/api' ;
59
59
import { base_url } from '../../components/routes/constants' ;
60
+ import { CONSTANTS } from '../../../js/constants/constants' ;
61
+ import moment from 'moment' ;
60
62
61
63
export const selectCurrentActionsList = ( ) => ( dispatch , getState ) => {
62
64
const state = getState ( ) ;
@@ -881,18 +883,14 @@ export const getCanRedo = () => (dispatch, getState) => {
881
883
return state . undoableTrackingReducers . future . length > 0 ;
882
884
} ;
883
885
884
- export const checkSendTruckingActions = truckAction => ( dispatch , getState ) => {
886
+ export const checkSendTruckingActions = ( ) => ( dispatch , getState ) => {
885
887
const state = getState ( ) ;
886
888
const currentProject = state . projectReducers . currentProject ;
887
889
const sendActions = state . trackingReducers . send_actions_list ;
888
890
const length = sendActions . length ;
889
891
890
- if ( length >= 5 ) {
891
- Promise . resolve ( dispatch ( sendTruckingActions ( sendActions , currentProject ) ) ) . then ( response => {
892
- dispatch ( appendToSendActionList ( truckAction ) ) ;
893
- } ) ;
894
- } else {
895
- dispatch ( appendToSendActionList ( truckAction ) ) ;
892
+ if ( length >= CONSTANTS . COUNT_SEND_TRUCK_ACTIONS ) {
893
+ dispatch ( sendTruckingActions ( sendActions , currentProject ) ) ;
896
894
}
897
895
} ;
898
896
@@ -902,14 +900,20 @@ const sendTruckingActions = (sendActions, currentProject) => (dispatch, getState
902
900
903
901
if ( projectID ) {
904
902
dispatch ( setIsActionsSending ( true ) ) ;
903
+
904
+ const dataToSend = {
905
+ session_project : projectID ,
906
+ author : currentProject . authorID ,
907
+ last_update_date : moment ( ) . format ( ) ,
908
+ actions : JSON . stringify ( sendActions )
909
+ } ;
905
910
return api ( {
906
- url : `${ base_url } /api/session-actions/${ projectID } / ` ,
911
+ url : `${ base_url } /api/session-actions/` ,
907
912
method : METHOD . POST ,
908
- data : JSON . stringify ( sendActions )
913
+ data : JSON . stringify ( dataToSend )
909
914
} )
910
915
. then ( response => {
911
916
dispatch ( setSendActionsList ( [ ] ) ) ;
912
- console . log ( 'RES:' + response ) ;
913
917
} )
914
918
. catch ( error => {
915
919
throw new Error ( error ) ;
@@ -924,4 +928,4 @@ const sendTruckingActions = (sendActions, currentProject) => (dispatch, getState
924
928
return Promise . resolve ( ) ;
925
929
}
926
930
} ;
927
- export const getTruckingActions = sendActions => ( dispatch , getState ) => { } ;
931
+ export const getTruckingActions = ( ) => ( dispatch , getState ) => { } ;
0 commit comments