mirror of
https://github.com/bakhirev/assayo.git
synced 2024-11-16 08:11:40 +00:00
update
This commit is contained in:
parent
5c4766ace2
commit
ac0e4c797a
File diff suppressed because one or more lines are too long
|
@ -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}</>);
|
||||||
|
|
|
@ -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}>
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue