@manuscripts/track-changes-plugin 1.6.1-LEAN-2737 → 1.6.1-LEAN-2752

package/dist/actions.d.ts

@@ -22,8 +22,7 @@ export declare enum TrackChangesAction {
     setPluginStatus = "track-changes-set-track-status",
     setChangeStatuses = "track-changes-set-change-statuses",
     refreshChanges = "track-changes-refresh-changes",
-    applyAndRemoveChanges = "track-changes-apply-remove-changes",
-    updateMetaNode = "track-changes-update-meta-node"
+    applyAndRemoveChanges = "track-changes-apply-remove-changes"
 }
 export declare type TrackChangesActionParams = {
     [TrackChangesAction.skipTrack]: boolean;
@@ -35,7 +34,6 @@ export declare type TrackChangesActionParams = {
     };
     [TrackChangesAction.refreshChanges]: boolean;
     [TrackChangesAction.applyAndRemoveChanges]: boolean;
-    [TrackChangesAction.updateMetaNode]: boolean;
 };
 /**
  * Gets the value of a meta field, action payload, of a defined track-changes action.

package/dist/index.cjs

@@ -19,7 +19,6 @@ var TrackChangesAction;
     TrackChangesAction["setChangeStatuses"] = "track-changes-set-change-statuses";
     TrackChangesAction["refreshChanges"] = "track-changes-refresh-changes";
     TrackChangesAction["applyAndRemoveChanges"] = "track-changes-apply-remove-changes";
-    TrackChangesAction["updateMetaNode"] = "track-changes-update-meta-node";
 })(TrackChangesAction || (TrackChangesAction = {}));
 /**
  * Gets the value of a meta field, action payload, of a defined track-changes action.
@@ -531,9 +530,7 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         return tr;
     }
     const { operation } = trackedAttrs;
-    const oldTrackData = change.type === 'text-change'
-        ? getTextNodeTrackedMarkData(node, schema)
-        : getBlockInlineTrackedData(node);
+    const oldTrackData = change.type === 'text-change' ? getTextNodeTrackedMarkData(node, schema) : getBlockInlineTrackedData(node);
     if (!operation) {
         log.warn('updateChangeAttrs: unable to determine operation of change ', change);
     }
@@ -554,7 +551,15 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         tr.setNodeMarkup(change.from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
     }
     else if (change.type === 'node-change' || change.type === 'node-attr-change') {
-        const newDataTracked = (getBlockInlineTrackedData(node) || []).map((oldTrack) => {
+        const trackedDataSource = getBlockInlineTrackedData(node) || [];
+        const targetDataTracked = trackedDataSource.find((t) => change.id === t.id);
+        const newDataTracked = trackedDataSource.map((oldTrack) => {
+            if (targetDataTracked) {
+                if (oldTrack.id === targetDataTracked.id) {
+                    return { ...oldTrack, ...trackedAttrs };
+                }
+                return oldTrack;
+            }
             if (oldTrack.operation === operation) {
                 return { ...oldTrack, ...trackedAttrs };
             }
@@ -952,7 +957,7 @@ function createNewUpdateAttrs(attrs, oldAttrs) {
     return {
         ...attrs,
         operation: exports.CHANGE_OPERATION.set_node_attributes,
-        oldAttrs: restAttrs,
+        oldAttrs: JSON.parse(JSON.stringify(restAttrs)),
     };
 }
 
@@ -1138,7 +1143,7 @@ function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackA
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function trackReplaceAroundStep(step, oldState, tr, newTr, attrs) {
+function trackReplaceAroundStep(step, oldState, newTr, attrs) {
     log.info('###### ReplaceAroundStep ######');
     // @ts-ignore
     const { from, to, gapFrom, gapTo, insert, slice, structure, } = step;
@@ -1159,18 +1164,14 @@ function trackReplaceAroundStep(step, oldState, tr, newTr, attrs) {
     log.info('DELETE STEPS: ', deleteSteps);
     // We only want to insert when there something inside the gap (actually would this be always true?)
     // or insert slice wasn't just start/end tokens (which we already merged inside deleteAndMergeSplitBlockNodes)
-    // ^^answering above comment we could have meta node like(bibliography_item, contributor) will not have content at all,
-    // and that case gap will be 0, for that will use updateMetaNode to indicate that we are going just to update that node
-    if (gap.size > 0 ||
-        (!structure && newSliceContent.size > 0) ||
-        tr.getMeta(TrackChangesAction.updateMetaNode)) {
+    if (gap.size > 0 || (!structure && newSliceContent.size > 0)) {
         log.info('newSliceContent', newSliceContent);
         // Since deleteAndMergeSplitBlockNodes modified the slice to not to contain any merged nodes,
         // the sides should be equal. TODO can they be other than 0?
         const openStart = slice.openStart !== slice.openEnd || newSliceContent.size === 0 ? 0 : slice.openStart;
         const openEnd = slice.openStart !== slice.openEnd || newSliceContent.size === 0 ? 0 : slice.openEnd;
         let insertedSlice = new prosemirrorModel.Slice(setFragmentAsInserted(newSliceContent, createNewInsertAttrs(attrs), oldState.schema), openStart, openEnd);
-        if (gap.size > 0 || tr.getMeta(TrackChangesAction.updateMetaNode)) {
+        if (gap.size > 0) {
             log.info('insertedSlice before inserted gap', insertedSlice);
             insertedSlice = insertedSlice.insertAt(insertedSlice.size === 0 ? 0 : insert, gap.content);
             log.info('insertedSlice after inserted gap', insertedSlice);
@@ -1203,7 +1204,8 @@ function trackReplaceAroundStep(step, oldState, tr, newTr, attrs) {
  */
 function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
     log.info('###### ReplaceStep ######');
