Merge pull request #1090 from assemblee-virtuelle/ControlLexiconImpor…

…tForm Control lexiconImportForm to avoid creating empty items
assemblee-virtuelle · Dec 22, 2022 · ab52648 · ab52648
2 parents 848c08e + cea8a40
commit ab52648
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/src/frontend/packages/interop-components/dist/index.cjs.js b/src/frontend/packages/interop-components/dist/index.cjs.js
diff --git a/src/frontend/packages/interop-components/dist/index.cjs.js.map b/src/frontend/packages/interop-components/dist/index.cjs.js.map
diff --git a/src/frontend/packages/interop-components/dist/index.es.js b/src/frontend/packages/interop-components/dist/index.es.js
diff --git a/src/frontend/packages/interop-components/dist/index.es.js.map b/src/frontend/packages/interop-components/dist/index.es.js.map
diff --git a/src/frontend/packages/interop-components/src/forms/LexiconImportForm.js b/src/frontend/packages/interop-components/src/forms/LexiconImportForm.js
@@ -1,4 +1,5 @@
 import React, { useCallback } from 'react';
+import { required } from 'react-admin';
 import { Form } from 'react-final-form';
 import { Box, Toolbar, makeStyles, Button } from '@material-ui/core';
 import SaveIcon from '@material-ui/icons/Save';
@@ -17,12 +18,17 @@ const useStyles = makeStyles(theme => ({
 
 const LexiconImportForm = ({ resource, fetchLexicon, selectData, redirect, save, saving, ...rest }) => {
   const classes = useStyles();
-
   const onSubmit = useCallback(
     async ({ lexicon }) => {
       // If we have no URI, it means we are creating a new definition
       // Delete the summary as it is "Ajouter XXX au dictionaire"
       if (!lexicon.uri) delete lexicon.summary;
+
+      // If the user doesn't select any option, use the text as the label
+      if (typeof lexicon === 'string') {
+        lexicon = { label : lexicon };
+      }
+
       await save(selectData(lexicon), redirect);
     },
     [selectData, save, redirect]
@@ -34,7 +40,7 @@ const LexiconImportForm = ({ resource, fetchLexicon, selectData, redirect, save,
       render={({ handleSubmit, dirtyFields }) => (
         <form onSubmit={handleSubmit}>
           <Box m="1em">
-            <LexiconAutocompleteInput label="Titre" source="lexicon" fetchLexicon={fetchLexicon} />
+            <LexiconAutocompleteInput label="Titre" source="lexicon" fetchLexicon={fetchLexicon} validate={required()} />
           </Box>
           <Toolbar className={classes.toolbar}>
             <Button

diff --git a/src/frontend/packages/interop-components/src/inputs/LexiconAutocompleteInput.js b/src/frontend/packages/interop-components/src/inputs/LexiconAutocompleteInput.js
@@ -27,7 +27,7 @@ const selectOptionText = (option, optionText) => {
   }
 };
 
-const capitalizeFirstLetter = string => string.charAt(0).toUpperCase() + string.slice(1);
+const capitalizeFirstLetter = string => string && (string.charAt(0).toUpperCase() + string.slice(1));
 
 const LexiconAutocompleteInput = ({
   fetchLexicon,
@@ -88,7 +88,7 @@ const LexiconAutocompleteInput = ({
       // For some reasons, this prop has to be passed
       filterOptions={(options, params) => {
         // Suggest the creation of a new value
-        if (keyword !== '') {
+        if (keyword) {
           options.push({
             label: capitalizeFirstLetter(keyword),
             summary: `Ajouter "${capitalizeFirstLetter(keyword)}" au dictionnaire`,