Skip to content

feat(site): edit organization member roles #13977

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 13 commits into from
Jul 24, 2024
Merged

feat(site): edit organization member roles #13977

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
23216d1
oh boy
aslilac Jul 22, 2024
86c86ad
the stuff
aslilac Jul 22, 2024
a7053bb
🧹
aslilac Jul 22, 2024
42344ef
🧴
aslilac Jul 22, 2024
06552e2
Merge branch 'main' into improve-org-members-table
aslilac Jul 23, 2024
d68adb0
Merge branch 'main' into improve-org-members-table
aslilac Jul 23, 2024
840e073
fix error and loading states
aslilac Jul 23, 2024
46a468f
tests
aslilac Jul 24, 2024
2144da8
no
aslilac Jul 24, 2024
8697339
:)
aslilac Jul 24, 2024
7a40e09
🧹
aslilac Jul 24, 2024
a3e7a8a
actually, use `active`
aslilac Jul 24, 2024
830979b
🧹
aslilac Jul 24, 2024
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
🧹
  • Loading branch information
@aslilac
aslilac committed Jul 22, 2024
commit a7053bb8b3aaeb493c3b46e9f8ca98a23a688571
6 changes: 0 additions & 6 deletions site/chromatic.config.json
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions site/src/pages/ManagementSettingsPage/OrganizationMembersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import TableCell from "@mui/material/TableCell";
import TableContainer from "@mui/material/TableContainer";
import TableHead from "@mui/material/TableHead";
import TableRow from "@mui/material/TableRow";
import Tooltip from "@mui/material/Tooltip";
import { type FC, useState } from "react";
import { useMutation, useQuery, useQueryClient } from "react-query";
import { useParams } from "react-router-dom";
Expand All @@ -18,6 +17,7 @@ import {
removeOrganizationMember,
updateOrganizationMemberRoles,
} from "api/queries/organizations";
import { organizationRoles } from "api/queries/roles";
import type { User } from "api/typesGenerated";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { AvatarData } from "components/AvatarData/AvatarData";
Expand All @@ -35,7 +35,6 @@ import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete";
import { UserAvatar } from "components/UserAvatar/UserAvatar";
import { useAuthenticated } from "contexts/auth/RequireAuth";
import { TableColumnHelpTooltip } from "./UserTable/TableColumnHelpTooltip";
import { organizationRoles } from "api/queries/roles";
import { UserRoleCell } from "./UserTable/UserRoleCell";

const OrganizationMembersPage: FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/ManagementSettingsPage/UserTable/UserRoleCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* went with a simpler design. If we decide we really do need to display the
* users like that, though, know that it will be painful
*/
import { Interpolation, Theme, useTheme } from "@emotion/react";
import { type Interpolation, type Theme, useTheme } from "@emotion/react";
import Stack from "@mui/material/Stack";
import TableCell from "@mui/material/TableCell";
import Tooltip from "@mui/material/Tooltip";
Expand Down
1 change: 0 additions & 1 deletion site/src/pages/TemplateSettingsPage/TemplatePermissionsPage/TemplatePermissionsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { useMutation, useQuery, useQueryClient } from "react-query";
import { setGroupRole, setUserRole, templateACL } from "api/queries/templates";
import { displaySuccess } from "components/GlobalSnackbar/utils";
import { Paywall } from "components/Paywall/Paywall";
import { useDashboard } from "modules/dashboard/useDashboard";
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
import { docs } from "utils/docs";
import { pageTitle } from "utils/page";
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import {
TableLoaderSkeleton,
TableRowSkeleton,
} from "components/TableLoader/TableLoader";
import { UserGroupsCell } from "./UserGroupsCell";
import { UserRoleCell } from "../../ManagementSettingsPage/UserTable/UserRoleCell";
import { UserGroupsCell } from "./UserGroupsCell";

dayjs.extend(relativeTime);

Expand Down
Loading