fix: LSDV-4601: Show correct author of draft (#1351)

* fix: LSDV-4601: Show correct author of draft

The problem is when userA views draft with comments from userB.
It's possible to see current user as an author if userB has username.

* createdBy can also have first and last names!

Fix code and tests

---------

Co-authored-by: hlomzik <[email protected]>
Co-authored-by: bmartel <[email protected]>

Author: hlomzik

src/stores/Annotation/store.js

@@ -1,17 +1,18 @@
 import { destroy, getEnv, getParent, getRoot, types } from 'mobx-state-tree';
 
+import { errorBuilder } from '../../core/DataValidator/ConfigValidator';
+import { DataValidator, ValidationError, VALIDATORS } from '../../core/DataValidator';
+import { guidGenerator } from '../../core/Helpers';
 import Registry from '../../core/Registry';
 import Tree from '../../core/Tree';
 import Types from '../../core/Types';
-import Utils from '../../utils';
-import { guidGenerator } from '../../core/Helpers';
-import { DataValidator, ValidationError, VALIDATORS } from '../../core/DataValidator';
-import { errorBuilder } from '../../core/DataValidator/ConfigValidator';
+import { StoreExtender } from '../../mixins/SharedChoiceStore/extender';
 import { ViewModel } from '../../tags/visual';
+import Utils from '../../utils';
 import { FF_DEV_1621, FF_DEV_3034, FF_DEV_3391, FF_DEV_3617, isFF } from '../../utils/feature-flags';
+import { emailFromCreatedBy } from '../../utils/utilities';
 import { Annotation } from './Annotation';
 import { HistoryItem } from './HistoryItem';
-import { StoreExtender } from '../../mixins/SharedChoiceStore/extender';
 
 const SelectedItem = types.union(Annotation, HistoryItem);
 
@@ -323,9 +324,9 @@ const AnnotationStoreModel = types
         let actual_user;
 
         if (isFF(FF_DEV_3034)) {
-        // drafts can be created by other user, but we don't have much info
-        // so parse "id", get email and find user by it
-          const email = item.createdBy?.replace(/,\s*\d+$/, '');
+          // drafts can be created by other user, but we don't have much info
+          // so parse "id", get email and find user by it
+          const email = emailFromCreatedBy(item.createdBy);
           const user = email && self.store.users.find(user => user.email === email);
 
           if (user) actual_user = user.id;

src/utils/__tests__/utilities.test.js

@@ -1,5 +1,18 @@
 /* global it, describe, expect, test */
-import { getUrl, isString, isStringEmpty, isStringJSON, toTimeString } from '../utilities';
+import { emailFromCreatedBy, getUrl, isString, isStringEmpty, isStringJSON, toTimeString } from '../utilities';
+
+describe('Helper function emailFromCreatedBy', () => {
+  expect(emailFromCreatedBy('[email protected], 12')).toBe('[email protected]');
+  // empty username, not a rare case
+  expect(emailFromCreatedBy(' [email protected], 12')).toBe('[email protected]');
+  expect(emailFromCreatedBy('usrnm [email protected], 12')).toBe('[email protected]');
+  // first and last name
+  expect(emailFromCreatedBy('Abc Def [email protected], 12')).toBe('[email protected]');
+  // complex case
+  expect(emailFromCreatedBy('Ab.C [email protected] [email protected], 12')).toBe('[email protected]');
+  // just a email, should not be a real case though
+  expect(emailFromCreatedBy('[email protected]')).toBe('[email protected]');
+});
 
 /**
  * isString

src/utils/utilities.ts

@@ -184,15 +184,22 @@ export const chunks = <T extends any[]>(source: T, chunkSize: number): T[][] =>
   return result;
 };
 
-export const userDisplayName = (user: any = {}) => {
-  const firstName = user.firstName ?? user.firstName;
-  const lastName = user.lastName ?? user.lastName;
+export const userDisplayName = (user: Record<string, string> = {}) => {
+  const { firstName, lastName } = user;
 
   return (firstName || lastName)
     ? [firstName, lastName].filter(n => !!n).join(' ').trim()
-    : (user.username)
-      ? user.username
-      : user.email;
+    : (user.username || user.email);
+};
+
+/**
+ * This name supposed to be username, but most likely it's first_name and last_name
+ * @param {string} createdBy string like "[<name> ]<email>, <id>"
+ * @returns {string} email
+ */
+export const emailFromCreatedBy = (createdBy: string) => {
+  // get the email followed by id and cut off the id
+  return createdBy?.match(/([^@,\s]+@[^@,\s]+)(,\s*\d+)?$/)?.[1];
 };
 
 export const camelizeKeys = (object: any): Record<string, unknown> => {