Skip to content

feat(site): make workspace batch deletion GA #9313

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 10 commits into from
Aug 30, 2023
Merged

feat(site): make workspace batch deletion GA #9313

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
15fc3db
Remove experiment from BE
BrunoQuaresma Aug 24, 2023
b95a643
Remove feature checks and improve loading stat
BrunoQuaresma Aug 24, 2023
c8f4369
Improve verbiage
BrunoQuaresma Aug 24, 2023
614bc14
Make comparison upper case
BrunoQuaresma Aug 24, 2023
83c23aa
Merge branch 'main' of https://github.com/coder/coder into bq/make-ba…
BrunoQuaresma Aug 29, 2023
c36d363
Add feature to enterprise
BrunoQuaresma Aug 29, 2023
e653b8c
Put feature behind enterprise
BrunoQuaresma Aug 29, 2023
d043685
fix js test
BrunoQuaresma Aug 29, 2023
90de8dd
Fix tests
BrunoQuaresma Aug 29, 2023
7f99182
Merge branch 'main' of https://github.com/coder/coder into bq/make-ba…
BrunoQuaresma Aug 29, 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 branch 'main' of https://github.com/coder/coder into bq/make-ba… 
…tch-action-ga
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Aug 29, 2023
commit 83c23aafaaf138a881e11a6407cfa7308d0045a5
60 changes: 33 additions & 27 deletions site/src/components/UsersTable/UsersTableBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,19 @@ import { TableRowMenu } from "../TableRowMenu/TableRowMenu"
import { EditRolesButton } from "components/EditRolesButton/EditRolesButton"
import { Stack } from "components/Stack/Stack"
import { EnterpriseBadge } from "components/DeploySettingsLayout/Badges"
import dayjs from "dayjs"
import { SxProps, Theme } from "@mui/material/styles"
import HideSourceOutlined from "@mui/icons-material/HideSourceOutlined"
import KeyOutlined from "@mui/icons-material/KeyOutlined"
import GitHub from "@mui/icons-material/GitHub"
import PasswordOutlined from "@mui/icons-material/PasswordOutlined"
import relativeTime from "dayjs/plugin/relativeTime"
import ShieldOutlined from "@mui/icons-material/ShieldOutlined"
import Skeleton from "@mui/material/Skeleton"
import { AvatarDataSkeleton } from "components/AvatarData/AvatarDataSkeleton"

dayjs.extend(relativeTime)

const isOwnerRole = (role: TypesGen.Role): boolean => {
return role.name === "owner"
}
Expand Down Expand Up @@ -86,7 +96,29 @@ export const UsersTableBody: FC<
return (
<ChooseOne>
<Cond condition={Boolean(isLoading)}>
<TableLoader />
<TableLoaderSkeleton>
<TableRowSkeleton>
<TableCell>
<Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
<AvatarDataSkeleton />
</Box>
</TableCell>
<TableCell>
<Skeleton variant="text" width="25%" />
</TableCell>
<TableCell>
<Skeleton variant="text" width="25%" />
</TableCell>
<TableCell>
<Skeleton variant="text" width="25%" />
</TableCell>
{canEditUsers && (
<TableCell>
<Skeleton variant="text" width="25%" />
</TableCell>
)}
</TableRowSkeleton>
</TableLoaderSkeleton>
</Cond>
<Cond condition={!users || users.length === 0}>
<ChooseOne>
Expand Down Expand Up @@ -342,29 +374,3 @@ const useStyles = makeStyles((theme) => ({
borderColor: theme.palette.info.light,
},
}))

const TableLoader = () => {
return (
<TableLoaderSkeleton>
<TableRowSkeleton>
<TableCell>
<Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
<AvatarDataSkeleton />
</Box>
</TableCell>
<TableCell>
<Skeleton variant="text" width="25%" />
</TableCell>
<TableCell>
<Skeleton variant="text" width="25%" />
</TableCell>
<TableCell>
<Skeleton variant="text" width="25%" />
</TableCell>
<TableCell>
<Skeleton variant="text" width="25%" />
</TableCell>
</TableRowSkeleton>
</TableLoaderSkeleton>
)
}
You are viewing a condensed version of this merge commit. You can view the full changes here.