-    let selectionPos = 0, changeSteps = [];
+    let selectionPos = 0;
+    const changeSteps = [];
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
         var _a, _b;
@@ -1427,15 +1429,29 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
         }
         else if (c.type === 'update-node-attrs') {
             const oldDataTracked = getBlockInlineTrackedData(c.node) || [];
-            const oldUpdate = oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.set_node_attributes && d.status === exports.CHANGE_STATUS.pending);
-            const { dataTracked, ...oldAttrs } = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
-            const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
-            const newUpdate = oldUpdate
+            const oldUpdate = oldDataTracked.reverse().find((d) => {
+                // reversing to start from the most recent change
+                if (d.operation === exports.CHANGE_OPERATION.set_node_attributes &&
+                    (d.status === exports.CHANGE_STATUS.pending || d.status === exports.CHANGE_STATUS.rejected)) {
+                    return true;
+                }
+                return false;
+            });
+            // if the selected last change is with status "rejected" we need to use oldAttrs from it because
+            // node's actual attributes represent the "rejected" values
+            const lastChangeRejected = oldUpdate && oldUpdate.status === exports.CHANGE_STATUS.rejected;
+            const sourceAttrs = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
+            const { dataTracked, ...restAttrs } = sourceAttrs;
+            const oldAttrs = lastChangeRejected ? oldUpdate.oldAttrs : restAttrs;
+            const newDataTracked = [
+                ...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id || lastChangeRejected),
+            ];
+            const newUpdate = oldUpdate && oldUpdate.status !== exports.CHANGE_STATUS.rejected
                 ? {
                     ...oldUpdate,
                     updatedAt: emptyAttrs.updatedAt,
                 }
