Merge branch 'main' into 7154-basic-test-scenario

coder · mtojek · Apr 19, 2023 · Apr 19, 2023 · Apr 19, 2023 · Apr 20, 2023
commit b09d9ebd0ebe05bc5fbb7a059939591d7b8b9718
diff --git a/site/e2e/pom/CreateTemplatePage.ts b/site/e2e/pom/CreateTemplatePage.ts
@@ -21,7 +21,7 @@ export class CreateTemplatePage extends BasePom {
 
   async submitForm() {
     await this.createTemplateForm
-      .getByTestId("form-template-upload")
+      .getByTestId("file-upload")
       .setInputFiles("./e2e/testdata/docker.tar")
     await this.createTemplateForm.getByLabel("Name *").fill("my-first-template")
     await this.createTemplateForm

diff --git a/site/src/components/FileUpload/FileUpload.tsx b/site/src/components/FileUpload/FileUpload.tsx
@@ -120,6 +120,7 @@ export const FileUpload: FC<FileUploadProps> = ({
         ref={inputRef}
         className={styles.input}
         accept={extension}
+        data-testid="file-upload"
         onChange={(event) => {
           const file = event.currentTarget.files?.[0]
           if (file) {

diff --git a/site/src/components/Resources/AgentVersion.tsx b/site/src/components/Resources/AgentVersion.tsx
@@ -16,7 +16,7 @@ export const AgentVersion: FC<{
   const { outdated } = getDisplayVersionStatus(agent.version, serverVersion)
 
   if (!outdated) {
-    return <span data-testid="agent-version">{displayVersion}</span>
+    return <span data-testid="agent-version">Updated</span>
   }
 
   return (

diff --git a/site/src/pages/CreateTemplatePage/TemplateUpload.tsx b/site/src/pages/CreateTemplatePage/TemplateUpload.tsx
@@ -21,52 +21,13 @@ export const TemplateUpload: FC<TemplateUploadProps> = ({
 
   const description = (
     <>
-      <div
-        className={combineClasses({
-          [styles.root]: true,
-          [styles.disabled]: isUploading,
-        })}
-        {...clickable}
-        {...tarDrop}
-      >
-        <Stack alignItems="center" spacing={1}>
-          {isUploading ? (
-            <CircularProgress size={32} />
-          ) : (
-            <UploadIcon className={styles.icon} />
-          )}
-
-          <Stack alignItems="center" spacing={0.5}>
-            <span className={styles.title}>{t("form.upload.title")}</span>
-            <span className={styles.description}>
-              The template has to be a .tar file. You can also use our{" "}
-              <Link
-                component={RouterLink}
-                to="/starter-templates"
-                // Prevent trigger the upload
-                onClick={(e) => {
-                  e.stopPropagation()
-                }}
-              >
-                starter templates
-              </Link>{" "}
-              to getting started with Coder.
-            </span>
-          </Stack>
-        </Stack>
-      </div>
-
-      <input
-        type="file"
-        ref={inputRef}
-        className={styles.input}
-        accept=".tar"
-        data-testid="form-template-upload"
-        onChange={(event) => {
-          const file = event.currentTarget.files?.[0]
-          if (file) {
-            onUpload(file)
-          }
+      The template has to be a .tar file. You can also use our{" "}
+      <Link
+        component={RouterLink}
+        to="/starter-templates"
+        // Prevent trigger the upload
+        onClick={(e) => {
+          e.stopPropagation()
         }}
       >
         starter templates

diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -162,10 +162,76 @@ export const CreateWorkspacePageView: FC<
 
   return (
     <FullPageHorizontalForm title="New workspace" onCancel={props.onCancel}>
+<<<<<<< HEAD
       <HorizontalForm
         onSubmit={form.handleSubmit}
         data-testid="form-create-workspace"
       >
+=======
+      <HorizontalForm onSubmit={form.handleSubmit}>
+        {Boolean(props.hasTemplateErrors) && (
+          <Stack>
+            {Boolean(
+              props.createWorkspaceErrors[
+                CreateWorkspaceErrors.GET_TEMPLATES_ERROR
+              ],
+            ) && (
+              <AlertBanner
+                severity="error"
+                error={
+                  props.createWorkspaceErrors[
+                    CreateWorkspaceErrors.GET_TEMPLATES_ERROR
+                  ]
+                }
+              />
+            )}
+            {Boolean(
+              props.createWorkspaceErrors[
+                CreateWorkspaceErrors.GET_TEMPLATE_SCHEMA_ERROR
+              ],
+            ) && (
+              <AlertBanner
+                severity="error"
+                error={
+                  props.createWorkspaceErrors[
+                    CreateWorkspaceErrors.GET_TEMPLATE_SCHEMA_ERROR
+                  ]
+                }
+              />
+            )}
+            {Boolean(
+              props.createWorkspaceErrors[
+                CreateWorkspaceErrors.GET_TEMPLATE_GITAUTH_ERROR
+              ],
+            ) && (
+              <AlertBanner
+                severity="error"
+                error={
+                  props.createWorkspaceErrors[
+                    CreateWorkspaceErrors.GET_TEMPLATE_GITAUTH_ERROR
+                  ]
+                }
+              />
+            )}
+          </Stack>
+        )}
+
+        {Boolean(
+          props.createWorkspaceErrors[
+            CreateWorkspaceErrors.CREATE_WORKSPACE_ERROR
+          ],
+        ) && (
+          <AlertBanner
+            severity="error"
+            error={
+              props.createWorkspaceErrors[
+                CreateWorkspaceErrors.CREATE_WORKSPACE_ERROR
+              ]
+            }
+          />
+        )}
+
+>>>>>>> main
         {/* General info */}
         <FormSection
           title="General info"