Skip to content

feat: add impending deletion filter to workspaces page #7860

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 18 commits into from
Jun 12, 2023
Merged

feat: add impending deletion filter to workspaces page #7860

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
55ece93
add workspace deletion dialog
Kira-Pilot Jun 1, 2023
39c1435
add deleting_by query param
Kira-Pilot Jun 2, 2023
c1c3040
added test
Kira-Pilot Jun 5, 2023
95e43ac
Merge remote-tracking branch 'origin/main' into inactivity-modal/kira…
Kira-Pilot Jun 5, 2023
e48b3cc
filtering on workspaces to be deleted
Kira-Pilot Jun 5, 2023
7eb45e5
cleaned up form
Kira-Pilot Jun 5, 2023
dde782c
added story
Kira-Pilot Jun 5, 2023
e7b6f89
added banner filter
Kira-Pilot Jun 5, 2023
ef6be22
PR feedback
Kira-Pilot Jun 6, 2023
a4b81ce
fix lint and stories
Kira-Pilot Jun 6, 2023
9697120
PR feedback
Kira-Pilot Jun 9, 2023
a08a0c9
added enterprise test
Kira-Pilot Jun 9, 2023
93cc918
Merge remote-tracking branch 'origin/main' into inactivity-modal/kira…
Kira-Pilot Jun 9, 2023
1acddb3
Merge remote-tracking branch 'origin/main' into inactivity-modal/kira…
Kira-Pilot Jun 12, 2023
0075964
added unit tests in search_test.go
Kira-Pilot Jun 12, 2023
a0f14dd
remove unused fn
Kira-Pilot Jun 12, 2023
e03e443
unstaged changes
Kira-Pilot Jun 12, 2023
5ce1d56
Merge remote-tracking branch 'origin/main' into inactivity-modal/kira…
Kira-Pilot Jun 12, 2023
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
Prev Previous commit
Next Next commit
unstaged changes
  • Loading branch information
@Kira-Pilot
Kira-Pilot committed Jun 12, 2023
commit e03e443d00f5eb28e694cd336ff0c67d5381904c
4 changes: 2 additions & 2 deletions coderd/searchquery/search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,15 +192,15 @@ func TestSearchWorkspace(t *testing.T) {
Query: "deleting_by:2023-06-09",
Expected: searchquery.PostFilter{
DeletingBy: ptr.Ref(time.Date(
2023, 06, 9, 0, 0, 0, 0, time.UTC)),
2023, 6, 9, 0, 0, 0, 0, time.UTC)),
},
},
{
Name: "MultipleParams",
Query: "deleting_by:2023-06-09 name:workspace-name",
Expected: searchquery.PostFilter{
DeletingBy: ptr.Ref(time.Date(
2023, 06, 9, 0, 0, 0, 0, time.UTC)),
2023, 6, 9, 0, 0, 0, 0, time.UTC)),
},
},
}
Expand Down
29 changes: 1 addition & 28 deletions site/src/pages/WorkspacesPage/WorkspacesPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
import { screen } from "@testing-library/react"
import { rest } from "msw"
import * as CreateDayString from "utils/createDayString"
import {
MockWorkspace,
MockWorkspacesResponse,
MockEntitlementsWithScheduling,
MockWorkspacesResponseWithDeletions,
} from "testHelpers/entities"
import { MockWorkspace, MockWorkspacesResponse } from "testHelpers/entities"
import { history, renderWithAuth } from "testHelpers/renderHelpers"
import { server } from "testHelpers/server"
import WorkspacesPage from "./WorkspacesPage"
import { i18n } from "i18n"
import * as API from "api/api"
import userEvent from "@testing-library/user-event"

const { t } = i18n

Expand Down Expand Up @@ -48,24 +41,4 @@ describe("WorkspacesPage", () => {
)
expect(templateDisplayNames).toHaveLength(MockWorkspacesResponse.count)
})

it("displays banner for impending deletions", async () => {
jest
.spyOn(API, "getEntitlements")
.mockResolvedValue(MockEntitlementsWithScheduling)

jest
.spyOn(API, "getWorkspaces")
.mockResolvedValue(MockWorkspacesResponseWithDeletions)

renderWithAuth(<WorkspacesPage />)

const banner = await screen.findByText(
"You have workspaces that will be deleted soon due to inactivity. To keep these workspaces, connect to them via SSH or the web terminal.",
)
const user = userEvent.setup()
await user.click(screen.getByTestId("dismiss-banner-btn"))

expect(banner).toBeEmptyDOMElement
})
})