-                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, c.node.attrs));
+                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, lastChangeRejected ? oldAttrs : c.node.attrs));
             // Dont add update changes if there exists already an insert change for this node
             if (JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) &&
                 !oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.insert)) {
@@ -1729,7 +1745,7 @@ function trackTransaction(tr, oldState, newTr, authorID) {
             }
         }
         else if (step instanceof prosemirrorTransform.ReplaceAroundStep) {
-            let steps = trackReplaceAroundStep(step, oldState, tr, newTr, emptyAttrs);
+            let steps = trackReplaceAroundStep(step, oldState, newTr, emptyAttrs);
             const deleted = steps.filter((s) => s.type !== 'insert-slice');
             const inserted = steps.filter((s) => s.type === 'insert-slice');
             log.info('INSERT STEPS: ', inserted);

package/dist/index.js

@@ -11,7 +11,6 @@ var TrackChangesAction;
     TrackChangesAction["setChangeStatuses"] = "track-changes-set-change-statuses";
     TrackChangesAction["refreshChanges"] = "track-changes-refresh-changes";
     TrackChangesAction["applyAndRemoveChanges"] = "track-changes-apply-remove-changes";
-    TrackChangesAction["updateMetaNode"] = "track-changes-update-meta-node";
 })(TrackChangesAction || (TrackChangesAction = {}));
 /**
  * Gets the value of a meta field, action payload, of a defined track-changes action.
@@ -523,9 +522,7 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         return tr;
     }
     const { operation } = trackedAttrs;
-    const oldTrackData = change.type === 'text-change'
-        ? getTextNodeTrackedMarkData(node, schema)
-        : getBlockInlineTrackedData(node);
+    const oldTrackData = change.type === 'text-change' ? getTextNodeTrackedMarkData(node, schema) : getBlockInlineTrackedData(node);
     if (!operation) {
         log.warn('updateChangeAttrs: unable to determine operation of change ', change);
     }
@@ -546,7 +543,15 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         tr.setNodeMarkup(change.from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
     }
     else if (change.type === 'node-change' || change.type === 'node-attr-change') {
-        const newDataTracked = (getBlockInlineTrackedData(node) || []).map((oldTrack) => {
+        const trackedDataSource = getBlockInlineTrackedData(node) || [];
+        const targetDataTracked = trackedDataSource.find((t) => change.id === t.id);
+        const newDataTracked = trackedDataSource.map((oldTrack) => {
+            if (targetDataTracked) {
+                if (oldTrack.id === targetDataTracked.id) {
+                    return { ...oldTrack, ...trackedAttrs };
+                }
+                return oldTrack;
+            }
             if (oldTrack.operation === operation) {
                 return { ...oldTrack, ...trackedAttrs };
             }
@@ -944,7 +949,7 @@ function createNewUpdateAttrs(attrs, oldAttrs) {
     return {
         ...attrs,
         operation: CHANGE_OPERATION.set_node_attributes,
-        oldAttrs: restAttrs,
+        oldAttrs: JSON.parse(JSON.stringify(restAttrs)),
     };
 }
 
@@ -1130,7 +1135,7 @@ function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackA
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function trackReplaceAroundStep(step, oldState, tr, newTr, attrs) {
+function trackReplaceAroundStep(step, oldState, newTr, attrs) {
     log.info('###### ReplaceAroundStep ######');
     // @ts-ignore
     const { from, to, gapFrom, gapTo, insert, slice, structure, } = step;
@@ -1151,18 +1156,14 @@ function trackReplaceAroundStep(step, oldState, tr, newTr, attrs) {
     log.info('DELETE STEPS: ', deleteSteps);
     // We only want to insert when there something inside the gap (actually would this be always true?)
     // or insert slice wasn't just start/end tokens (which we already merged inside deleteAndMergeSplitBlockNodes)
-    // ^^answering above comment we could have meta node like(bibliography_item, contributor) will not have content at all,
-    // and that case gap will be 0, for that will use updateMetaNode to indicate that we are going just to update that node
-    if (gap.size > 0 ||
-        (!structure && newSliceContent.size > 0) ||
-        tr.getMeta(TrackChangesAction.updateMetaNode)) {
+    if (gap.size > 0 || (!structure && newSliceContent.size > 0)) {
         log.info('newSliceContent', newSliceContent);
         // Since deleteAndMergeSplitBlockNodes modified the slice to not to contain any merged nodes,
         // the sides should be equal. TODO can they be other than 0?
         const openStart = slice.openStart !== slice.openEnd || newSliceContent.size === 0 ? 0 : slice.openStart;
         const openEnd = slice.openStart !== slice.openEnd || newSliceContent.size === 0 ? 0 : slice.openEnd;
         let insertedSlice = new Slice(setFragmentAsInserted(newSliceContent, createNewInsertAttrs(attrs), oldState.schema), openStart, openEnd);
-        if (gap.size > 0 || tr.getMeta(TrackChangesAction.updateMetaNode)) {
+        if (gap.size > 0) {
             log.info('insertedSlice before inserted gap', insertedSlice);
             insertedSlice = insertedSlice.insertAt(insertedSlice.size === 0 ? 0 : insert, gap.content);
             log.info('insertedSlice after inserted gap', insertedSlice);
@@ -1195,7 +1196,8 @@ function trackReplaceAroundStep(step, oldState, tr, newTr, attrs) {
  */
 function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
     log.info('###### ReplaceStep ######');
