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

Commit5a547fc

Browse files
committed
Show ineditable form without org edit perm
I think the "you do not have permission to edit" message might make itsound like you can do nothing at all with the org, but it might be thatyou can edit members and groups, just not the org settings.So, instead, show the org settings but disable the form if you cannotedit. Probably there is still a better design but maybe this is OK fornow.
1 parent0b4b00b commit5a547fc

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,12 @@ const OrganizationSettingsPage: FC = () => {
5757
return<Loader/>;
5858
}
5959

60-
// When someone views the top-level org URL (/organizations/my-org) they might
61-
// not have edit permissions.
62-
if(!permissions.editOrganization){
63-
return(
64-
<EmptyStatemessage="You do not have permission to edit this organization."/>
65-
);
66-
}
67-
6860
consterror=
6961
updateOrganizationMutation.error??deleteOrganizationMutation.error;
7062

7163
return(
7264
<OrganizationSettingsPageView
65+
canEdit={permissions.editOrganization}
7366
organization={organization}
7467
error={error}
7568
onSubmit={async(values)=>{

‎site/src/pages/ManagementSettingsPage/OrganizationSettingsPageView.stories.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const meta: Meta<typeof OrganizationSettingsPageView> = {
1010
component:OrganizationSettingsPageView,
1111
args:{
1212
organization:MockOrganization,
13+
canEdit:true,
1314
},
1415
};
1516

@@ -23,3 +24,9 @@ export const DefaultOrg: Story = {
2324
organization:MockDefaultOrganization,
2425
},
2526
};
27+
28+
exportconstCannotEdit:Story={
29+
args:{
30+
canEdit:false,
31+
},
32+
};

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ interface OrganizationSettingsPageViewProps {
4444
error:unknown;
4545
onSubmit:(values:UpdateOrganizationRequest)=>Promise<void>;
4646
onDeleteOrganization:()=>void;
47+
canEdit:boolean;
4748
}
4849

4950
exportconstOrganizationSettingsPageView:FC<
5051
OrganizationSettingsPageViewProps
51-
>=({ organization, error, onSubmit, onDeleteOrganization})=>{
52+
>=({ organization, error, onSubmit, onDeleteOrganization, canEdit})=>{
5253
constform=useFormik<UpdateOrganizationRequest>({
5354
initialValues:{
5455
name:organization.name,
@@ -82,10 +83,10 @@ export const OrganizationSettingsPageView: FC<
8283
>
8384
<FormSection
8485
title="Info"
85-
description="Change thenameor description of the organization."
86+
description="Thenameand description of the organization."
8687
>
8788
<fieldset
88-
disabled={form.isSubmitting}
89+
disabled={form.isSubmitting||!canEdit}
8990
css={{border:"unset",padding:0,margin:0,width:"100%"}}
9091
>
9192
<FormFields>
@@ -117,10 +118,10 @@ export const OrganizationSettingsPageView: FC<
117118
</FormFields>
118119
</fieldset>
119120
</FormSection>
120-
<FormFooterisLoading={form.isSubmitting}/>
121+
{canEdit&&<FormFooterisLoading={form.isSubmitting}/>}
121122
</HorizontalForm>
122123

123-
{!organization.is_default&&(
124+
{canEdit&&!organization.is_default&&(
124125
<HorizontalContainercss={{marginTop:48}}>
125126
<HorizontalSection
126127
title="Settings"

0 commit comments

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