@tsed/react-formio 1.11.1 → 1.13.0

package/src/stores/form/form.actions.ts

@@ -14,79 +14,70 @@ export const resetForm = createAction();
 export const sendForm = createAction();
 
 function shouldGet(form: Partial<FormSchema>, id: string) {
-  return (
-    form &&
-    form.components &&
-    Array.isArray(form.components) &&
-    form.components.length &&
-    form._id === id
-  );
+  return form && form.components && Array.isArray(form.components) && form.components.length && form._id === id;
 }
 
-export const getForm = (name: string, id = "", done = noop) => async (
-  dispatch: any,
-  getState: any
-) => {
-  dispatch(clearFormError(name));
-  // Check to see if the form is already loaded.
-  const form = selectForm(name, getState());
+export const getForm =
+  (name: string, id = "", done = noop) =>
+  async (dispatch: any, getState: any) => {
+    dispatch(clearFormError(name));
+    // Check to see if the form is already loaded.
+    const form = selectForm(name, getState());
 
-  if (shouldGet(form, id)) {
-    return;
-  }
+    if (shouldGet(form, id)) {
+      return;
+    }
 
-  const url = getFormUrl(id);
-  const formio = new Formio(url);
+    const url = getFormUrl(id);
+    const formio = new Formio(url);
 
-  dispatch(requestForm(name, { id, url }));
+    dispatch(requestForm(name, { id, url }));
 
-  try {
-    const form = await formio.loadForm();
+    try {
+      const form = await formio.loadForm();
 
-    dispatch(receiveForm(name, { form, url }));
-    dispatch(getActions(form._id));
-    done(null, form);
-  } catch (error) {
-    dispatch(failForm(name, { error }));
-    done({ error });
-  }
-};
+      dispatch(receiveForm(name, { form, url }));
+      dispatch(getActions(form._id));
+      done(null, form);
+    } catch (error) {
+      dispatch(failForm(name, { error }));
+      done({ error });
+    }
+  };
 
-export const saveForm = (
-  name: string,
-  form: Partial<FormSchema>,
-  done = noop
-) => async (dispatch: any) => {
-  dispatch(clearFormError(name));
-  dispatch(sendForm(name, { form }));
+export const saveForm =
+  (name: string, form: Partial<FormSchema>, done = noop) =>
+  async (dispatch: any) => {
+    dispatch(clearFormError(name));
+    dispatch(sendForm(name, { form }));
 
-  const id = form._id || "";
-  const url = getFormUrl(id);
-  const formio = new Formio(url);
+    const id = form._id || "";
+    const url = getFormUrl(id);
+    const formio = new Formio(url);
 
-  try {
-    const result = await formio.saveForm(form);
-    dispatch(receiveForm(name, { form: result, url: getFormUrl(result._id) }));
-    done(null, result);
-  } catch (error) {
-    dispatch(failForm(name, { error }));
-    done(error);
-  }
-};
+    try {
+      const result = await formio.saveForm(form);
+      dispatch(receiveForm(name, { form: result, url: getFormUrl(result._id) }));
+      done(null, result);
+    } catch (error) {
+      dispatch(failForm(name, { error }));
+      done(error);
+    }
+  };
 
-export const deleteForm = (name: string, id: string, done = noop) => async (
-  dispatch: any
-) => {
-  dispatch(clearFormError(name));
-  const url = getFormUrl(id);
-  const formio = new Formio(url);
+export const deleteForm =
+  (name: string, id: string, done = noop) =>
+  async (dispatch: any) => {
+    dispatch(clearFormError(name));
+    const url = getFormUrl(id);
+    const formio = new Formio(url);
 
-  try {
-    await formio.deleteForm();
-    dispatch(resetForm(name));
-    done();
-  } catch (error) {
-    dispatch(failForm(name, { error }));
-    done({ error });
-  }
-};
+    try {
+      await formio.deleteForm();
+      dispatch(resetForm(name));
+      done();
+    } catch (error) {
+      dispatch(failForm(name, { error }));
+      done({ error });
+    }
+  };

package/src/stores/form/form.reducers.spec.ts

