Skip to content

feat: add impending deletion indicators to the workspace page #7588

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 9 commits into from
May 18, 2023
Merged

feat: add impending deletion indicators to the workspace page #7588

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3691b49
created WorkspaceDeletion directory
Kira-Pilot May 17, 2023
92d0365
remove commented code
Kira-Pilot May 17, 2023
819983c
attempting to fix workspace stories
Kira-Pilot May 17, 2023
8f728bb
fix lint
Kira-Pilot May 17, 2023
e987c70
fix the rest of the stories
Kira-Pilot May 17, 2023
8322b63
fix right stories
Kira-Pilot May 17, 2023
5aec820
PR comments
Kira-Pilot May 18, 2023
d94f9fb
Merge remote-tracking branch 'origin/main' into deletion-indicators-w…
Kira-Pilot May 18, 2023
20ba906
fix lint
Kira-Pilot May 18, 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
Merge remote-tracking branch 'origin/main' into deletion-indicators-w… 
…orkspace-page/kira-pilot
  • Loading branch information
@Kira-Pilot
Kira-Pilot committed May 18, 2023
commit d94f9fb0cee85acfadd6e98ed1259c28250dfa83
11 changes: 4 additions & 7 deletions site/src/components/WorkspaceDeletion/ImpendingDeletionBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Workspace } from "api/typesGenerated"
import { displayImpendingDeletion } from "./utils"
import { useDashboard } from "components/Dashboard/DashboardProvider"
import { Maybe } from "components/Conditionals/Maybe"
import { AlertBanner } from "components/AlertBanner/AlertBanner"
import { Alert } from "components/Alert/Alert"

export const ImpendingDeletionBanner = ({
workspace,
Expand Down Expand Up @@ -32,12 +32,9 @@ export const ImpendingDeletionBanner = ({
displayImpendingDeletionBanner,
)}
>
<AlertBanner
severity="info"
onDismiss={onDismiss}
dismissible
text="You have workspaces that will be deleted soon."
/>
<Alert severity="info" onDismiss={onDismiss} dismissible>
You have workspaces that will be deleted soon.
</Alert>
</Maybe>
)
}
1 change: 1 addition & 0 deletions site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { workspaceFilterQuery } from "utils/filters"
import { useLocalStorage } from "hooks"
import difference from "lodash/difference"
import { ImpendingDeletionBanner } from "components/WorkspaceDeletion"
import { ErrorAlert } from "components/Alert/ErrorAlert"

export const Language = {
pageTitle: "Workspaces",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.