-    let selectionPos = 0, changeSteps = [];
+    let selectionPos = 0;
+    const changeSteps = [];
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
         var _a, _b;
@@ -1419,15 +1421,29 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
         }
         else if (c.type === 'update-node-attrs') {
             const oldDataTracked = getBlockInlineTrackedData(c.node) || [];
-            const oldUpdate = oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.set_node_attributes && d.status === CHANGE_STATUS.pending);
-            const { dataTracked, ...oldAttrs } = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
-            const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
-            const newUpdate = oldUpdate
+            const oldUpdate = oldDataTracked.reverse().find((d) => {
+                // reversing to start from the most recent change
+                if (d.operation === CHANGE_OPERATION.set_node_attributes &&
+                    (d.status === CHANGE_STATUS.pending || d.status === CHANGE_STATUS.rejected)) {
+                    return true;
+                }
+                return false;
+            });
+            // if the selected last change is with status "rejected" we need to use oldAttrs from it because
+            // node's actual attributes represent the "rejected" values
+            const lastChangeRejected = oldUpdate && oldUpdate.status === CHANGE_STATUS.rejected;
+            const sourceAttrs = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
+            const { dataTracked, ...restAttrs } = sourceAttrs;
+            const oldAttrs = lastChangeRejected ? oldUpdate.oldAttrs : restAttrs;
+            const newDataTracked = [
+                ...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id || lastChangeRejected),
+            ];
+            const newUpdate = oldUpdate && oldUpdate.status !== CHANGE_STATUS.rejected
                 ? {
                     ...oldUpdate,
                     updatedAt: emptyAttrs.updatedAt,
                 }
-                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, c.node.attrs));
+                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, lastChangeRejected ? oldAttrs : c.node.attrs));
             // Dont add update changes if there exists already an insert change for this node
             if (JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) &&
                 !oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.insert)) {
@@ -1721,7 +1737,7 @@ function trackTransaction(tr, oldState, newTr, authorID) {
             }
         }
         else if (step instanceof ReplaceAroundStep) {
-            let steps = trackReplaceAroundStep(step, oldState, tr, newTr, emptyAttrs);
+            let steps = trackReplaceAroundStep(step, oldState, newTr, emptyAttrs);
             const deleted = steps.filter((s) => s.type !== 'insert-slice');
             const inserted = steps.filter((s) => s.type === 'insert-slice');
             log.info('INSERT STEPS: ', inserted);

package/dist/steps/trackReplaceAroundStep.d.ts

@@ -2,4 +2,4 @@ import type { EditorState, Transaction } from 'prosemirror-state';
 import { ReplaceAroundStep } from 'prosemirror-transform';
 import { NewEmptyAttrs } from '../types/track';
 import { ChangeStep } from '../types/step';
-export declare function trackReplaceAroundStep(step: ReplaceAroundStep, oldState: EditorState, tr: Transaction, newTr: Transaction, attrs: NewEmptyAttrs): ChangeStep[];
+export declare function trackReplaceAroundStep(step: ReplaceAroundStep, oldState: EditorState, newTr: Transaction, attrs: NewEmptyAttrs): ChangeStep[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.6.1-LEAN-2737",
+  "version": "1.6.1-LEAN-2752",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-quarterback/tree/main/quarterback-packages/track-changes-plugin",