diff --git a/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js b/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js index ccbae044b3bc72d1dbb9bd8f446d9bac6bc5d011..c4dde0a55a19aa9a4f656d767a73d443b0da8c36 100644 --- a/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js +++ b/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js @@ -99,7 +99,6 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => { node.type.name === 'figure' ) { const track = node.attrs.track.slice(); - console.log('viewId', viewId); track.push({ type: 'deletion', user: user.userId, @@ -109,7 +108,6 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => { group, viewid: viewId, }); - console.log('track', track); tr.setNodeMarkup( deletionMap.map(pos), null, diff --git a/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js b/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js index 4faf2eafffc8e2453082a7f1b046de1a1f878ba3..c8ffdd9231d3615fe1f379f557d54fd41a7ee1c6 100644 --- a/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js +++ b/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js @@ -58,8 +58,6 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => { }; const focusOnBlcock = trackData => { - console.log(trackData); - console.log(pmViews, viewId); pmViews[viewId].dispatch( pmViews[viewId].state.tr.setSelection( new TextSelection( diff --git a/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/TrackChangesBox.js b/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/TrackChangesBox.js index 87c6cc0f733608b60e628dfd78d664b0837919f4..9316652ab92e983a54fa529eacf74ef31e868229 100644 --- a/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/TrackChangesBox.js +++ b/wax-prosemirror-services/src/CommentsService/components/ui/trackChanges/TrackChangesBox.js @@ -127,6 +127,7 @@ const TrackChangesBox = props => { const labelBlockChange = 'changed '; let textBlockChange = ''; let textBlockInsert = ''; + let textBlockRemoved = ''; if (trackData.type && trackData.type.name === 'format_change') { const { before, after } = trackData.attrs; @@ -156,6 +157,9 @@ const TrackChangesBox = props => { if (track.type === 'block_change') { textBlockChange = `${track.before.type} to ${trackData.node.type.name}`; } + if (track.type === 'deletion') { + textBlockRemoved = trackData.node.type.name; + } } return ( @@ -198,6 +202,12 @@ const TrackChangesBox = props => { <Text>{textBlockInsert}</Text> </ActionWrapper> )} + {textBlockRemoved !== '' && ( + <ActionWrapper> + <Label>{labelRemoved}</Label> + <Text>{textBlockRemoved}</Text> + </ActionWrapper> + )} {textBlockChange !== '' && ( <ActionWrapper> <Label>{labelBlockChange}</Label>