Skip to content

feat(site): allow any file extension on template editor #12000

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 20 commits into from
Feb 7, 2024
Merged

feat(site): allow any file extension on template editor #12000

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4635cbd
Display all files in the editor
BrunoQuaresma Feb 2, 2024
541c953
Adjust group padding
BrunoQuaresma Feb 2, 2024
1785b90
Show error for unsupported files
BrunoQuaresma Feb 2, 2024
9653fc7
Save version on URL even when building
BrunoQuaresma Feb 2, 2024
ce75edd
Remove unecessary state
BrunoQuaresma Feb 2, 2024
4403a18
Keep user navigation from URL
BrunoQuaresma Feb 2, 2024
3957240
Merge branch 'main' of https://github.com/coder/coder into bq/templat…
BrunoQuaresma Feb 5, 2024
a418467
Show stack files
BrunoQuaresma Feb 5, 2024
0c72ecc
Remove unecessary imports
BrunoQuaresma Feb 5, 2024
2353ea9
Add file tree on template files
BrunoQuaresma Feb 5, 2024
0c2ffc9
Add edit button
BrunoQuaresma Feb 5, 2024
98aa054
Use same editor bg
BrunoQuaresma Feb 5, 2024
8508e69
Add storybook for visual testing
BrunoQuaresma Feb 6, 2024
94775b1
Fix tests
BrunoQuaresma Feb 6, 2024
4593f0e
Fix test
BrunoQuaresma Feb 6, 2024
1a7ef6d
Merge branch 'main' of https://github.com/coder/coder into bq/templat…
BrunoQuaresma Feb 7, 2024
955bced
wip: group empty folders
BrunoQuaresma Feb 7, 2024
bfdabb3
Group empty folders + remove contextual actions if there is any
BrunoQuaresma Feb 7, 2024
469a35c
Grey out hidden files
BrunoQuaresma Feb 7, 2024
9a95846
Fix storybook
BrunoQuaresma Feb 7, 2024
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
wip: group empty folders
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Feb 7, 2024
commit 955bced3a64f90c3df497640f261998c0c1add63
17 changes: 17 additions & 0 deletions site/src/modules/templates/TemplateFiles/TemplateFileTree.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,20 @@ export const NestedOpen: Story = {
activePath: "folder/nested.tf",
},
};

export const GroupEmptyFolders: Story = {
args: {
fileTree: {
"main.tf": "resource aws_instance my_instance {}",
"variables.tf": "variable my_var {}",
"outputs.tf": "output my_output {}",
folder: {
"other-folder": {
another: {
"nested.tf": "resource aws_instance my_instance {}",
},
},
},
},
},
};
21 changes: 17 additions & 4 deletions site/src/modules/templates/TemplateFiles/TemplateFileTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,23 @@ export const TemplateFileTree: FC<TemplateFilesTreeProps> = ({
Label,
}) => {
const [contextMenu, setContextMenu] = useState<ContextMenu | undefined>();

const isFolder = (content?: FileTree | string): content is FileTree =>
typeof content === "object";

const buildTreeItems = (
filename: string,
content?: FileTree | string,
parentPath?: string,
): JSX.Element => {
const currentPath = parentPath ? `${parentPath}/${filename}` : filename;
const isFolder = typeof content === "object";
let icon: JSX.Element | null = isFolder ? null : (
// Used to group empty folders in one single label like VSCode does
const shouldGroupFolderLabel =
isFolder(content) &&
Object.keys(content).length === 1 &&
isFolder(Object.keys(content)[0]);

let icon: JSX.Element | null = isFolder(content) ? null : (
<FormatAlignLeftOutlined />
);

Expand All @@ -73,7 +82,11 @@ export const TemplateFileTree: FC<TemplateFilesTreeProps> = ({
key={currentPath}
label={
Label ? (
<Label path={currentPath} filename={filename} isFolder={isFolder} />
<Label
path={currentPath}
filename={filename}
isFolder={isFolder(content)}
/>
) : (
filename
)
Expand Down Expand Up @@ -143,7 +156,7 @@ export const TemplateFileTree: FC<TemplateFilesTreeProps> = ({
} as CSSProperties
}
>
{isFolder &&
{isFolder(content) &&
Object.keys(content)
.sort(sortFileTree(content))
.map((filename) => {
Expand Down