@fiduswriter/editor 0.1.47 → 0.1.50
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/clipboard/copy/serializers.js.map +1 -1
- package/dist/collab/doc.js.map +1 -1
- package/dist/collab/merge/index.d.ts.map +1 -1
- package/dist/collab/merge/index.js +1 -1
- package/dist/collab/merge/index.js.map +1 -1
- package/dist/comments/editors/comment.d.ts.map +1 -1
- package/dist/comments/editors/comment.js +1 -1
- package/dist/comments/editors/comment.js.map +1 -1
- package/dist/comments/editors/notify.d.ts +2 -1
- package/dist/comments/editors/notify.d.ts.map +1 -1
- package/dist/comments/editors/notify.js +2 -3
- package/dist/comments/editors/notify.js.map +1 -1
- package/dist/comments/interactions.js +2 -2
- package/dist/comments/interactions.js.map +1 -1
- package/dist/contacts/add_dialog.d.ts +3 -1
- package/dist/contacts/add_dialog.d.ts.map +1 -1
- package/dist/contacts/add_dialog.js +11 -8
- package/dist/contacts/add_dialog.js.map +1 -1
- package/dist/databases/images.d.ts.map +1 -1
- package/dist/databases/images.js +8 -5
- package/dist/databases/images.js.map +1 -1
- package/dist/dialogs/citation.js +1 -1
- package/dist/dialogs/citation.js.map +1 -1
- package/dist/dialogs/figure.d.ts.map +1 -1
- package/dist/dialogs/figure.js +2 -1
- package/dist/dialogs/figure.js.map +1 -1
- package/dist/document_template/exporter.d.ts +8 -2
- package/dist/document_template/exporter.d.ts.map +1 -1
- package/dist/document_template/exporter.js +4 -8
- package/dist/document_template/exporter.js.map +1 -1
- package/dist/document_template/index.d.ts.map +1 -1
- package/dist/document_template/index.js +1 -1
- package/dist/document_template/index.js.map +1 -1
- package/dist/documents/access_rights/index.d.ts +9 -2
- package/dist/documents/access_rights/index.d.ts.map +1 -1
- package/dist/documents/access_rights/index.js +25 -12
- package/dist/documents/access_rights/index.js.map +1 -1
- package/dist/e2ee/passphrase_urls.d.ts +14 -0
- package/dist/e2ee/passphrase_urls.d.ts.map +1 -0
- package/dist/e2ee/passphrase_urls.js +27 -0
- package/dist/e2ee/passphrase_urls.js.map +1 -0
- package/dist/exporter/native/copy.d.ts +2 -1
- package/dist/exporter/native/copy.d.ts.map +1 -1
- package/dist/exporter/native/copy.js +11 -10
- package/dist/exporter/native/copy.js.map +1 -1
- package/dist/exporter/native/file.d.ts +8 -1
- package/dist/exporter/native/file.d.ts.map +1 -1
- package/dist/exporter/native/file.js +2 -2
- package/dist/exporter/native/file.js.map +1 -1
- package/dist/exporter/native/revision.js +4 -3
- package/dist/exporter/native/revision.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +24 -15
- package/dist/index.js.map +1 -1
- package/dist/menus/headerbar/model.d.ts.map +1 -1
- package/dist/menus/headerbar/model.js +10 -8
- package/dist/menus/headerbar/model.js.map +1 -1
- package/dist/no_collab_save/index.d.ts +1 -1
- package/dist/no_collab_save/index.d.ts.map +1 -1
- package/dist/no_collab_save/index.js +13 -12
- package/dist/no_collab_save/index.js.map +1 -1
- package/dist/state_plugins/inline_reference/dropup.js.map +1 -1
- package/dist/state_plugins/settings.js.map +1 -1
- package/dist/types.d.ts +128 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +9 -6
- package/src/clipboard/copy/serializers.ts +1 -1
- package/src/collab/doc.ts +1 -1
- package/src/collab/merge/index.ts +1 -0
- package/src/comments/editors/comment.ts +6 -1
- package/src/comments/editors/notify.ts +3 -2
- package/src/comments/interactions.ts +2 -2
- package/src/contacts/add_dialog.ts +15 -8
- package/src/databases/images.ts +21 -18
- package/src/dialogs/citation.ts +3 -3
- package/src/dialogs/figure.ts +29 -29
- package/src/document_template/exporter.ts +10 -8
- package/src/document_template/index.ts +3 -2
- package/src/documents/access_rights/index.ts +44 -23
- package/src/exporter/native/copy.ts +18 -10
- package/src/exporter/native/file.ts +9 -1
- package/src/exporter/native/revision.ts +16 -16
- package/src/index.ts +46 -34
- package/src/menus/headerbar/model.ts +17 -9
- package/src/no_collab_save/index.ts +20 -22
- package/src/state_plugins/inline_reference/dropup.ts +2 -2
- package/src/state_plugins/settings.ts +1 -1
- package/src/types.ts +92 -2
package/dist/types.d.ts
CHANGED
|
@@ -9,13 +9,131 @@
|
|
|
9
9
|
import type { Node, Schema } from "prosemirror-model";
|
|
10
10
|
import type { Plugin, Transaction } from "prosemirror-state";
|
|
11
11
|
import type { EditorView } from "prosemirror-view";
|
|
12
|
-
import type { BibDB, BibDBEntries, CommentData, CSL, ImageDB, ImageDBEntries } from "@fiduswriter/document";
|
|
13
|
-
|
|
12
|
+
import type { BibDB, BibDBEntries, BibDBEntry, CommentData, CSL, ImageDB, ImageDBEntries } from "@fiduswriter/document";
|
|
13
|
+
import type { ImageApi } from "@fiduswriter/image-manager";
|
|
14
|
+
export type { BibDB, BibDBEntries, BibDBEntry, CommentData, CSL, ImageDB, ImageDBEntries };
|
|
14
15
|
/** Image database interface used by the editor (document and user DBs). */
|
|
15
16
|
export interface EditorImageDB extends ImageDB {
|
|
16
17
|
saveImage(imageData: Record<string, unknown>): Promise<number>;
|
|
17
18
|
setImage(id: number, imageData: Record<string, unknown>): void;
|
|
18
19
|
}
|
|
20
|
+
/** Bibliography database interface used by the editor. */
|
|
21
|
+
export interface EditorBibDB {
|
|
22
|
+
db: Record<string, BibDBEntry>;
|
|
23
|
+
}
|
|
24
|
+
/** API connector for document-level operations used by the editor. */
|
|
25
|
+
export interface EditorDocumentApi {
|
|
26
|
+
createDocument(data: Record<string, unknown>): Promise<{
|
|
27
|
+
json: unknown;
|
|
28
|
+
status: number;
|
|
29
|
+
}>;
|
|
30
|
+
getWebSocketBase(data: {
|
|
31
|
+
id: number;
|
|
32
|
+
token?: string;
|
|
33
|
+
}): Promise<{
|
|
34
|
+
json: unknown;
|
|
35
|
+
status: number;
|
|
36
|
+
}>;
|
|
37
|
+
getDocumentStyles(data: {
|
|
38
|
+
id: number;
|
|
39
|
+
token?: string;
|
|
40
|
+
}): Promise<{
|
|
41
|
+
json: unknown;
|
|
42
|
+
status: number;
|
|
43
|
+
}>;
|
|
44
|
+
getDocumentData(data: {
|
|
45
|
+
id: number;
|
|
46
|
+
token?: string;
|
|
47
|
+
v?: number;
|
|
48
|
+
}): Promise<{
|
|
49
|
+
json: unknown;
|
|
50
|
+
status: number;
|
|
51
|
+
}>;
|
|
52
|
+
saveDocument(data: Record<string, unknown>, options?: {
|
|
53
|
+
keepalive?: boolean;
|
|
54
|
+
}): Promise<{
|
|
55
|
+
json: unknown;
|
|
56
|
+
status: number;
|
|
57
|
+
}>;
|
|
58
|
+
commentNotify(data: Record<string, unknown>): Promise<unknown>;
|
|
59
|
+
requestAccess(data: {
|
|
60
|
+
document_id: number;
|
|
61
|
+
rights: string;
|
|
62
|
+
}): Promise<{
|
|
63
|
+
json: unknown;
|
|
64
|
+
status: number;
|
|
65
|
+
}>;
|
|
66
|
+
validateShareToken(token: string): Promise<{
|
|
67
|
+
json: unknown;
|
|
68
|
+
status: number;
|
|
69
|
+
}>;
|
|
70
|
+
listShareTokens(document_id: number): Promise<{
|
|
71
|
+
json: unknown;
|
|
72
|
+
status: number;
|
|
73
|
+
}>;
|
|
74
|
+
createShareToken(data: Record<string, unknown>): Promise<{
|
|
75
|
+
json: unknown;
|
|
76
|
+
status: number;
|
|
77
|
+
}>;
|
|
78
|
+
revokeShareToken(token_id: number): Promise<{
|
|
79
|
+
json: unknown;
|
|
80
|
+
status: number;
|
|
81
|
+
}>;
|
|
82
|
+
getAccessRights(data: {
|
|
83
|
+
document_ids: number[];
|
|
84
|
+
}): Promise<{
|
|
85
|
+
json: unknown;
|
|
86
|
+
status: number;
|
|
87
|
+
}>;
|
|
88
|
+
saveAccessRights(data: {
|
|
89
|
+
document_ids: number[];
|
|
90
|
+
access_rights: unknown[];
|
|
91
|
+
}): Promise<unknown>;
|
|
92
|
+
saveE2EEImage(data: Record<string, unknown>, files?: Record<string, unknown>): Promise<{
|
|
93
|
+
json: unknown;
|
|
94
|
+
status: number;
|
|
95
|
+
}>;
|
|
96
|
+
deleteE2EEImage(data: {
|
|
97
|
+
doc_id: number;
|
|
98
|
+
image_id: number;
|
|
99
|
+
}): Promise<unknown>;
|
|
100
|
+
uploadRevision(data: {
|
|
101
|
+
note: string;
|
|
102
|
+
document_id: number;
|
|
103
|
+
}, files: Record<string, unknown>): Promise<unknown>;
|
|
104
|
+
getTemplateForDoc(id: number | string, token: string | false): Promise<{
|
|
105
|
+
json: unknown;
|
|
106
|
+
status: number;
|
|
107
|
+
}>;
|
|
108
|
+
}
|
|
109
|
+
/** API connector for contact operations used by the editor. */
|
|
110
|
+
export interface EditorContactsApi {
|
|
111
|
+
add(data: {
|
|
112
|
+
user_string: string;
|
|
113
|
+
}): Promise<{
|
|
114
|
+
json: unknown;
|
|
115
|
+
status: number;
|
|
116
|
+
}>;
|
|
117
|
+
}
|
|
118
|
+
/** API connector for document import/copy operations used by the editor. */
|
|
119
|
+
export interface EditorDocumentImportApi {
|
|
120
|
+
createDoc(data: Record<string, unknown>, files?: Record<string, unknown>): Promise<{
|
|
121
|
+
json: unknown;
|
|
122
|
+
status: number;
|
|
123
|
+
}>;
|
|
124
|
+
saveImage(data: Record<string, unknown>, files: Record<string, unknown>): Promise<{
|
|
125
|
+
json: unknown;
|
|
126
|
+
status: number;
|
|
127
|
+
}>;
|
|
128
|
+
saveE2EEImage(data: Record<string, unknown>, files: Record<string, unknown>): Promise<{
|
|
129
|
+
json: unknown;
|
|
130
|
+
status: number;
|
|
131
|
+
}>;
|
|
132
|
+
saveDocument(data: Record<string, unknown>): Promise<{
|
|
133
|
+
json: unknown;
|
|
134
|
+
status: number;
|
|
135
|
+
}>;
|
|
136
|
+
}
|
|
19
137
|
/** Minimal app interface — only the fields the Editor actually uses. */
|
|
20
138
|
export interface EditorApp {
|
|
21
139
|
routes: Record<string, {
|
|
@@ -32,10 +150,17 @@ export interface EditorApp {
|
|
|
32
150
|
init(): void;
|
|
33
151
|
};
|
|
34
152
|
}>]>;
|
|
35
|
-
name
|
|
153
|
+
name: string;
|
|
36
154
|
isOffline(): boolean;
|
|
37
155
|
csl: CSL;
|
|
156
|
+
bibDB?: EditorBibDB;
|
|
38
157
|
imageDB: EditorImageDB;
|
|
158
|
+
apiConnectors: {
|
|
159
|
+
document: EditorDocumentApi;
|
|
160
|
+
documentImport: EditorDocumentImportApi;
|
|
161
|
+
image: ImageApi;
|
|
162
|
+
contacts: EditorContactsApi;
|
|
163
|
+
};
|
|
39
164
|
}
|
|
40
165
|
/** Document access role constants. */
|
|
41
166
|
export type CommentOnlyRole = "review" | "comment";
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AA2IH,MAAM,CAAC,MAAM,kBAAkB,GAAsB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;AAC1E,MAAM,CAAC,MAAM,eAAe,GAAmB,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAA;AAChF,MAAM,CAAC,MAAM,YAAY,GAAiB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAA;AACtE,MAAM,CAAC,MAAM,WAAW,GAAgB;IACpC,OAAO;IACP,eAAe;IACf,gBAAgB;CACnB,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fiduswriter/editor",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.50",
|
|
4
4
|
"description": "Fidus Writer browser editor",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -65,11 +65,12 @@
|
|
|
65
65
|
"lint:fix": "eslint src --fix",
|
|
66
66
|
"format": "prettier --write .",
|
|
67
67
|
"format:check": "prettier --check .",
|
|
68
|
-
"test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config jest.config.js"
|
|
68
|
+
"test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config jest.config.js",
|
|
69
|
+
"install-hooks": "husky"
|
|
69
70
|
},
|
|
70
71
|
"dependencies": {
|
|
71
|
-
"@fiduswriter/bibliography-manager": "^0.1.
|
|
72
|
-
"@fiduswriter/document": "^0.2.
|
|
72
|
+
"@fiduswriter/bibliography-manager": "^0.1.20",
|
|
73
|
+
"@fiduswriter/document": "^0.2.29",
|
|
73
74
|
"@fiduswriter/image-manager": "^0.1.4",
|
|
74
75
|
"cropperjs": "^1.6.2",
|
|
75
76
|
"diff": "^5.0.0",
|
|
@@ -78,7 +79,7 @@
|
|
|
78
79
|
"fast-xml-parser": "^4.5.0",
|
|
79
80
|
"fastdom": "^1.0.11",
|
|
80
81
|
"fix-utf8": "^2.0.1",
|
|
81
|
-
"fwtoolkit": "
|
|
82
|
+
"fwtoolkit": "file:../fwtoolkit",
|
|
82
83
|
"jszip": "^3.10.1",
|
|
83
84
|
"mathml-to-latex": "^1.4.3",
|
|
84
85
|
"mathml2omml": "^0.5.0",
|
|
@@ -116,7 +117,9 @@
|
|
|
116
117
|
"ts-jest": "^29.4.11",
|
|
117
118
|
"ts-jest-resolver": "^2.0.1",
|
|
118
119
|
"typescript": "^6.0.3",
|
|
119
|
-
"typescript-eslint": "^8.62.0"
|
|
120
|
+
"typescript-eslint": "^8.62.0",
|
|
121
|
+
"husky": "^9.1.7",
|
|
122
|
+
"lint-staged": "^17.0.8"
|
|
120
123
|
},
|
|
121
124
|
"lint-staged": {
|
|
122
125
|
"*.{ts,js,mjs,css,md,json,html}": [
|
|
@@ -43,7 +43,7 @@ class ClipboardDOMSerializer {
|
|
|
43
43
|
settings.citationstyle,
|
|
44
44
|
bibliographyHeader,
|
|
45
45
|
(this.editor.mod.db as any).bibDB,
|
|
46
|
-
|
|
46
|
+
this.editor.app.csl,
|
|
47
47
|
true // synchronous. Should work as the editor has used the same style previously.
|
|
48
48
|
)
|
|
49
49
|
const fm = citRenderer.fm as any
|
package/src/collab/doc.ts
CHANGED
|
@@ -1439,7 +1439,7 @@ export class ModCollabDoc {
|
|
|
1439
1439
|
rid: data["rid"],
|
|
1440
1440
|
footnoterender: data["footnoterender"],
|
|
1441
1441
|
reject_request_id: data["reject_request_id"],
|
|
1442
|
-
...decryptedPayload
|
|
1442
|
+
...(decryptedPayload as Record<string, unknown>)
|
|
1443
1443
|
}
|
|
1444
1444
|
|
|
1445
1445
|
// Process the decrypted diff normally
|
|
@@ -297,7 +297,12 @@ export class CommentEditor {
|
|
|
297
297
|
const comment = this.view.state.doc,
|
|
298
298
|
docId = this.mod.editor.docInfo.id as number
|
|
299
299
|
newUserTags.forEach(userId =>
|
|
300
|
-
notifyMentionedUser(
|
|
300
|
+
notifyMentionedUser(
|
|
301
|
+
this.mod.editor.app.apiConnectors.document,
|
|
302
|
+
docId,
|
|
303
|
+
userId,
|
|
304
|
+
comment
|
|
305
|
+
)
|
|
301
306
|
)
|
|
302
307
|
}
|
|
303
308
|
}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
import {post} from "fwtoolkit"
|
|
2
1
|
import {serializeCommentNode} from "./schema.js"
|
|
3
2
|
import type {Node} from "prosemirror-model"
|
|
3
|
+
import type {EditorDocumentApi} from "../../types.js"
|
|
4
4
|
|
|
5
5
|
export const notifyMentionedUser = (
|
|
6
|
+
documentApi: EditorDocumentApi,
|
|
6
7
|
docId: number,
|
|
7
8
|
userId: number,
|
|
8
9
|
comment: Node
|
|
9
10
|
) => {
|
|
10
11
|
const {html, text} = serializeCommentNode(comment)
|
|
11
|
-
return
|
|
12
|
+
return documentApi.commentNotify({
|
|
12
13
|
doc_id: docId,
|
|
13
14
|
collaborator_id: userId,
|
|
14
15
|
comment_html: html,
|
|
@@ -3,7 +3,7 @@ import {TextSelection} from "prosemirror-state"
|
|
|
3
3
|
import {GapCursor} from "prosemirror-gapcursor"
|
|
4
4
|
import type {EditorView} from "prosemirror-view"
|
|
5
5
|
|
|
6
|
-
import {findTarget
|
|
6
|
+
import {findTarget} from "fwtoolkit"
|
|
7
7
|
import {READ_ONLY_ROLES} from "../index.js"
|
|
8
8
|
import type {Editor} from "../types.js"
|
|
9
9
|
import {
|
|
@@ -389,7 +389,7 @@ export class ModCommentInteractions {
|
|
|
389
389
|
const comment = this.mod.store.findComment(id)
|
|
390
390
|
const {html, text} = serializeComment(comment.comment)
|
|
391
391
|
|
|
392
|
-
|
|
392
|
+
this.mod.editor.app.apiConnectors.document.commentNotify({
|
|
393
393
|
doc_id: this.mod.editor.docInfo.id,
|
|
394
394
|
collaborator_id: user,
|
|
395
395
|
comment_html: html,
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {Dialog, cancelPromise, escapeText
|
|
1
|
+
import {Dialog, cancelPromise, escapeText} from "fwtoolkit"
|
|
2
2
|
import {addContactTemplate} from "./templates.js"
|
|
3
|
+
import type {EditorContactsApi} from "../types.js"
|
|
3
4
|
|
|
4
5
|
interface ContactResponse {
|
|
5
6
|
contact?: unknown
|
|
@@ -9,9 +10,14 @@ interface ContactResponse {
|
|
|
9
10
|
//dialog for adding a user to contacts
|
|
10
11
|
export class AddContactDialog {
|
|
11
12
|
settings: Record<string, unknown>
|
|
13
|
+
contactsApi: EditorContactsApi
|
|
12
14
|
|
|
13
|
-
constructor(
|
|
15
|
+
constructor(
|
|
16
|
+
settings: Record<string, unknown>,
|
|
17
|
+
contactsApi: EditorContactsApi
|
|
18
|
+
) {
|
|
14
19
|
this.settings = settings
|
|
20
|
+
this.contactsApi = contactsApi
|
|
15
21
|
}
|
|
16
22
|
|
|
17
23
|
init(): Promise<unknown[]> {
|
|
@@ -91,24 +97,25 @@ export class AddContactDialog {
|
|
|
91
97
|
return cancelPromise()
|
|
92
98
|
}
|
|
93
99
|
|
|
94
|
-
const {json, status} =
|
|
100
|
+
const {json, status} = await this.contactsApi.add({
|
|
95
101
|
user_string: userString
|
|
96
|
-
})
|
|
102
|
+
})
|
|
103
|
+
const data = json as ContactResponse
|
|
97
104
|
if (status == 201) {
|
|
98
105
|
//user added to the contacts
|
|
99
|
-
return
|
|
106
|
+
return data.contact
|
|
100
107
|
} else {
|
|
101
108
|
//user not found
|
|
102
109
|
let responseHtml
|
|
103
|
-
if (
|
|
110
|
+
if (data.error === 1) {
|
|
104
111
|
responseHtml = gettext(
|
|
105
112
|
"You cannot add yourself to your contacts!"
|
|
106
113
|
)
|
|
107
|
-
} else if (
|
|
114
|
+
} else if (data.error === 2) {
|
|
108
115
|
responseHtml = gettext(
|
|
109
116
|
"This person is already in your contacts!"
|
|
110
117
|
)
|
|
111
|
-
} else if (
|
|
118
|
+
} else if (data.error === 3) {
|
|
112
119
|
responseHtml = gettext("Invalid email!")
|
|
113
120
|
}
|
|
114
121
|
document
|
package/src/databases/images.ts
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
For E2EE documents, images are encrypted client-side and uploaded directly
|
|
10
10
|
via a dedicated endpoint to an EncryptedDocumentImage model.
|
|
11
11
|
*/
|
|
12
|
-
import {addAlert, get
|
|
12
|
+
import {addAlert, get} from "fwtoolkit"
|
|
13
13
|
|
|
14
14
|
import type {Editor} from "../types.js"
|
|
15
15
|
|
|
@@ -60,7 +60,7 @@ export class ModImageDB {
|
|
|
60
60
|
// Set a timeout so that the update can be combines with other updates
|
|
61
61
|
// if they happen more or less simultaneously.
|
|
62
62
|
window.setTimeout(
|
|
63
|
-
() =>
|
|
63
|
+
() => this.mod.editor.mod.collab!.doc.sendToCollaborators(),
|
|
64
64
|
100
|
|
65
65
|
)
|
|
66
66
|
}
|
|
@@ -79,7 +79,9 @@ export class ModImageDB {
|
|
|
79
79
|
const isE2EE = this.mod.editor.e2ee?.encrypted === true
|
|
80
80
|
if (!isE2EE) {
|
|
81
81
|
// Non-E2EE documents must use the user's imageDB
|
|
82
|
-
return
|
|
82
|
+
return this.mod.editor.app.imageDB.saveImage(
|
|
83
|
+
imageData as unknown as Record<string, unknown>
|
|
84
|
+
)
|
|
83
85
|
}
|
|
84
86
|
|
|
85
87
|
// E2EE path: upload encrypted image directly to the document
|
|
@@ -103,7 +105,8 @@ export class ModImageDB {
|
|
|
103
105
|
}
|
|
104
106
|
}
|
|
105
107
|
|
|
106
|
-
return
|
|
108
|
+
return this.mod.editor.app.apiConnectors.document
|
|
109
|
+
.saveE2EEImage(jsonData, files)
|
|
107
110
|
.then(({json}: {json: any}) => {
|
|
108
111
|
const dbEntry: ImageEntry = {
|
|
109
112
|
id: json.id,
|
|
@@ -122,7 +125,7 @@ export class ModImageDB {
|
|
|
122
125
|
this.setImage(json.id, dbEntry)
|
|
123
126
|
return json.id
|
|
124
127
|
})
|
|
125
|
-
.catch(error => {
|
|
128
|
+
.catch((error: unknown) => {
|
|
126
129
|
addAlert("error", gettext("Could not save encrypted image"))
|
|
127
130
|
throw error
|
|
128
131
|
})
|
|
@@ -160,12 +163,14 @@ export class ModImageDB {
|
|
|
160
163
|
}
|
|
161
164
|
|
|
162
165
|
deleteE2EEImageFromServer(id: number): void {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
166
|
+
this.mod.editor.app.apiConnectors.document
|
|
167
|
+
.deleteE2EEImage({
|
|
168
|
+
doc_id: this.mod.editor.docInfo.id as number,
|
|
169
|
+
image_id: id
|
|
170
|
+
})
|
|
171
|
+
.catch(() => {
|
|
172
|
+
// Silently ignore — orphaned image records are acceptable
|
|
173
|
+
})
|
|
169
174
|
}
|
|
170
175
|
|
|
171
176
|
deleteLocalImage(id: number): void {
|
|
@@ -186,10 +191,10 @@ export class ModImageDB {
|
|
|
186
191
|
// document's unique key and are not reusable across documents.
|
|
187
192
|
return
|
|
188
193
|
}
|
|
189
|
-
const appImageDB =
|
|
194
|
+
const appImageDB = this.mod.editor.app.imageDB
|
|
190
195
|
if (Object.keys(appImageDB.db).includes(String(id))) {
|
|
191
196
|
// Just directly reset the image as we already have the image present in user Image DB
|
|
192
|
-
this.setImage(id, appImageDB.db[id])
|
|
197
|
+
this.setImage(id, appImageDB.db[id] as unknown as ImageEntry)
|
|
193
198
|
} else {
|
|
194
199
|
// If image is not present in both the userImage DB and docDB we can safely assume that we have to upload again.
|
|
195
200
|
this.reUploadImage(
|
|
@@ -256,15 +261,13 @@ export class ModImageDB {
|
|
|
256
261
|
cats: [],
|
|
257
262
|
copyright: copyright
|
|
258
263
|
}
|
|
259
|
-
|
|
264
|
+
this.mod.editor.app.imageDB.saveImage(x).then(
|
|
260
265
|
(newId: number) => {
|
|
261
266
|
const imageData = JSON.parse(
|
|
262
267
|
JSON.stringify(
|
|
263
|
-
|
|
264
|
-
newId
|
|
265
|
-
]
|
|
268
|
+
this.mod.editor.app.imageDB.db[newId]
|
|
266
269
|
)
|
|
267
|
-
)
|
|
270
|
+
) as unknown as ImageEntry
|
|
268
271
|
this.setImage(newId, imageData)
|
|
269
272
|
this.mod.editor.view.state.doc.descendants(
|
|
270
273
|
(node, pos) => {
|
package/src/dialogs/citation.ts
CHANGED
|
@@ -160,8 +160,8 @@ export class CitationDialog {
|
|
|
160
160
|
)
|
|
161
161
|
)
|
|
162
162
|
})
|
|
163
|
-
Object.keys(
|
|
164
|
-
const bib =
|
|
163
|
+
Object.keys(this.editor.app.bibDB!.db).forEach(id => {
|
|
164
|
+
const bib = this.editor.app.bibDB!.db[id]
|
|
165
165
|
if (!(this.editor.mod.db as any).bibDB.hasReference(bib)) {
|
|
166
166
|
data.push(this.createTableRow(bib, Number.parseInt(id), "user"))
|
|
167
167
|
}
|
|
@@ -457,7 +457,7 @@ export class CitationDialog {
|
|
|
457
457
|
if (db === "user") {
|
|
458
458
|
// entry is from user's bibDB. We need to import it into the
|
|
459
459
|
// document's bibDB.
|
|
460
|
-
const bib =
|
|
460
|
+
const bib = this.editor.app.bibDB!.db[String(id)]
|
|
461
461
|
id = (this.editor.mod.db as any).bibDB.addReference(bib, id)
|
|
462
462
|
}
|
|
463
463
|
const returnObj: CitationReference = {
|
package/src/dialogs/figure.ts
CHANGED
|
@@ -4,6 +4,7 @@ import type {JSONValue} from "@fiduswriter/document"
|
|
|
4
4
|
import type {ContentMenuInit} from "fwtoolkit/content_menu"
|
|
5
5
|
import {ContentMenu, Dialog, addAlert, dropdownSelect} from "fwtoolkit"
|
|
6
6
|
import {ImageSelectionDialog} from "@fiduswriter/image-manager/selection_dialog"
|
|
7
|
+
import type {ImageDB as ImageManagerImageDB} from "@fiduswriter/image-manager"
|
|
7
8
|
import {E2EEEncryptor} from "fwtoolkit/e2ee/encryptor"
|
|
8
9
|
|
|
9
10
|
import {configureFigureTemplate} from "./templates.js"
|
|
@@ -157,45 +158,44 @@ export class FigureDialog {
|
|
|
157
158
|
|
|
158
159
|
selectImage(): void {
|
|
159
160
|
const imageSelection = new ImageSelectionDialog(
|
|
160
|
-
this.imageDB,
|
|
161
|
-
this.userImageDB,
|
|
161
|
+
this.imageDB as unknown as ImageManagerImageDB,
|
|
162
|
+
this.userImageDB as unknown as ImageManagerImageDB,
|
|
162
163
|
this.imgId,
|
|
163
|
-
this.editor
|
|
164
|
+
this.editor as any
|
|
164
165
|
)
|
|
165
166
|
imageSelection
|
|
166
167
|
.init()
|
|
167
|
-
.then(
|
|
168
|
-
|
|
168
|
+
.then((result) => {
|
|
169
|
+
const {
|
|
169
170
|
id,
|
|
170
171
|
db
|
|
171
|
-
}
|
|
172
|
+
} = result as {
|
|
172
173
|
id: number | false
|
|
173
174
|
db: "document" | "user"
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
)
|
|
175
|
+
}
|
|
176
|
+
if (id) {
|
|
177
|
+
this.imgId = id
|
|
178
|
+
this.imgDb = db
|
|
179
|
+
// We take a copy of the object in case of the image coming from the user db in order
|
|
180
|
+
// not to overwrite the copyright info from the user's image db.
|
|
181
|
+
this.copyright =
|
|
182
|
+
db === "document"
|
|
183
|
+
? (this.imageDB.db[String(id)].copyright as
|
|
184
|
+
| Record<string, JSONValue>
|
|
185
|
+
| undefined) || false
|
|
186
|
+
: JSON.parse(
|
|
187
|
+
JSON.stringify(
|
|
188
|
+
this.userImageDB.db[String(id)]
|
|
189
|
+
.copyright
|
|
190
190
|
)
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
191
|
+
)
|
|
192
|
+
this.layoutImagePreview()
|
|
193
|
+
} else {
|
|
194
|
+
this.imgId = false
|
|
195
|
+
this.imgDb = false
|
|
196
|
+
this.layoutMathEditor()
|
|
197
197
|
}
|
|
198
|
-
)
|
|
198
|
+
})
|
|
199
199
|
}
|
|
200
200
|
|
|
201
201
|
async layoutImagePreview(): Promise<void> {
|
|
@@ -2,7 +2,6 @@ import download from "downloadjs"
|
|
|
2
2
|
|
|
3
3
|
import {createSlug} from "@fiduswriter/document/exporter/tools/file"
|
|
4
4
|
import {ZipFileCreator} from "fwtoolkit/file/zip"
|
|
5
|
-
import {postJson} from "fwtoolkit"
|
|
6
5
|
|
|
7
6
|
interface HttpFile {
|
|
8
7
|
filename: string
|
|
@@ -33,7 +32,10 @@ interface TemplateResponse {
|
|
|
33
32
|
|
|
34
33
|
export class DocumentTemplateExporter {
|
|
35
34
|
id: number | string
|
|
36
|
-
|
|
35
|
+
getTemplateForDoc: (
|
|
36
|
+
id: number | string,
|
|
37
|
+
token: string | false
|
|
38
|
+
) => Promise<{json: unknown; status: number}>
|
|
37
39
|
download: boolean
|
|
38
40
|
token: string | false
|
|
39
41
|
zipFileName: string | false
|
|
@@ -43,12 +45,15 @@ export class DocumentTemplateExporter {
|
|
|
43
45
|
|
|
44
46
|
constructor(
|
|
45
47
|
id: number | string,
|
|
46
|
-
|
|
48
|
+
getTemplateForDoc: (
|
|
49
|
+
id: number | string,
|
|
50
|
+
token: string | false
|
|
51
|
+
) => Promise<{json: unknown; status: number}>,
|
|
47
52
|
download = true,
|
|
48
53
|
token: string | false = false
|
|
49
54
|
) {
|
|
50
55
|
this.id = id
|
|
51
|
-
this.
|
|
56
|
+
this.getTemplateForDoc = getTemplateForDoc
|
|
52
57
|
this.download = download
|
|
53
58
|
this.token = token
|
|
54
59
|
|
|
@@ -59,10 +64,7 @@ export class DocumentTemplateExporter {
|
|
|
59
64
|
}
|
|
60
65
|
|
|
61
66
|
init(): Promise<void> {
|
|
62
|
-
|
|
63
|
-
? {id: this.id, token: this.token}
|
|
64
|
-
: {id: this.id}
|
|
65
|
-
return postJson(this.getUrl, params).then(({json}) => {
|
|
67
|
+
return this.getTemplateForDoc(this.id, this.token).then(({json}) => {
|
|
66
68
|
const data = json as TemplateResponse
|
|
67
69
|
this.docVersion = data.doc_version
|
|
68
70
|
this.zipFileName = `${createSlug(data.title)}.fidustemplate`
|