2199 feature adding some additional features in kanban #2201
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,22 @@ | ||
| import { DraggableProvided } from 'react-beautiful-dnd'; | ||
| import PriorityIcon from '@components/ui/svgs/priority-icon'; | ||
| import { ITeamTask, Tag } from '@app/interfaces'; | ||
| import { | ||
| useAuthenticateUser, | ||
| useCollaborative, | ||
| useOrganizationTeams, | ||
| useTMCardTaskEdit, | ||
| useTeamMemberCard, | ||
| useTimerView | ||
| } from '@app/hooks'; | ||
| import ImageComponent, { ImageOverlapperProps } from './image-overlapper'; | ||
| import { TaskInput, TaskIssueStatus } from 'lib/features'; | ||
| import Link from 'next/link'; | ||
| import CircularProgress from '@components/ui/svgs/circular-progress'; | ||
| import { HorizontalSeparator } from './separator'; | ||
| import { pad } from '@app/helpers'; | ||
| import { TaskStatus } from '@app/constants'; | ||
| import { UserTeamCardMenu } from 'lib/features/team/user-team-card/user-team-card-menu'; | ||
|
|
||
| function getStyle(provided: DraggableProvided, style: any) { | ||
| if (!style) { | ||
|
|
@@ -21,23 +29,23 @@ function getStyle(provided: DraggableProvided, style: any) { | |
| }; | ||
| } | ||
|
|
||
| // function setCommentIconColor(commentType: 'tagged' | 'untagged') { | ||
| // let style; | ||
|
|
||
| // if (commentType === 'tagged') { | ||
| // style = { | ||
| // backgroundColor: '#D95F5F' | ||
| // }; | ||
| // } else if (commentType === 'untagged') { | ||
| // style = { | ||
| // backgroundColor: '#27AE60' | ||
| // }; | ||
| // } else { | ||
| // style = {}; | ||
| // } | ||
|
|
||
| // return style; | ||
| // } | ||
|
|
||
| function TagCard({ title, backgroundColor, color }: { title: string; backgroundColor: string; color: string }) { | ||
| return ( | ||
|
|
@@ -86,45 +94,46 @@ function Priority({ level }: { level: number }) { | |
| </> | ||
| ); | ||
| } | ||
| type ItemProps = { | ||
| item: ITeamTask; | ||
| isDragging: boolean; | ||
| isGroupedOver: boolean; | ||
| provided: DraggableProvided; | ||
| style: any; | ||
| isClone: boolean; | ||
| index: number; | ||
| }; | ||
| /** | ||
| * card that represent each task | ||
| * @param props | ||
| * @returns | ||
| */ | ||
| export default function Item(props: ItemProps) { | ||
| const { item, isDragging, provided, style, index } = props; | ||
|
|
||
| const { hours, minutes, seconds } = useTimerView(); | ||
| const { activeTeam } = useOrganizationTeams(); | ||
| const { user } = useAuthenticateUser(); | ||
|
|
||
| const members = activeTeam?.members || []; | ||
| const currentUser = members.find((m) => m.employee.userId === user?.id); | ||
|
|
||
| const memberInfo = useTeamMemberCard(currentUser); | ||
| const taskEdition = useTMCardTaskEdit(memberInfo.memberTask); | ||
| const taskAssignee: ImageOverlapperProps[] = item.members.map((member: any) => { | ||
| return { | ||
| id: member.user.id, | ||
| url: member.user.imageUrl, | ||
| alt: member.user.firstName | ||
| }; | ||
| }); | ||
| const { collaborativeSelect } = useCollaborative(memberInfo.memberUser); | ||
|
|
||
| const menu = <>{!collaborativeSelect && <UserTeamCardMenu memberInfo={memberInfo} edition={taskEdition} />}</>; | ||
|
|
||
| return ( | ||
|
There was a problem hiding this comment. We had that isDragging and isGroupedOver before, why you don't need it anymore? There was a problem hiding this comment. Yes I removed that because it's not the valid jsx There was a problem hiding this comment. Sir please check by your self when you go to this file it throughs these errors and saying |
||
| <div | ||
| draggable={isDragging} | ||
| ref={provided.innerRef} | ||
| {...provided.draggableProps} | ||
| {...provided.dragHandleProps} | ||
|
|
@@ -133,62 +142,84 @@ export default function Item(props: any) { | |
| data-is-dragging={isDragging} | ||
| data-testid={item.id} | ||
| data-index={index} | ||
| aria-label={item.label} | ||
| > | ||
|
There was a problem hiding this comment. @Anishali2 why you removed Issue Status, link etc? i.e. all those lines!? Or you moved them somewhere? There was a problem hiding this comment. Noting is removed I just aligned the css a little bit because there is so much unused css there |
||
| <div className=" w-full justify-between h-40"> | ||
| <div className="w-full flex justify-between"> | ||
| <span>{<TagList tags={[]} />}</span> | ||
| {menu} | ||
| </div> | ||
| <div className="w-full flex justify-between my-3"> | ||
| <div className="flex items-center "> | ||
| {!taskEdition.editMode ? ( | ||
| <> | ||
| <TaskIssueStatus | ||
| showIssueLabels={false} | ||
| task={item} | ||
| className="rounded-sm mr-1 h-6 w-6" | ||
| /> | ||
| <span className="text-grey text-normal mr-1">#{item.number}</span> | ||
| <Link | ||
| href={`/task/${item.id}`} | ||
| className="text-black dark:text-white text-normal capitalize mr-2 bg-blue line-clamp-2" | ||
| > | ||
| {item.title} | ||
| </Link> | ||
| <Priority level={1} /> | ||
| </> | ||
| ) : ( | ||
| <div className="w-56"> | ||
| <TaskInput | ||
| task={taskEdition.task} | ||
| initEditMode={true} | ||
| keepOpen={true} | ||
| showCombobox={false} | ||
| autoFocus={true} | ||
| autoInputSelectText={true} | ||
| onTaskClick={(e) => { | ||
| console.log(e); | ||
| }} | ||
| onEnterKey={() => { | ||
| taskEdition.setEditMode(false); | ||
| }} | ||
| /> | ||
| </div> | ||
| )} | ||
| </div> | ||
| <CircularProgress percentage={10} /> | ||
| </div> | ||
| <div className="my-2"> | ||
| <HorizontalSeparator /> | ||
| </div> | ||
| <div className="w-full flex items-center justify-between"> | ||
| <div className="mt-1"> | ||
| {item.status === TaskStatus.INPROGRESS ? ( | ||
| <div className="flex items-center gap-2"> | ||
| <small className="text-grey text-xs text-normal">Live:</small> | ||
| <p className="text-[#219653] font-medium text-sm"> | ||
| {pad(hours)}:{pad(minutes)}:{pad(seconds)}{' '} | ||
| </p> | ||
| </div> | ||
| ) : ( | ||
| <div className="flex items-center gap-2"> | ||
| <small className="text-grey text-xs text-normal">Worked:</small> | ||
| <p className="text-black dark:text-white font-medium text-sm"> | ||
| {pad(hours)}:{pad(minutes)}:{pad(seconds)}{' '} | ||
| </p> | ||
| </div> | ||
| )} | ||
| </div> | ||
| <ImageComponent images={taskAssignee} /> | ||
| {/* {item. && ( | ||
| <div className="flex flex-row items-center justify-center rounded-full w-5 h-5 z-10 bg-[#e5e7eb] dark:bg-[#181920] absolute top-0 right-0"> | ||
| <div | ||
| className="w-3.5 h-3.5 rounded-full" | ||
| style={setCommentIconColor(item.hasComment)} | ||
| ></div> | ||
|
There was a problem hiding this comment. @Anishali2 why this commented out!? There was a problem hiding this comment. Sorry I've forget to uncomment this let me check it again There was a problem hiding this comment. Sir there is an condition exist |
||
| </div> | ||
| )} */} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Anishali2 why this code commented out? Why we had it you think, how you replaced it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let me check this