Skip to content

Commit 5eae893

Browse files
jaaydenhjaaydenh
committed
chore: cleanup
1 parent 44e1e26 commit 5eae893

File tree

6 files changed

+329
-425
lines changed

6 files changed

+329
-425
lines changed

‎site/src/modules/workspaces/DynamicParameter/DynamicParameter.tsx

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ import {
3434
} from "components/Tooltip/Tooltip";
3535
import { useDebouncedValue } from "hooks/debounce";
3636
import { useEffectEvent } from "hooks/hookPolyfills";
37-
import { Info, LinkIcon, Settings, TriangleAlert } from "lucide-react";
37+
import {
38+
CircleAlert,
39+
Info,
40+
LinkIcon,
41+
Settings,
42+
TriangleAlert,
43+
} from "lucide-react";
3844
import { type FC, useEffect, useId, useRef, useState } from "react";
3945
import type { AutofillBuildParameter } from "utils/richParameters";
4046
import * as Yup from "yup";
@@ -45,7 +51,7 @@ export interface DynamicParameterProps {
4551
onChange: (value: string) => void;
4652
disabled?: boolean;
4753
isPreset?: boolean;
48-
autofill: boolean;
54+
autofill?: boolean;
4955
}
5056

5157
export const DynamicParameter: FC<DynamicParameterProps> = ({
@@ -810,3 +816,44 @@ const parameterError = (
810816
(match) => r.get(match) || "",
811817
);
812818
};
819+
820+
interface DiagnosticsProps {
821+
diagnostics: PreviewParameter["diagnostics"];
822+
}
823+
824+
export const Diagnostics: FC<DiagnosticsProps> = ({ diagnostics }) => {
825+
return (
826+
<div className="flex flex-col gap-4">
827+
{diagnostics.map((diagnostic, index) => (
828+
<div
829+
key={`diagnostic-${diagnostic.summary}-${index}`}
830+
className={`text-xs font-semibold flex flex-col rounded-md border px-3.5 py-3.5 border-solid
831+
${
832+
diagnostic.severity === "error"
833+
? "text-content-primary border-border-destructive bg-content-destructive/15"
834+
: "text-content-primary border-border-warning bg-content-warning/15"
835+
}`}
836+
>
837+
<div className="flex flex-row items-start">
838+
{diagnostic.severity === "error" && (
839+
<CircleAlert
840+
className="me-2 inline-flex shrink-0 text-content-destructive size-icon-sm"
841+
aria-hidden="true"
842+
/>
843+
)}
844+
{diagnostic.severity === "warning" && (
845+
<TriangleAlert
846+
className="me-2 inline-flex shrink-0 text-content-warning size-icon-sm"
847+
aria-hidden="true"
848+
/>
849+
)}
850+
<div className="flex flex-col gap-3">
851+
<p className="m-0">{diagnostic.summary}</p>
852+
{diagnostic.detail && <p className="m-0">{diagnostic.detail}</p>}
853+
</div>
854+
</div>
855+
</div>
856+
))}
857+
</div>
858+
);
859+
};

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ import { Spinner } from "components/Spinner/Spinner";
1919
import { Switch } from "components/Switch/Switch";
2020
import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete";
2121
import { type FormikContextType, useFormik } from "formik";
22-
import { ArrowLeft, CircleAlert, TriangleAlert } from "lucide-react";
22+
import { ArrowLeft } from "lucide-react";
2323
import { useSyncFormParameters } from "modules/hooks/useSyncFormParameters";
2424
import {
25+
Diagnostics,
2526
DynamicParameter,
2627
getInitialParameterValues,
2728
useValidationSchemaForDynamicParameters,
@@ -616,44 +617,3 @@ export const CreateWorkspacePageViewExperimental: FC<
616617
</>
617618
);
618619
};
619-
620-
interface DiagnosticsProps {
621-
diagnostics: PreviewParameter["diagnostics"];
622-
}
623-
624-
const Diagnostics: FC<DiagnosticsProps> = ({ diagnostics }) => {
625-
return (
626-
<div className="flex flex-col gap-4">
627-
{diagnostics.map((diagnostic, index) => (
628-
<div
629-
key={`diagnostic-${diagnostic.summary}-${index}`}
630-
className={`text-xs font-semibold flex flex-col rounded-md border px-3.5 py-3.5 border-solid
631-
${
632-
diagnostic.severity === "error"
633-
? "text-content-primary border-border-destructive bg-content-destructive/15"
634-
: "text-content-primary border-border-warning bg-content-warning/15"
635-
}`}
636-
>
637-
<div className="flex flex-row items-start">
638-
{diagnostic.severity === "error" && (
639-
<CircleAlert
640-
className="me-2 inline-flex shrink-0 text-content-destructive size-icon-sm"
641-
aria-hidden="true"
642-
/>
643-
)}
644-
{diagnostic.severity === "warning" && (
645-
<TriangleAlert
646-
className="me-2 inline-flex shrink-0 text-content-warning size-icon-sm"
647-
aria-hidden="true"
648-
/>
649-
)}
650-
<div className="flex flex-col gap-3">
651-
<p className="m-0">{diagnostic.summary}</p>
652-
{diagnostic.detail && <p className="m-0">{diagnostic.detail}</p>}
653-
</div>
654-
</div>
655-
</div>
656-
))}
657-
</div>
658-
);
659-
};

‎site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedExperimentRouter.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ import TemplateEmbedPageExperimental from "./TemplateEmbedPageExperimental";
55

66
// Similar context as in CreateWorkspaceExperimentRouter for maintaining consistency
77
export const ExperimentalFormContext = createContext<
8-
{ toggleOptedOut: () => void } | undefined
8+
{ toggleOptedOut: () => void } | undefined
99
>(undefined);
1010

1111
const TemplateEmbedExperimentRouter: FC = () => {
12-
const { experiments } = useDashboard();
13-
const dynamicParametersEnabled = experiments.includes("dynamic-parameters");
12+
const { experiments } = useDashboard();
13+
const dynamicParametersEnabled = experiments.includes("dynamic-parameters");
1414

15-
if (dynamicParametersEnabled) {
16-
return <TemplateEmbedPageExperimental />;
17-
}
15+
if (dynamicParametersEnabled) {
16+
return <TemplateEmbedPageExperimental />;
17+
}
1818

19-
return <TemplateEmbedPage />;
19+
return <TemplateEmbedPage />;
2020
};
2121

22-
export default TemplateEmbedExperimentRouter;
22+
export default TemplateEmbedExperimentRouter;

0 commit comments

Comments
 (0)