From d6a72e6ab9de70847d6162d455b183bdd58db2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Mon, 12 Dec 2022 22:19:59 +0400 Subject: [PATCH] Add jsonDiff to difference component --- src/api/parole/content-types/parole/lifecycles.js | 3 ++- src/api/parole/services/parole.js | 7 ++++++- src/components/difference/paroles-diff.json | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/api/parole/content-types/parole/lifecycles.js b/src/api/parole/content-types/parole/lifecycles.js index 4fa5cf2..de5e82b 100644 --- a/src/api/parole/content-types/parole/lifecycles.js +++ b/src/api/parole/content-types/parole/lifecycles.js @@ -207,7 +207,8 @@ module.exports = { ...result.difference, { admin_user: result.updatedBy.id, - paroles: state.diff, + paroles: state.diff.path, + jsonDiff: state.diff.jsonDiff, date: new Date(), sources: 'transcription' }] diff --git a/src/api/parole/services/parole.js b/src/api/parole/services/parole.js index c31fa14..a2fda82 100644 --- a/src/api/parole/services/parole.js +++ b/src/api/parole/services/parole.js @@ -72,7 +72,12 @@ module.exports = createCoreService('api::parole.parole', ({strapi}) => ({ const parsePatch = Diff.parsePatch(patch) if (parsePatch[0].hunks.length > 0) { - return patch + const jsonDiff = Diff.diffWords(oldString, newString) + + return { + patch, + jsonDiff + } } } })); diff --git a/src/components/difference/paroles-diff.json b/src/components/difference/paroles-diff.json index 544e2ce..26b4624 100644 --- a/src/components/difference/paroles-diff.json +++ b/src/components/difference/paroles-diff.json @@ -28,6 +28,9 @@ "type": "relation", "relation": "oneToOne", "target": "admin::user" + }, + "jsonDiff": { + "type": "json" } } }