Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6e1d93d

Browse files
committed
feat: cleanup
1 parentb94050b commit6e1d93d

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePage.tsx

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { useNavigate, useParams } from "react-router-dom";
55
import{getErrorMessage}from"api/errors";
66
import{patchOrganizationRole,organizationRoles}from"api/queries/roles";
77
import{displayError}from"components/GlobalSnackbar/utils";
8+
import{Loader}from"components/Loader/Loader";
89
import{pageTitle}from"utils/page";
910
importCreateEditRolePageViewfrom"./CreateEditRolePageView";
1011

@@ -18,26 +19,32 @@ export const CreateGroupPage: FC = () => {
1819
constpatchOrganizationRoleMutation=useMutation(
1920
patchOrganizationRole(queryClient,organization??"default"),
2021
);
21-
const{ data}=useQuery(organizationRoles(organization));
22-
constrole=data?.find((role)=>role.name===roleName);
23-
constpageTitleText=
24-
role!==undefined ?"Edit Custom Role" :"Create Custom Role";
22+
const{data:roleData, isLoading}=useQuery(
23+
organizationRoles(organization),
24+
);
25+
constrole=roleData?.find((role)=>role.name===roleName);
26+
27+
if(isLoading){
28+
return<Loader/>;
29+
}
2530

2631
return(
2732
<>
2833
<Helmet>
29-
<title>{pageTitle(pageTitleText)}</title>
34+
<title>
35+
{pageTitle(
36+
role!==undefined ?"Edit Custom Role" :"Create Custom Role",
37+
)}
38+
</title>
3039
</Helmet>
3140
<CreateEditRolePageView
3241
role={role}
3342
organization={organization}
3443
onSubmit={async(data)=>{
3544
try{
36-
console.log({ data});
3745
awaitpatchOrganizationRoleMutation.mutateAsync(data);
3846
navigate(`/organizations/${organization}/roles`);
3947
}catch(error){
40-
console.log({ error});
4148
displayError(
4249
getErrorMessage(error,"Failed to update custom role"),
4350
);

‎site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import TableCell from "@mui/material/TableCell";
66
importTableContainerfrom"@mui/material/TableContainer";
77
importTableRowfrom"@mui/material/TableRow";
88
importTextFieldfrom"@mui/material/TextField";
9-
import{typeFormikValues,useFormik}from"formik";
10-
import{typeChangeEvent,useState,typeFC,useEffect}from"react";
9+
import{useFormik}from"formik";
10+
import{typeChangeEvent,useState,typeFC}from"react";
1111
import{useNavigate}from"react-router-dom";
1212
import*asYupfrom"yup";
1313
import{isApiValidationError}from"api/errors";
@@ -112,7 +112,7 @@ interface ActionCheckboxesProps {
112112
}
113113

114114
constActionCheckboxes:FC<ActionCheckboxesProps>=({ permissions, form})=>{
115-
const[checkedActions,setIsChecked]=useState(permissions);
115+
const[checkedActions,setCheckActions]=useState(permissions);
116116

117117
consthandleCheckChange=async(
118118
e:ChangeEvent<HTMLInputElement>,
@@ -134,14 +134,10 @@ const ActionCheckboxes: FC<ActionCheckboxesProps> = ({ permissions, form }) => {
134134
(p)=>p.resource_type!==resource_type||p.action!==action,
135135
);
136136

137-
setIsChecked(newPermissions);
138-
awaitform.setFieldValue("organization_permissions",checkedActions);
137+
setCheckActions(newPermissions);
138+
awaitform.setFieldValue("organization_permissions",newPermissions);
139139
};
140140

141-
// useEffect(() => {
142-
// setIsChecked(permissions);
143-
// }, [permissions]);
144-
145141
return(
146142
<TableContainer>
147143
<Table>

‎site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPage.tsx

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,9 @@ import Button from "@mui/material/Button";
33
import{typeFC,useEffect}from"react";
44
import{Helmet}from"react-helmet-async";
55
import{useQuery}from"react-query";
6-
import{
7-
Navigate,
8-
LinkasRouterLink,
9-
useLocation,
10-
useParams,
11-
}from"react-router-dom";
6+
import{LinkasRouterLink,useLocation,useParams}from"react-router-dom";
127
import{getErrorMessage}from"api/errors";
138
import{organizationRoles}from"api/queries/roles";
14-
importtype{Organization}from"api/typesGenerated";
159
import{displayError}from"components/GlobalSnackbar/utils";
1610
import{PageHeader,PageHeaderTitle}from"components/PageHeader/PageHeader";
1711
import{useAuthenticated}from"contexts/auth/RequireAuth";
@@ -31,6 +25,9 @@ export const CustomRolesPage: FC = () => {
3125
constlocation=useLocation();
3226
const{ organization="default"}=useParams()as{organization:string};
3327
constorganizationRolesQuery=useQuery(organizationRoles(organization));
28+
constfilteredRoleData=organizationRolesQuery.data?.filter(
29+
(role)=>role.built_in===false,
30+
);
3431

3532
useEffect(()=>{
3633
if(organizationRolesQuery.error){
@@ -56,7 +53,7 @@ export const CustomRolesPage: FC = () => {
5653
return(
5754
<>
5855
<Helmet>
59-
<title>{pageTitle("Groups")}</title>
56+
<title>{pageTitle("Custom Roles")}</title>
6057
</Helmet>
6158

6259
<PageHeader
@@ -78,7 +75,7 @@ export const CustomRolesPage: FC = () => {
7875
</PageHeader>
7976

8077
<CustomRolesPageView
81-
roles={organizationRolesQuery.data}
78+
roles={filteredRoleData}
8279
canAssignOrgRole={canAssignOrgRole}
8380
isCustomRolesEnabled={isCustomRolesEnabled}
8481
/>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp