Skip to content

feat: add frontend for locked workspaces #8655

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 16 commits into from
Aug 4, 2023
Merged

feat: add frontend for locked workspaces #8655

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0d79b8f
feat: add frontend for locked workspaces
sreya Jul 14, 2023
d50d37b
fix error
sreya Jul 21, 2023
6ac1ba2
do not return locked workspaces by default
sreya Jul 25, 2023
2bea418
integrate xstate
sreya Jul 26, 2023
3c850ad
fix tests
sreya Aug 1, 2023
4ddb62f
fix returned workspaces
sreya Aug 1, 2023
69d0160
Merge branch 'main' into jon/lockedfe
sreya Aug 2, 2023
e866e50
make gen
sreya Aug 2, 2023
8d458b6
fix test
sreya Aug 2, 2023
90b6ade
remove some redundant code
sreya Aug 2, 2023
5d3fb7d
try to fix linting
sreya Aug 2, 2023
7257228
lint
sreya Aug 2, 2023
c300fd8
fix lint again
sreya Aug 2, 2023
152932b
linttt
sreya Aug 2, 2023
6873a95
fix a stray banner
sreya Aug 2, 2023
246f3a3
fix tests
BrunoQuaresma Jul 27, 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
fix a stray banner
  • Loading branch information
@sreya
sreya committed Aug 2, 2023
commit 6873a95da5ae934bd80c4c6adfd93c8923ec3f38
8 changes: 4 additions & 4 deletions site/src/components/WorkspaceDeletion/ImpendingDeletionBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ export const LockedWorkspaceBanner = ({
)

if (
(!hasLockedWorkspaces ||
// Banners should be redisplayed after dismissal when additional workspaces are newly scheduled for deletion
!shouldRedisplayBanner) &&
// Only show this if the experiment is included.
experimentEnabled
!experimentEnabled ||
!hasLockedWorkspaces ||
// Banners should be redisplayed after dismissal when additional workspaces are newly scheduled for deletion
!shouldRedisplayBanner
) {
return null
}
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/WorkspacesPage/WorkspacesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const WorkspacesPage: FC = () => {
// like locked workspaces don't exist.
setLockedWorkspaces([])
}
}, [experimentEnabled])
}, [experimentEnabled, data, filterProps.filter.query])

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logic feels very similar to the useWorkspacesToBeLocked, why not use it here as well?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The useWorkspacesToBeLocked takes a template which the workspaces page doesn't mandate. I could refactor it, but I'd rather merge this as-is and go back and clean up things as we move it out of experimental.

const updateWorkspace = useWorkspaceUpdate(queryKey)

Expand Down