Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

feat: add form_type error#18067

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
jaaydenh merged 1 commit intomainfromjaaydenh/error-form-type
May 27, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -156,6 +156,32 @@ export const Slider: Story = {
},
};

export const ErrorFormType: Story = {
args: {
parameter: {
...MockPreviewParameter,
form_type: "error",
type: "string",
diagnostics: [
{
severity: "error",
summary: "This is an error",
detail:
"This is a longer error message. This is a longer error message. This is a longer error message. This is a longer error message. This is a longer error message. This is a longer error message.",
extra: { code: "" },
},
{
severity: "error",
summary: "This is an error",
detail:
"This is a longer error message. This is a longer error message. This is a longer error message. This is a longer error message. This is a longer error message. This is a longer error message.",
extra: { code: "" },
},
],
},
},
};

export const Disabled: Story = {
args: {
parameter: {
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,13 @@ import {
} from "components/Tooltip/Tooltip";
import { useDebouncedValue } from "hooks/debounce";
import { useEffectEvent } from "hooks/hookPolyfills";
import { Info, LinkIcon, Settings, TriangleAlert } from "lucide-react";
import {
CircleAlert,
Info,
LinkIcon,
Settings,
TriangleAlert,
} from "lucide-react";
import { type FC, useEffect, useId, useRef, useState } from "react";
import type { AutofillBuildParameter } from "utils/richParameters";
import * as Yup from "yup";
Expand DownExpand Up@@ -89,7 +95,9 @@ export const DynamicParameter: FC<DynamicParameterProps> = ({
/>
)}
</div>
<ParameterDiagnostics diagnostics={parameter.diagnostics} />
{parameter.form_type !== "error" && (
<ParameterDiagnostics diagnostics={parameter.diagnostics} />
)}
</div>
);
};
Expand DownExpand Up@@ -508,6 +516,8 @@ const ParameterField: FC<ParameterFieldProps> = ({
<span className="w-4 font-medium">{parameter.value.value}</span>
</div>
);
case "error":
return <Diagnostics diagnostics={parameter.diagnostics} />;
}
};

Expand DownExpand Up@@ -832,3 +842,45 @@ const parameterError = (
(match) => r.get(match) || "",
);
};

interface DiagnosticsProps {
diagnostics: PreviewParameter["diagnostics"];
}

// Displays a diagnostic with a border, icon and background color
export const Diagnostics: FC<DiagnosticsProps> = ({ diagnostics }) => {
return (
<div className="flex flex-col gap-4">
{diagnostics.map((diagnostic, index) => (
<div
key={`diagnostic-${diagnostic.summary}-${index}`}
className={`text-xs font-semibold flex flex-col rounded-md border px-3.5 py-3.5 border-solid
${
diagnostic.severity === "error"
? "text-content-primary border-border-destructive bg-content-destructive/15"
: "text-content-primary border-border-warning bg-content-warning/15"
}`}
>
<div className="flex flex-row items-start">
{diagnostic.severity === "error" && (
<CircleAlert
className="me-2 inline-flex shrink-0 text-content-destructive size-icon-sm"
aria-hidden="true"
/>
)}
{diagnostic.severity === "warning" && (
<TriangleAlert
className="me-2 inline-flex shrink-0 text-content-warning size-icon-sm"
aria-hidden="true"
/>
)}
<div className="flex flex-col gap-3">
<p className="m-0">{diagnostic.summary}</p>
{diagnostic.detail && <p className="m-0">{diagnostic.detail}</p>}
</div>
</div>
</div>
))}
</div>
);
};
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,9 @@ import {
} from "components/Tooltip/Tooltip";
import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete";
import { type FormikContextType, useFormik } from "formik";
import {
ArrowLeft,
CircleAlert,
CircleHelp,
TriangleAlert,
Undo2,
} from "lucide-react";
import { ArrowLeft, CircleHelp, Undo2 } from "lucide-react";
import { useSyncFormParameters } from "modules/hooks/useSyncFormParameters";
import { Diagnostics } from "modules/workspaces/DynamicParameter/DynamicParameter";
import {
DynamicParameter,
getInitialParameterValues,
Expand DownExpand Up@@ -665,44 +660,3 @@ export const CreateWorkspacePageViewExperimental: FC<
</>
);
};

interface DiagnosticsProps {
diagnostics: PreviewParameter["diagnostics"];
}

const Diagnostics: FC<DiagnosticsProps> = ({ diagnostics }) => {
return (
<div className="flex flex-col gap-4">
{diagnostics.map((diagnostic, index) => (
<div
key={`diagnostic-${diagnostic.summary}-${index}`}
className={`text-xs font-semibold flex flex-col rounded-md border px-3.5 py-3.5 border-solid
${
diagnostic.severity === "error"
? "text-content-primary border-border-destructive bg-content-destructive/15"
: "text-content-primary border-border-warning bg-content-warning/15"
}`}
>
<div className="flex flex-row items-start">
{diagnostic.severity === "error" && (
<CircleAlert
className="me-2 inline-flex shrink-0 text-content-destructive size-icon-sm"
aria-hidden="true"
/>
)}
{diagnostic.severity === "warning" && (
<TriangleAlert
className="me-2 inline-flex shrink-0 text-content-warning size-icon-sm"
aria-hidden="true"
/>
)}
<div className="flex flex-col gap-3">
<p className="m-0">{diagnostic.summary}</p>
{diagnostic.detail && <p className="m-0">{diagnostic.detail}</p>}
</div>
</div>
</div>
))}
</div>
);
};
Loading
[8]ページ先頭
©2009-2025 Movatter.jp