Timer::CreatedBy link

https://freecode.academy/tasks/cklo6kv4m9hmh0730pd8jyxp6
freecode-academy · Feb 27, 2021 · dbc2717 · dbc2717
1 parent 0fa07d9
commit dbc2717
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/src/pages/Office/Projects/Project/View/Tasks/Task/index.tsx b/src/pages/Office/Projects/Project/View/Tasks/Task/index.tsx
@@ -24,6 +24,7 @@ const OfficeProjectPageViewTask: React.FC<OfficeProjectPageViewTaskProps> = ({
   info,
   activeTimer,
   filterByProject,
+  CreatedBy,
 }) => {
   const { stopTimerClickHandler, stopTimerLoading } = useActiveTimer()
 
@@ -183,6 +184,7 @@ const OfficeProjectPageViewTask: React.FC<OfficeProjectPageViewTaskProps> = ({
           projects={projects}
           task={childTask}
           project={project}
+          CreatedBy={childTask.CreatedBy}
         />
       )
     })
@@ -192,7 +194,7 @@ const OfficeProjectPageViewTask: React.FC<OfficeProjectPageViewTaskProps> = ({
     return (
       <OfficeProjectPageViewTaskStyled>
         <OfficeTaskListItemStyled>
-          <UikitUserLink user={task.CreatedBy} showName={false} />
+          <UikitUserLink user={CreatedBy} showName={false} />
           {timer}
           <div className="task">
             <div className="task-info">
@@ -246,6 +248,7 @@ const OfficeProjectPageViewTask: React.FC<OfficeProjectPageViewTaskProps> = ({
       </OfficeProjectPageViewTaskStyled>
     )
   }, [
+    CreatedBy,
     timer,
     task,
     projects,

diff --git a/src/pages/Office/Projects/Project/View/Tasks/Task/interfaces.ts b/src/pages/Office/Projects/Project/View/Tasks/Task/interfaces.ts
@@ -3,6 +3,7 @@ import {
   Scalars,
   Task_Fragment,
 } from 'src/modules/gql/generated'
+import { UikitUserLinkProps } from 'src/uikit/Link/User'
 import { OfficeProjectPageViewTaskProjectProps } from './Project/interfaces'
 
 export type OfficeProjectPageViewTaskProps = {
@@ -26,4 +27,11 @@ export type OfficeProjectPageViewTaskProps = {
   info?: JSX.Element
 
   activeTimer: MeUserTimerFragment | null | undefined
+
+  // TODO сейчас это хак, потому что в этот компонент приходит по сути или Задача или Задача таймера,
+  // в которой не все сущности имеются. Надо будет переделать компонент
+  /**
+   * Владелец объекта
+   */
+  CreatedBy: UikitUserLinkProps['user']
 }
diff --git a/src/pages/Office/Projects/Project/View/Tasks/index.tsx b/src/pages/Office/Projects/Project/View/Tasks/index.tsx
@@ -138,6 +138,7 @@ const ProjectTasks: React.FC<ProjectTasksProps> = ({ project }) => {
                 task={task}
                 activeTimer={activeTimer}
                 project={project}
+                CreatedBy={task.CreatedBy}
               />
             )
           })}
@@ -157,6 +158,7 @@ const ProjectTasks: React.FC<ProjectTasksProps> = ({ project }) => {
                 task={task}
                 activeTimer={activeTimer}
                 project={project}
+                CreatedBy={task.CreatedBy}
               />
             )
           })}
@@ -176,6 +178,7 @@ const ProjectTasks: React.FC<ProjectTasksProps> = ({ project }) => {
                 task={task}
                 activeTimer={activeTimer}
                 project={project}
+                CreatedBy={task.CreatedBy}
               />
             )
           })}

diff --git a/src/pages/Office/Timers/View/Timer/index.tsx b/src/pages/Office/Timers/View/Timer/index.tsx
@@ -2,6 +2,8 @@ import React, { useMemo } from 'react'
 import { OfficeTimersTimerProps } from './interfaces'
 
 import moment from 'moment'
+
+// TODO Надо создать самостоятельный компонент, так как возникают коллизии со свойствами объекта
 import OfficeProjectPageViewTask from 'src/pages/Office/Projects/Project/View/Tasks/Task'
 
 const OfficeTimersTimer: React.FC<OfficeTimersTimerProps> = ({
@@ -31,6 +33,7 @@ const OfficeTimersTimer: React.FC<OfficeTimersTimerProps> = ({
           activeTimer={!timer.stopedAt ? timer : null}
           info={info}
           filterByProject={filterByProject}
+          CreatedBy={timer.CreatedBy}
         />
       </>
     )