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

Commitdb4945d

Browse files
authored
chore: consolidate onshowOrganizations usage (#14756)
1 parent661d226 commitdb4945d

File tree

8 files changed

+29
-51
lines changed

8 files changed

+29
-51
lines changed

‎site/src/modules/dashboard/Navbar/Navbar.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ export const Navbar: FC = () => {
1212
const{ metadata}=useEmbeddedMetadata();
1313
constbuildInfoQuery=useQuery(buildInfo(metadata["build-info"]));
1414

15-
const{ appearance,experiments}=useDashboard();
15+
const{ appearance,showOrganizations}=useDashboard();
1616
const{user:me, permissions, signOut}=useAuthenticated();
1717
constfeatureVisibility=useFeatureVisibility();
1818
constcanViewAuditLog=
1919
featureVisibility.audit_log&&Boolean(permissions.viewAnyAuditLog);
2020
constcanViewDeployment=Boolean(permissions.viewDeploymentValues);
2121
constcanViewOrganizations=
22-
Boolean(permissions.editAnyOrganization)&&
23-
experiments.includes("multi-organization");
22+
Boolean(permissions.editAnyOrganization)&&showOrganizations;
2423
constcanViewAllUsers=Boolean(permissions.viewAllUsers);
2524
constproxyContextValue=useProxy();
2625
constcanViewHealth=canViewDeployment;

‎site/src/pages/CreateTemplatePage/ImportStarterTemplateView.tsx‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,13 @@ export const ImportStarterTemplateView: FC<CreateTemplatePageViewProps> = ({
2727
isCreating,
2828
})=>{
2929
constnavigate=useNavigate();
30-
const{ entitlements, experiments}=useDashboard();
31-
const{multiple_organizations:organizationsEnabled}=
32-
useFeatureVisibility();
30+
const{ entitlements, showOrganizations}=useDashboard();
3331
const[searchParams]=useSearchParams();
3432
consttemplateExamplesQuery=useQuery(templateExamples());
3533
consttemplateExample=templateExamplesQuery.data?.find(
3634
(e)=>e.id===searchParams.get("exampleId")!,
3735
);
3836

39-
constshowOrganizationPicker=
40-
experiments.includes("multi-organization")&&organizationsEnabled;
41-
4237
constisLoading=templateExamplesQuery.isLoading;
4338
constloadingError=templateExamplesQuery.error;
4439

@@ -77,7 +72,7 @@ export const ImportStarterTemplateView: FC<CreateTemplatePageViewProps> = ({
7772
onCancel={()=>navigate(-1)}
7873
jobError={isJobError ?error.job.error :undefined}
7974
logs={templateVersionLogsQuery.data}
80-
showOrganizationPicker={showOrganizationPicker}
75+
showOrganizationPicker={showOrganizations}
8176
onSubmit={async(formData)=>{
8277
awaitonCreateTemplate({
8378
organization:formData.organization,

‎site/src/pages/CreateTemplatePage/UploadTemplateView.tsx‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,9 @@ export const UploadTemplateView: FC<CreateTemplatePageViewProps> = ({
2121
error,
2222
})=>{
2323
constnavigate=useNavigate();
24-
const{ entitlements, experiments}=useDashboard();
25-
const{multiple_organizations:organizationsEnabled}=
26-
useFeatureVisibility();
24+
const{ entitlements, showOrganizations}=useDashboard();
2725
constformPermissions=getFormPermissions(entitlements);
2826

29-
constshowOrganizationPicker=
30-
experiments.includes("multi-organization")&&organizationsEnabled;
31-
3227
constuploadFileMutation=useMutation(uploadFile());
3328
constuploadedFile=uploadFileMutation.data;
3429

@@ -61,7 +56,7 @@ export const UploadTemplateView: FC<CreateTemplatePageViewProps> = ({
6156
onRemove:uploadFileMutation.reset,
6257
file:uploadFileMutation.variables,
6358
}}
64-
showOrganizationPicker={showOrganizationPicker}
59+
showOrganizationPicker={showOrganizations}
6560
onSubmit={async(formData)=>{
6661
awaitonCreateTemplate({
6762
organization:formData.organization,

‎site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesGalleryPage.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@ import { CreateTemplatesPageView } from "./CreateTemplatesPageView";
1010
import{StarterTemplatesPageView}from"./StarterTemplatesPageView";
1111

1212
constCreateTemplatesGalleryPage:FC=()=>{
13-
const{experiments}=useDashboard();
13+
const{showOrganizations}=useDashboard();
1414
consttemplateExamplesQuery=useQuery(templateExamples());
1515
conststarterTemplatesByTag=templateExamplesQuery.data
1616
?// Currently, the scratch template should not be displayed on the starter templates page.
1717
getTemplatesByTag(removeScratchExample(templateExamplesQuery.data))
1818
:undefined;
19-
constmultiOrgExperimentEnabled=experiments.includes("multi-organization");
2019

2120
return(
2221
<>
2322
<Helmet>
2423
<title>{pageTitle("Create a Template")}</title>
2524
</Helmet>
26-
{multiOrgExperimentEnabled ?(
25+
{showOrganizations ?(
2726
<CreateTemplatesPageView
2827
error={templateExamplesQuery.error}
2928
starterTemplatesByTag={starterTemplatesByTag}

‎site/src/pages/DeploySettingsPage/DeploySettingsLayout.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@ export const useDeploySettings = (): DeploySettingsContextValue => {
3131
};
3232

3333
exportconstDeploySettingsLayout:FC=()=>{
34-
const{experiments}=useDashboard();
34+
const{showOrganizations}=useDashboard();
3535

36-
constcanViewOrganizations=experiments.includes("multi-organization");
37-
38-
returncanViewOrganizations ?(
36+
returnshowOrganizations ?(
3937
<ManagementSettingsLayout/>
4038
) :(
4139
<DeploySettingsLayoutInner/>

‎site/src/pages/TemplatesPage/TemplatesPageView.tsx‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import {
3838
TableRowSkeleton,
3939
}from"components/TableLoader/TableLoader";
4040
import{useClickableTableRow}from"hooks/useClickableTableRow";
41-
import{useDashboard}from"modules/dashboard/useDashboard";
4241
import{linkToTemplate,useLinks}from"modules/navigation";
4342
importtype{FC}from"react";
4443
import{useNavigate}from"react-router-dom";
@@ -193,31 +192,27 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = ({
193192
examples,
194193
templates,
195194
})=>{
196-
const{ experiments}=useDashboard();
197195
constisLoading=!templates;
198196
constisEmpty=templates&&templates.length===0;
199197
constnavigate=useNavigate();
200-
constmultiOrgExperimentEnabled=experiments.includes("multi-organization");
201198

202-
constcreateTemplateAction=()=>{
203-
returnmultiOrgExperimentEnabled ?(
204-
<Button
205-
startIcon={<AddIcon/>}
206-
variant="contained"
207-
onClick={()=>{
208-
navigate("/starter-templates");
209-
}}
210-
>
211-
Create Template
212-
</Button>
213-
) :(
214-
<CreateTemplateButtononNavigate={navigate}/>
215-
);
216-
};
199+
constcreateTemplateAction=showOrganizations ?(
200+
<Button
201+
startIcon={<AddIcon/>}
202+
variant="contained"
203+
onClick={()=>{
204+
navigate("/starter-templates");
205+
}}
206+
>
207+
Create Template
208+
</Button>
209+
) :(
210+
<CreateTemplateButtononNavigate={navigate}/>
211+
);
217212

218213
return(
219214
<Margins>
220-
<PageHeaderactions={canCreateTemplates&&createTemplateAction()}>
215+
<PageHeaderactions={canCreateTemplates&&createTemplateAction}>
221216
<PageHeaderTitle>
222217
<Stackspacing={1}direction="row"alignItems="center">
223218
Templates

‎site/src/pages/UsersPage/UsersLayout.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@ import {
1919

2020
exportconstUsersLayout:FC=()=>{
2121
const{ permissions}=useAuthenticated();
22-
const{experiments}=useDashboard();
22+
const{showOrganizations}=useDashboard();
2323
constnavigate=useNavigate();
2424
constfeats=useFeatureVisibility();
2525
constlocation=useLocation();
2626
constactiveTab=location.pathname.endsWith("groups") ?"groups" :"users";
2727

28-
constcanViewOrganizations=experiments.includes("multi-organization");
29-
3028
return(
3129
<>
3230
<Margins>
@@ -59,7 +57,7 @@ export const UsersLayout: FC = () => {
5957
</PageHeader>
6058
</Margins>
6159

62-
{!canViewOrganizations&&(
60+
{!showOrganizations&&(
6361
<Tabs
6462
css={{marginBottom:40,marginTop:-TAB_PADDING_Y}}
6563
active={activeTab}

‎site/src/pages/UsersPage/UsersPage.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const UsersPage: FC = () => {
4040
constnavigate=useNavigate();
4141
constlocation=useLocation();
4242
constsearchParamsResult=useSearchParams();
43-
const{ entitlements,experiments}=useDashboard();
43+
const{ entitlements,showOrganizations}=useDashboard();
4444
const[searchParams]=searchParamsResult;
4545

4646
constgroupsByUserIdQuery=useQuery(groupsByUserId());
@@ -102,8 +102,7 @@ const UsersPage: FC = () => {
102102
authMethodsQuery.isLoading||
103103
groupsByUserIdQuery.isLoading;
104104

105-
constcanViewOrganizations=experiments.includes("multi-organization");
106-
if(canViewOrganizations&&location.pathname!=="/deployment/users"){
105+
if(showOrganizations&&location.pathname!=="/deployment/users"){
107106
return<Navigateto={`/deployment/users${location.search}`}replace/>;
108107
}
109108

@@ -160,7 +159,7 @@ const UsersPage: FC = () => {
160159
menus:{status:statusMenu},
161160
}}
162161
usersQuery={usersQuery}
163-
canViewOrganizations={canViewOrganizations}
162+
canViewOrganizations={showOrganizations}
164163
canCreateUser={canCreateUser}
165164
/>
166165

0 commit comments

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