Skip to content

feat: add template editor to the ui #5963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Feb 7, 2023
Merged

feat: add template editor to the ui #5963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
564d40e
Add initial editor
kylecarbs Feb 1, 2023
6986531
Fix editor file being reset onChange
kylecarbs Feb 1, 2023
b149c08
Add updating the active build version
kylecarbs Feb 1, 2023
a78837b
Update nav height
kylecarbs Feb 1, 2023
5a6f871
Add tabs
kylecarbs Feb 1, 2023
191e2f0
Fix title
kylecarbs Feb 1, 2023
78e35d6
Hide timestamps in build logs
kylecarbs Feb 1, 2023
15e0a06
Add create file dialog
kylecarbs Feb 1, 2023
566561f
Add validation for empty path
kylecarbs Feb 2, 2023
03abb15
Hide resources tab
kylecarbs Feb 2, 2023
5368132
Fix label names
kylecarbs Feb 2, 2023
cbab7f2
Merge branch 'main' into templateeditor
kylecarbs Feb 3, 2023
3f152cd
Add rename and delete
kylecarbs Feb 5, 2023
a315d78
Improve UX
kylecarbs Feb 5, 2023
aad213b
Add padding to the editor
kylecarbs Feb 5, 2023
97e5496
Add dirty state
kylecarbs Feb 5, 2023
65c8757
Hide build logs until a build is made
kylecarbs Feb 6, 2023
33ffd77
Add stories
kylecarbs Feb 7, 2023
0d03b92
Add experiment to enable the template editor
kylecarbs Feb 7, 2023
4cbd69b
Fix linting errors
kylecarbs Feb 7, 2023
b87ec5d
Fix duplicate fields
kylecarbs Feb 7, 2023
8440b44
Fix theme type
kylecarbs Feb 7, 2023
eef8a18
Merge branch 'main' into templateeditor
kylecarbs Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix duplicate fields
  • Loading branch information
@kylecarbs
kylecarbs committed Feb 7, 2023
commit b87ec5d2bb3124b90a60d057167a3b62db737785
6 changes: 3 additions & 3 deletions site/src/components/TemplateVersionEditor/TemplateVersionEditor.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ export default {
},
}

const Template: Story<TemplateVersionEditorProps> = (args: TemplateVersionEditorProps) => (
<TemplateVersionEditor {...args} />
)
const Template: Story<TemplateVersionEditorProps> = (
args: TemplateVersionEditorProps,
) => <TemplateVersionEditor {...args} />

export const Example = Template.bind({})
Example.args = {
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const WorkspaceBuildLogs: FC<WorkspaceBuildLogsProps> = ({
}) => {
const groupedLogsByStage = groupLogsByStage(logs)
const stages = Object.keys(groupedLogsByStage)
const styles = useStyles({ templateEditorPane })
const styles = useStyles({ templateEditorPane: Boolean(templateEditorPane) })

return (
<div className={styles.logs}>
Expand Down
1 change: 0 additions & 1 deletion site/src/xServices/templateVersion/templateVersionXService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export interface TemplateVersionMachineContext {
orgId: string
templateName: string
versionName: string
templateName: string
template?: Template
currentVersion?: TemplateVersion
currentFiles?: TemplateVersionFiles
Expand Down