remove user commonname on front end

Author: SandraMonnier

colab-webapp/src/main/node/app/src/components/common/element/Avatar.tsx

@@ -37,8 +37,7 @@ export default function Avatar({ currentUser }: AvatarProps): JSX.Element {
     currentUser.firstname && currentUser.lastname
       ? { first: currentUser.firstname, last: currentUser.lastname }
       : undefined;
-  const uncompleteName =
-    currentUser.commonname || currentUser.lastname || currentUser.firstname || '?';
+  const uncompleteName = currentUser.firstname || currentUser.lastname || '?';
   const letters = fullName
     ? `${fullName.first[0]}${fullName.last[0]}`.toUpperCase()
     : uncompleteName.slice(0, 2);

colab-webapp/src/main/node/app/src/components/settings/UserProfile.tsx

@@ -29,12 +29,6 @@ export default function UserProfile({ user }: UserProfileProps): JSX.Element {
       isMandatory: false,
       readOnly: true,
     },
-    {
-      key: 'commonname',
-      label: i18n.user.model.commonName,
-      type: 'text',
-      isMandatory: false,
-    },
     {
       key: 'firstname',
       label: i18n.user.model.firstname,

colab-webapp/src/main/node/app/src/components/team/InstanceMakersList.tsx

@@ -5,22 +5,22 @@
  * Licensed under the MIT License
  */
 
+import { css, cx } from '@emotion/css';
+import { InstanceMaker } from 'colab-rest-client/dist/ColabClient';
 import React from 'react';
+import * as API from '../../API/api';
 import useTranslations from '../../i18n/I18nContext';
+import { useAppDispatch, useLoadingState } from '../../store/hooks';
 import {
   useInstanceMakers,
   useUserByInstanceMaker,
 } from '../../store/selectors/instanceMakerSelector';
-import AvailabilityStatusIndicator from '../common/element/AvailabilityStatusIndicator';
-import { css, cx } from '@emotion/css';
+import { useIsCurrentTeamMemberOwner } from '../../store/selectors/teamMemberSelector';
 import { space_xs, text_xs, th_sm } from '../../styling/style';
-import { InstanceMaker } from 'colab-rest-client/dist/ColabClient';
-import { useAppDispatch, useLoadingState } from '../../store/hooks';
-import * as API from '../../API/api';
-import { PendingUserName } from './UserName';
+import AvailabilityStatusIndicator from '../common/element/AvailabilityStatusIndicator';
 import IconButton from '../common/element/IconButton';
 import { ConfirmDeleteModal } from '../common/layout/ConfirmDeleteModal';
-import { useIsCurrentTeamMemberOwner } from '../../store/selectors/teamMemberSelector';
+import { PendingUserName } from './UserName';
 
 interface InstanceMakerRowProps {
   instanceMaker: InstanceMaker;
@@ -83,7 +83,6 @@ function InstanceMakerRow({ instanceMaker }: InstanceMakerRowProps): React.React
       {user ? (
         <>
           <>
-            <td>{user.commonname}</td>
             <td>{user.firstname}</td>
             <td>{user.lastname}</td>
             <td>{user.affiliation}</td>
@@ -96,7 +95,6 @@ function InstanceMakerRow({ instanceMaker }: InstanceMakerRowProps): React.React
           </td>
           <td />
           <td />
-          <td />
         </>
       )}
       <td className={css({ display: 'flex', alignItems: 'center', justifyContent: 'flex-end' })}>
@@ -168,7 +166,6 @@ export default function InstanceMakersPanel(): React.ReactElement {
           })}
         >
           <tr>
-            <th className={th_sm}>{i18n.user.model.commonName}</th>
             <th className={th_sm}>{i18n.user.model.firstname}</th>
             <th className={th_sm}>{i18n.user.model.lastname}</th>
             <th className={th_sm}>{i18n.user.model.affiliation}</th>

colab-webapp/src/main/node/app/src/components/team/MembersList.tsx

@@ -109,7 +109,6 @@ export default function TeamMembersPanel(): JSX.Element {
         <thead className={teamTableHeaderStyle}>
           {/* titles header row */}
           <tr className={team1stHeaderRowStyle}>
-            <th className={teamThStyle}>{i18n.user.model.commonName}</th>
             <th className={teamThStyle}>{i18n.user.model.firstname}</th>
             <th className={teamThStyle}>{i18n.user.model.lastname}</th>
             <th className={teamThStyle}>{i18n.user.model.affiliation}</th>
@@ -200,7 +199,6 @@ function MemberRow({ member }: MemberRowProps): JSX.Element {
       )}
       {user ? (
         <>
-          <td className={dataStyle(isCurrentUser)}>{user.commonname}</td>
           <td className={dataStyle(isCurrentUser)}>{user.firstname}</td>
           <td className={dataStyle(isCurrentUser)}>{user.lastname}</td>
           <td className={dataStyle(isCurrentUser)}>{user.affiliation}</td>
@@ -212,7 +210,6 @@ function MemberRow({ member }: MemberRowProps): JSX.Element {
           </td>
           <td />
           <td />
-          <td />
         </>
       )}
 

colab-webapp/src/main/node/app/src/components/team/UserName.tsx

@@ -46,9 +46,8 @@ export const getDisplayName = (
 ): string => {
   return (
     (user != null &&
-      (((user.firstname || user.lastname) &&
-        `${user.firstname || ''} ${user.lastname || ''}`.trim()) ||
-        user.commonname)) ||
+      (user.firstname || user.lastname) &&
+      `${user.firstname || ''} ${user.lastname || ''}`.trim()) ||
     participant?.displayName ||
     i18n.user.anonymous
   );

colab-webapp/src/main/node/app/src/i18n/en.ts

@@ -205,7 +205,6 @@ export const en = {
   user: {
     model: {
       username: 'Username',
-      commonName: 'Common name',
       firstname: 'First name',
       lastname: 'Last name',
       affiliation: 'Affiliation',

colab-webapp/src/main/node/app/src/i18n/fr.ts

@@ -210,7 +210,6 @@ export const fr: ColabTranslations = {
   user: {
     model: {
       username: "Nom d'utilisateur",
-      commonName: 'Surnom',
       firstname: 'Prénom',
       lastname: 'Nom',
       affiliation: 'Affiliation',