Skip to content

Commit 3a3cd29

Browse files
authored
1127 missing validator in some rjsf forms (#1128)
* missing one validator * missing validator * error list is no long supported * remove redundant import
1 parent b391ea1 commit 3a3cd29

File tree

7 files changed

+6
-28
lines changed

7 files changed

+6
-28
lines changed

frontend/src/components/datasets/CreateDatasetModal.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import datasetSchema from "../../schema/datasetSchema.json";
77
import { FormProps } from "@rjsf/core";
88
import { ClowderRjsfTextWidget } from "../styledComponents/ClowderRjsfTextWidget";
99
import { ClowderRjsfSelectWidget } from "../styledComponents/ClowderRjsfSelectWidget";
10-
import { ClowderRjsfErrorList } from "../styledComponents/ClowderRjsfErrorList";
1110
import { ClowderRjsfTextAreaWidget } from "../styledComponents/ClowderRjsfTextAreaWidget";
1211
import validator from "@rjsf/validator-ajv8";
1312

@@ -35,7 +34,6 @@ export const CreateDatasetModal: React.FC<CreateDatasetModalProps> = (
3534
onSubmit={({ formData }) => {
3635
onSave(formData);
3736
}}
38-
ErrorList={ClowderRjsfErrorList}
3937
>
4038
<Box className="inputGroup">
4139
<Button variant="contained" type="submit">

frontend/src/components/datasets/CreateLicenseModal.tsx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
1-
import React, { useState } from "react";
2-
import {
3-
Container,
4-
Dialog,
5-
DialogTitle,
6-
DialogContent,
7-
DialogActions,
8-
Button,
9-
TextField,
10-
Box,
11-
} from "@mui/material";
1+
import React from "react";
2+
import { Container, Button, Box } from "@mui/material";
123
import licenseSchema from "../../schema/licenseSchema.json";
134
import { FormProps } from "@rjsf/core";
14-
import { ClowderRjsfErrorList } from "../styledComponents/ClowderRjsfErrorList";
155
import Form from "@rjsf/mui";
16-
import { V2 } from "../../openapi";
176
import validator from "@rjsf/validator-ajv8";
187

198
type CreateLicenseModalProps = {
@@ -46,7 +35,6 @@ export const CreateLicenseModal = (props: CreateLicenseModalProps) => {
4635
// close modal
4736
setLicenseModalOpen(false);
4837
}}
49-
ErrorList={ClowderRjsfErrorList}
5038
>
5139
<Box className="inputGroup" sx={{ float: "right" }}>
5240
<Button variant="contained" type="submit">

frontend/src/components/datasets/EditLicenseModal.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ import React, { useState } from "react";
22
import {
33
Container,
44
Dialog,
5-
DialogTitle,
65
DialogContent,
7-
DialogActions,
6+
DialogTitle,
87
Button,
9-
TextField,
108
Box,
119
} from "@mui/material";
1210
import licenseSchema from "../../schema/licenseSchema.json";
1311
import { FormProps } from "@rjsf/core";
14-
import { ClowderRjsfErrorList } from "../styledComponents/ClowderRjsfErrorList";
1512
import Form from "@rjsf/mui";
1613
import validator from "@rjsf/validator-ajv8";
1714
import { useDispatch, useSelector } from "react-redux";
@@ -44,7 +41,6 @@ export const EditLicenseModal = (props: EditLicenseModalProps) => {
4441
// close modal
4542
setEditLicenseOpen(false);
4643
}}
47-
ErrorList={ClowderRjsfErrorList}
4844
>
4945
<Box className="inputGroup" sx={{ float: "right" }}>
5046
<Button variant="contained" type="submit">

frontend/src/components/groups/CreateGroup.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { ClowderRjsfTextWidget } from "../styledComponents/ClowderRjsfTextWidget
1212
import { ClowderRjsfSelectWidget } from "../styledComponents/ClowderRjsfSelectWidget";
1313
import groupSchema from "../../schema/groupSchema.json";
1414
import { ClowderRjsfTextAreaWidget } from "../styledComponents/ClowderRjsfTextAreaWidget";
15-
import { ClowderRjsfErrorList } from "../styledComponents/ClowderRjsfErrorList";
1615
import { useNavigate } from "react-router-dom";
1716
import { RootState } from "../../types/data";
1817
import validator from "@rjsf/validator-ajv8";
@@ -59,7 +58,6 @@ export const CreateGroup = (props: CreateGroupProps): JSX.Element => {
5958
// close modal
6059
setCreateGroupOpen(false);
6160
}}
62-
ErrorList={ClowderRjsfErrorList}
6361
>
6462
<Box className="inputGroup" sx={{ float: "right" }}>
6563
<Button variant="contained" type="submit">

frontend/src/components/listeners/CreateFeedModal.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import React, { useEffect, useState } from "react";
1+
import React, { useEffect } from "react";
22
import { Container, Button, Box } from "@mui/material";
33
import feedSchema from "../../schema/feedSchema.json";
44
import { FormProps } from "@rjsf/core";
5-
import { ClowderRjsfErrorList } from "../styledComponents/ClowderRjsfErrorList";
65
import Form from "@rjsf/mui";
76
import { useDispatch, useSelector } from "react-redux";
87
import { createFeed, fetchListeners } from "../../actions/listeners";
@@ -52,7 +51,6 @@ export const CreateFeedModal = (props: CreateFeedProps) => {
5251
// close modal
5352
setCreateFeedOpen(false);
5453
}}
55-
ErrorList={ClowderRjsfErrorList}
5654
>
5755
<Box className="inputGroup" sx={{ float: "right" }}>
5856
<Button variant="contained" type="submit">

frontend/src/components/listeners/EditFeedModal.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from "react";
22
import { Container, Button, Box } from "@mui/material";
33
import feedSchema from "../../schema/feedSchema.json";
44
import { FormProps } from "@rjsf/core";
5-
import { ClowderRjsfErrorList } from "../styledComponents/ClowderRjsfErrorList";
65
import Form from "@rjsf/mui";
76
import { useDispatch, useSelector } from "react-redux";
87
import { fetchListeners, updateFeed } from "../../actions/listeners";
@@ -62,7 +61,6 @@ export const EditFeedModal = (props: EditFeedProps) => {
6261
// close modal
6362
setEditFeedOpen(false);
6463
}}
65-
ErrorList={ClowderRjsfErrorList}
6664
>
6765
<Box className="inputGroup" sx={{ float: "right" }}>
6866
<Button variant="contained" type="submit">

frontend/src/components/listeners/SubmitExtraction.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ export default function SubmitExtraction(props: SubmitExtractionProps) {
183183
) : (
184184
<Container>
185185
<Form
186+
widgets={widgets}
187+
validator={validator}
186188
schema={{ properties: {} }}
187189
uiSchema={uiSchema}
188190
onSubmit={({ formData }) => {

0 commit comments

Comments
 (0)