@formio/js 5.0.0-dev.5600.70c970a → 5.0.0-dev.5604.02ffada

package/lib/cjs/components/form/Form.js

@@ -206,6 +206,9 @@ class FormComponent extends Component_1.default {
         if (this.options.saveDraftThrottle) {
             options.saveDraftThrottle = this.options.saveDraftThrottle;
         }
+        if (this.options.skipDraftRestore) {
+            options.skipDraftRestore = this.options.skipDraftRestore;
+        }
         return options;
     }
     /* eslint-enable max-statements */
@@ -577,8 +580,9 @@ class FormComponent extends Component_1.default {
             this.subForm.triggerSaveDraft.cancel();
         }
         const isAlreadySubmitted = submission && submission._id && submission.form;
+        const isDraftSubmission = this.options.saveDraft && submission.state === 'draft';
         // This submission has already been submitted, so just return the reference data.
-        if (isAlreadySubmitted && !((_c = this.subForm) === null || _c === void 0 ? void 0 : _c.wizard)) {
+        if (isAlreadySubmitted && !((_c = this.subForm) === null || _c === void 0 ? void 0 : _c.wizard) && !isDraftSubmission) {
             this.dataValue = submission;
             return Promise.resolve(this.dataValue);
         }

package/lib/cjs/components/form/fixtures/comp7.d.ts

@@ -0,0 +1,36 @@
+declare namespace _default {
+    let _id: string;
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        src?: undefined;
+        disableOnInvalid?: undefined;
+    } | {
+        label: string;
+        tableView: boolean;
+        src: string;
+        key: string;
+        type: string;
+        input: boolean;
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        src?: undefined;
+    })[];
+    let project: string;
+    let machineName: string;
+}
+export default _default;

package/lib/cjs/components/form/fixtures/comp7.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    _id: '66051dae494c977c47028fac',
+    title: 'test draft parent',
+    name: 'testDraftParent',
+    path: 'testdraftparent',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Parent Form Field',
+            tableView: true,
+            key: 'parent',
+            type: 'textfield',
+            input: true,
+        },
+        {
+            label: 'Form',
+            tableView: true,
+            src: 'http://localhost:3000/idwqwhclwioyqbw/testdraftnested',
+            key: 'form',
+            type: 'form',
+            input: true,
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+    project: '63cead09be0090345b109e22',
+    machineName: 'idwqwhclwioyqbw:testdraftparent'
+};

package/lib/cjs/components/form/fixtures/comp8.d.ts

@@ -0,0 +1,26 @@
+declare namespace _default {
+    let _id: string;
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+    })[];
+    let project: string;
+    let machineName: string;
+}
+export default _default;

package/lib/cjs/components/form/fixtures/comp8.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    _id: '63e4deda12b88c4f05c125cf',
+    title: 'test draft nested',
+    name: 'testDraftNested',
+    path: 'testdraftnested',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Nested Form Field',
+            tableView: true,
+            key: 'nested',
+            type: 'textfield',
+            input: true,
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+    project: '63cead09be0090345b109e22',
+    machineName: 'idwqwhclwioyqbw:testdraftparent'
+};

package/lib/cjs/components/form/fixtures/index.d.ts

@@ -5,4 +5,6 @@ import comp3 from './comp3';
 import comp4 from './comp4';
 import comp5 from './comp5';
 import comp6 from './comp6';
-export { formModalEdit, comp1, comp2, comp3, comp4, comp5, comp6 };
+import comp7 from './comp7';
+import comp8 from './comp8';
+export { formModalEdit, comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8 };

package/lib/cjs/components/form/fixtures/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = exports.formModalEdit = void 0;
+exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = exports.formModalEdit = void 0;
 const formModalEdit_1 = __importDefault(require("./formModalEdit"));
 exports.formModalEdit = formModalEdit_1.default;
 const comp1_1 = __importDefault(require("./comp1"));
@@ -18,3 +18,7 @@ const comp5_1 = __importDefault(require("./comp5"));
 exports.comp5 = comp5_1.default;
 const comp6_1 = __importDefault(require("./comp6"));
 exports.comp6 = comp6_1.default;
