This repository has been archived by the owner on Jul 2, 2024. It is now read-only.
DEVPROD-1968 Convert AnnotationTicketsTable into a list #2180
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,5 +1,5 @@ | ||
| import { CustomStoryObj, CustomMeta } from "test_utils/types"; | ||
| import AnnotationTicketRow from "."; | ||
|
|
||
| export default { | ||
| component: AnnotationTicketRow, | ||
|
|
@@ -29,6 +29,7 @@ export const Default: CustomStoryObj<typeof AnnotationTicketRow> = { | |
| ), | ||
| args: { | ||
| confidenceScore: 0.5, | ||
| loading: false, | ||
| }, | ||
| argTypes: { | ||
| confidenceScore: { | ||
|
|
||
File renamed without changes.
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,7 +1,7 @@ | ||
| import styled from "@emotion/styled"; | ||
| import Badge from "@leafygreen-ui/badge"; | ||
| import { Skeleton } from "@leafygreen-ui/skeleton-loader"; | ||
| import { Disclaimer } from "@leafygreen-ui/typography"; | ||
| import { useAnnotationAnalytics } from "analytics"; | ||
| import { StyledLink } from "components/styles"; | ||
| import { size } from "constants/tokens"; | ||
|
|
@@ -12,14 +12,14 @@ import { numbers } from "utils"; | |
| const { roundDecimal, toPercent } = numbers; | ||
|
|
||
| interface AnnotationTicketRowProps { | ||
| issueKey?: string; | ||
| url?: string; | ||
| jiraTicket?: JiraTicket; | ||
| loading?: boolean; | ||
| confidenceScore?: number; | ||
| } | ||
|
|
||
| const AnnotationTicketRow: React.FC<AnnotationTicketRowProps> = ({ | ||
| confidenceScore, | ||
| issueKey, | ||
| jiraTicket, | ||
|
|
@@ -37,28 +37,40 @@ export const AnnotationTicketRow: React.FC<AnnotationTicketRowProps> = ({ | |
| summary, | ||
| updated, | ||
| } = fields ?? {}; | ||
| return ( | ||
| <Container data-cy="annotation-ticket-row"> | ||
| {loading ? ( | ||
| <> | ||
| <JiraSummaryLink | ||
| href={url} | ||
| target="_blank" | ||
| data-cy={issueKey} | ||
| onClick={() => | ||
| annotationAnalytics.sendEvent({ | ||
| name: "Click Annotation Ticket Link", | ||
| }) | ||
| } | ||
| > | ||
| {issueKey} | ||
| {summary && `: ${summary}`} | ||
| </JiraSummaryLink> | ||
|
There was a problem hiding this comment. Save this as a variable in the function body so there isn't repeated JSX |
||
| <Skeleton data-cy="loading-annotation-ticket" /> | ||
| </> | ||
| ) : ( | ||
| <> | ||
| <JiraSummaryLink | ||
| href={url} | ||
| target="_blank" | ||
| data-cy={issueKey} | ||
| onClick={() => | ||
| annotationAnalytics.sendEvent({ | ||
| name: "Click Annotation Ticket Link", | ||
| }) | ||
| } | ||
| > | ||
| {issueKey} | ||
| {summary && `: ${summary}`} | ||
| </JiraSummaryLink> | ||
| {jiraTicket && ( | ||
| <StyledBadge data-cy={`${issueKey}-badge`} variant="lightgray"> | ||
| {status.name} | ||
|
|
@@ -95,12 +107,11 @@ export const AnnotationTicketRow: React.FC<AnnotationTicketRowProps> = ({ | |
| </BottomMetaDataWrapper> | ||
| </> | ||
| )} | ||
| </Container> | ||
| ); | ||
| }; | ||
| const Container = styled.div` | ||
| width: 100%; | ||
| `; | ||
|
|
||
| const JiraSummaryLink = styled(StyledLink)` | ||
|
|
@@ -118,3 +129,6 @@ const BottomMetaDataWrapper = styled.div` | |
| margin-top: ${size.xs}; | ||
| width: 80%; | ||
| `; | ||
|
|
||
| export default AnnotationTicketRow; | ||
|
There was a problem hiding this comment. Why not leave this as a named export since named exports for React components is already an established pattern? |
||
| export type { AnnotationTicketRowProps }; | ||
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 |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { CustomMeta, CustomStoryObj } from "test_utils/types"; | ||
| import AnnotationTicketRowWithActionProps from "."; | ||
|
|
||
| export default { | ||
| component: AnnotationTicketRowWithActionProps, | ||
| } satisfies CustomMeta<typeof AnnotationTicketRowWithActionProps>; | ||
|
|
||
| export const Default: CustomStoryObj< | ||
| typeof AnnotationTicketRowWithActionProps | ||
| > = { | ||
| render: (args) => <AnnotationTicketRowWithActionProps {...args} />, | ||
| argTypes: {}, | ||
| args: { | ||
| issueKey: "EVG-123", | ||
| url: "https://www.google.com", | ||
| jiraTicket: { | ||
| key: "key", | ||
| fields: { | ||
| summary: "summary", | ||
| status: { | ||
| name: "status", | ||
| id: "id", | ||
| }, | ||
| created: "2020-01-02", | ||
| updated: "2020-01-02", | ||
| assigneeDisplayName: "mohamed.khelif", | ||
| assignedTeam: "evg-ui", | ||
| }, | ||
| }, | ||
| confidenceScore: 0.5, | ||
| loading: false, | ||
| userCanModify: true, | ||
| isIssue: true, | ||
| }, | ||
| }; |
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 |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| import { forwardRef } from "react"; | ||
| import styled from "@emotion/styled"; | ||
| import Button, { Size } from "@leafygreen-ui/button"; | ||
| import { palette } from "@leafygreen-ui/palette"; | ||
| import Tooltip from "@leafygreen-ui/tooltip"; | ||
| import { ConditionalWrapper } from "components/ConditionalWrapper"; | ||
| import Icon from "components/Icon"; | ||
| import Popconfirm from "components/Popconfirm"; | ||
| import { size } from "constants/tokens"; | ||
| import AnnotationTicketRow, { | ||
| AnnotationTicketRowProps, | ||
| } from "../AnnotationTicketRow"; | ||
|
|
||
| const { gray } = palette; | ||
| interface AnnotationTicketRowWithActionsProps extends AnnotationTicketRowProps { | ||
| onRemove: (url: string, issueKey: string) => void; | ||
| userCanModify: boolean; | ||
| onMove: ({ | ||
| confidenceScore, | ||
| issueKey, | ||
| url, | ||
| }: { | ||
| url: string; | ||
| issueKey?: string; | ||
| confidenceScore?: number; | ||
| }) => void; | ||
| issueString: string; | ||
| isIssue: boolean; | ||
| selected: boolean; | ||
| } | ||
|
|
||
| const AnnotationTicketRowWithActions = forwardRef< | ||
| HTMLDivElement, | ||
| AnnotationTicketRowWithActionsProps | ||
| >( | ||
| ( | ||
| { | ||
| isIssue, | ||
| issueString, | ||
| onMove, | ||
| onRemove, | ||
| selected, | ||
| userCanModify, | ||
| ...rest | ||
| }, | ||
| ref | ||
| ) => { | ||
| const { confidenceScore, issueKey, loading, url } = rest; | ||
| return ( | ||
| <Container selected={selected} ref={ref}> | ||
| <AnnotationTicketRow {...rest} /> | ||
| {!loading && ( | ||
| <ButtonContainer> | ||
| {ConditionalWrapper({ | ||
| condition: userCanModify, | ||
| wrapper: (children: JSX.Element) => ( | ||
| <Popconfirm | ||
| align="right" | ||
| onConfirm={() => { | ||
| onMove({ url, issueKey, confidenceScore }); | ||
| }} | ||
| trigger={children} | ||
| > | ||
| Do you want to move this {issueString} to{" "} | ||
| {isIssue ? "suspected issues" : "issues"}? | ||
| </Popconfirm> | ||
| ), | ||
| altWrapper: (children: JSX.Element) => ( | ||
| <Tooltip trigger={children}> | ||
| You are not authorized to edit failure details | ||
| </Tooltip> | ||
| ), | ||
| children: ( | ||
| <Button | ||
| size={Size.Small} | ||
| data-cy={`move-btn-${issueKey}`} | ||
| disabled={!userCanModify} | ||
| leftGlyph={<Icon glyph={isIssue ? "ArrowDown" : "ArrowUp"} />} | ||
| > | ||
| Move to {isIssue ? "suspected issues" : "issues"} | ||
| </Button> | ||
| ), | ||
| })} | ||
| {ConditionalWrapper({ | ||
| condition: userCanModify, | ||
| wrapper: (children: JSX.Element) => ( | ||
| <Popconfirm | ||
| align="right" | ||
| onConfirm={() => { | ||
| onRemove(url, issueKey); | ||
| }} | ||
| trigger={children} | ||
| > | ||
| Do you want to delete this {issueString}? | ||
| </Popconfirm> | ||
| ), | ||
| altWrapper: (children: JSX.Element) => ( | ||
| <Tooltip trigger={children}> | ||
| You are not authorized to edit failure details | ||
| </Tooltip> | ||
| ), | ||
| children: ( | ||
| <Button | ||
| size="small" | ||
| data-cy={`${issueKey}-delete-btn`} | ||
| leftGlyph={<Icon glyph="Trash" />} | ||
| disabled={!userCanModify} | ||
| /> | ||
| ), | ||
| })} | ||
| </ButtonContainer> | ||
| )} | ||
| </Container> | ||
| ); | ||
| } | ||
| ); | ||
|
|
||
| const ButtonContainer = styled.div` | ||
| display: flex; | ||
| justify-content: space-between; | ||
| gap: ${size.xs}; | ||
| `; | ||
|
|
||
| const Container = styled.div` | ||
| display: flex; | ||
| justify-content: space-between; | ||
| padding: ${size.xs}; | ||
| ${({ selected }: { selected?: boolean }) => | ||
| selected && | ||
| ` | ||
| background-color: ${gray.light2}; | ||
| `} | ||
| `; | ||
|
|
||
| export default AnnotationTicketRowWithActions; |
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.
The readability and debugging overhead of this function can be reduced by aliasing in beforeEach. Check it out:
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.
Woah cool suggestion!