mirror of
https://github.com/empayre/fleet.git
synced 2024-11-07 01:15:22 +00:00
39e9cdd7b1
# Checklist for submitter
- [x] Added/updated tests
- [x] Manual QA for all new/changed functionality
> [!NOTE]
> For the reviewer, you won't hurt my feelings at all if you have a
better implementation in mind and want to close this out! I'll be
upfront that I'm much more of a Go dev than a frontend dev. I'm just
using this issue as an opportunity to become more familiar with Fleet,
since I'm a fan of what y'all are doing and have been looking for a
project to spend some spare-time contributing to 😄
>
> You should also have edit access to this branch, so feel free to
commandeer it as you see fit.
# Summary
This PR aims to fix a regression identified in #14353 in which certain
"zero" datetimes are displayed as "54 years ago" instead of the
preferred "Never". The "zero" datetimes are commonly used [as a proxy to
indicate](5cb8051a40/server/datastore/mysql/hosts.go (L1649))
that a date wasn't set, e.g. when a host hasn't had its details fetched
yet.
We don't want to apply this treatment to _all_ datetimes, since some
(like vulnerability data) have valid dates before Fleet was created.
To support both use cases, I:
* Added an optional boolean, `cutoffBeforeFleetLaunch`, to indicate that
dates should be cutoff prior to the hardcoded Fleet launch date. This is
set to `false` in `HumanTimeDiffWithDateTip` for
backwards-compatibility.
* Created `HumanTimeDiffWithFleetLaunchCutoff` which is a drop-in
replacement for `HumanTimeDiffWithDateTip` that sets the
`cutoffBeforeFleetLaunch` flag to `true`.
I then used `HumanTimeDiffWithFleetLaunchCutoff` in the various host
related fields I could find. It's possible I missed some, so please
double-check me! I'm still getting my bearings on the codebase.
Here's a screenshot showing the host table with a host that I had
deleted and waited to appear again:
<img width="1381" alt="Screenshot 2023-10-11 at 11 27 29 PM"
src="https://github.com/fleetdm/fleet/assets/1317288/3cd23879-3233-409f-91a0-8b5e02d09deb">
You may find it helpful to review this commit-by-commit.
Closes #14353
48 lines
1.4 KiB
TypeScript
48 lines
1.4 KiB
TypeScript
import React from "react";
|
|
import { render, screen } from "@testing-library/react";
|
|
import { renderWithSetup } from "test/test-utils";
|
|
|
|
import {
|
|
HumanTimeDiffWithDateTip,
|
|
HumanTimeDiffWithFleetLaunchCutoff,
|
|
} from "./HumanTimeDiffWithDateTip";
|
|
|
|
const EMPTY_STRING = "Unavailable";
|
|
const INVALID_STRING = "Invalid date";
|
|
|
|
describe("HumanTimeDiffWithDateTip - component", () => {
|
|
it("renders tooltip on hover", async () => {
|
|
const { user } = renderWithSetup(
|
|
<HumanTimeDiffWithDateTip timeString="2015-12-06T10:30:00Z" />
|
|
);
|
|
|
|
// Note: number of years varies over time
|
|
await user.hover(screen.getByText(/years ago/i));
|
|
|
|
// Note: hour of day varies for timezones
|
|
expect(screen.getByText(/12\/6\/2015/i)).toBeInTheDocument();
|
|
});
|
|
|
|
it("handles empty string error", async () => {
|
|
render(<HumanTimeDiffWithDateTip timeString="" />);
|
|
|
|
const emptyStringText = screen.getByText(EMPTY_STRING);
|
|
expect(emptyStringText).toBeInTheDocument();
|
|
});
|
|
|
|
it("handles invalid string error", async () => {
|
|
render(<HumanTimeDiffWithDateTip timeString="foobar" />);
|
|
|
|
const invalidStringText = screen.getByText(INVALID_STRING);
|
|
expect(invalidStringText).toBeInTheDocument();
|
|
});
|
|
|
|
it("returns never if configured to cutoff dates before Fleet was created", async () => {
|
|
render(
|
|
<HumanTimeDiffWithFleetLaunchCutoff timeString="1970-01-02T00:00:00Z" />
|
|
);
|
|
|
|
expect(screen.getByText(/never/i)).toBeInTheDocument();
|
|
});
|
|
});
|