Allow any form to be saved

plone · Jan 12, 2023 · 4fd716a · 4fd716a
1 parent 4c0ff4d
commit 4fd716a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/components/manage/Form/Form.jsx b/src/components/manage/Form/Form.jsx
@@ -307,7 +307,7 @@ class Form extends Component {
   componentDidMount() {
     this.setState({ isClient: true });
 
-    // schema was just received async and plugged as prop
+    // schema already exists in redux store
     if (this.props.schema) {
       const oldFormData = this.props.checkSavedDraft(this.state.formData);
 

diff --git a/src/helpers/Utils/saveAsDraft.js b/src/helpers/Utils/saveAsDraft.js
@@ -16,19 +16,31 @@ const mapSchemaToData = (schema, data) => {
   );
 };
 
+const getFormId = (props) => {
+  const { type, pathname, isEditForm } = props;
+
+  const id = isEditForm
+    ? ['form', type, pathname].join('-')
+    : type
+    ? ['form', 'add', type].join('-')
+    : ['form', pathname].join('-');
+
+  return id;
+};
+
 export function withSaveAsDraft(options) {
   const { forwardRef } = options;
 
   return (WrappedComponent) => {
     function WithSaveAsDraft(props) {
-      const { type, pathname, schema, isEditForm } = props;
+      const { schema } = props;
+      const id = getFormId(props);
 
-      const id = `form-edit-${type}-${pathname}`;
       const ref = React.useRef();
 
       const checkSavedDraft = React.useCallback(
         (state) => {
-          if (!schema && !isEditForm) return;
+          if (!schema) return;
           const saved = localStorage.getItem(id);
           if (saved) {
             const formData = mapSchemaToData(schema, state);
@@ -45,7 +57,7 @@ export function withSaveAsDraft(options) {
             }
           }
         },
-        [id, schema, isEditForm],
+        [id, schema],
       );
 
       const onSaveDraft = React.useCallback(