@manuscripts/article-editor 3.7.20-LEAN-4162.0 → 3.7.20-LEAN-3843.0

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.
@@ -36,6 +36,7 @@ class Api {
36
36
  }
37
37
  };
38
38
  this.post = async (path, data) => {
39
+ console.log('post', path, data);
39
40
  return this.instance
40
41
  .post(path, data)
41
42
  .then((result) => result.data)
@@ -96,7 +97,6 @@ class Api {
96
97
  const config = (0, config_1.getConfig)();
97
98
  const base = config.api.url.replace('http', 'ws');
98
99
  const url = `${base}/doc/${projectID}/manuscript/${manuscriptID}/listen`;
99
- let ws;
100
100
  const onOpen = () => {
101
101
  console.log('Established WebSocket connection');
102
102
  };
@@ -118,14 +118,14 @@ class Api {
118
118
  rejoin();
119
119
  };
120
120
  const close = () => {
121
- if (!ws) {
121
+ if (!this.ws) {
122
122
  return;
123
123
  }
124
- ws.removeEventListener('open', onOpen);
125
- ws.removeEventListener('message', onMessage);
126
- ws.removeEventListener('close', onClose);
127
- ws.removeEventListener('error', onError);
128
- ws.close();
124
+ this.ws.removeEventListener('open', onOpen);
125
+ this.ws.removeEventListener('message', onMessage);
126
+ this.ws.removeEventListener('close', onClose);
127
+ this.ws.removeEventListener('error', onError);
128
+ this.ws.close();
129
129
  };
130
130
  const rejoin = () => {
131
131
  close();
@@ -133,11 +133,11 @@ class Api {
133
133
  };
134
134
  const join = () => {
135
135
  try {
136
- ws = new WebSocket(url);
137
- ws.addEventListener('open', onOpen);
138
- ws.addEventListener('message', onMessage);
139
- ws.addEventListener('close', onClose);
140
- ws.addEventListener('error', onError);
136
+ this.ws = new WebSocket(url);
137
+ this.ws.addEventListener('open', onOpen);
138
+ this.ws.addEventListener('message', onMessage);
139
+ this.ws.addEventListener('close', onClose);
140
+ this.ws.addEventListener('error', onError);
141
141
  }
142
142
  catch (e) {
143
143
  console.log(e);
@@ -152,6 +152,7 @@ class Api {
152
152
  baseURL: config.api.url,
153
153
  headers: { ...config.api.headers, Authorization: 'Bearer ' + authToken },
154
154
  });
155
+ this.token = authToken;
155
156
  }
156
157
  }
157
158
  exports.Api = Api;
@@ -1 +1 @@
1
- {"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"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"}
@@ -46,21 +46,49 @@ class StepsExchanger extends body_editor_1.CollabProvider {
46
46
  }
47
47
  async sendSteps(version, steps, clientID, flush = false) {
48
48
  this.flushImmediately = this.debounce(async () => {
49
- const response = await this.api.sendSteps(this.projectID, this.manuscriptID, {
50
- steps: steps,
51
- version,
49
+ const payload = {
52
50
  clientID,
53
- });
54
- if (response.error === 'conflict' && this.attempt < MAX_ATTEMPTS) {
55
- console.warn('Retrying');
56
- this.newStepsListener();
57
- this.attempt++;
58
- }
59
- else if (response.error) {
60
- console.error('Failed to send steps', response.error);
51
+ steps: steps.map((s) => s.toJSON()),
52
+ version,
53
+ };
54
+ if (this.api.ws && this.api.ws.readyState === WebSocket.OPEN) {
55
+ this.api.ws.send(JSON.stringify({
56
+ projectID: this.projectID,
57
+ manuscriptID: this.manuscriptID,
58
+ payload,
59
+ token: this.api.token,
60
+ }));
61
+ this.api.ws.onmessage = (event) => {
62
+ const data = JSON.parse(event.data);
63
+ if (data.status === 'error') {
64
+ if (data.InternalErrorCode === 'VERSION_MISMATCH' &&
65
+ this.attempt < MAX_ATTEMPTS) {
66
+ console.warn('Retrying');
67
+ this.newStepsListener();
68
+ this.attempt++;
69
+ }
70
+ else {
71
+ console.error('Failed to send steps', data.message);
72
+ }
73
+ }
74
+ else if (data.status === 'success') {
75
+ this.attempt = 0;
76
+ }
77
+ };
61
78
  }
62
79
  else {
63
- this.attempt = 0;
80
+ const response = await this.api.sendSteps(this.projectID, this.manuscriptID, payload);
81
+ if (response.error === 'conflict' && this.attempt < MAX_ATTEMPTS) {
82
+ console.warn('Retrying');
83
+ this.newStepsListener();
84
+ this.attempt++;
85
+ }
86
+ else if (response.error) {
87
+ console.error('Failed to send steps', response.error);
88
+ }
89
+ else {
90
+ this.attempt = 0;
91
+ }
64
92
  }
65
93
  }, THROTTLING_INTERVAL, flush, () => this.isThrottling.setValue(false));
66
94
  if (!flush) {
@@ -1 +1 @@
1
- {"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.ts"],"names":[],"mappings":"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"}
@@ -48,7 +48,7 @@ const attrs_change_filter_1 = require("../../lib/attrs-change-filter");
48
48
  const store_1 = require("../../store");
49
49
  const EditIcon_1 = __importDefault(require("../projects/icons/EditIcon"));
50
50
  function isValidValue(val, oldVal) {
51
- if (val !== oldVal) {
51
+ if (val || typeof val === 'boolean') {
52
52
  if ((val === false || val === 'No') && !oldVal) {
53
53
  // if old attribute was undefined (i.e. falsy) and it's not "false" - don't consider it to be a change
54
54
  return false;
@@ -162,9 +162,9 @@ exports.TrackModal = (0, react_1.forwardRef)((props, ref) => {
162
162
  oldAttrs[key]?.value ? (react_1.default.createElement("div", null,
163
163
  react_1.default.createElement(DeleteLabel, null, "Deleted: "),
164
164
  react_1.default.createElement(OldAttribute, null, oldAttrs[key].value))) : null,
165
- newAttrs[key]?.value.length > 0 && (react_1.default.createElement("div", null,
165
+ react_1.default.createElement("div", null,
166
166
  react_1.default.createElement(InsertLabel, null, "Inserted: "),
167
- react_1.default.createElement(AttributeValue, null, newAttrs[key].value))))) : null)))));
167
+ react_1.default.createElement(AttributeValue, null, newAttrs[key].value || oldAttrs[key].value)))) : null)))));
168
168
  });
