LLM-Driven Extraction of Unstructured Data — Built for API Deployments & ETL Pipeline Workflows
Python ai-agentsdata-engineeringdocument-aigenerative-aiidpjson-extractionllmmcp-serverocrpdf-extractionprompt-engineeringstructured-output
FEAT: Support Markdown Rendering (#871)
Tahier Hussaina3651e636550
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsxindex 9fbf63bee..734be4ad7 100644--- a/frontend/src/App.jsx+++ b/frontend/src/App.jsx@@ -7,6 +7,7 @@ import { useAlertStore } from "./store/alert-store.js";import { useSessionStore } from "./store/session-store.js";import PostHogPageviewTracker from "./PostHogPageviewTracker.js";import { useEffect } from "react";+import CustomMarkdown from "./components/helpers/custom-markdown/CustomMarkdown.jsx";let GoogleTagManagerHelper;try {@@ -46,7 +47,7 @@ function App() {notificationAPI.open({message: alertDetails?.title,- description: alertDetails?.content,+ description: <CustomMarkdown text={alertDetails?.content} />,type: alertDetails?.type,duration: alertDetails?.duration,btn,diff --git a/frontend/src/components/agency/display-logs/DisplayLogs.jsx b/frontend/src/components/agency/display-logs/DisplayLogs.jsxindex 93cb7aca7..de456743a 100644--- a/frontend/src/components/agency/display-logs/DisplayLogs.jsx+++ b/frontend/src/components/agency/display-logs/DisplayLogs.jsx@@ -3,6 +3,7 @@ import { Col, Row, Typography } from "antd";import "./DisplayLogs.css";import { useSocketLogsStore } from "../../../store/socket-logs-store";+import CustomMarkdown from "../../helpers/custom-markdown/CustomMarkdown";function DisplayLogs() {const bottomRef = useRef(null);@@ -37,9 +38,10 @@ function DisplayLogs() {</Typography></Col><Col span={8}>- <Typography className="display-logs-col">- {log?.message}- </Typography>+ <CustomMarkdown+ text={log?.message}+ styleClassName="display-logs-col"+ /></Col><Col span={2}><Typography className="display-logs-col">diff --git a/frontend/src/components/custom-tools/display-logs/DisplayLogs.jsx b/frontend/src/components/custom-tools/display-logs/DisplayLogs.jsxindex f0f6b7bd0..1fa43cc0a 100644--- a/frontend/src/components/custom-tools/display-logs/DisplayLogs.jsx+++ b/frontend/src/components/custom-tools/display-logs/DisplayLogs.jsx@@ -4,6 +4,7 @@ import { Col, Row, Typography } from "antd";import "../../agency/display-logs/DisplayLogs.css";import { useSocketCustomToolStore } from "../../../store/socket-custom-tool";import { getDateTimeString } from "../../../helpers/GetStaticData";+import CustomMarkdown from "../../helpers/custom-markdown/CustomMarkdown";function DisplayLogs() {const bottomRef = useRef(null);@@ -48,9 +49,10 @@ function DisplayLogs() {</Typography></Col><Col span={8}>- <Typography className="display-logs-col">- {message?.message}- </Typography>+ <CustomMarkdown+ text={message?.message}+ styleClassName="display-logs-col"+ /></Col></Row><div ref={bottomRef} />diff --git a/frontend/src/components/helpers/custom-markdown/CustomMarkdown.jsx b/frontend/src/components/helpers/custom-markdown/CustomMarkdown.jsxnew file mode 100644index 000000000..173d60a6e--- /dev/null+++ b/frontend/src/components/helpers/custom-markdown/CustomMarkdown.jsx@@ -0,0 +1,112 @@+import { useMemo } from "react";+import { Typography } from "antd";+import PropTypes from "prop-types";++const { Text, Link, Paragraph } = Typography;++const CustomMarkdown = ({+ text = "",+ renderNewLines = true,+ isSecondary = false,+ styleClassName,+}) => {+ const textType = isSecondary ? "secondary" : undefined;++ /*+ Patterns with bounded quantifiers to prevent performance issues:+ - Triple code: ```...```+ - Inline code: `...`+ - Bold: **...**+ - Link: [text](url)+ - New line: \n+ */+ const patterns = [+ { type: "tripleCode", regex: /```([^`]{1,1000})```/g },+ { type: "inlineCode", regex: /`([^`]{1,100})`/g },+ { type: "bold", regex: /\*\*([^*]{1,100})\*\*/g },+ { type: "link", regex: /\[([^\]]{1,100})\]\(([^)]{1,200})\)/g },+ { type: "newline", regex: /\n/g },+ ];++ const renderToken = (type, content, url) => {+ switch (type) {+ case "tripleCode":+ return (+ <Paragraph style={{ margin: 0 }}>+ <pre style={{ margin: 0 }}>{content}</pre>+ </Paragraph>+ );+ case "inlineCode":+ return (+ <Text code type={textType}>+ {content}+ </Text>+ );+ case "bold":+ return (+ <Text strong type={textType}>+ {content}+ </Text>+ );+ case "link":+ return (+ <Link href={url} target="_blank" rel="noopener noreferrer">+ {content}+ </Link>+ );+ case "newline":+ return renderNewLines ? <br /> : "\n";+ default:+ return content;+ }+ };++ const content = useMemo(() => {+ let elements = [text];++ // Process each pattern sequentially+ patterns.forEach(({ type, regex }) => {+ const newElements = [];+ elements.forEach((element) => {+ if (typeof element !== "string") {+ newElements.push(element);+ return;+ }++ let lastIndex = 0;+ let match;+ while ((match = regex.exec(element)) !== null) {+ const matchIndex = match.index;+ if (matchIndex > lastIndex) {+ newElements.push(element.substring(lastIndex, matchIndex));+ }+ const url = match[2]; // Relevant only for link+ newElements.push(renderToken(type, match[1], url));+ lastIndex = matchIndex + match[0].length;+ }++ if (lastIndex < element.length) {+ newElements.push(element.substring(lastIndex));+ }+ });+ elements = newElements;+ });++ return elements;+ }, [text, renderNewLines, textType]);++ return (+ <Text type={textType} className={styleClassName}>+ {content}+ </Text>+ );+};++CustomMarkdown.propTypes = {+ text: PropTypes.string,+ renderNewLines: PropTypes.bool,+ isSecondary: PropTypes.bool,+ styleClassName: PropTypes.string,+};++export default CustomMarkdown;diff --git a/frontend/src/components/pipelines-or-deployments/log-modal/LogsModal.jsx b/frontend/src/components/pipelines-or-deployments/log-modal/LogsModal.jsxindex a41f9e041..27f3e5b64 100644--- a/frontend/src/components/pipelines-or-deployments/log-modal/LogsModal.jsx+++ b/frontend/src/components/pipelines-or-deployments/log-modal/LogsModal.jsx@@ -7,6 +7,7 @@ import { useAxiosPrivate } from "../../../hooks/useAxiosPrivate.js";import { useAlertStore } from "../../../store/alert-store.js";import { useExceptionHandler } from "../../../hooks/useExceptionHandler.jsx";import "./LogsModel.css";+import CustomMarkdown from "../../helpers/custom-markdown/CustomMarkdown.jsx";const LogsModal = ({open,@@ -38,16 +39,16 @@ const LogsModal = ({};axiosPrivate(requestOptions).then((res) => {- const logDetails = res.data.results.map((item) => ({- id: item.id,- log: item.data?.log,- type: item.data?.type,- stage: item.data?.stage,- level: item.data?.level,- event_time: item.event_time,+ const logDetails = res?.data?.results?.map((item) => ({+ id: item?.id,+ log: <CustomMarkdown text={item?.data?.log} />,+ type: item?.data?.type,+ stage: item?.data?.stage,+ level: item?.data?.level,+ event_time: item?.event_time,}));setLogDetails(logDetails);- setTotalCount(res.data.count);+ setTotalCount(res?.data?.count);}).catch((err) => {setAlertDetails(handleException(err));@@ -74,7 +75,7 @@ const LogsModal = ({return (<Buttontype="link"- onClick={() => handleLogIdClick(record.execution_id)}+ onClick={() => handleLogIdClick(record?.execution_id)}>{text}</Button>@@ -85,7 +86,7 @@ const LogsModal = ({title: "Status",dataIndex: "status",key: "status",- render: (level) => <span className={level.toLowerCase()}>{level}</span>,+ render: (level) => <span className={level?.toLowerCase()}>{level}</span>,},];@@ -104,7 +105,7 @@ const LogsModal = ({title: "Log Level",dataIndex: "level",key: "level",- render: (level) => <span className={level.toLowerCase()}>{level}</span>,+ render: (level) => <span className={level?.toLowerCase()}>{level}</span>,},{title: "Log",@@ -112,6 +113,7 @@ const LogsModal = ({key: "log",},];+return (<><Modaldiff --git a/frontend/src/components/rjsf-custom-widgets/alt-date-time-widget/AltDateTimeWidget.jsx b/frontend/src/components/rjsf-custom-widgets/alt-date-time-widget/AltDateTimeWidget.jsxindex 59f52c4b4..25112fa3b 100644--- a/frontend/src/components/rjsf-custom-widgets/alt-date-time-widget/AltDateTimeWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/alt-date-time-widget/AltDateTimeWidget.jsx@@ -4,7 +4,15 @@ import PropTypes from "prop-types";import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx";-const AltDateTimeWidget = ({ id, value, onChange, label, required }) => {+const AltDateTimeWidget = ({+ id,+ value,+ onChange,+ label,+ schema,+ required,+}) => {+ const description = schema?.description || "";const handleDateChange = (date) => {onChange(date?.toISOString());};@@ -17,7 +25,11 @@ const AltDateTimeWidget = ({ id, value, onChange, label, required }) => {};return (- <RjsfWidgetLayout label={label} required={required}>+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}+ ><DatePickerid={id}value={value ? moment(value) : null}@@ -36,6 +48,7 @@ AltDateTimeWidget.propTypes = {value: PropTypes.string,onChange: PropTypes.func.isRequired,label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,required: PropTypes.bool,};diff --git a/frontend/src/components/rjsf-custom-widgets/alt-date-widget/AltDateWidget.jsx b/frontend/src/components/rjsf-custom-widgets/alt-date-widget/AltDateWidget.jsxindex d1843ab50..7c996c060 100644--- a/frontend/src/components/rjsf-custom-widgets/alt-date-widget/AltDateWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/alt-date-widget/AltDateWidget.jsx@@ -4,13 +4,19 @@ import PropTypes from "prop-types";import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx";-const AltDateWidget = ({ id, value, onChange, label, required }) => {+const AltDateWidget = ({ id, value, onChange, label, schema, required }) => {+ const description = schema?.description || "";+const handleDateChange = (date) => {onChange(date?.toISOString());};return (- <RjsfWidgetLayout label={label} required={required}>+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}+ ><DatePickerid={id}value={value ? moment(value) : null}@@ -25,6 +31,7 @@ AltDateWidget.propTypes = {value: PropTypes.string,onChange: PropTypes.func.isRequired,label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,required: PropTypes.bool,};diff --git a/frontend/src/components/rjsf-custom-widgets/checkbox-widget/CheckboxWidget.jsx b/frontend/src/components/rjsf-custom-widgets/checkbox-widget/CheckboxWidget.jsxindex de5a9c4dd..4ea6ba0b1 100644--- a/frontend/src/components/rjsf-custom-widgets/checkbox-widget/CheckboxWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/checkbox-widget/CheckboxWidget.jsx@@ -1,22 +1,27 @@-import { QuestionCircleOutlined } from "@ant-design/icons";-import { Checkbox, Space, Tooltip, Typography } from "antd";+import { Checkbox, Space, Typography } from "antd";import PropTypes from "prop-types";import "./CheckboxWidget.css";-const CheckboxWidget = ({ id, value, onChange, label, schema }) => {+import CustomMarkdown from "../../helpers/custom-markdown/CustomMarkdown";+const CheckboxWidget = ({ id, value, onChange, label, schema, required }) => {const description = schema?.description || "";const handleCheckboxChange = (event) => {onChange(event.target.checked);};return (- <Space className="checkbox-widget-main">+ <Space direction="vertical" className="checkbox-widget-main" size={0}><Checkbox id={id} checked={value} onChange={handleCheckboxChange}>- <Typography>{label}</Typography>+ <Typography>+ {required && <span className="form-item-required">* </span>}+ {label}+ </Typography></Checkbox>{description?.length > 0 && (- <Tooltip title={description}>- <QuestionCircleOutlined className="checkbox-widget-info-icon" />- </Tooltip>+ <CustomMarkdown+ text={description}+ isSecondary={true}+ styleClassName="rjsf-helper-font"+ />)}</Space>);@@ -28,6 +33,7 @@ CheckboxWidget.propTypes = {onChange: PropTypes.func.isRequired,label: PropTypes.string.isRequired,schema: PropTypes.object.isRequired,+ required: PropTypes.bool,};export { CheckboxWidget };diff --git a/frontend/src/components/rjsf-custom-widgets/checkboxes-widget/CheckboxesWidget.jsx b/frontend/src/components/rjsf-custom-widgets/checkboxes-widget/CheckboxesWidget.jsxindex 18f11651a..76fbf0873 100644--- a/frontend/src/components/rjsf-custom-widgets/checkboxes-widget/CheckboxesWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/checkboxes-widget/CheckboxesWidget.jsx@@ -3,7 +3,16 @@ import { Checkbox } from "antd";import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx";-const CheckboxesWidget = ({ id, options, value, onChange, label }) => {+const CheckboxesWidget = ({+ id,+ options,+ value,+ onChange,+ label,+ schema,+ required,+}) => {+ const description = schema?.description || "";const handleCheckboxChange = (optionValue) => {const newValue = [...(value || [])];const index = newValue.indexOf(optionValue);@@ -16,7 +25,11 @@ const CheckboxesWidget = ({ id, options, value, onChange, label }) => {};return (- <RjsfWidgetLayout label={label}>+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}+ >{options.map((option) => (<Checkboxkey={option.value}@@ -36,6 +49,8 @@ CheckboxesWidget.propTypes = {value: PropTypes.array,onChange: PropTypes.func.isRequired,label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,+ required: PropTypes.bool,};export { CheckboxesWidget };diff --git a/frontend/src/components/rjsf-custom-widgets/color-widget/ColorWidget.jsx b/frontend/src/components/rjsf-custom-widgets/color-widget/ColorWidget.jsxindex baa3f3aaf..d6a1b4750 100644--- a/frontend/src/components/rjsf-custom-widgets/color-widget/ColorWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/color-widget/ColorWidget.jsx@@ -3,13 +3,19 @@ import { Input } from "antd";import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx";-const ColorWidget = ({ id, value, onChange, label }) => {+const ColorWidget = ({ id, value, onChange, schema, label, required }) => {+ const description = schema?.description || "";+const handleColorChange = (event) => {onChange(event.target.value);};return (- <RjsfWidgetLayout label={label}>+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}+ ><Input type="color" id={id} value={value} onChange={handleColorChange} /></RjsfWidgetLayout>);@@ -19,7 +25,9 @@ ColorWidget.propTypes = {id: PropTypes.string.isRequired,value: PropTypes.string,onChange: PropTypes.func.isRequired,+ schema: PropTypes.object.isRequired,label: PropTypes.string.isRequired,+ required: PropTypes.bool,};export { ColorWidget };diff --git a/frontend/src/components/rjsf-custom-widgets/date-time-widget/DateTimeWidget.jsx b/frontend/src/components/rjsf-custom-widgets/date-time-widget/DateTimeWidget.jsxindex 218988cf1..a3b2df307 100644--- a/frontend/src/components/rjsf-custom-widgets/date-time-widget/DateTimeWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/date-time-widget/DateTimeWidget.jsx@@ -4,13 +4,18 @@ import PropTypes from "prop-types";import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx";-const DateTimeWidget = ({ id, value, onChange, label, required }) => {+const DateTimeWidget = ({ id, value, onChange, label, schema, required }) => {+ const description = schema?.description || "";const handleDateTimeChange = (dateTime) => {onChange(dateTime?.toISOString());};return (- <RjsfWidgetLayout label={label} required={required}>+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}+ ><DatePickershowTimeid={id}@@ -26,6 +31,7 @@ DateTimeWidget.propTypes = {value: PropTypes.string,onChange: PropTypes.func.isRequired,label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,required: PropTypes.bool,};diff --git a/frontend/src/components/rjsf-custom-widgets/date-widget/DateWidget.jsx b/frontend/src/components/rjsf-custom-widgets/date-widget/DateWidget.jsxindex cc756073d..06ea0a494 100644--- a/frontend/src/components/rjsf-custom-widgets/date-widget/DateWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/date-widget/DateWidget.jsx@@ -4,13 +4,18 @@ import PropTypes from "prop-types";import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx";-const DateWidget = ({ id, value, onChange, label, required }) => {+const DateWidget = ({ id, value, onChange, label, schema, required }) => {+ const description = schema?.description || "";const handleDateChange = (date) => {onChange(date?.toISOString());};return (- <RjsfWidgetLayout label={label} required={required}>+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}+ ><DatePickerid={id}value={value ? moment(value) : null}@@ -25,6 +30,7 @@ DateWidget.propTypes = {value: PropTypes.string,onChange: PropTypes.func.isRequired,label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,required: PropTypes.bool,};diff --git a/frontend/src/components/rjsf-custom-widgets/email-widget/EmailWidget.jsx b/frontend/src/components/rjsf-custom-widgets/email-widget/EmailWidget.jsxindex 7268e28cf..711cb0b5d 100644--- a/frontend/src/components/rjsf-custom-widgets/email-widget/EmailWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/email-widget/EmailWidget.jsx@@ -3,13 +3,18 @@ import PropTypes from "prop-types";import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx";-const EmailWidget = ({ id, value, onChange, label, required }) => {+const EmailWidget = ({ id, value, onChange, label, schema, required }) => {+ const description = schema?.description || "";const handleEmailChange = (event) => {onChange(event.target.value);};return (- <RjsfWidgetLayout label={label} required={required}>+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}+ ><Input type="email" id={id} value={value} onChange={handleEmailChange} /></RjsfWidgetLayout>);@@ -20,6 +25,7 @@ EmailWidget.propTypes = {value: PropTypes.string,onChange: PropTypes.func.isRequired,label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,required: PropTypes.bool,};diff --git a/frontend/src/components/rjsf-custom-widgets/file-widget/FileWidget.jsx b/frontend/src/components/rjsf-custom-widgets/file-widget/FileWidget.jsxindex 4ba89d1a6..4a43ed121 100644--- a/frontend/src/components/rjsf-custom-widgets/file-widget/FileWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/file-widget/FileWidget.jsx@@ -4,7 +4,8 @@ import PropTypes from "prop-types";import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx";-const FileWidget = ({ id, onChange, label, required }) => {+const FileWidget = ({ id, onChange, label, schema, required }) => {+ const description = schema?.description || "";const handleFileChange = (info) => {if (info.file.status === "done") {const fileUrl = info.file.response.url; // Assuming the response contains the uploaded file URL@@ -13,7 +14,11 @@ const FileWidget = ({ id, onChange, label, required }) => {};return (- <RjsfWidgetLayout label={label} required={required}>+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}+ ><Upload id={id} onChange={handleFileChange}><Button icon={<UploadOutlined />}>Upload File</Button></Upload>@@ -25,6 +30,7 @@ FileWidget.propTypes = {id: PropTypes.string.isRequired,onChange: PropTypes.func.isRequired,label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,required: PropTypes.bool,};diff --git a/frontend/src/components/rjsf-custom-widgets/select-widget/SelectWidget.jsx b/frontend/src/components/rjsf-custom-widgets/select-widget/SelectWidget.jsxindex 8b6846591..49af88ee7 100644--- a/frontend/src/components/rjsf-custom-widgets/select-widget/SelectWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/select-widget/SelectWidget.jsx@@ -1,27 +1,44 @@-import { Form, Select } from "antd";+import { Form, Select, Space, Typography } from "antd";import PropTypes from "prop-types";+import CustomMarkdown from "../../helpers/custom-markdown/CustomMarkdown";const { Option } = Select;const SelectWidget = (props) => {- const { id, value, options, onChange, rawErrors } = props;+ const { id, value, options, onChange, label, schema, rawErrors } = props;+ const description = schema?.description || "";+const handleSelectChange = (selectedValue) => {onChange(selectedValue);};const hasError = rawErrors && rawErrors.length > 0;return (- <Form.Item- style={{ width: "100%" }}- validateStatus={hasError ? "error" : ""}- >- <Select id={id} value={value} onChange={handleSelectChange} showSearch>- {options?.enumOptions &&- options.enumOptions.map((option, index) => (- <Option key={option.value} value={option.value}>- {option.label}- </Option>- ))}- </Select>+ <Form.Item className="width-100" validateStatus={hasError ? "error" : ""}>+ <Space direction="vertical" className="width-100">+ <Typography.Text>{label}</Typography.Text>+ <div>+ <Select+ id={id}+ value={value}+ onChange={handleSelectChange}+ showSearch+ >+ {options?.enumOptions &&+ options.enumOptions.map((option, index) => (+ <Option key={option.value} value={option.value}>+ {option.label}+ </Option>+ ))}+ </Select>+ {description?.length > 0 && (+ <CustomMarkdown+ text={description}+ isSecondary={true}+ styleClassName="rjsf-helper-font"+ />+ )}+ </div>+ </Space></Form.Item>);};@@ -32,6 +49,8 @@ SelectWidget.propTypes = {options: PropTypes.any,onChange: PropTypes.func.isRequired,rawErrors: PropTypes.array,+ label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,};export { SelectWidget };diff --git a/frontend/src/components/rjsf-custom-widgets/time-widget/TimeWidget.jsx b/frontend/src/components/rjsf-custom-widgets/time-widget/TimeWidget.jsxindex f26ced515..bad749ffa 100644--- a/frontend/src/components/rjsf-custom-widgets/time-widget/TimeWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/time-widget/TimeWidget.jsx@@ -4,13 +4,18 @@ import PropTypes from "prop-types";import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx";-const TimeWidget = ({ id, value, onChange, label, required }) => {+const TimeWidget = ({ id, value, onChange, label, schema, required }) => {+ const description = schema?.description || "";const handleTimeChange = (time) => {onChange(time?.toISOString());};return (- <RjsfWidgetLayout label={label} required={required}>+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}+ ><TimePickerid={id}value={value ? moment(value) : null}@@ -25,6 +30,7 @@ TimeWidget.propTypes = {value: PropTypes.string,onChange: PropTypes.func.isRequired,label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,required: PropTypes.bool,};diff --git a/frontend/src/components/rjsf-custom-widgets/up-down-widget/UpDownWidget.jsx b/frontend/src/components/rjsf-custom-widgets/up-down-widget/UpDownWidget.jsxindex 38fa20e78..23f0cf8e8 100644--- a/frontend/src/components/rjsf-custom-widgets/up-down-widget/UpDownWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/up-down-widget/UpDownWidget.jsx@@ -3,13 +3,18 @@ import PropTypes from "prop-types";import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx";-const UpDownWidget = ({ id, value, onChange, label, required }) => {+const UpDownWidget = ({ id, value, onChange, label, schema, required }) => {+ const description = schema?.description || "";const handleNumberChange = (numberValue) => {onChange(numberValue);};return (- <RjsfWidgetLayout label={label} required={required}>+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}+ ><InputNumber id={id} value={value} onChange={handleNumberChange} /></RjsfWidgetLayout>);@@ -20,6 +25,7 @@ UpDownWidget.propTypes = {value: PropTypes.number,onChange: PropTypes.func.isRequired,label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,required: PropTypes.bool,};diff --git a/frontend/src/components/rjsf-custom-widgets/url-widget/URLWidget.jsx b/frontend/src/components/rjsf-custom-widgets/url-widget/URLWidget.jsxindex c2aba010e..ab1425713 100644--- a/frontend/src/components/rjsf-custom-widgets/url-widget/URLWidget.jsx+++ b/frontend/src/components/rjsf-custom-widgets/url-widget/URLWidget.jsx@@ -1,20 +1,22 @@-import { Form, Input } from "antd";+import { Input } from "antd";import PropTypes from "prop-types";+import { RjsfWidgetLayout } from "../../../layouts/rjsf-widget-layout/RjsfWidgetLayout";-const URLWidget = ({ id, value, onChange, rawErrors }) => {+const URLWidget = (props) => {+ const { id, value, onChange, label, schema, required } = props;+ const description = schema?.description || "";const handleURLChange = (event) => {onChange(event.target.value);};- const hasError = rawErrors && rawErrors.length > 0;-return (- <Form.Item- style={{ width: "100%" }}- validateStatus={hasError ? "error" : ""}+ <RjsfWidgetLayout+ label={label}+ description={description}+ required={required}><Input type="url" id={id} value={value} onChange={handleURLChange} />- </Form.Item>+ </RjsfWidgetLayout>);};@@ -22,7 +24,9 @@ URLWidget.propTypes = {id: PropTypes.string.isRequired,value: PropTypes.string,onChange: PropTypes.func.isRequired,- rawErrors: PropTypes.array,+ label: PropTypes.string.isRequired,+ schema: PropTypes.object.isRequired,+ required: PropTypes.bool,};export { URLWidget };diff --git a/frontend/src/layouts/rjsf-form-layout/CustomFieldTemplate.jsx b/frontend/src/layouts/rjsf-form-layout/CustomFieldTemplate.jsxnew file mode 100644index 000000000..598e5cc44--- /dev/null+++ b/frontend/src/layouts/rjsf-form-layout/CustomFieldTemplate.jsx@@ -0,0 +1,21 @@+import PropTypes from "prop-types";++const CustomFieldTemplate = (props) => {+ const { classNames, errors, children, help } = props;+ return (+ <div className={classNames}>+ {children}+ {errors}+ {help}+ </div>+ );+};++CustomFieldTemplate.propTypes = {+ classNames: PropTypes.string,+ help: PropTypes.node,+ errors: PropTypes.node,+ children: PropTypes.node,+};++export { CustomFieldTemplate };diff --git a/frontend/src/layouts/rjsf-form-layout/RjsfFormLayout.css b/frontend/src/layouts/rjsf-form-layout/RjsfFormLayout.cssindex 8edb72964..46a09663b 100644--- a/frontend/src/layouts/rjsf-form-layout/RjsfFormLayout.css+++ b/frontend/src/layouts/rjsf-form-layout/RjsfFormLayout.css@@ -1,7 +1,7 @@/* Styles for RjsfFormLayout */.rjsf-form-layout-spin {- padding: 10px 0px;+ padding: 10px 0px;}.my-rjsf-form .ant-form-item {@@ -19,3 +19,7 @@padding-right: 0 !important;padding-bottom: 0 !important;}++.rjsf-helper-font {+ font-size: 12px;+}diff --git a/frontend/src/layouts/rjsf-form-layout/RjsfFormLayout.jsx b/frontend/src/layouts/rjsf-form-layout/RjsfFormLayout.jsxindex 6c971c680..85bf8efb3 100644--- a/frontend/src/layouts/rjsf-form-layout/RjsfFormLayout.jsx+++ b/frontend/src/layouts/rjsf-form-layout/RjsfFormLayout.jsx@@ -1,3 +1,4 @@+import { useCallback, useMemo } from "react";import Form from "@rjsf/antd";import validator from "@rjsf/validator-ajv8";import PropTypes from "prop-types";@@ -17,6 +18,12 @@ import { SelectWidget } from "../../components/rjsf-custom-widgets/select-widgetimport { TimeWidget } from "../../components/rjsf-custom-widgets/time-widget/TimeWidget.jsx";import { URLWidget } from "../../components/rjsf-custom-widgets/url-widget/URLWidget.jsx";import { SpinnerLoader } from "../../components/widgets/spinner-loader/SpinnerLoader.jsx";+import { TextWidget } from "../../components/rjsf-custom-widgets/text-widget/TextWidget.jsx";+import { PasswordWidget } from "../../components/rjsf-custom-widgets/password-widget/PasswordWidget.jsx";+import { UpDownWidget } from "../../components/rjsf-custom-widgets/up-down-widget/UpDownWidget.jsx";+import { CustomFieldTemplate } from "./CustomFieldTemplate.jsx";+import { Alert, Space } from "antd";+import CustomMarkdown from "../../components/helpers/custom-markdown/CustomMarkdown.jsx";import "./RjsfFormLayout.css";function RjsfFormLayout({@@ -29,59 +36,73 @@ function RjsfFormLayout({validateAndSubmit,isStateUpdateRequired,}) {- schema.title = "";- schema.description = "";- const widgets = {- CheckboxWidget: CheckboxWidget,- DateWidget: DateWidget,- AltDateTimeWidget: AltDateTimeWidget,- AltDateWidget: AltDateWidget,- CheckboxesWidget: CheckboxesWidget,- ColorWidget: ColorWidget,- DateTimeWidget: DateTimeWidget,- EmailWidget: EmailWidget,- FileWidget: FileWidget,- HiddenWidget: HiddenWidget,- TimeWidget: TimeWidget,- URLWidget: URLWidget,- SelectWidget: SelectWidget,- };+ const formSchema = useMemo(() => {+ if (!schema) return {};+ const rest = { ...schema };+ delete rest.title;+ delete rest.description;+ return rest;+ }, [schema]);- const fields = {- ArrayField: ArrayField,- };+ const description = useMemo(() => schema?.description || "", [schema]);- const uiSchema = {- "ui:classNames": "my-rjsf-form",- mark_horizontal_lines: {- "ui:widget": !formData?.mark_vertical_lines ? "hidden" : undefined,- },- };+ const widgets = useMemo(+ () => ({+ AltDateTimeWidget,+ AltDateWidget,+ CheckboxWidget,+ CheckboxesWidget,+ ColorWidget,+ DateTimeWidget,+ DateWidget,+ EmailWidget,+ FileWidget,+ HiddenWidget,+ PasswordWidget,+ SelectWidget,+ TextWidget,+ TimeWidget,+ UpDownWidget,+ URLWidget,+ }),+ []+ );++ const fields = useMemo(+ () => ({+ ArrayField,+ }),+ []+ );++ const uiSchema = useMemo(+ () => ({+ "ui:classNames": "my-rjsf-form",+ mark_horizontal_lines: {+ "ui:widget": !formData?.mark_vertical_lines ? "hidden" : undefined,+ },+ }),+ [formData]+ );- const removeBlankDefault = (schema) => {- /**- * We are removing the "required fields" default property if the value is null or "".- * We need this for applying the required field form valiation.- */+ const removeBlankDefault = useCallback((schema) => {if (schema?.properties && schema?.required) {- Object.keys(schema.properties).forEach((key) => {+ const properties = schema.properties;+ schema.required.forEach((key) => {if (- schema.required.includes(key) &&- (schema.properties[key].default === null ||- schema.properties[key].default === "")+ properties[key] &&+ (properties[key].default === null || properties[key].default === "")) {- delete schema.properties[key].default;+ delete properties[key].default;}});}return schema;- };+ }, []);- // Change the error message for required fields.- const transformErrors = (errors) => {+ const transformErrors = useCallback((errors) => {return errors.map((error) => {if (error.name === "required") {- // Change the error message for the "required" validationreturn {...error,message: "This field is mandatory. Please provide a value.",@@ -89,41 +110,51 @@ function RjsfFormLayout({}return error;});- };+ }, []);- // If required, the `formData` state can be dynamically updated to store the latest user input as they interact with the form.- const handleChange = (event) => {- if (!isStateUpdateRequired) {- return;- }- const data = event.formData;- setFormData(data);- };+ const handleChange = useCallback(+ (event) => {+ if (!isStateUpdateRequired) {+ return;+ }+ const data = event.formData;+ setFormData(data);+ },+ [isStateUpdateRequired, setFormData]+ );return (<>{isLoading ? (<SpinnerLoader />) : (- <Form- form={formRef}- schema={removeBlankDefault(schema)}- uiSchema={uiSchema}- validator={validator}- widgets={widgets}- fields={fields}- formData={formData}- transformErrors={transformErrors}- onError={() => {}}- onSubmit={(e) => validateAndSubmit(e.formData)}- formContext={{- descriptionLocation: "tooltip",- }}- showErrorList={false}- onChange={handleChange}- >- {children}- </Form>+ <Space direction="vertical" className="width-100">+ {description && (+ <Alert+ message={<CustomMarkdown text={description} />}+ type="info"+ />+ )}+ <Form+ form={formRef}+ schema={removeBlankDefault(formSchema)}+ uiSchema={uiSchema}+ validator={validator}+ widgets={widgets}+ fields={fields}+ formData={formData}+ transformErrors={transformErrors}+ onError={() => {}}+ onSubmit={(e) => validateAndSubmit(e.formData)}+ showErrorList={false}+ onChange={handleChange}+ templates={{+ FieldTemplate: CustomFieldTemplate,+ }}+ >+ {children}+ </Form>+ </Space>)}</>);diff --git a/frontend/src/layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx b/frontend/src/layouts/rjsf-widget-layout/RjsfWidgetLayout.jsxindex f33b1eb6d..6a6991fbd 100644--- a/frontend/src/layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx+++ b/frontend/src/layouts/rjsf-widget-layout/RjsfWidgetLayout.jsx@@ -1,7 +1,7 @@-import { QuestionCircleOutlined } from "@ant-design/icons";-import { Form, Tooltip, Typography } from "antd";+import { Form, Typography } from "antd";import PropTypes from "prop-types";import "./RjsfWidgetLayout.css";+import CustomMarkdown from "../../components/helpers/custom-markdown/CustomMarkdown";function RjsfWidgetLayout({ children, label, description, required }) {return (@@ -9,13 +9,15 @@ function RjsfWidgetLayout({ children, label, description, required }) {<Typography className="form-item-label">{required && <span className="form-item-required">* </span>}{label}- {description?.length > 0 && (- <Tooltip title={description}>- <QuestionCircleOutlined className="form-item-tooltip" />- </Tooltip>- )}</Typography>{children}+ {description?.length > 0 && (+ <CustomMarkdown+ text={description}+ isSecondary={true}+ styleClassName="rjsf-helper-font"+ />+ )}</Form.Item>);}