Skip to content

Fix UI bugs #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Fix UI bugs #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85122b6
Fixed jira ticket ui
opoliarush Mar 4, 2024
1d5ba45
clean-up
opoliarush Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/components/Insights/common/InsightCard/InsightCard.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,32 @@ export const Default: Story = {
insight: { ...mockedEndpointNPlusOneInsight, criticality: 0.9 }
}
};

export const JiraButtonIsPrimary: Story = {
args: {
isAsync: true,
insight: { ...mockedEndpointNPlusOneInsight, criticality: 0.9 },
onGoToLive: undefined,
onDismiss: undefined,
onPin: undefined,
onGoToTrace: undefined,
onOpenHistogram: undefined
}
};

export const LinkedJiraTicket: Story = {
args: {
isAsync: true,
insight: { ...mockedEndpointNPlusOneInsight, criticality: 0.9 },
jiraTicketInfo: {
ticketLink: "some",
spanCodeObjectId: "test",
isHintEnabled: false
},
onGoToLive: undefined,
onDismiss: undefined,
onPin: undefined,
onGoToTrace: undefined,
onOpenHistogram: undefined
}
};
5 changes: 3 additions & 2 deletions src/components/Insights/common/insights/TopUsageInsight/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { ConfigContext } from "../../../../common/App/ConfigContext";
import { TraceIcon } from "../../../../common/icons/12px/TraceIcon";
import { ArrowDashedLineIcon } from "../../../../common/icons/ArrowDashedLineIcon";
import { Direction } from "../../../../common/icons/types";
import { Button } from "../../../../common/v3/Button";
import { Pagination } from "../../../../common/v3/Pagination";
import { Tag } from "../../../../common/v3/Tag";
import { Tooltip } from "../../../../common/v3/Tooltip";
Expand Down Expand Up @@ -153,8 +154,8 @@ export const TopUsageInsight = (props: TopUsageInsightProps) => {
<>
{config.isJaegerEnabled && traceId && (
<Tooltip title={"Open trace"}>
<s.Button
buttonType={"tertiary"}
<Button
buttonType={"primary"}
icon={TraceIcon}
onClick={() =>
handleTraceButtonClick(
Expand Down
6 changes: 0 additions & 6 deletions src/components/Insights/common/insights/TopUsageInsight/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
footnoteRegularTypography
} from "../../../../common/App/typographies";
import { Link as CommonLink } from "../../../../common/Link";
import { Button as CommonButton } from "../../../../common/v3/Button";

export const Container = styled.div`
display: flex;
Expand Down Expand Up @@ -34,10 +33,6 @@ export const SpanNamePart = styled.span`
text-overflow: ellipsis;
`;

export const Button = styled(CommonButton)`
margin-right: 10px;
`;

export const Link = styled(CommonLink)`
${footnoteRegularTypography}

Expand Down Expand Up @@ -95,7 +90,6 @@ export const TableBodyRow = styled.div`

export const TableBodyCell = styled.div`
display: flex;
align-items: center;
overflow: hidden;

&:first-child {
Expand Down
6 changes: 1 addition & 5 deletions src/components/common/v3/JiraButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,7 @@ export const JiraButtonComponent = (
<JiraLogoIcon
isActive={true}
size={16}
color={
buttonType === "primary"
? "currentColor"
: theme.colors.v3.icon.brandPrimary
}
color={theme.colors.v3.icon.brandSecondary}
/>
)}
/>
Expand Down