From 91cf527dd2c8501f8b742a63ae86aa4ba73f6dce Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Mon, 6 Nov 2023 20:25:33 +0000 Subject: [PATCH 1/2] hide actions from unpriviledged users --- .../TemplateVersionsPage.tsx | 2 + .../TemplateVersionsPage/VersionRow.tsx | 59 ++++++++++--------- .../VersionsTable.stories.tsx | 25 ++++---- 3 files changed, 45 insertions(+), 41 deletions(-) diff --git a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx index 86bed4cf7082e..b941b0df298ab 100644 --- a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx @@ -64,6 +64,8 @@ const TemplateVersionsPage = () => { string | undefined >(); + console.log("permissions.canUpdateTemplate", permissions.canUpdateTemplate); + return ( <> diff --git a/site/src/pages/TemplatePage/TemplateVersionsPage/VersionRow.tsx b/site/src/pages/TemplatePage/TemplateVersionsPage/VersionRow.tsx index 62fc6cb25aa3a..0f29766b838d4 100644 --- a/site/src/pages/TemplatePage/TemplateVersionsPage/VersionRow.tsx +++ b/site/src/pages/TemplatePage/TemplateVersionsPage/VersionRow.tsx @@ -33,6 +33,7 @@ export const VersionRow: React.FC = ({ }); const jobStatus = version.job.status; + const showActions = onPromoteClick || onArchiveClick; return ( = ({ {isActive && } {isLatest && } + {jobStatus === "pending" && ( Pending…} type="warning" lightBorder /> )} @@ -87,34 +89,35 @@ export const VersionRow: React.FC = ({ )} {jobStatus === "failed" && } - {jobStatus === "failed" ? ( - - ) : ( - + + {showActions && ( + <> + {jobStatus === "failed" ? ( + + ) : ( + + )} + )} diff --git a/site/src/pages/TemplatePage/TemplateVersionsPage/VersionsTable.stories.tsx b/site/src/pages/TemplatePage/TemplateVersionsPage/VersionsTable.stories.tsx index 119d56f06a771..5c64a4b510ee8 100644 --- a/site/src/pages/TemplatePage/TemplateVersionsPage/VersionsTable.stories.tsx +++ b/site/src/pages/TemplatePage/TemplateVersionsPage/VersionsTable.stories.tsx @@ -30,23 +30,14 @@ export const Example: Story = { }, MockTemplateVersion, ], - onPromoteClick: undefined, }, }; -export const CanPromote: Story = { +export const NoEditPermission: Story = { args: { - activeVersionId: MockTemplateVersion.id, - onPromoteClick: action("onPromoteClick"), - versions: [ - { - ...MockTemplateVersion, - id: "2", - name: "test-template-version-2", - created_at: "2022-05-18T18:39:01.382927298Z", - }, - MockTemplateVersion, - ], + ...Example.args, + onPromoteClick: undefined, + onArchiveClick: undefined, }, }; @@ -95,6 +86,14 @@ export const BuildStatuses: Story = { }, }; +export const BuildStatusesNoEditPermission: Story = { + args: { + ...BuildStatuses.args, + onPromoteClick: undefined, + onArchiveClick: undefined, + }, +}; + export const Empty: Story = { args: { versions: [], From 90028c0747fc97bbccdaf92e101d2d3fdb896dbb Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Mon, 6 Nov 2023 20:32:30 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A7=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx index b941b0df298ab..86bed4cf7082e 100644 --- a/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx +++ b/site/src/pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage.tsx @@ -64,8 +64,6 @@ const TemplateVersionsPage = () => { string | undefined >(); - console.log("permissions.canUpdateTemplate", permissions.canUpdateTemplate); - return ( <>