From cecde8cf48fb5e102d597bd77ac31b5a2875b879 Mon Sep 17 00:00:00 2001 From: dewa Date: Fri, 12 Jan 2024 19:06:00 +0800 Subject: [PATCH] OC-16858 Attribute autoqueries to system user --- test/client/dn-widget.spec.js | 12 ++++++------ widget/discrepancy-note/dn-widget.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/client/dn-widget.spec.js b/test/client/dn-widget.spec.js index 5b41de501..7c01d05c2 100644 --- a/test/client/dn-widget.spec.js +++ b/test/client/dn-widget.spec.js @@ -345,11 +345,11 @@ describe('DN object', () => { ['{"queries":[], "logs":[{"type": "comment"}]}', ''], // first has system user [ - '{"queries":[], "logs":[{"type": "comment", "status": "updated", "user": "root", "date_time":2}]}', + '{"queries":[], "logs":[{"type": "comment", "status": "updated", "user": "system", "date_time":2}]}', '', ], [ - '{"queries":[{"type": "comment", "status": "updated", "user": "root", "date_time":2}], "logs":[]}', + '{"queries":[{"type": "comment", "status": "updated", "user": "system", "date_time":2}], "logs":[]}', '', ], // first has empty user @@ -372,20 +372,20 @@ describe('DN object', () => { ], // first root ignored, next is taken [ - '{"queries":[], "logs":[{"type": "audit", "user": "root", "date_time":2},{"type": "comment", "user": "jen", "date_time":1}]}', + '{"queries":[], "logs":[{"type": "audit", "user": "system", "date_time":2},{"type": "comment", "user": "jen", "date_time":1}]}', 'jen', ], [ - '{"queries":[{"type": "audit", "user": "root", "date_time":2},{"type": "comment", "user": "jen", "date_time":1}], "logs":[]}', + '{"queries":[{"type": "audit", "user": "system", "date_time":2},{"type": "comment", "user": "jen", "date_time":1}], "logs":[]}', 'jen', ], // same, but switched order (same date_time) to test ordering [ - '{"queries":[], "logs":[{"type": "comment", "user": "jen", "date_time":1}, {"type": "audit", "user": "root", "date_time":2}]}', + '{"queries":[], "logs":[{"type": "comment", "user": "jen", "date_time":1}, {"type": "audit", "user": "system", "date_time":2}]}', 'jen', ], [ - '{"queries":[{"type": "comment", "user": "jen", "date_time":1}, {"type": "audit", "user": "root", "date_time":2}], "logs":[]}', + '{"queries":[{"type": "comment", "user": "jen", "date_time":1}, {"type": "audit", "user": "system", "date_time":2}], "logs":[]}', 'jen', ], ].forEach((test) => { diff --git a/widget/discrepancy-note/dn-widget.js b/widget/discrepancy-note/dn-widget.js index 3b52f4f0b..56a24ba3a 100644 --- a/widget/discrepancy-note/dn-widget.js +++ b/widget/discrepancy-note/dn-widget.js @@ -12,7 +12,7 @@ import reasons from '../../public/js/src/module/reasons'; let currentUser; let users; let annotationIconDataUri; -const SYSTEM_USER = 'root'; +const SYSTEM_USER = 'system'; const pad2 = (x) => (x < 10 ? `0${x}` : x);