Skip to content

Commit fa13afc

Browse files
BrunoQuaresmapull[bot]
BrunoQuaresma
authored and
pull[bot]
committed
chore(site): Remove template editor out of experimental (#7165)
1 parent abaf7bd commit fa13afc

File tree

12 files changed

+42
-73
lines changed

12 files changed

+42
-73
lines changed

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codersdk/deployment.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,10 +1605,6 @@ func (c *Client) BuildInfo(ctx context.Context) (BuildInfoResponse, error) {
16051605
type Experiment string
16061606

16071607
const (
1608-
// ExperimentTemplateEditor is an internal experiment that enables the template editor
1609-
// for all users.
1610-
ExperimentTemplateEditor Experiment = "template_editor"
1611-
16121608
// ExperimentMoons enabled the workspace proxy endpoints and CRUD. This
16131609
// feature is not yet complete in functionality.
16141610
ExperimentMoons Experiment = "moons"
@@ -1621,7 +1617,7 @@ const (
16211617
// users to opt-in to via --experimental='*'.
16221618
// Experiments that are not ready for consumption by all users should
16231619
// not be included here and will be essentially hidden.
1624-
var ExperimentsAll = Experiments{ExperimentTemplateEditor}
1620+
var ExperimentsAll = Experiments{}
16251621

16261622
// Experiments is a list of experiments that are enabled for the deployment.
16271623
// Multiple experiments may be enabled at the same time.

‎docs/api/general.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ curl -X GET http://coder-server:8080/api/v2/experiments \
507507
> 200 Response
508508
509509
```json
510-
["template_editor"]
510+
["moons"]
511511
```
512512

513513
### Responses

‎docs/api/schemas.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2447,17 +2447,16 @@ CreateParameterRequest is a structure used to create a new parameter value for a
24472447
## codersdk.Experiment
24482448

24492449
```json
2450-
"template_editor"
2450+
"moons"
24512451
```
24522452

24532453
### Properties
24542454

24552455
#### Enumerated Values
24562456

2457-
| Value |
2458-
| ----------------- |
2459-
| `template_editor` |
2460-
| `moons` |
2457+
| Value |
2458+
| ------- |
2459+
| `moons` |
24612460

24622461
## codersdk.Feature
24632462

‎site/src/api/typesGenerated.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,8 +1309,8 @@ export const Entitlements: Entitlement[] = [
13091309
]
13101310

13111311
// From codersdk/deployment.go
1312-
export type Experiment = "moons" | "template_editor"
1313-
export const Experiments: Experiment[] = ["moons", "template_editor"]
1312+
export type Experiment = "moons"
1313+
export const Experiments: Experiment[] = ["moons"]
13141314

13151315
// From codersdk/deployment.go
13161316
export type FeatureName =

‎site/src/components/TemplateLayout/TemplateLayout.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
getTemplateVersion,
1515
} from "api/api"
1616
import { useQuery } from "@tanstack/react-query"
17-
import { useDashboard } from "components/Dashboard/DashboardProvider"
1817
import { AuthorizationRequest } from "api/typesGenerated"
1918

2019
const templatePermissions = (
@@ -72,7 +71,6 @@ export const TemplateLayout: FC<{ children?: JSX.Element }> = ({
7271
queryKey: ["template", templateName],
7372
queryFn: () => fetchTemplate(orgId, templateName),
7473
})
75-
const dashboard = useDashboard()
7674

7775
if (error) {
7876
return (
@@ -92,7 +90,6 @@ export const TemplateLayout: FC<{ children?: JSX.Element }> = ({
9290
template={data.template}
9391
activeVersion={data.activeVersion}
9492
permissions={data.permissions}
95-
canEditFiles={dashboard.experiments.includes("template_editor")}
9693
onDeleteTemplate={() => {
9794
navigate("/templates")
9895
}}

‎site/src/components/TemplateLayout/TemplatePageHeader.tsx

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ import FileCopyOutlined from "@material-ui/icons/FileCopyOutlined"
2929
const TemplateMenu: FC<{
3030
templateName: string
3131
templateVersion: string
32-
canEditFiles: boolean
3332
onDelete: () => void
34-
}> = ({ templateName, templateVersion, canEditFiles, onDelete }) => {
33+
}> = ({ templateName, templateVersion, onDelete }) => {
3534
const menuTriggerRef = useRef<HTMLButtonElement>(null)
3635
const [isMenuOpen, setIsMenuOpen] = useState(false)
3736
const navigate = useNavigate()
@@ -69,28 +68,24 @@ const TemplateMenu: FC<{
6968
<SettingsOutlined />
7069
Settings
7170
</MenuItem>
72-
{canEditFiles && (
73-
<MenuItem
74-
onClick={onMenuItemClick(() =>
75-
navigate(`/templates/new?fromTemplate=${templateName}`),
76-
)}
77-
>
78-
<FileCopyOutlined />
79-
Duplicate
80-
</MenuItem>
81-
)}
82-
{canEditFiles && (
83-
<MenuItem
84-
onClick={onMenuItemClick(() =>
85-
navigate(
86-
`/templates/${templateName}/versions/${templateVersion}/edit`,
87-
),
88-
)}
89-
>
90-
<EditOutlined />
91-
Edit files
92-
</MenuItem>
93-
)}
71+
<MenuItem
72+
onClick={onMenuItemClick(() =>
73+
navigate(`/templates/new?fromTemplate=${templateName}`),
74+
)}
75+
>
76+
<FileCopyOutlined />
77+
Duplicate
78+
</MenuItem>
79+
<MenuItem
80+
onClick={onMenuItemClick(() =>
81+
navigate(
82+
`/templates/${templateName}/versions/${templateVersion}/edit`,
83+
),
84+
)}
85+
>
86+
<EditOutlined />
87+
Edit files
88+
</MenuItem>
9489
<MenuItem onClick={onMenuItemClick(onDelete)}>
9590
<DeleteOutlined />
9691
Delete
@@ -117,15 +112,13 @@ export type TemplatePageHeaderProps = {
117112
template: Template
118113
activeVersion: TemplateVersion
119114
permissions: AuthorizationResponse
120-
canEditFiles: boolean
121115
onDeleteTemplate: () => void
122116
}
123117

124118
export const TemplatePageHeader: FC<TemplatePageHeaderProps> = ({
125119
template,
126120
activeVersion,
127121
permissions,
128-
canEditFiles,
129122
onDeleteTemplate,
130123
}) => {
131124
const hasIcon = template.icon && template.icon !== ""
@@ -142,7 +135,6 @@ export const TemplatePageHeader: FC<TemplatePageHeaderProps> = ({
142135
templateVersion={activeVersion.name}
143136
templateName={template.name}
144137
onDelete={deleteTemplate.openDeleteConfirmation}
145-
canEditFiles={canEditFiles}
146138
/>
147139
</Maybe>
148140
</>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ import { VersionsTable } from "components/VersionsTable/VersionsTable"
88
import { useState } from "react"
99
import { Helmet } from "react-helmet-async"
1010
import { getTemplatePageTitle } from "../utils"
11-
import { useDashboard } from "components/Dashboard/DashboardProvider"
1211

1312
const TemplateVersionsPage = () => {
14-
const dashboard = useDashboard()
1513
const { template, permissions } = useTemplateLayoutContext()
1614
const { data } = useQuery({
1715
queryKey: ["template", "versions", template.id],
@@ -39,9 +37,6 @@ const TemplateVersionsPage = () => {
3937
const [selectedVersionIdToPromote, setSelectedVersionIdToPromote] = useState<
4038
string | undefined
4139
>()
42-
const canPromoteVersion =
43-
dashboard.experiments.includes("template_editor") &&
44-
permissions.canUpdateTemplate
4540

4641
return (
4742
<>
@@ -51,7 +46,9 @@ const TemplateVersionsPage = () => {
5146
<VersionsTable
5247
versions={data}
5348
onPromoteClick={
54-
canPromoteVersion ? setSelectedVersionIdToPromote : undefined
49+
permissions.canUpdateTemplate
50+
? setSelectedVersionIdToPromote
51+
: undefined
5552
}
5653
activeVersionId={latestActiveVersion}
5754
/>

‎site/src/pages/TemplateVersionPage/TemplateVersionPage.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { useMachine } from "@xstate/react"
2-
import { useDashboard } from "components/Dashboard/DashboardProvider"
32
import { useOrganizationId } from "hooks/useOrganizationId"
43
import { useTab } from "hooks/useTab"
54
import { FC } from "react"
@@ -23,7 +22,6 @@ export const TemplateVersionPage: FC = () => {
2322
})
2423
const tab = useTab("file", "0")
2524
const { t } = useTranslation("templateVersionPage")
26-
const dashboard = useDashboard()
2725

2826
return (
2927
<>
@@ -38,7 +36,6 @@ export const TemplateVersionPage: FC = () => {
3836
versionName={versionName}
3937
templateName={templateName}
4038
tab={tab}
41-
canEdit={dashboard.experiments.includes("template_editor")}
4239
/>
4340
</>
4441
)

‎site/src/pages/TemplateVersionPage/TemplateVersionPageView.tsx

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export interface TemplateVersionPageViewProps {
2525
*/
2626
versionName: string
2727
templateName: string
28-
canEdit: boolean
2928
tab: UseTabResult
3029
context: TemplateVersionMachineContext
3130
}
@@ -35,7 +34,6 @@ export const TemplateVersionPageView: FC<TemplateVersionPageViewProps> = ({
3534
tab,
3635
versionName,
3736
templateName,
38-
canEdit,
3937
}) => {
4038
const { currentFiles, error, currentVersion, previousFiles } = context
4139
const { t } = useTranslation("templateVersionPage")
@@ -44,17 +42,15 @@ export const TemplateVersionPageView: FC<TemplateVersionPageViewProps> = ({
4442
<Margins>
4543
<PageHeader
4644
actions={
47-
canEdit ? (
48-
<Link
49-
underline="none"
50-
component={RouterLink}
51-
to={`/templates/${templateName}/versions/${versionName}/edit`}
52-
>
53-
<Button variant="outlined" startIcon={<EditIcon />}>
54-
Edit
55-
</Button>
56-
</Link>
57-
) : undefined
45+
<Link
46+
underline="none"
47+
component={RouterLink}
48+
to={`/templates/${templateName}/versions/${versionName}/edit`}
49+
>
50+
<Button variant="outlined" startIcon={<EditIcon />}>
51+
Edit
52+
</Button>
53+
</Link>
5854
}
5955
>
6056
<PageHeaderCaption>{t("header.caption")}</PageHeaderCaption>

‎site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ export const WorkspaceReadyPage = ({
7676
queryFn: () => getTemplateVersions(workspace.template_id),
7777
enabled: changeVersionDialogOpen,
7878
})
79-
const dashboard = useDashboard()
8079

8180
// keep banner machine in sync with workspace
8281
useEffect(() => {
@@ -137,9 +136,7 @@ export const WorkspaceReadyPage = ({
137136
builds={builds}
138137
canUpdateWorkspace={canUpdateWorkspace}
139138
canUpdateTemplate={canUpdateTemplate}
140-
canChangeVersions={
141-
canUpdateTemplate && dashboard.experiments.includes("template_editor")
142-
}
139+
canChangeVersions={canUpdateTemplate}
143140
hideSSHButton={featureVisibility["browser_only"]}
144141
hideVSCodeDesktopButton={featureVisibility["browser_only"]}
145142
workspaceErrors={{

0 commit comments

Comments
 (0)