Skip to content

chore(site): remove create template xservice #10112

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 17 commits into from
Oct 9, 2023
Merged

chore(site): remove create template xservice #10112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b1a0b25
Started to think on a few abstractions
BrunoQuaresma Oct 6, 2023
fca6504
Refactor loading views and duplicate template
BrunoQuaresma Oct 6, 2023
1180e8b
Show logs and build errors
BrunoQuaresma Oct 6, 2023
f6b3fd2
Fix missing parameters
BrunoQuaresma Oct 6, 2023
21ae383
Refactor DuplicateTemplateView
BrunoQuaresma Oct 6, 2023
db14220
Refactor ImportStarterTemplateView
BrunoQuaresma Oct 6, 2023
a95ed6d
Refactor upload view
BrunoQuaresma Oct 6, 2023
80ac7bf
Remove create template xservice
BrunoQuaresma Oct 6, 2023
82fd842
Merge branch 'main' of https://github.com/coder/coder into bq/refacto…
BrunoQuaresma Oct 9, 2023
be8a70e
Fix imports
BrunoQuaresma Oct 9, 2023
d3ca396
Show missed variables
BrunoQuaresma Oct 9, 2023
3d13ca6
Remove emotion warning
BrunoQuaresma Oct 9, 2023
4d4a629
Mock scroll to function
BrunoQuaresma Oct 9, 2023
5310b1b
Mock logs
BrunoQuaresma Oct 9, 2023
d1b307a
Fix one test
BrunoQuaresma Oct 9, 2023
4e2476f
Fix tests
BrunoQuaresma Oct 9, 2023
673c524
Fix storybook
BrunoQuaresma Oct 9, 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
Show missed variables
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Oct 9, 2023
commit d3ca396771a13d616ded12846712d88b7fb0380f
9 changes: 9 additions & 0 deletions site/src/pages/CreateTemplatePage/ImportStarterTemplateView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
JobError,
createTemplate,
templateExamples,
templateVersionVariables,
} from "api/queries/templates";
import { ErrorAlert } from "components/Alert/ErrorAlert";
import { useOrganizationId } from "hooks";
Expand Down Expand Up @@ -40,6 +41,13 @@ export const ImportStarterTemplateView = () => {
enabled: isJobError,
});

const missedVariables = useQuery({
...templateVersionVariables(isJobError ? createError.version.id : ""),
enabled:
isJobError &&
createError.job.error_code === "REQUIRED_TEMPLATE_VARIABLES",
});

if (isLoading) {
return <Loader />;
}
Expand All @@ -52,6 +60,7 @@ export const ImportStarterTemplateView = () => {
<CreateTemplateForm
{...formPermissions}
starterTemplate={templateExample!}
variables={missedVariables.data}
error={createTemplateMutation.error}
isSubmitting={createTemplateMutation.isLoading}
onCancel={() => navigate(-1)}
Expand Down
14 changes: 13 additions & 1 deletion site/src/pages/CreateTemplatePage/UploadTemplateView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { useQuery, useMutation } from "react-query";
import { templateVersionLogs } from "api/queries/templateVersions";
import { JobError, createTemplate } from "api/queries/templates";
import {
JobError,
createTemplate,
templateVersionVariables,
} from "api/queries/templates";
import { useOrganizationId } from "hooks";
import { useNavigate } from "react-router-dom";
import { CreateTemplateForm } from "./CreateTemplateForm";
Expand All @@ -26,9 +30,17 @@ export const UploadTemplateView = () => {
enabled: isJobError,
});

const missedVariables = useQuery({
...templateVersionVariables(isJobError ? createError.version.id : ""),
enabled:
isJobError &&
createError.job.error_code === "REQUIRED_TEMPLATE_VARIABLES",
});

return (
<CreateTemplateForm
{...formPermissions}
variables={missedVariables.data}
error={createTemplateMutation.error}
isSubmitting={createTemplateMutation.isLoading}
onCancel={() => navigate(-1)}
Expand Down