From f877dd588138fba677786f79588561feb459cb95 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Wed, 14 Feb 2024 17:53:30 +0200
Subject: [PATCH] fix boxes info
---
.../utilities/track-changes/helpers/markDeletion.js | 2 --
.../CommentsService/components/ConnectedTrackChange.js | 2 --
.../components/ui/trackChanges/TrackChangesBox.js | 10 ++++++++++
3 files changed, 10 insertions(+), 4 deletions(-)
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 ccbae044b..c4dde0a55 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 4faf2eaff..c8ffdd923 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 87c6cc0f7..9316652ab 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>
--
GitLab