169
169
  exports.default = exports.TrackModal;
170
170
  const InsertLabel = styled_components_1.default.span `
@@ -1 +1 @@
1
- {"version":3,"file":"TrackModal.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackModal.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TrackModal.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackModal.tsx"],"names":[],"mappings":"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"}
@@ -30,6 +30,7 @@ export class Api {
30
30
  }
31
31
  };
32
32
  this.post = async (path, data) => {
33
+ console.log('post', path, data);
33
34
  return this.instance
34
35
  .post(path, data)
35
36
  .then((result) => result.data)
@@ -90,7 +91,6 @@ export class Api {
90
91
  const config = getConfig();
91
92
  const base = config.api.url.replace('http', 'ws');
92
93
  const url = `${base}/doc/${projectID}/manuscript/${manuscriptID}/listen`;
93
- let ws;
94
94
  const onOpen = () => {
95
95
  console.log('Established WebSocket connection');
96
96
  };
@@ -112,14 +112,14 @@ export class Api {
112
112
  rejoin();
113
113
  };
114
114
  const close = () => {
115
- if (!ws) {
115
+ if (!this.ws) {
116
116
  return;
117
117
  }
118
- ws.removeEventListener('open', onOpen);
119
- ws.removeEventListener('message', onMessage);
120
- ws.removeEventListener('close', onClose);
121
- ws.removeEventListener('error', onError);
122
- ws.close();
118
+ this.ws.removeEventListener('open', onOpen);
119
+ this.ws.removeEventListener('message', onMessage);
120
+ this.ws.removeEventListener('close', onClose);
121
+ this.ws.removeEventListener('error', onError);
122
+ this.ws.close();
123
123
  };
124
124
  const rejoin = () => {
125
125
  close();
@@ -127,11 +127,11 @@ export class Api {
127
127
  };
128
128
  const join = () => {
129
129
  try {
130
- ws = new WebSocket(url);
131
- ws.addEventListener('open', onOpen);
132
- ws.addEventListener('message', onMessage);
133
- ws.addEventListener('close', onClose);
134
- ws.addEventListener('error', onError);
130
+ this.ws = new WebSocket(url);
131
+ this.ws.addEventListener('open', onOpen);
132
+ this.ws.addEventListener('message', onMessage);
133
+ this.ws.addEventListener('close', onClose);
134
+ this.ws.addEventListener('error', onError);
135
135
  }
136
136
  catch (e) {
137
137
  console.log(e);
@@ -146,6 +146,7 @@ export class Api {
146
146
  baseURL: config.api.url,
147
147
  headers: { ...config.api.headers, Authorization: 'Bearer ' + authToken },
148
148
  });
149
+ this.token = authToken;
149
150
  }
150
151
  }
151
152
  export const ApiContext = createContext(undefined);
@@ -1 +1 @@
1
- {"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"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"}
@@ -42,21 +42,49 @@ export class StepsExchanger extends CollabProvider {
42
42
  }
43
43
  async sendSteps(version, steps, clientID, flush = false) {
44
44
  this.flushImmediately = this.debounce(async () => {
45
- const response = await this.api.sendSteps(this.projectID, this.manuscriptID, {
46
- steps: steps,
47
- version,
45
+ const payload = {
48
46
  clientID,
49
- });
50
- if (response.error === 'conflict' && this.attempt < MAX_ATTEMPTS) {
51
- console.warn('Retrying');
52
- this.newStepsListener();
53
- this.attempt++;
54
- }
55
- else if (response.error) {
56
- console.error('Failed to send steps', response.error);
47
+ steps: steps.map((s) => s.toJSON()),
48
+ version,
49
+ };
50
+ if (this.api.ws && this.api.ws.readyState === WebSocket.OPEN) {
51
+ this.api.ws.send(JSON.stringify({
52
+ projectID: this.projectID,
53
+ manuscriptID: this.manuscriptID,
54
+ payload,
55
+ token: this.api.token,
56
+ }));
57
+ this.api.ws.onmessage = (event) => {
58
+ const data = JSON.parse(event.data);
59
+ if (data.status === 'error') {
60
+ if (data.InternalErrorCode === 'VERSION_MISMATCH' &&
61
+ this.attempt < MAX_ATTEMPTS) {
62
+ console.warn('Retrying');
63
+ this.newStepsListener();
64
+ this.attempt++;
65
+ }
66
+ else {
67
+ console.error('Failed to send steps', data.message);
68
+ }
69
+ }
70
+ else if (data.status === 'success') {
71
+ this.attempt = 0;
72
+ }
73
+ };
57
74
  }
58
75
  else {
59
- this.attempt = 0;
76
+ const response = await this.api.sendSteps(this.projectID, this.manuscriptID, payload);
77
+ if (response.error === 'conflict' && this.attempt < MAX_ATTEMPTS) {
78
+ console.warn('Retrying');
79
+ this.newStepsListener();
80
+ this.attempt++;
81
+ }
82
+ else if (response.error) {
83
+ console.error('Failed to send steps', response.error);
84
+ }
85
+ else {
86
+ this.attempt = 0;
87
+ }
60
88
  }
61
89
  }, THROTTLING_INTERVAL, flush, () => this.isThrottling.setValue(false));
62
90
  if (!flush) {
@@ -1 +1 @@
1
- {"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,7 @@ import { filterAttrsChange } from '../../lib/attrs-change-filter';
19
19
  import { useStore } from '../../store';
20
20
  import EditIcon from '../projects/icons/EditIcon';
21
21
  function isValidValue(val, oldVal) {
22
- if (val !== oldVal) {
22
+ if (val || typeof val === 'boolean') {
23
23
  if ((val === false || val === 'No') && !oldVal) {
24
24
  // if old attribute was undefined (i.e. falsy) and it's not "false" - don't consider it to be a change
25
25
  return false;
@@ -133,9 +133,9 @@ export const TrackModal = forwardRef((props, ref) => {
133
133
  oldAttrs[key]?.value ? (React.createElement("div", null,
134
134
  React.createElement(DeleteLabel, null, "Deleted: "),
135
135
  React.createElement(OldAttribute, null, oldAttrs[key].value))) : null,
136
- newAttrs[key]?.value.length > 0 && (React.createElement("div", null,
136
+ React.createElement("div", null,
137
137
  React.createElement(InsertLabel, null, "Inserted: "),
138
- React.createElement(AttributeValue, null, newAttrs[key].value))))) : null)))));
138
+ React.createElement(AttributeValue, null, newAttrs[key].value || oldAttrs[key].value)))) : null)))));
139
139
  });
140
140
  export default TrackModal;
141
141
  const InsertLabel = styled.span `
@@ -1 +1 @@
1
- {"version":3,"file":"TrackModal.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackModal.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TrackModal.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackModal.tsx"],"names":[],"mappings":"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"}
@@ -17,6 +17,8 @@ import { ManuscriptDoc, ManuscriptSnapshot } from '../lib/doc';
17
17
  import { CreateSnapshotResponse, SendStepsPayload, SendStepsResponse, StepsListener, StepsSinceResponse } from './types';
18
18
  export declare class Api {
19
19
  instance: AxiosInstance;
20
+ ws: WebSocket;
21
+ token: string;
20
22
  constructor(authToken: string);
21
23
  get: <T>(url: string) => Promise<T | undefined>;
22
24
  post: <T>(path: string, data: unknown) => Promise<T>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manuscripts/article-editor",
3
- "version": "3.7.20-LEAN-4162.0",
3
+ "version": "3.7.20-LEAN-3843.0",
4
4
  "license": "CPAL-1.0",
5
5
  "description": "React components for editing and viewing manuscripts",
6
6
  "repository": "github:Atypon-OpenSource/manuscripts-article-editor",