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

Commitf8104b0

Browse files
committed
chore: update workspace permission names
1 parentff17bb9 commitf8104b0

13 files changed

+31
-30
lines changed

‎site/src/modules/permissions/workspaces.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export const workspacePermissionChecks = (
33
userId:string,
44
)=>
55
({
6-
createWorkspace:{
6+
createWorkspaceForUserID:{
77
object:{
88
resource_type:"workspace",
99
organization_id:organizationId,

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { pageTitle } from "utils/page";
2626
importtype{AutofillBuildParameter}from"utils/richParameters";
2727
import{paramsUsedToCreateWorkspace}from"utils/workspace";
2828
import{CreateWorkspacePageView}from"./CreateWorkspacePageView";
29-
import{typeCreateWSPermissions,createWorkspaceChecks}from"./permissions";
29+
import{typeCreateWorkspacePermissions,createWorkspaceChecks}from"./permissions";
3030

3131
exportconstcreateWorkspaceModes=["form","auto","duplicate"]asconst;
3232
exporttypeCreateWorkspaceMode=(typeofcreateWorkspaceModes)[number];
@@ -206,7 +206,7 @@ const CreateWorkspacePage: FC = () => {
206206
externalAuthPollingState={externalAuthPollingState}
207207
startPollingExternalAuth={startPollingExternalAuth}
208208
hasAllRequiredExternalAuth={hasAllRequiredExternalAuth}
209-
permissions={permissionsQuery.dataasCreateWSPermissions}
209+
permissions={permissionsQuery.dataasCreateWorkspacePermissions}
210210
parameters={realizedParametersasTemplateVersionParameter[]}
211211
presets={templateVersionPresetsQuery.data??[]}
212212
creatingWorkspace={createWorkspaceMutation.isLoading}

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { paramsUsedToCreateWorkspace } from "utils/workspace";
2828
import{CreateWorkspacePageViewExperimental}from"./CreateWorkspacePageViewExperimental";
2929
exportconstcreateWorkspaceModes=["form","auto","duplicate"]asconst;
3030
exporttypeCreateWorkspaceMode=(typeofcreateWorkspaceModes)[number];
31-
import{typeCreateWSPermissions,createWorkspaceChecks}from"./permissions";
31+
import{typeCreateWorkspacePermissions,createWorkspaceChecks}from"./permissions";
3232

3333
exporttypeExternalAuthPollingState="idle"|"polling"|"abandoned";
3434

@@ -205,7 +205,7 @@ const CreateWorkspacePageExperimental: FC = () => {
205205
externalAuthPollingState={externalAuthPollingState}
206206
startPollingExternalAuth={startPollingExternalAuth}
207207
hasAllRequiredExternalAuth={hasAllRequiredExternalAuth}
208-
permissions={permissionsQuery.dataasCreateWSPermissions}
208+
permissions={permissionsQuery.dataasCreateWorkspacePermissions}
209209
parameters={realizedParametersasTemplateVersionParameter[]}
210210
presets={templateVersionPresetsQuery.data??[]}
211211
creatingWorkspace={createWorkspaceMutation.isLoading}

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const meta: Meta<typeof CreateWorkspacePageView> = {
2727
hasAllRequiredExternalAuth:true,
2828
mode:"form",
2929
permissions:{
30-
createWorkspaceForUser:true,
30+
createWorkspaceForAny:true,
3131
},
3232
onCancel:action("onCancel"),
3333
},

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import type {
4646
ExternalAuthPollingState,
4747
}from"./CreateWorkspacePage";
4848
import{ExternalAuthButton}from"./ExternalAuthButton";
49-
importtype{CreateWSPermissions}from"./permissions";
49+
importtype{CreateWorkspacePermissions}from"./permissions";
5050
exportconstLanguage={
5151
duplicationWarning:
5252
"Duplicating a workspace only copies its parameters. No state from the old workspace is copied over.",
@@ -68,7 +68,7 @@ export interface CreateWorkspacePageViewProps {
6868
parameters:TypesGen.TemplateVersionParameter[];
6969
autofillParameters:AutofillBuildParameter[];
7070
presets:TypesGen.Preset[];
71-
permissions:CreateWSPermissions;
71+
permissions:CreateWorkspacePermissions;
7272
creatingWorkspace:boolean;
7373
onCancel:()=>void;
7474
onSubmit:(
@@ -255,7 +255,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
255255
<FormSection
256256
title="General"
257257
description={
258-
permissions.createWorkspaceForUser
258+
permissions.createWorkspaceForAny
259259
?"The name of the workspace and its owner. Only admins can create workspaces for other users."
260260
:"The name of your new workspace."
261261
}
@@ -300,7 +300,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
300300
</FormHelperText>
301301
</div>
302302

303-
{permissions.createWorkspaceForUser&&(
303+
{permissions.createWorkspaceForAny&&(
304304
<UserAutocomplete
305305
value={owner}
306306
onChange={(user)=>{

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import type {
3636
ExternalAuthPollingState,
3737
}from"./CreateWorkspacePage";
3838
import{ExternalAuthButton}from"./ExternalAuthButton";
39-
importtype{CreateWSPermissions}from"./permissions";
39+
importtype{CreateWorkspacePermissions}from"./permissions";
4040
exportconstLanguage={
4141
duplicationWarning:
4242
"Duplicating a workspace only copies its parameters. No state from the old workspace is copied over.",
@@ -58,7 +58,7 @@ export interface CreateWorkspacePageViewExperimentalProps {
5858
parameters:TypesGen.TemplateVersionParameter[];
5959
autofillParameters:AutofillBuildParameter[];
6060
presets:TypesGen.Preset[];
61-
permissions:CreateWSPermissions;
61+
permissions:CreateWorkspacePermissions;
6262
creatingWorkspace:boolean;
6363
onCancel:()=>void;
6464
onSubmit:(
@@ -252,7 +252,7 @@ export const CreateWorkspacePageViewExperimental: FC<
252252
<hgroup>
253253
<h2className="text-xl font-semibold m-0">General</h2>
254254
<pclassName="text-sm text-content-secondary mt-0">
255-
{permissions.createWorkspaceForUser
255+
{permissions.createWorkspaceForAny
256256
?"Only admins can create workspaces for other users."
257257
:"The name of your new workspace."}
258258
</p>
@@ -299,7 +299,7 @@ export const CreateWorkspacePageViewExperimental: FC<
299299
</div>
300300
</div>
301301
</div>
302-
{permissions.createWorkspaceForUser&&(
302+
{permissions.createWorkspaceForAny&&(
303303
<divclassName="flex flex-col gap-2 flex-1">
304304
<LabelclassName="text-sm"htmlFor={`${id}-workspace-name`}>
305305
Owner
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
exportconstcreateWorkspaceChecks=(organizationId:string)=>
22
({
3-
createWorkspaceForUser:{
3+
createWorkspaceForAny:{
44
object:{
55
resource_type:"workspace",
66
organization_id:organizationId,
@@ -10,7 +10,7 @@ export const createWorkspaceChecks = (organizationId: string) =>
1010
},
1111
})asconst;
1212

13-
exporttypeCreateWSPermissions=Record<
13+
exporttypeCreateWorkspacePermissions=Record<
1414
keyofReturnType<typeofcreateWorkspaceChecks>,
1515
boolean
1616
>;

‎site/src/pages/TemplatePage/TemplateLayout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Loader } from "components/Loader/Loader";
66
import{Margins}from"components/Margins/Margins";
77
import{TabLink,Tabs,TabsList}from"components/Tabs/Tabs";
88
import{useAuthenticated}from"contexts/auth/RequireAuth";
9-
import{workspacePermissionChecks}from"modules/permissions/workspaces";
9+
import{workspacePermissionChecks,typeWorkspacePermissions}from"modules/permissions/workspaces";
1010
import{
1111
typeFC,
1212
typePropsWithChildren,
@@ -113,7 +113,7 @@ export const TemplateLayout: FC<PropsWithChildren> = ({
113113
template={data.template}
114114
activeVersion={data.activeVersion}
115115
permissions={data.permissions}
116-
workspacePermissions={workspacePermissionsQuery.data}
116+
workspacePermissions={workspacePermissionsQuery.dataasWorkspacePermissions}
117117
onDeleteTemplate={()=>{
118118
navigate("/templates");
119119
}}

‎site/src/pages/TemplatePage/TemplatePageHeader.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const meta: Meta<typeof TemplatePageHeader> = {
1414
canUpdateTemplate:true,
1515
},
1616
workspacePermissions:{
17-
createWorkspace:true,
17+
createWorkspaceForUserID:true,
1818
},
1919
},
2020
};
@@ -35,7 +35,7 @@ export const CanNotUpdate: Story = {
3535
exportconstCannotCreateWorkspace:Story={
3636
args:{
3737
workspacePermissions:{
38-
createWorkspace:false,
38+
createWorkspaceForUserID:false,
3939
},
4040
},
4141
};

‎site/src/pages/TemplatePage/TemplatePageHeader.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import type { FC } from "react";
3535
import{useQuery}from"react-query";
3636
import{LinkasRouterLink,useNavigate}from"react-router-dom";
3737
import{useDeletionDialogState}from"./useDeletionDialogState";
38+
importtype{WorkspacePermissions}from"modules/permissions/workspaces";
3839

3940
typeTemplateMenuProps={
4041
organizationName:string;
@@ -158,7 +159,7 @@ export type TemplatePageHeaderProps = {
158159
template:Template;
159160
activeVersion:TemplateVersion;
160161
permissions:AuthorizationResponse;
161-
workspacePermissions:AuthorizationResponse;
162+
workspacePermissions:WorkspacePermissions;
162163
onDeleteTemplate:()=>void;
163164
};
164165

@@ -179,7 +180,7 @@ export const TemplatePageHeader: FC<TemplatePageHeaderProps> = ({
179180
<PageHeader
180181
actions={
181182
<>
182-
{!template.deprecated&&workspacePermissions.createWorkspace&&(
183+
{!template.deprecated&&workspacePermissions.createWorkspaceForUserID&&(
183184
<Button
184185
variant="contained"
185186
startIcon={<AddIcon/>}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export const WithTemplates: Story = {
7676
examples:[],
7777
workspacePermissions:{
7878
[MockTemplate.organization_id]:{
79-
createWorkspace:true,
79+
createWorkspaceForUserID:true,
8080
},
8181
},
8282
},
@@ -94,7 +94,7 @@ export const CannotCreateWorkspaces: Story = {
9494
...WithTemplates.args,
9595
workspacePermissions:{
9696
[MockTemplate.organization_id]:{
97-
createWorkspace:false,
97+
createWorkspaceForUserID:false,
9898
},
9999
},
100100
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ const TemplateRow: FC<TemplateRowProps> = ({
160160
{template.deprecated ?(
161161
<DeprecatedBadge/>
162162
) :workspacePermissions?.[template.organization_id]
163-
?.createWorkspace ?(
163+
?.createWorkspaceForUserID ?(
164164
<MuiButton
165165
size="small"
166166
css={styles.actionButton}

‎site/src/pages/WorkspacesPage/WorkspacesPage.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const WorkspacesPage: FC = () => {
4545

4646
consttemplatesQuery=useQuery(templates());
4747

48-
constorgPermissionsQuery=useQuery(
48+
constworkspacePermissionsQuery=useQuery(
4949
workspacePermissionsByOrganization(
5050
templatesQuery.data?.map((template)=>template.organization_id),
5151
me.id,
@@ -54,15 +54,15 @@ const WorkspacesPage: FC = () => {
5454

5555
// Filter templates based on workspace creation permission
5656
constfilteredTemplates=useMemo(()=>{
57-
if(!templatesQuery.data||!orgPermissionsQuery.data){
57+
if(!templatesQuery.data||!workspacePermissionsQuery.data){
5858
returntemplatesQuery.data;
5959
}
6060

6161
returntemplatesQuery.data.filter((template)=>{
62-
constorgPermission=orgPermissionsQuery.data[template.organization_id];
63-
returnorgPermission?.createWorkspace;
62+
constworkspacePermission=workspacePermissionsQuery.data[template.organization_id];
63+
returnworkspacePermission?.createWorkspaceForUserID;
6464
});
65-
},[templatesQuery.data,orgPermissionsQuery.data]);
65+
},[templatesQuery.data,workspacePermissionsQuery.data]);
6666

6767
constfilterProps=useWorkspacesFilter({
6868
searchParamsResult,

0 commit comments

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