@@ -1,10 +1,4 @@
-import {
-  clearFormError,
-  failForm,
-  receiveForm,
-  requestForm,
-  resetForm
-} from "./form.actions";
+import { clearFormError, failForm, receiveForm, requestForm, resetForm } from "./form.actions";
 import { formReducer } from "./form.reducers";
 
 describe("Form reducer", () => {

package/src/stores/form/form.reducers.ts

@@ -1,13 +1,6 @@
 import { createReducer, InitialStateCreator } from "@tsed/redux-utils";
 import { FormSchema } from "../../interfaces";
-import {
-  clearFormError,
-  failForm,
-  receiveForm,
-  requestForm,
-  resetForm,
-  sendForm
-} from "./form.actions";
+import { clearFormError, failForm, receiveForm, requestForm, resetForm, sendForm } from "./form.actions";
 
 export interface FormState {
   error: null | Error;

package/src/stores/form/form.selectors.ts

@@ -2,5 +2,4 @@ import { FormSchema } from "../../interfaces";
 import { selectRoot } from "../root";
 import { FormState } from "./form.reducers";
 
-export const selectForm = (name: string, state: any): Partial<FormSchema> =>
-  selectRoot<FormState>(name, state).data;
+export const selectForm = (name: string, state: any): Partial<FormSchema> => selectRoot<FormState>(name, state).data;

package/src/stores/forms/forms.actions.spec.ts

@@ -1,11 +1,6 @@
 import { Formio } from "formiojs";
 import { mapRequestParams } from "../../utils/mapRequestParams";
-import {
-  failForms,
-  getForms,
-  receiveForms,
-  requestForms
-} from "./forms.actions";
+import { failForms, getForms, receiveForms, requestForms } from "./forms.actions";
 
 jest.mock("formiojs");
 jest.mock("../../utils/mapRequestParams");
@@ -18,9 +13,7 @@ describe("Forms actions", () => {
   describe("getForms", () => {
     it("should return a result", async () => {
       // GIVEN
-      (Formio as any).prototype.loadForms.mockReturnValue(
-        Promise.resolve([{}])
-      );
+      (Formio as any).prototype.loadForms.mockReturnValue(Promise.resolve([{}]));
       (Formio as any).getProjectUrl.mockReturnValue("https://formio");
       const dispatch = jest.fn();
       const name = "name";
@@ -36,9 +29,7 @@ describe("Forms actions", () => {
       });
 
       // WHEN
-      await new Promise((resolve) =>
-        getForms(name, parameters, resolve)(dispatch, getState)
-      );
+      await new Promise((resolve) => getForms(name, parameters, resolve)(dispatch, getState));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("https://formio/form");
@@ -60,9 +51,7 @@ describe("Forms actions", () => {
     });
     it("should return a error", async () => {
       // GIVEN
-      (Formio.prototype.loadForms as any).mockReturnValue(
-        Promise.reject(new Error("message"))
-      );
+      (Formio.prototype.loadForms as any).mockReturnValue(Promise.reject(new Error("message")));
       (Formio.getProjectUrl as any).mockReturnValue("https://formio");
 
       const dispatch = jest.fn();
@@ -79,9 +68,7 @@ describe("Forms actions", () => {
       });
 
       // WHEN
-      await new Promise((resolve) =>
-        getForms(name, parameters, resolve)(dispatch, getState)
-      );
+      await new Promise((resolve) => getForms(name, parameters, resolve)(dispatch, getState));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("https://formio/form");

package/src/stores/forms/forms.actions.ts

@@ -15,29 +15,25 @@ export const failForms = createAction();
 
 export type GetFormsCB = (err: any, forms?: FormSchema[]) => void;
 
-export const getForms = (
-  name: string,
-  parameters: Partial<RequestParamsOptions>,
-  done: GetFormsCB = noop
-) => async (dispatch: any, getState: any) => {
-  dispatch(requestForms(name, { parameters }));
+export const getForms =
+  (name: string, parameters: Partial<RequestParamsOptions>, done: GetFormsCB = noop) =>
+  async (dispatch: any, getState: any) => {
+    dispatch(requestForms(name, { parameters }));
 
-  const formio = new Formio(`${Formio.getProjectUrl()}/form`);
-  const requestParams = mapRequestParams(
-    selectFormsParameters(name, getState())
-  );
+    const formio = new Formio(`${Formio.getProjectUrl()}/form`);
+    const requestParams = mapRequestParams(selectFormsParameters(name, getState()));
 
-  try {
-    const result: FormSchema[] = await formio.loadForms({
-      params: requestParams
-    });
-    dispatch(receiveForms(name, { forms: result }));
-    done(null, result);
-  } catch (error) {
-    dispatch(failForms(name, { error }));
-    done(error);
-  }
-};
+    try {
+      const result: FormSchema[] = await formio.loadForms({
+        params: requestParams
+      });
+      dispatch(receiveForms(name, { forms: result }));
+      done(null, result);
+    } catch (error) {
+      dispatch(failForms(name, { error }));
+      done(error);
+    }
+  };
 
 export const refreshForms = (name: string, done = noop) => {
   return async (dispatch: any, getState: any) => {

package/src/stores/forms/forms.reducers.spec.ts

@@ -1,9 +1,4 @@
-import {
-  failForms,
-  receiveForms,
-  requestForms,
-  resetForms
-} from "./forms.actions";
+import { failForms, receiveForms, requestForms, resetForms } from "./forms.actions";
 import { formsReducer } from "./forms.reducers";
 
 describe("Forms reducer", () => {

package/src/stores/forms/forms.reducers.ts

@@ -1,11 +1,6 @@
 import { createReducer } from "@tsed/redux-utils";
 import { FormSchema } from "../../interfaces";
-import {
-  failForms,
-  receiveForms,
-  requestForms,
-  resetForms
-} from "./forms.actions";
+import { failForms, receiveForms, requestForms, resetForms } from "./forms.actions";
 
 export interface FormsState {
   error: null | Error;
@@ -22,13 +17,7 @@ export interface FormsState {
   data: FormSchema[];
 }
 
-const createInitialState = ({
-  pageIndex = 0,
-  pageSize = 10,
-  query = {},
-  select = "",
-  sortBy = []
-}: any = {}): FormsState => {
+const createInitialState = ({ pageIndex = 0, pageSize = 10, query = {}, select = "", sortBy = [] }: any = {}): FormsState => {
   return {
     error: null,
     isActive: false,

package/src/stores/forms/forms.selectors.ts

@@ -1,8 +1,6 @@
 import { selectRoot } from "../root";
 import { FormsState } from "./forms.reducers";
 
-export const selectForms = (name: string, state: any) =>
-  selectRoot<FormsState>(name, state).data;
+export const selectForms = (name: string, state: any) => selectRoot<FormsState>(name, state).data;
 
-export const selectFormsParameters = (name: string, state: any) =>
-  selectRoot<FormsState>(name, state).parameters;
+export const selectFormsParameters = (name: string, state: any) => selectRoot<FormsState>(name, state).parameters;

package/src/stores/index.spec.ts

@@ -2,15 +2,12 @@ import { defaultFormioReducer } from "./index";
 
 describe("defaultFormioReducer", () => {
   it("should return initial state", () => {
-    const state = Object.entries(defaultFormioReducer).reduce(
-      (state, [key, reduce]) => {
-        return {
-          ...state,
-          [key]: reduce(undefined, {} as any)
-        };
-      },
-      {}
-    );
+    const state = Object.entries(defaultFormioReducer).reduce((state, [key, reduce]) => {
+      return {
+        ...state,
+        [key]: reduce(undefined, {} as any)
+      };
+    }, {});
 
     expect(state).toEqual({
       action: {

package/src/stores/root/root.selectors.spec.ts

@@ -1,9 +1,4 @@
-import {
-  oneOfIsActive,
-  selectError,
-  selectIsActive,
-  selectRoot
-} from "./root.selectors";
+import { oneOfIsActive, selectError, selectIsActive, selectRoot } from "./root.selectors";
 
 describe("root Selectors", () => {
   describe("selectRoot()", () => {

package/src/stores/root/root.selectors.ts

@@ -1,16 +1,8 @@
 import get from "lodash/get";
 
-export function selectRoot<State = Record<string, any>>(
-  name: string
-): (state: Record<string, any>) => State;
-export function selectRoot<State = Record<string, any>>(
-  name: string,
-  state: Record<string, any>
-): State;
-export function selectRoot<State = Record<string, any>>(
-  name: string,
-  state?: Record<string, any>
-): any {
+export function selectRoot<State = Record<string, any>>(name: string): (state: Record<string, any>) => State;
+export function selectRoot<State = Record<string, any>>(name: string, state: Record<string, any>): State;
+export function selectRoot<State = Record<string, any>>(name: string, state?: Record<string, any>): any {
   if (state) {
     return state[name];
   }
@@ -18,24 +10,14 @@ export function selectRoot<State = Record<string, any>>(
   return (state: Record<string, any>) => selectRoot(name, state);
 }
 
-export const selectError = (
-  name: string,
-  state: Record<string, any>
-): null | Error => get(selectRoot(name, state), "error");
+export const selectError = (name: string, state: Record<string, any>): null | Error => get(selectRoot(name, state), "error");
 
-export const selectIsActive = (
-  name: string,
-  state: Record<string, any>
-): boolean => get(selectRoot(name, state), "isActive");
+export const selectIsActive = (name: string, state: Record<string, any>): boolean => get(selectRoot(name, state), "isActive");
 
 export function oneOfIsActive(...names: string[]) {
   return (state: any) => {
     return !!names.find((name) => {
-      return get(
-        state,
-        `${name}.isActive`,
-        get(state, `${name}.current.isActive`)
-      );
+      return get(state, `${name}.isActive`, get(state, `${name}.current.isActive`));
     });
   };
 }

package/src/stores/submission/submission.actions.spec.ts

@@ -20,9 +20,7 @@ describe("Submission actions", () => {
     });
     it("should return a result", async () => {
       // GIVEN
-      (Formio as any).prototype.loadSubmission.mockReturnValue(
-        Promise.resolve({})
-      );
+      (Formio as any).prototype.loadSubmission.mockReturnValue(Promise.resolve({}));
 
       const dispatch = jest.fn();
       const name = "name";
@@ -34,9 +32,7 @@ describe("Submission actions", () => {
       });
 
       // WHEN
-      await new Promise((resolve) =>
-        getSubmission(name, formId, id, resolve)(dispatch, getState)
-      );
+      await new Promise((resolve) => getSubmission(name, formId, id, resolve)(dispatch, getState));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("/formId/submission/123454");
@@ -61,9 +57,7 @@ describe("Submission actions", () => {
     });
     it("should do nothing when submission is already loaded", async () => {
       // GIVEN
-      (Formio.prototype.loadSubmission as any).mockReturnValue(
-        Promise.resolve({})
-      );
+      (Formio.prototype.loadSubmission as any).mockReturnValue(Promise.resolve({}));
 
       const dispatch = jest.fn();
       const name = "name";
@@ -82,9 +76,7 @@ describe("Submission actions", () => {
     });
     it("should throw error", async () => {
       // GIVEN
-      (Formio.prototype.loadSubmission as any).mockReturnValue(
-        Promise.reject(new Error("message"))
-      );
+      (Formio.prototype.loadSubmission as any).mockReturnValue(Promise.reject(new Error("message")));
 
       const dispatch = jest.fn();
       const name = "name";
@@ -96,9 +88,7 @@ describe("Submission actions", () => {
       });
 
       // WHEN
-      await new Promise((resolve) =>
-        getSubmission(name, formId, id, resolve)(dispatch, getState)
-      );
+      await new Promise((resolve) => getSubmission(name, formId, id, resolve)(dispatch, getState));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("/formId/submission/123454");
@@ -120,13 +110,9 @@ describe("Submission actions", () => {
       const data = { _id: "123454" };
       const formId = "formId";
 
-      (Formio.prototype.saveSubmission as any).mockReturnValue(
-        Promise.resolve(data)
-      );
+      (Formio.prototype.saveSubmission as any).mockReturnValue(Promise.resolve(data));
       // WHEN
-      await new Promise((resolve) =>
-        saveSubmission(name, formId, data, resolve)(dispatch)
-      );
+      await new Promise((resolve) => saveSubmission(name, formId, data, resolve)(dispatch));
 
       // THEN
       expect(dispatch).toHaveBeenCalledWith({
@@ -164,9 +150,7 @@ describe("Submission actions", () => {
       const formId = "formId";
 
       // WHEN
-      await new Promise((resolve) =>
-        saveSubmission(name, formId, data, resolve)(dispatch)
-      );
+      await new Promise((resolve) => saveSubmission(name, formId, data, resolve)(dispatch));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("/formId/submission/123454");
@@ -183,9 +167,7 @@ describe("Submission actions", () => {
   describe("deleteSubmission", () => {
     it("should return a result", async () => {
       // GIVEN
-      (Formio.prototype.deleteSubmission as any).mockReturnValue(
-        Promise.resolve({})
-      );
+      (Formio.prototype.deleteSubmission as any).mockReturnValue(Promise.resolve({}));
 
       const dispatch = jest.fn();
       const name = "name";
@@ -193,9 +175,7 @@ describe("Submission actions", () => {
       const formId = "formId";
 
       // WHEN
-      await new Promise((resolve) =>
-        deleteSubmission(name, formId, id, resolve)(dispatch)
-      );
+      await new Promise((resolve) => deleteSubmission(name, formId, id, resolve)(dispatch));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("/formId/submission/123454");
@@ -216,9 +196,7 @@ describe("Submission actions", () => {
       const formId = "formId";
 
       // WHEN
-      await new Promise((resolve) =>
-        deleteSubmission(name, formId, id, resolve)(dispatch)
-      );
+      await new Promise((resolve) => deleteSubmission(name, formId, id, resolve)(dispatch));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("/formId/submission/123454");

package/src/stores/submission/submission.actions.ts

@@ -11,79 +11,70 @@ export const receiveSubmission = createAction();
 export const failSubmission = createAction();
 export const resetSubmission = createAction();
 
-export const getSubmission = (
-  name: string,
-  formId: string,
-  id: string,
-  done = noop
-) => async (dispatch: any, getState: any) => {
-  // Check to see if the submission is already loaded.
-  if (getState().id === id) {
-    return;
-  }
+export const getSubmission =
+  (name: string, formId: string, id: string, done = noop) =>
+  async (dispatch: any, getState: any) => {
+    // Check to see if the submission is already loaded.
+    if (getState().id === id) {
+      return;
+    }
 
-  const url = getSubmissionUrl(formId, id);
-  const formio = new Formio(url);
+    const url = getSubmissionUrl(formId, id);
+    const formio = new Formio(url);
 
-  dispatch(clearSubmissionError(name));
-  dispatch(requestSubmission(name, { id, formId, url }));
+    dispatch(clearSubmissionError(name));
+    dispatch(requestSubmission(name, { id, formId, url }));
 
-  try {
-    const result = await formio.loadSubmission();
+    try {
+      const result = await formio.loadSubmission();
 
-    dispatch(receiveSubmission(name, { submission: result, url }));
-    done(null, result);
-  } catch (error) {
-    dispatch(failSubmission(name, { error }));
-    done(error);
-  }
-};
+      dispatch(receiveSubmission(name, { submission: result, url }));
+      done(null, result);
+    } catch (error) {
+      dispatch(failSubmission(name, { error }));
+      done(error);
+    }
+  };
 
-export const saveSubmission = (
-  name: string,
-  formId: string,
-  data: Submission,
-  done = noop
-) => async (dispatch: any) => {
-  dispatch(clearSubmissionError(name));
-  dispatch(sendSubmission(name, { submission: data, formId }));
+export const saveSubmission =
+  (name: string, formId: string, data: Submission, done = noop) =>
+  async (dispatch: any) => {
+    dispatch(clearSubmissionError(name));
+    dispatch(sendSubmission(name, { submission: data, formId }));
 
-  const id = data._id;
-  const url = getSubmissionUrl(formId, id);
-  const formio = new Formio(url);
+    const id = data._id;
+    const url = getSubmissionUrl(formId, id);
+    const formio = new Formio(url);
 
-  try {
-    const result = await formio.saveSubmission(data);
-    dispatch(
-      receiveSubmission(name, {
-        submission: result,
-        url: getSubmissionUrl(formId, result._id)
-      })
-    );
-    done(null, result);
-  } catch (error) {
-    dispatch(failSubmission(name, { error }));
-    done(error);
-  }
-};
+    try {
+      const result = await formio.saveSubmission(data);
+      dispatch(
+        receiveSubmission(name, {
+          submission: result,
+          url: getSubmissionUrl(formId, result._id)
+        })
+      );
+      done(null, result);
+    } catch (error) {
+      dispatch(failSubmission(name, { error }));
+      done(error);
+    }
+  };
 
-export const deleteSubmission = (
-  name: string,
-  formId: string,
-  id: string,
-  done = noop
-) => async (dispatch: any) => {
-  dispatch(clearSubmissionError(name));
+export const deleteSubmission =
+  (name: string, formId: string, id: string, done = noop) =>
+  async (dispatch: any) => {
+    dispatch(clearSubmissionError(name));
 
-  const url = getSubmissionUrl(formId, id);
-  const formio = new Formio(url);
+    const url = getSubmissionUrl(formId, id);
+    const formio = new Formio(url);
 
-  try {
-    await formio.deleteSubmission();
-    dispatch(resetSubmission(name));
-    done(null);
-  } catch (error) {
-    dispatch(failSubmission(name, { error }));
-    done(error);
-  }
-};
+    try {
+      await formio.deleteSubmission();
+      dispatch(resetSubmission(name));
+      done(null);
+    } catch (error) {
+      dispatch(failSubmission(name, { error }));
+      done(error);
+    }
+  };