Skip to content

fix(site): Fix template version editor rename #6251

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 13 commits into from
Mar 6, 2023
Merged

fix(site): Fix template version editor rename #6251

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0d5bcdb
fix(site): Fix template version editor rename
BrunoQuaresma Feb 17, 2023
4ce0baf
Fix
BrunoQuaresma Feb 21, 2023
8da592a
Merge branch 'main' into bq/refactor-rename-feature
BrunoQuaresma Feb 22, 2023
d3c8df9
Merge branch 'main' into bq/refactor-rename-feature
BrunoQuaresma Feb 23, 2023
2bbc919
Fix file tree remove
BrunoQuaresma Feb 23, 2023
5fcdcf5
Merge branch 'main' into bq/refactor-rename-feature
BrunoQuaresma Feb 23, 2023
19d84a2
Do not allow creation of not allowed extensions
BrunoQuaresma Mar 2, 2023
c88237a
Improve error message
BrunoQuaresma Mar 2, 2023
8527242
Apply extension error to rename
BrunoQuaresma Mar 2, 2023
ab9b8da
Fix minor UI issues
BrunoQuaresma Mar 2, 2023
fb98745
Merge branch 'main' into bq/refactor-rename-feature
BrunoQuaresma Mar 2, 2023
29b984d
Fix filetree test
BrunoQuaresma Mar 2, 2023
cb15a40
Merge branch 'main' into bq/refactor-rename-feature
BrunoQuaresma Mar 6, 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
Do not allow creation of not allowed extensions
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Mar 2, 2023
commit 19d84a245896ac9c026c3b288d0159eb0260c00e
9 changes: 9 additions & 0 deletions site/src/components/TemplateVersionEditor/FileDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog"
import { Stack } from "components/Stack/Stack"
import { ChangeEvent, FC, useState } from "react"
import Typography from "@material-ui/core/Typography"
import { allowedExtensions, isAllowedFile } from "util/templateVersion"

export const CreateFileDialog: FC<{
onClose: () => void
Expand All @@ -24,6 +25,14 @@ export const CreateFileDialog: FC<{
setError("File already exists")
return
}
if (!isAllowedFile(pathValue)) {
setError(
`This is not an allowed extension. Valid extensions are: ${allowedExtensions.join(
", ",
)}.`,
)
return
}
onConfirm(pathValue)
setPathValue("")
}
Expand Down
2 changes: 1 addition & 1 deletion site/src/util/templateVersion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const getTemplateVersionFiles = async (
return files
}

const allowedExtensions = ["tf", "md", "Dockerfile"]
export const allowedExtensions = ["tf", "md", "Dockerfile"]

export const isAllowedFile = (name: string) => {
return allowedExtensions.some((ext) => name.endsWith(ext))
Expand Down