Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
chirag-madlani committed Dec 26, 2023
1 parent 86483e9 commit 5f8bed1
Showing 1 changed file with 11 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ import { capitalize, isEmpty, toString } from 'lodash';
import React, { Fragment, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { EntityHistory } from '../../../generated/type/entityHistory';
import { getUserById } from '../../../rest/userAPI';
import { getEntityName } from '../../../utils/EntityUtils';
import { getSummary, isMajorVersion } from '../../../utils/EntityVersionUtils';
import CloseIcon from '../../Modals/CloseIcon.component';
import { getUserById } from "../../../rest/userAPI";
import { AxiosError } from 'axios';


type Props = {
versionList: EntityHistory;
Expand All @@ -39,19 +38,17 @@ const EntityVersionTimeLine: React.FC<Props> = ({
}: Props) => {
const { t } = useTranslation();
const [versionType] = useState<VersionType>('all');
const [uname, setUname] = useState<string>()(' ');
const [uname, setUname] = useState<string>('');

const fetchUserName = async (id: string) => {
try {
const userData = await getUserById(id, 'displayName');

if(userData){
let nameData: string = userData.displayName ?? "Unknown User";
setUname(nameData);
}
}catch (error: AxiosError) {

const name: string = getEntityName(userData);
setUname(name);
} catch (err) {
setUname(id);
}
}
};

const versions = useMemo(() => {
Expand Down Expand Up @@ -97,7 +94,9 @@ const EntityVersionTimeLine: React.FC<Props> = ({
const currV = JSON.parse(v);
const userId: string = currV?.updatedBy;
fetchUserName(userId);
{userId == 'admin'?setUname('admin'):" "}
{
userId === 'admin' ? setUname('admin') : ' ';
}
const majorVersionChecks = () => {
return (
isMajorVersion(
Expand Down

0 comments on commit 5f8bed1

Please sign in to comment.