-
Notifications
You must be signed in to change notification settings - Fork 458
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.
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
Fleet UI: Add timestamps to host count on software detail pages #25143
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
86c87bc
Fleet UI: Add timestamps to host count on software detail pages
RachelElysia e1b5221
Clean typings
RachelElysia 9f29ef8
Componentize, styling nits
RachelElysia 3be1589
Add storybook
RachelElysia 03a8808
Allow updated never
RachelElysia 319ec3f
Unbold updated text
RachelElysia 334e794
Fix all updated text to not be bold by accident
RachelElysia 8dc8ec7
Remove local fix since global fix is in
RachelElysia File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
- Fleet UI: Added timestamp for software, OS, and vulnerability detail pages for host count last update time |
23 changes: 23 additions & 0 deletions
23
frontend/components/LastUpdatedHostCount/LastUpdatedHostCount.stories.tsx
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,23 @@ | ||
import { Meta, StoryObj } from "@storybook/react"; | ||
|
||
import LastUpdatedHostCount from "./LastUpdatedHostCount"; | ||
|
||
const meta: Meta<typeof LastUpdatedHostCount> = { | ||
title: "Components/LastUpdatedHostCount", | ||
component: LastUpdatedHostCount, | ||
args: { | ||
hostCount: 40, | ||
}, | ||
}; | ||
|
||
export default meta; | ||
|
||
type Story = StoryObj<typeof LastUpdatedHostCount>; | ||
|
||
export const Basic: Story = {}; | ||
|
||
export const WithLastUpdatedAt: Story = { | ||
args: { | ||
lastUpdatedAt: "2021-01-01T00:00:00Z", | ||
}, | ||
}; |
37 changes: 37 additions & 0 deletions
37
frontend/components/LastUpdatedHostCount/LastUpdatedHostCount.tests.tsx
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,37 @@ | ||
import React from "react"; | ||
import { fireEvent, render, screen } from "@testing-library/react"; | ||
|
||
import LastUpdatedHostCount from "."; | ||
|
||
describe("Last updated host count", () => { | ||
it("renders host count and updated text", () => { | ||
const currentDate = new Date(); | ||
currentDate.setDate(currentDate.getDate() - 2); | ||
const twoDaysAgo = currentDate.toISOString(); | ||
|
||
render(<LastUpdatedHostCount hostCount={40} lastUpdatedAt={twoDaysAgo} />); | ||
|
||
const hostCount = screen.getByText(/40/i); | ||
const updateText = screen.getByText("Updated 2 days ago"); | ||
|
||
expect(hostCount).toBeInTheDocument(); | ||
expect(updateText).toBeInTheDocument(); | ||
}); | ||
it("renders never if missing timestamp", () => { | ||
render(<LastUpdatedHostCount />); | ||
|
||
const text = screen.getByText("Updated never"); | ||
|
||
expect(text).toBeInTheDocument(); | ||
}); | ||
|
||
it("renders tooltip on hover", async () => { | ||
render(<LastUpdatedHostCount hostCount={0} />); | ||
|
||
await fireEvent.mouseEnter(screen.getByText("Updated never")); | ||
|
||
expect( | ||
screen.getByText(/last time host data was updated/i) | ||
).toBeInTheDocument(); | ||
}); | ||
}); |
34 changes: 34 additions & 0 deletions
34
frontend/components/LastUpdatedHostCount/LastUpdatedHostCount.tsx
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,34 @@ | ||
import React from "react"; | ||
import LastUpdatedText from "components/LastUpdatedText"; | ||
|
||
const baseClass = "last-updated-host-count"; | ||
|
||
interface ILastUpdatedHostCount { | ||
hostCount?: string | number; | ||
lastUpdatedAt?: string; | ||
} | ||
|
||
const LastUpdatedHostCount = ({ | ||
hostCount, | ||
lastUpdatedAt, | ||
}: ILastUpdatedHostCount): JSX.Element => { | ||
const tooltipContent = ( | ||
<> | ||
The last time host data was updated. <br /> | ||
Click <b>View all hosts</b> to see the most | ||
<br /> up-to-date host count. | ||
</> | ||
); | ||
|
||
return ( | ||
<div className={baseClass}> | ||
<>{hostCount}</> | ||
<LastUpdatedText | ||
lastUpdatedAt={lastUpdatedAt} | ||
customTooltipText={tooltipContent} | ||
/> | ||
</div> | ||
); | ||
}; | ||
|
||
export default LastUpdatedHostCount; |
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,6 @@ | ||
.last-updated-host-count { | ||
display: flex; | ||
align-items: baseline; | ||
gap: $pad-small; | ||
font-size: $x-small; | ||
} |
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 @@ | ||
export { default } from "./LastUpdatedHostCount"; |
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
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
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 |
---|---|---|
|
@@ -295,8 +295,4 @@ | |
} | ||
} | ||
} | ||
|
||
.component__last-updated-text { | ||
font-weight: normal; | ||
} | ||
} |
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
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.
Updated globally here
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.
Thanks Rachel. Can you also please remove these lines (same fix, locally) with merging this global update