@manuscripts/article-editor 1.12.5 → 1.12.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/components/track-changes/TrackModal.js +26 -9
- package/dist/cjs/components/track-changes/TrackModal.js.map +1 -1
- package/dist/cjs/components/track-changes/suggestion-list/Suggestion.js +1 -1
- package/dist/cjs/components/track-changes/suggestion-list/Suggestion.js.map +1 -1
- package/dist/cjs/lib/attrs-change-filter.js +36 -5
- package/dist/cjs/lib/attrs-change-filter.js.map +1 -1
- package/dist/es/components/track-changes/TrackModal.js +27 -10
- package/dist/es/components/track-changes/TrackModal.js.map +1 -1
- package/dist/es/components/track-changes/suggestion-list/Suggestion.js +1 -1
- package/dist/es/components/track-changes/suggestion-list/Suggestion.js.map +1 -1
- package/dist/es/lib/attrs-change-filter.js +36 -5
- package/dist/es/lib/attrs-change-filter.js.map +1 -1
- package/dist/types/lib/attrs-change-filter.d.ts +3 -2
- package/package.json +1 -1
|
@@ -62,11 +62,12 @@ const modalWidth = 368;
|
|
|
62
62
|
const modalXOffset = 90;
|
|
63
63
|
exports.TrackModal = (0, react_1.forwardRef)((props, ref) => {
|
|
64
64
|
const { changeId, isVisible, setVisible, children } = props;
|
|
65
|
-
const [{ selectedAttrsChange, trackState, files, trackModelMap }, dispatch] = (0, store_1.useStore)((store) => ({
|
|
65
|
+
const [{ selectedAttrsChange, trackState, files, trackModelMap, doc }, dispatch,] = (0, store_1.useStore)((store) => ({
|
|
66
66
|
selectedAttrsChange: store.selectedAttrsChange,
|
|
67
67
|
trackState: store.trackState,
|
|
68
68
|
files: store.files,
|
|
69
69
|
trackModelMap: store.trackModelMap,
|
|
70
|
+
doc: store.doc,
|
|
70
71
|
}));
|
|
71
72
|
(0, react_1.useEffect)(() => {
|
|
72
73
|
if (selectedAttrsChange == changeId) {
|
|
@@ -109,15 +110,31 @@ exports.TrackModal = (0, react_1.forwardRef)((props, ref) => {
|
|
|
109
110
|
document.removeEventListener('click', captureOutside);
|
|
110
111
|
};
|
|
111
112
|
}, []); // eslint-disable-line react-hooks/exhaustive-deps
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
113
|
+
const change = trackState?.changeSet.get(changeId);
|
|
114
|
+
const nodeOfChange = (0, react_1.useMemo)(() => {
|
|
115
|
+
let foundNode = null;
|
|
116
|
+
if (!trackState || change?.type !== 'node-attr-change') {
|
|
117
|
+
return foundNode;
|
|
118
|
+
}
|
|
119
|
+
const attrChange = change;
|
|
120
|
+
doc.descendants((node) => {
|
|
121
|
+
if (foundNode) {
|
|
122
|
+
return true;
|
|
123
|
+
}
|
|
124
|
+
if (node.attrs.id === attrChange.newAttrs.id ||
|
|
125
|
+
node.attrs.id === attrChange.oldAttrs.id) {
|
|
126
|
+
foundNode = node;
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
return foundNode;
|
|
130
|
+
}, [doc, trackState, change]);
|
|
131
|
+
if (!nodeOfChange || !isVisible || !change) {
|
|
117
132
|
return null;
|
|
118
133
|
}
|
|
119
134
|
const affiliations = (0, transform_1.getModelsByType)(trackModelMap, json_schema_1.ObjectTypes.Affiliation);
|
|
120
|
-
const
|
|
135
|
+
const references = (0, transform_1.getModelsByType)(trackModelMap, json_schema_1.ObjectTypes.BibliographyItem);
|
|
136
|
+
const footnotes = (0, transform_1.getModelsByType)(trackModelMap, json_schema_1.ObjectTypes.Footnote);
|
|
137
|
+
const { newAttrs, oldAttrs } = (0, attrs_change_filter_1.filterAttrsChange)(nodeOfChange, change, files, affiliations, references, footnotes);
|
|
121
138
|
return (react_1.default.createElement("div", { ref: setPopperElement, style: { zIndex: 100, ...styles.popper }, ...attributes.popper },
|
|
122
139
|
react_1.default.createElement(TrackModalWrapper, { "data-cy": "suggestion-details-modal" },
|
|
123
140
|
react_1.default.createElement(Header, null,
|
|
@@ -132,10 +149,10 @@ exports.TrackModal = (0, react_1.forwardRef)((props, ref) => {
|
|
|
132
149
|
newAttrs[key].label,
|
|
133
150
|
":"),
|
|
134
151
|
oldAttrs[key]?.value ? (react_1.default.createElement("div", null,
|
|
135
|
-
react_1.default.createElement(DeleteLabel, null, "
|
|
152
|
+
react_1.default.createElement(DeleteLabel, null, "Deleted: "),
|
|
136
153
|
react_1.default.createElement(OldAttribute, null, oldAttrs[key].value))) : null,
|
|
137
154
|
react_1.default.createElement("div", null,
|
|
138
|
-
react_1.default.createElement(InsertLabel, null, "
|
|
155
|
+
react_1.default.createElement(InsertLabel, null, "Inserted: "),
|
|
139
156
|
react_1.default.createElement(AttributeValue, null, newAttrs[key].value || oldAttrs[key].value)))) : null)))));
|
|
140
157
|
});
|
|
141
158
|
exports.default = exports.TrackModal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TrackModal.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackModal.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,
|
|
1
|
+
{"version":3,"file":"TrackModal.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackModal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
|
|
|
42
42
|
const react_1 = __importStar(require("react"));
|
|
43
43
|
const styled_components_1 = __importDefault(require("styled-components"));
|
|
44
44
|
const store_1 = require("../../../store");
|
|
45
|
-
const TrackModal_1 = __importDefault(require("
|
|
45
|
+
const TrackModal_1 = __importDefault(require("../TrackModal"));
|
|
46
46
|
const SuggestionActions_1 = __importDefault(require("./SuggestionActions"));
|
|
47
47
|
const SuggestionSnippet_1 = require("./SuggestionSnippet");
|
|
48
48
|
const Suggestion = ({ suggestion, handleAccept, handleReject, handleReset, handleClickSuggestion, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Suggestion.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/Suggestion.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,4EAAgF;AAChF,+CAAmE;AACnE,0EAAsC;AAEtC,0CAAyC;AACzC
|
|
1
|
+
{"version":3,"file":"Suggestion.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/Suggestion.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,15 +13,16 @@
|
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.filterAttrsChange = void 0;
|
|
15
15
|
const library_1 = require("@manuscripts/library");
|
|
16
|
+
const transform_1 = require("@manuscripts/transform");
|
|
16
17
|
/**
|
|
17
18
|
* Filter PN node attributes to show for comparing them with old change
|
|
18
19
|
* @param attrsChange
|
|
19
20
|
*/
|
|
20
|
-
const filterAttrsChange = (attrsChange, files, affiliations) => {
|
|
21
|
+
const filterAttrsChange = (modelOfChange, attrsChange, files, affiliations, references, footnotes) => {
|
|
21
22
|
// TODO:: use attrsChange.nodeType when adding filter for other nodes
|
|
22
23
|
return {
|
|
23
|
-
newAttrs:
|
|
24
|
-
oldAttrs:
|
|
24
|
+
newAttrs: createAttrsDisplay(modelOfChange, attrsChange.newAttrs, files, affiliations, references, footnotes),
|
|
25
|
+
oldAttrs: createAttrsDisplay(modelOfChange, attrsChange.oldAttrs, files, affiliations, references, footnotes),
|
|
25
26
|
};
|
|
26
27
|
};
|
|
27
28
|
exports.filterAttrsChange = filterAttrsChange;
|
|
@@ -39,7 +40,7 @@ const getLabel = (key) => key.replace(/[a-z][A-Z,0-9]|^./g, (match) => {
|
|
|
39
40
|
return res.join('');
|
|
40
41
|
}
|
|
41
42
|
});
|
|
42
|
-
const
|
|
43
|
+
const createAttrsDisplay = (modelOfChange, attrs, files, affiliations, references, footnotes) => {
|
|
43
44
|
const filteredAttrs = {};
|
|
44
45
|
const excludedKeys = ['id', 'paragraphStyle', 'dataTracked'];
|
|
45
46
|
Object.entries(attrs)
|
|
@@ -58,6 +59,36 @@ const bibliographyAttrsFilter = (attrs, files, affiliations) => {
|
|
|
58
59
|
value: displayBibliographicName(value),
|
|
59
60
|
};
|
|
60
61
|
return;
|
|
62
|
+
case 'rids':
|
|
63
|
+
if ((0, transform_1.isInlineFootnoteNode)(modelOfChange)) {
|
|
64
|
+
const limit = 50;
|
|
65
|
+
filteredAttrs[key] = {
|
|
66
|
+
label: 'Footnote',
|
|
67
|
+
value: footnotes.reduce((acc, fn) => {
|
|
68
|
+
const rids = value;
|
|
69
|
+
if (rids.includes(fn._id)) {
|
|
70
|
+
const fnText = fn.contents.substring(0, limit) +
|
|
71
|
+
(fn.contents.length > limit ? '...' : '');
|
|
72
|
+
return acc ? acc + ', ' + fnText : fnText;
|
|
73
|
+
}
|
|
74
|
+
return acc;
|
|
75
|
+
}, ''),
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
if ((0, transform_1.isCitationNode)(modelOfChange)) {
|
|
79
|
+
filteredAttrs[key] = {
|
|
80
|
+
label: 'Reference',
|
|
81
|
+
value: references.reduce((acc, ref) => {
|
|
82
|
+
const rids = value;
|
|
83
|
+
if (rids.includes(ref._id)) {
|
|
84
|
+
const refText = ref.title || ref.DOI || '';
|
|
85
|
+
return acc ? acc + ', \n' + refText : refText;
|
|
86
|
+
}
|
|
87
|
+
return acc;
|
|
88
|
+
}, ''),
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
return;
|
|
61
92
|
case 'affiliations':
|
|
62
93
|
return (filteredAttrs[key] = {
|
|
63
94
|
label: getLabel(key),
|
|
@@ -87,7 +118,7 @@ const bibliographyAttrsFilter = (attrs, files, affiliations) => {
|
|
|
87
118
|
});
|
|
88
119
|
case 'issued':
|
|
89
120
|
return (filteredAttrs[key] = {
|
|
90
|
-
label:
|
|
121
|
+
label: 'year',
|
|
91
122
|
value: (value?.['date-parts'] || []).join('/'),
|
|
92
123
|
});
|
|
93
124
|
case 'containerTitle':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attrs-change-filter.js","sourceRoot":"","sources":["../../../src/lib/attrs-change-filter.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;
|
|
1
|
+
{"version":3,"file":"attrs-change-filter.js","sourceRoot":"","sources":["../../../src/lib/attrs-change-filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
*
|
|
10
10
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2023 Atypon Systems LLC. All Rights Reserved.
|
|
11
11
|
*/
|
|
12
|
-
import { ObjectTypes } from '@manuscripts/json-schema';
|
|
12
|
+
import { ObjectTypes, } from '@manuscripts/json-schema';
|
|
13
13
|
import { ButtonGroup, TextButton } from '@manuscripts/style-guide';
|
|
14
14
|
import { getModelsByType } from '@manuscripts/transform';
|
|
15
15
|
import _ from 'lodash';
|
|
@@ -33,11 +33,12 @@ const modalWidth = 368;
|
|
|
33
33
|
const modalXOffset = 90;
|
|
34
34
|
export const TrackModal = forwardRef((props, ref) => {
|
|
35
35
|
const { changeId, isVisible, setVisible, children } = props;
|
|
36
|
-
const [{ selectedAttrsChange, trackState, files, trackModelMap }, dispatch] = useStore((store) => ({
|
|
36
|
+
const [{ selectedAttrsChange, trackState, files, trackModelMap, doc }, dispatch,] = useStore((store) => ({
|
|
37
37
|
selectedAttrsChange: store.selectedAttrsChange,
|
|
38
38
|
trackState: store.trackState,
|
|
39
39
|
files: store.files,
|
|
40
40
|
trackModelMap: store.trackModelMap,
|
|
41
|
+
doc: store.doc,
|
|
41
42
|
}));
|
|
42
43
|
useEffect(() => {
|
|
43
44
|
if (selectedAttrsChange == changeId) {
|
|
@@ -80,15 +81,31 @@ export const TrackModal = forwardRef((props, ref) => {
|
|
|
80
81
|
document.removeEventListener('click', captureOutside);
|
|
81
82
|
};
|
|
82
83
|
}, []); // eslint-disable-line react-hooks/exhaustive-deps
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
84
|
+
const change = trackState?.changeSet.get(changeId);
|
|
85
|
+
const nodeOfChange = useMemo(() => {
|
|
86
|
+
let foundNode = null;
|
|
87
|
+
if (!trackState || change?.type !== 'node-attr-change') {
|
|
88
|
+
return foundNode;
|
|
89
|
+
}
|
|
90
|
+
const attrChange = change;
|
|
91
|
+
doc.descendants((node) => {
|
|
92
|
+
if (foundNode) {
|
|
93
|
+
return true;
|
|
94
|
+
}
|
|
95
|
+
if (node.attrs.id === attrChange.newAttrs.id ||
|
|
96
|
+
node.attrs.id === attrChange.oldAttrs.id) {
|
|
97
|
+
foundNode = node;
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
return foundNode;
|
|
101
|
+
}, [doc, trackState, change]);
|
|
102
|
+
if (!nodeOfChange || !isVisible || !change) {
|
|
88
103
|
return null;
|
|
89
104
|
}
|
|
90
105
|
const affiliations = getModelsByType(trackModelMap, ObjectTypes.Affiliation);
|
|
91
|
-
const
|
|
106
|
+
const references = getModelsByType(trackModelMap, ObjectTypes.BibliographyItem);
|
|
107
|
+
const footnotes = getModelsByType(trackModelMap, ObjectTypes.Footnote);
|
|
108
|
+
const { newAttrs, oldAttrs } = filterAttrsChange(nodeOfChange, change, files, affiliations, references, footnotes);
|
|
92
109
|
return (React.createElement("div", { ref: setPopperElement, style: { zIndex: 100, ...styles.popper }, ...attributes.popper },
|
|
93
110
|
React.createElement(TrackModalWrapper, { "data-cy": "suggestion-details-modal" },
|
|
94
111
|
React.createElement(Header, null,
|
|
@@ -103,10 +120,10 @@ export const TrackModal = forwardRef((props, ref) => {
|
|
|
103
120
|
newAttrs[key].label,
|
|
104
121
|
":"),
|
|
105
122
|
oldAttrs[key]?.value ? (React.createElement("div", null,
|
|
106
|
-
React.createElement(DeleteLabel, null, "
|
|
123
|
+
React.createElement(DeleteLabel, null, "Deleted: "),
|
|
107
124
|
React.createElement(OldAttribute, null, oldAttrs[key].value))) : null,
|
|
108
125
|
React.createElement("div", null,
|
|
109
|
-
React.createElement(InsertLabel, null, "
|
|
126
|
+
React.createElement(InsertLabel, null, "Inserted: "),
|
|
110
127
|
React.createElement(AttributeValue, null, newAttrs[key].value || oldAttrs[key].value)))) : null)))));
|
|
111
128
|
});
|
|
112
129
|
export default TrackModal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TrackModal.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackModal.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"TrackModal.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackModal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ import { CHANGE_STATUS } from '@manuscripts/track-changes-plugin';
|
|
|
13
13
|
import React, { useEffect, useMemo, useRef, useState } from 'react';
|
|
14
14
|
import styled from 'styled-components';
|
|
15
15
|
import { useStore } from '../../../store';
|
|
16
|
-
import TrackModal from '
|
|
16
|
+
import TrackModal from '../TrackModal';
|
|
17
17
|
import SuggestionActions from './SuggestionActions';
|
|
18
18
|
import { SuggestionSnippet } from './SuggestionSnippet';
|
|
19
19
|
export const Suggestion = ({ suggestion, handleAccept, handleReject, handleReset, handleClickSuggestion, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Suggestion.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/Suggestion.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,aAAa,EAAiB,MAAM,mCAAmC,CAAA;AAChF,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACnE,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,UAAU,MAAM,
|
|
1
|
+
{"version":3,"file":"Suggestion.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/Suggestion.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,15 +10,16 @@
|
|
|
10
10
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2023 Atypon Systems LLC. All Rights Reserved.
|
|
11
11
|
*/
|
|
12
12
|
import { bibliographyItemTypes } from '@manuscripts/library';
|
|
13
|
+
import { isCitationNode, isInlineFootnoteNode, } from '@manuscripts/transform';
|
|
13
14
|
/**
|
|
14
15
|
* Filter PN node attributes to show for comparing them with old change
|
|
15
16
|
* @param attrsChange
|
|
16
17
|
*/
|
|
17
|
-
export const filterAttrsChange = (attrsChange, files, affiliations) => {
|
|
18
|
+
export const filterAttrsChange = (modelOfChange, attrsChange, files, affiliations, references, footnotes) => {
|
|
18
19
|
// TODO:: use attrsChange.nodeType when adding filter for other nodes
|
|
19
20
|
return {
|
|
20
|
-
newAttrs:
|
|
21
|
-
oldAttrs:
|
|
21
|
+
newAttrs: createAttrsDisplay(modelOfChange, attrsChange.newAttrs, files, affiliations, references, footnotes),
|
|
22
|
+
oldAttrs: createAttrsDisplay(modelOfChange, attrsChange.oldAttrs, files, affiliations, references, footnotes),
|
|
22
23
|
};
|
|
23
24
|
};
|
|
24
25
|
function displayBibliographicName(value) {
|
|
@@ -35,7 +36,7 @@ const getLabel = (key) => key.replace(/[a-z][A-Z,0-9]|^./g, (match) => {
|
|
|
35
36
|
return res.join('');
|
|
36
37
|
}
|
|
37
38
|
});
|
|
38
|
-
const
|
|
39
|
+
const createAttrsDisplay = (modelOfChange, attrs, files, affiliations, references, footnotes) => {
|
|
39
40
|
const filteredAttrs = {};
|
|
40
41
|
const excludedKeys = ['id', 'paragraphStyle', 'dataTracked'];
|
|
41
42
|
Object.entries(attrs)
|
|
@@ -54,6 +55,36 @@ const bibliographyAttrsFilter = (attrs, files, affiliations) => {
|
|
|
54
55
|
value: displayBibliographicName(value),
|
|
55
56
|
};
|
|
56
57
|
return;
|
|
58
|
+
case 'rids':
|
|
59
|
+
if (isInlineFootnoteNode(modelOfChange)) {
|
|
60
|
+
const limit = 50;
|
|
61
|
+
filteredAttrs[key] = {
|
|
62
|
+
label: 'Footnote',
|
|
63
|
+
value: footnotes.reduce((acc, fn) => {
|
|
64
|
+
const rids = value;
|
|
65
|
+
if (rids.includes(fn._id)) {
|
|
66
|
+
const fnText = fn.contents.substring(0, limit) +
|
|
67
|
+
(fn.contents.length > limit ? '...' : '');
|
|
68
|
+
return acc ? acc + ', ' + fnText : fnText;
|
|
69
|
+
}
|
|
70
|
+
return acc;
|
|
71
|
+
}, ''),
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
if (isCitationNode(modelOfChange)) {
|
|
75
|
+
filteredAttrs[key] = {
|
|
76
|
+
label: 'Reference',
|
|
77
|
+
value: references.reduce((acc, ref) => {
|
|
78
|
+
const rids = value;
|
|
79
|
+
if (rids.includes(ref._id)) {
|
|
80
|
+
const refText = ref.title || ref.DOI || '';
|
|
81
|
+
return acc ? acc + ', \n' + refText : refText;
|
|
82
|
+
}
|
|
83
|
+
return acc;
|
|
84
|
+
}, ''),
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
return;
|
|
57
88
|
case 'affiliations':
|
|
58
89
|
return (filteredAttrs[key] = {
|
|
59
90
|
label: getLabel(key),
|
|
@@ -83,7 +114,7 @@ const bibliographyAttrsFilter = (attrs, files, affiliations) => {
|
|
|
83
114
|
});
|
|
84
115
|
case 'issued':
|
|
85
116
|
return (filteredAttrs[key] = {
|
|
86
|
-
label:
|
|
117
|
+
label: 'year',
|
|
87
118
|
value: (value?.['date-parts'] || []).join('/'),
|
|
88
119
|
});
|
|
89
120
|
case 'containerTitle':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attrs-change-filter.js","sourceRoot":"","sources":["../../../src/lib/attrs-change-filter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"attrs-change-filter.js","sourceRoot":"","sources":["../../../src/lib/attrs-change-filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,14 +9,15 @@
|
|
|
9
9
|
*
|
|
10
10
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2023 Atypon Systems LLC. All Rights Reserved.
|
|
11
11
|
*/
|
|
12
|
-
import { Affiliation } from '@manuscripts/json-schema';
|
|
12
|
+
import { Affiliation, BibliographyItem, Footnote } from '@manuscripts/json-schema';
|
|
13
13
|
import { FileAttachment } from '@manuscripts/style-guide';
|
|
14
14
|
import { NodeAttrChange } from '@manuscripts/track-changes-plugin';
|
|
15
|
+
import { ManuscriptNode } from '@manuscripts/transform';
|
|
15
16
|
/**
|
|
16
17
|
* Filter PN node attributes to show for comparing them with old change
|
|
17
18
|
* @param attrsChange
|
|
18
19
|
*/
|
|
19
|
-
export declare const filterAttrsChange: (attrsChange: NodeAttrChange, files: FileAttachment[], affiliations: Affiliation[]) => {
|
|
20
|
+
export declare const filterAttrsChange: (modelOfChange: ManuscriptNode, attrsChange: NodeAttrChange, files: FileAttachment[], affiliations: Affiliation[], references: BibliographyItem[], footnotes: Footnote[]) => {
|
|
20
21
|
newAttrs: Record<string, {
|
|
21
22
|
label: string;
|
|
22
23
|
value: string;
|
package/package.json
CHANGED