+const comp7_1 = __importDefault(require("./comp7"));
+exports.comp7 = comp7_1.default;
+const comp8_1 = __importDefault(require("./comp8"));
+exports.comp8 = comp8_1.default;

package/lib/mjs/components/form/Form.js

@@ -200,6 +200,9 @@ export default class FormComponent extends Component {
         if (this.options.saveDraftThrottle) {
             options.saveDraftThrottle = this.options.saveDraftThrottle;
         }
+        if (this.options.skipDraftRestore) {
+            options.skipDraftRestore = this.options.skipDraftRestore;
+        }
         return options;
     }
     /* eslint-enable max-statements */
@@ -570,8 +573,9 @@ export default class FormComponent extends Component {
             this.subForm.triggerSaveDraft.cancel();
         }
         const isAlreadySubmitted = submission && submission._id && submission.form;
+        const isDraftSubmission = this.options.saveDraft && submission.state === 'draft';
         // This submission has already been submitted, so just return the reference data.
-        if (isAlreadySubmitted && !this.subForm?.wizard) {
+        if (isAlreadySubmitted && !this.subForm?.wizard && !isDraftSubmission) {
             this.dataValue = submission;
             return Promise.resolve(this.dataValue);
         }

package/lib/mjs/components/form/fixtures/comp7.d.ts

@@ -0,0 +1,36 @@
+declare namespace _default {
+    let _id: string;
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        src?: undefined;
+        disableOnInvalid?: undefined;
+    } | {
+        label: string;
+        tableView: boolean;
+        src: string;
+        key: string;
+        type: string;
+        input: boolean;
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        src?: undefined;
+    })[];
+    let project: string;
+    let machineName: string;
+}
+export default _default;

package/lib/mjs/components/form/fixtures/comp7.js

@@ -0,0 +1,35 @@
+export default {
+    _id: '66051dae494c977c47028fac',
+    title: 'test draft parent',
+    name: 'testDraftParent',
+    path: 'testdraftparent',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Parent Form Field',
+            tableView: true,
+            key: 'parent',
+            type: 'textfield',
+            input: true,
+        },
+        {
+            label: 'Form',
+            tableView: true,
+            src: 'http://localhost:3000/idwqwhclwioyqbw/testdraftnested',
+            key: 'form',
+            type: 'form',
+            input: true,
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+    project: '63cead09be0090345b109e22',
+    machineName: 'idwqwhclwioyqbw:testdraftparent'
+};

package/lib/mjs/components/form/fixtures/comp8.d.ts

@@ -0,0 +1,26 @@
+declare namespace _default {
+    let _id: string;
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+    })[];
+    let project: string;
+    let machineName: string;
+}
+export default _default;

package/lib/mjs/components/form/fixtures/comp8.js

@@ -0,0 +1,27 @@
+export default {
+    _id: '63e4deda12b88c4f05c125cf',
+    title: 'test draft nested',
+    name: 'testDraftNested',
+    path: 'testdraftnested',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Nested Form Field',
+            tableView: true,
+            key: 'nested',
+            type: 'textfield',
+            input: true,
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+    project: '63cead09be0090345b109e22',
+    machineName: 'idwqwhclwioyqbw:testdraftparent'
+};

package/lib/mjs/components/form/fixtures/index.d.ts

@@ -5,4 +5,6 @@ import comp3 from './comp3';
 import comp4 from './comp4';
 import comp5 from './comp5';
 import comp6 from './comp6';
-export { formModalEdit, comp1, comp2, comp3, comp4, comp5, comp6 };
+import comp7 from './comp7';
+import comp8 from './comp8';
+export { formModalEdit, comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8 };

package/lib/mjs/components/form/fixtures/index.js

@@ -5,4 +5,6 @@ import comp3 from './comp3';
 import comp4 from './comp4';
 import comp5 from './comp5';
 import comp6 from './comp6';
-export { formModalEdit, comp1, comp2, comp3, comp4, comp5, comp6 };
+import comp7 from './comp7';
+import comp8 from './comp8';
+export { formModalEdit, comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5600.70c970a",
+  "version": "5.0.0-dev.5604.02ffada",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {