@vonaffenfels/contentful-slate-editor 1.1.29 → 1.1.30

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vonaffenfels/contentful-slate-editor",
3
- "version": "1.1.29",
3
+ "version": "1.1.30",
4
4
  "scripts": {
5
5
  "prepublish": "yarn run build",
6
6
  "dev": "yarn run start",
@@ -96,7 +96,7 @@
96
96
  "@vonaffenfels/slate-editor": "^1.1.29",
97
97
  "webpack": "5.88.2"
98
98
  },
99
- "gitHead": "6f766a57107e33b358372874a69e2199dc14d8f6",
99
+ "gitHead": "d4bee0dde0eb4aeaaa5881fd11823ccd9258695e",
100
100
  "publishConfig": {
101
101
  "access": "public"
102
102
  }
@@ -4,21 +4,61 @@ import {
4
4
  import {
5
5
  Button, Table,
6
6
  } from "@contentful/f36-components";
7
+ import getSlug from "speakingurl";
7
8
 
8
9
  export const DialogTranslation = ({
9
10
  sdk,
10
11
  activeConfig,
12
+ translateFromLocale = "de",
11
13
  }) => {
12
14
  const {entryId} = sdk.parameters.invocation;
13
15
  const [entry, setEntry] = useState(null);
14
16
  const [loading, setLoading] = useState({});
17
+ const [usage, setUsage] = useState({});
15
18
  const [contentType, setContentType] = useState(null);
19
+ const localizedFields = contentType?.fields?.filter(field => field.localized);
20
+
21
+ const getTranslationUsage = async (content) => {
22
+ if (!sdk?.parameters?.installation?.translationService) {
23
+ console.error(`no translation service configured!`);
24
+ return;
25
+ }
26
+
27
+ try {
28
+ const response = await fetch(sdk?.parameters?.installation?.translationService + "/usage", {
29
+ method: "POST",
30
+ body: JSON.stringify({
31
+ editorContent: typeof content === "object" ? content : undefined,
32
+ text: typeof content === "string" ? content : undefined,
33
+ }),
34
+ });
35
+
36
+ const translatedValue = await response.json();
37
+ return translatedValue?.usage || 0;
38
+ } catch (e) {
39
+ console.error(e);
40
+ }
41
+ };
42
+
43
+ const updateUsage = async (entry, contentType) => {
44
+ const localizedFields = contentType?.fields?.filter(field => field.localized);
45
+ const newUsage = {};
46
+ for (let i = 0; i < localizedFields.length; i++) {
47
+ const localizedField = localizedFields[i];
48
+ newUsage[localizedField.id] = await getTranslationUsage(entry?.fields[localizedField.id]?.[translateFromLocale]);
49
+ }
50
+
51
+ return newUsage;
52
+ };
16
53
 
17
54
  useEffect(() => {
18
55
  sdk.space.getEntry(entryId).then(entry => {
19
56
  sdk.space.getContentType(entry.sys.contentType.sys.id).then(contentType => {
20
- setEntry(entry);
21
- setContentType(contentType);
57
+ updateUsage(entry, contentType).then((usage) => {
58
+ setUsage(usage);
59
+ setEntry(entry);
60
+ setContentType(contentType);
61
+ });
22
62
  });
23
63
  });
24
64
  }, []);
@@ -27,7 +67,7 @@ export const DialogTranslation = ({
27
67
  return null;
28
68
  }
29
69
 
30
- const translateValue = async (content, targetLanguage, translateFromLocale = "de") => {
70
+ const translateValue = async (content, targetLanguage) => {
31
71
  if (!sdk?.parameters?.installation?.translationService) {
32
72
  console.error(`no translation service configured!`);
33
73
  return;
@@ -40,7 +80,7 @@ export const DialogTranslation = ({
40
80
  editorContent: typeof content === "object" ? content : undefined,
41
81
  text: typeof content === "string" ? content : undefined,
42
82
  targetLanguage,
43
- sourceLanguage: translateFromLocale,
83
+ translateFromLocale: translateFromLocale,
44
84
  }),
45
85
  });
46
86
 
@@ -51,38 +91,142 @@ export const DialogTranslation = ({
51
91
  }
52
92
  };
53
93
 
54
- const localizedFields = contentType.fields.filter(field => field.localized);
55
- const onTranslateClick = async (targetLanguage) => {
56
- setLoading({[targetLanguage]: true});
94
+ const onTranslateClick = async (targetLanguageOrLanguages, refreshAll = false, onlyFields = []) => {
95
+ if (!Array.isArray(targetLanguageOrLanguages)) {
96
+ targetLanguageOrLanguages = [targetLanguageOrLanguages];
97
+ }
98
+
99
+ let newEntry = entry;
100
+ for (let i = 0; i < targetLanguageOrLanguages.length; i++) {
101
+ if (targetLanguageOrLanguages[i] === translateFromLocale) {
102
+ continue;
103
+ }
104
+
105
+ newEntry = await translateForLocale(
106
+ targetLanguageOrLanguages[i], newEntry, refreshAll, onlyFields,
107
+ );
108
+ }
109
+
110
+ await sdk.space.updateEntry(newEntry);
111
+ setEntry(await sdk.space.getEntry(entryId));
112
+ };
113
+
114
+ const translateForLocale = async (
115
+ targetLanguage, entry = {}, refreshAll = false, onlyFields = [],
116
+ ) => {
117
+ setLoading({
118
+ ...loading,
119
+ [targetLanguage]: true,
120
+ });
57
121
  const newEntry = {...entry};
58
122
  for (let i = 0; i < localizedFields.length; i++) {
59
123
  const localizedField = localizedFields[i];
60
- const newValue = await translateValue(entry?.fields[localizedField.id]?.[sdk.locales.default], targetLanguage);
124
+ const currentValue = entry?.fields[localizedField.id]?.[targetLanguage];
125
+ if (
126
+ (!refreshAll && !isEmptyValue(currentValue) && !onlyFields.length) ||
127
+ (onlyFields.length && !onlyFields.includes(localizedField.id))
128
+ ) {
129
+ continue;
130
+ }
131
+
132
+ setLoading({
133
+ ...loading,
134
+ [targetLanguage + localizedField.id]: true,
135
+ });
136
+
137
+ let newValue = await translateValue(entry?.fields[localizedField.id]?.[sdk.locales.default], targetLanguage);
138
+
139
+ setLoading({
140
+ ...loading,
141
+ [targetLanguage + localizedField.id]: false,
142
+ });
143
+
144
+ if (!newValue) {
145
+ continue;
146
+ }
147
+
148
+ if (localizedField.id === "slug" && newValue) {
149
+ newValue = getSlug(newValue);
150
+ }
61
151
 
62
152
  newEntry.fields[localizedField.id][targetLanguage] = newValue;
63
153
  }
154
+ setLoading({
155
+ ...loading,
156
+ [targetLanguage]: false,
157
+ });
64
158
 
65
- await sdk.space.updateEntry(newEntry);
66
- setEntry(await sdk.space.getEntry(entryId));
67
- setLoading({});
159
+ return newEntry;
160
+ };
161
+
162
+ const isEmptyValue = (value) => {
163
+ if (!value) {
164
+ return true;
165
+ }
166
+
167
+ // editor value
168
+ if (Array.isArray(value)) {
169
+ if (value.length === 1 && value[0].type === "paragraph" && value[0].children.length === 1 && value[0].children[0].text === "") {
170
+ return true;
171
+ }
172
+ }
173
+
174
+ return false;
68
175
  };
69
176
 
177
+ const isComplete = (locale) => {
178
+ for (let i = 0; i < localizedFields.length; i++) {
179
+ const localizedField = localizedFields[i];
180
+ const value = entry?.fields[localizedField.id]?.[locale];
181
+
182
+ if (isEmptyValue(value)) {
183
+ return false;
184
+ }
185
+ }
186
+
187
+ return true;
188
+ };
189
+
190
+ const fullUsage = Object.keys(usage || {}).reduce((acc, key) => acc + usage[key], 0);
70
191
 
71
192
  return <div className="flex flex-col gap-2 p-4">
72
193
  <Table>
73
194
  <Table.Head>
74
195
  <Table.Row>
75
- <Table.Cell />
196
+ <Table.Cell style={{width: 250}}>Feld</Table.Cell>
197
+ <Table.Cell style={{width: 100}}>Zeichen</Table.Cell>
76
198
  {sdk.locales.available.map(locale => {
199
+ const languageComplete = isComplete(locale);
200
+ const isTranslateFromLocale = locale === translateFromLocale;
201
+
202
+ if (isTranslateFromLocale) {
203
+ return <Table.Cell key={locale}/>;
204
+ }
205
+
206
+ if (loading[locale]) {
207
+ return <Table.Cell key={locale}><Button size="small" variant="transparent">Wird übersetzt</Button></Table.Cell>;
208
+ }
209
+
210
+ const buttonLabel = languageComplete ? "Erneut Übersetzen" : "Vervollständigen";
211
+
77
212
  return <Table.Cell key={locale}>
78
- {locale !== "de" && <Button size="small" variant="primary" onClick={e => onTranslateClick(locale)}>Übersetzen</Button>}
213
+ <Button
214
+ size="small"
215
+ className="group"
216
+ variant={languageComplete ? "secondary" : "primary"}
217
+ title={buttonLabel}
218
+ onClick={e => onTranslateClick(locale, languageComplete)}>
219
+ {!languageComplete && <span className="text-orange-500">Fehlende Übersetzen</span>}
220
+ {languageComplete && <span className="text-green-500">Vollständig Übersetzt</span>}
221
+ </Button>
79
222
  </Table.Cell>;
80
223
  })}
81
224
  </Table.Row>
82
225
  </Table.Head>
83
226
  <Table.Body>
84
227
  <Table.Row>
85
- <Table.Cell />
228
+ <Table.Cell/>
229
+ <Table.Cell>∑ {fullUsage}</Table.Cell>
86
230
  {sdk.locales.available.map(locale => {
87
231
  const name = sdk.locales.names[locale];
88
232
 
@@ -94,7 +238,20 @@ export const DialogTranslation = ({
94
238
  {localizedFields.map(field => {
95
239
  return <Table.Row key={field.id}>
96
240
  <Table.Cell>
97
- {field.name}
241
+ <Button
242
+ className="max-w-full truncate"
243
+ style={{maxWidth: 250}}
244
+ size="small"
245
+ variant={"transparent"}
246
+ title={"Alle Übersetzungen Aktualisieren"}
247
+ onClick={e => {
248
+ onTranslateClick(sdk.locales.available, false, [field.id]);
249
+ }}>
250
+ {field.name}
251
+ </Button>
252
+ </Table.Cell>
253
+ <Table.Cell>
254
+ {usage?.[field.id]}
98
255
  </Table.Cell>
99
256
  {sdk.locales.available.map(locale => {
100
257
  let preview = entry?.fields[field.id]?.[locale];
@@ -104,11 +261,33 @@ export const DialogTranslation = ({
104
261
  }
105
262
 
106
263
  if (typeof preview === "object") {
107
- preview = "Keine Vorschau...";
264
+ preview = "Keine Vorschau Verfügbar";
265
+ }
266
+
267
+ if (locale === translateFromLocale) {
268
+ return <Table.Cell key={locale}>
269
+ <div
270
+ className="max-w-full truncate"
271
+ style={{maxWidth: 250}}>
272
+ {preview}
273
+ </div>
274
+ </Table.Cell>;
275
+ }
276
+
277
+ if (loading[locale + field.id]) {
278
+ return <Table.Cell key={locale}><Button size="small" variant="transparent">Wird übersetzt</Button></Table.Cell>;
108
279
  }
109
280
 
110
281
  return <Table.Cell key={locale}>
111
- {preview}
282
+ <Button
283
+ className="max-w-full truncate"
284
+ style={{maxWidth: 250}}
285
+ size="small"
286
+ variant={"transparent"}
287
+ title={"Übersetzung Aktualisieren"}
288
+ onClick={e => onTranslateClick(locale, false, [field.id])}>
289
+ {preview}
290
+ </Button>
112
291
  </Table.Cell>;
113
292
  })}
114
293
  </Table.Row>;