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

Commitae276c4

Browse files
committed
feat: show summary if unable to edit org
This can happen if you can edit the members, for example, but not theorganization settings. In this case you will see a new summary pageinstead of the edit form.
1 parent475f6e2 commitae276c4

6 files changed

+101
-13
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,20 @@ describe("OrganizationSettingsPage", () => {
122122
awaitrenderPage("the-endless-void");
123123
awaitscreen.findByText("Organization not found");
124124
});
125+
126+
it("cannot edit organization",async()=>{
127+
server.use(
128+
http.get("/api/v2/organizations",()=>{
129+
returnHttpResponse.json([MockDefaultOrganization]);
130+
}),
131+
http.post("/api/v2/authcheck",async()=>{
132+
returnHttpResponse.json({
133+
viewDeploymentValues:true,
134+
});
135+
}),
136+
);
137+
// No form since they cannot edit, instead sees the summary view.
138+
awaitrenderPage(MockDefaultOrganization.name);
139+
awaitscreen.findByText(MockDefaultOrganization.display_name);
140+
});
125141
});

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
useOrganizationSettings,
1616
}from"./ManagementSettingsLayout";
1717
import{OrganizationSettingsPageView}from"./OrganizationSettingsPageView";
18+
import{OrganizationSummaryPageView}from"./OrganizationSummaryPageView";
1819

1920
constOrganizationSettingsPage:FC=()=>{
2021
const{organization:organizationName}=useParams()as{
@@ -66,12 +67,18 @@ const OrganizationSettingsPage: FC = () => {
6667
return<EmptyStatemessage="Organization not found"/>;
6768
}
6869

70+
// The user may not be able to edit this org but they can still see it because
71+
// they can edit members, etc. In this case they will be shown a read-only
72+
// summary page instead of the settings form.
73+
if(!permissions[organization.id]?.editOrganization){
74+
return<OrganizationSummaryPageVieworganization={organization}/>;
75+
}
76+
6977
consterror=
7078
updateOrganizationMutation.error??deleteOrganizationMutation.error;
7179

7280
return(
7381
<OrganizationSettingsPageView
74-
canEdit={permissions[organization.id].editOrganization}
7582
organization={organization}
7683
error={error}
7784
onSubmit={async(values)=>{

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

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

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

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

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

5049
exportconstOrganizationSettingsPageView:FC<
5150
OrganizationSettingsPageViewProps
52-
>=({ organization, error, onSubmit, onDeleteOrganization, canEdit})=>{
51+
>=({ organization, error, onSubmit, onDeleteOrganization})=>{
5352
constform=useFormik<UpdateOrganizationRequest>({
5453
initialValues:{
5554
name:organization.name,
@@ -87,7 +86,7 @@ export const OrganizationSettingsPageView: FC<
8786
description="The name and description of the organization."
8887
>
8988
<fieldset
90-
disabled={form.isSubmitting||!canEdit}
89+
disabled={form.isSubmitting}
9190
css={{border:"unset",padding:0,margin:0,width:"100%"}}
9291
>
9392
<FormFields>
@@ -119,10 +118,10 @@ export const OrganizationSettingsPageView: FC<
119118
</FormFields>
120119
</fieldset>
121120
</FormSection>
122-
{canEdit&&<FormFooterisLoading={form.isSubmitting}/>}
121+
<FormFooterisLoading={form.isSubmitting}/>
123122
</HorizontalForm>
124123

125-
{canEdit&&!organization.is_default&&(
124+
{!organization.is_default&&(
126125
<HorizontalContainercss={{marginTop:48}}>
127126
<HorizontalSection
128127
title="Settings"
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
importtype{Meta,StoryObj}from"@storybook/react";
2+
import{
3+
MockDefaultOrganization,
4+
MockOrganization,
5+
}from"testHelpers/entities";
6+
import{OrganizationSummaryPageView}from"./OrganizationSummaryPageView";
7+
8+
constmeta:Meta<typeofOrganizationSummaryPageView>={
9+
title:"pages/OrganizationSummaryPageView",
10+
component:OrganizationSummaryPageView,
11+
args:{
12+
organization:MockOrganization,
13+
},
14+
};
15+
16+
exportdefaultmeta;
17+
typeStory=StoryObj<typeofOrganizationSummaryPageView>;
18+
19+
exportconstDefaultOrg:Story={
20+
args:{
21+
organization:MockDefaultOrganization,
22+
},
23+
};
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
import{typeFC}from"react";
2+
importtype{Organization}from"api/typesGenerated";
3+
import{
4+
PageHeader,
5+
PageHeaderTitle,
6+
PageHeaderSubtitle,
7+
}from"components/PageHeader/PageHeader";
8+
import{Stack}from"components/Stack/Stack";
9+
import{UserAvatar}from"components/UserAvatar/UserAvatar";
10+
11+
interfaceOrganizationSummaryPageViewProps{
12+
organization:Organization;
13+
}
14+
15+
exportconstOrganizationSummaryPageView:FC<
16+
OrganizationSummaryPageViewProps
17+
>=(props)=>{
18+
return(
19+
<div>
20+
<PageHeader
21+
css={{
22+
// The deployment settings layout already has padding.
23+
paddingTop:0,
24+
}}
25+
>
26+
<Stackdirection="row"spacing={3}alignItems="center">
27+
<UserAvatar
28+
key={props.organization.id}
29+
size="xl"
30+
username={
31+
props.organization.display_name||props.organization.name
32+
}
33+
avatarURL={props.organization.icon}
34+
/>
35+
<div>
36+
<PageHeaderTitle>
37+
{props.organization.display_name||props.organization.name}
38+
</PageHeaderTitle>
39+
{props.organization.description&&(
40+
<PageHeaderSubtitle>
41+
{props.organization.description}
42+
</PageHeaderSubtitle>
43+
)}
44+
</div>
45+
</Stack>
46+
</PageHeader>
47+
You are a member of this organization.
48+
</div>
49+
);
50+
};

0 commit comments

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