This commit is contained in:
bakhirev 2024-10-17 22:52:15 +03:00
parent 5c4766ace2
commit ac0e4c797a
4 changed files with 8 additions and 8 deletions

File diff suppressed because one or more lines are too long

View file

@ -46,13 +46,13 @@ function TaskInfo({ tasks }: { tasks: ITask }): React.ReactElement {
return pr.dateMerge >= milliseconds; return pr.dateMerge >= milliseconds;
}); });
return ( return (
<> <div key={`${prId}${task}`}>
<div className={style.day_info_link}> <div className={style.day_info_link}>
<TaskLink task={task}/> <TaskLink task={task}/>
<PRLink prId={prId}/> <PRLink prId={prId}/>
</div> </div>
<CommitInfo commits={commits}/> <CommitInfo commits={commits}/>
</> </div>
); );
}); });
return (<>{items}</>); return (<>{items}</>);

View file

@ -17,7 +17,8 @@ function GetItem({ commit, mode }: IGetItemProps) {
const className = size > 5 const className = size > 5
? style.get_list_big_number ? style.get_list_big_number
: ''; : '';
const prId = dataGrip.pr.prByTask.get(commit.task); const task = dataGrip.tasks.statisticByName.get(commit.task);
const prId = dataGrip.pr.pr.get(task?.prIds?.[0]);
return ( return (
<div className={style.get_list}> <div className={style.get_list}>

View file

@ -20,8 +20,7 @@ const Tasks = observer(({
}: IPersonCommonProps): React.ReactElement | null => { }: IPersonCommonProps): React.ReactElement | null => {
const allRows = dataGripStore.dataGrip.tasks.statistic; const allRows = dataGripStore.dataGrip.tasks.statistic;
const rows = allRows.filter((row: any) => ( const rows = allRows.filter((row: any) => (
row.author === user.author row.author === user.author || row?.authors?.[user.author]
|| (row.authors || []).includes(user.author)
)); ));
if (!rows?.length) return mode !== 'print' ? (<NothingFound />) : null; if (!rows?.length) return mode !== 'print' ? (<NothingFound />) : null;