@tsed/react-formio 1.11.2 → 1.13.1

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);
+    }
+  };

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

@@ -1,10 +1,4 @@
-import {
-  failSubmission,
-  receiveSubmission,
-  requestSubmission,
-  resetSubmission,
-  sendSubmission
-} from "./submission.actions";
+import { failSubmission, receiveSubmission, requestSubmission, resetSubmission, sendSubmission } from "./submission.actions";
 import { submissionReducer } from "./submission.reducers";
 
 describe("Submission reducers", () => {
@@ -33,16 +27,14 @@ describe("Submission reducers", () => {
       url: "url"
     };
 
-    expect(reducer.$emit(requestSubmission.toString(), state, payload)).toEqual(
-      {
-        name: "name",
-        formId: "formId",
-        id: "id",
-        isActive: true,
-        data: {},
-        url: "url"
-      }
-    );
+    expect(reducer.$emit(requestSubmission.toString(), state, payload)).toEqual({
+      name: "name",
+      formId: "formId",
+      id: "id",
+      isActive: true,
+      data: {},
+      url: "url"
+    });
   });
 
   it("should return state (sendSubmission)", () => {
@@ -77,17 +69,15 @@ describe("Submission reducers", () => {
       }
     };
 
-    expect(reducer.$emit(receiveSubmission.toString(), state, payload)).toEqual(
-      {
-        name: "name",
-        url: "url",
-        error: null,
-        isActive: false,
-        data: {
-          _id: "id"
-        }
+    expect(reducer.$emit(receiveSubmission.toString(), state, payload)).toEqual({
+      name: "name",
+      url: "url",
+      error: null,
+      isActive: false,
+      data: {
+        _id: "id"
       }
-    );
+    });
   });
 
   it("should return state (failSubmission)", () => {

package/src/stores/submission/submission.reducers.ts

@@ -44,10 +44,7 @@ export const submissionReducer = createReducer<SubmissionState>(
       data: {},
       isActive: true
     }),
-    [sendSubmission.toString()]: (
-      state: any,
-      { formId, submission, id, url }: any
-    ) => ({
+    [sendSubmission.toString()]: (state: any, { formId, submission, id, url }: any) => ({
       ...state,
       formId,
       id,

package/src/stores/submission/submission.selectors.ts

@@ -2,7 +2,4 @@ import { Submission } from "../../interfaces";
 import { selectRoot } from "../root";
 import { SubmissionState } from "./submission.reducers";
 
-export const selectSubmission = (
-  name: string,
-  state: any
-): Partial<Submission> => selectRoot<SubmissionState>(name, state).data;
+export const selectSubmission = (name: string, state: any): Partial<Submission> => selectRoot<SubmissionState>(name, state).data;

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

@@ -1,11 +1,6 @@
 import { Formio } from "formiojs";
 import { mapRequestParams } from "../../utils/mapRequestParams";
-import {
-  failSubmissions,
-  getSubmissions,
-  receiveSubmissions,
-  requestSubmissions
-} from "./submissions.actions";
+import { failSubmissions, getSubmissions, receiveSubmissions, requestSubmissions } from "./submissions.actions";
 
 jest.mock("formiojs");
 jest.mock("../../utils/mapRequestParams");
@@ -17,9 +12,7 @@ describe("Submissions actions", () => {
   describe("getSubmissions", () => {
     it("should return a result", async () => {
       // GIVEN
-      (Formio.prototype.loadSubmissions as any).mockReturnValue(
-        Promise.resolve([{}])
-      );
+      (Formio.prototype.loadSubmissions as any).mockReturnValue(Promise.resolve([{}]));
       (Formio.getProjectUrl as any).mockReturnValue("https://formio");
 
       const dispatch = jest.fn();
@@ -37,9 +30,7 @@ describe("Submissions actions", () => {
       });
 
       // WHEN
-      await new Promise((resolve) =>
-        getSubmissions(name, formId, parameters, resolve)(dispatch, getState)
-      );
+      await new Promise((resolve) => getSubmissions(name, formId, parameters, resolve)(dispatch, getState));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("https://formio/formId/submission");
@@ -64,9 +55,7 @@ describe("Submissions actions", () => {
     });
     it("should return a error", async () => {
       // GIVEN
-      (Formio.prototype.loadSubmissions as any).mockReturnValue(
-        Promise.reject(new Error("message"))
-      );
+      (Formio.prototype.loadSubmissions as any).mockReturnValue(Promise.reject(new Error("message")));
       (Formio.getProjectUrl as any).mockReturnValue("https://formio");
 
       const dispatch = jest.fn();
@@ -84,9 +73,7 @@ describe("Submissions actions", () => {
       });
 
       // WHEN
-      await new Promise((resolve) =>
-        getSubmissions(name, formId, parameters, resolve)(dispatch, getState)
-      );
+      await new Promise((resolve) => getSubmissions(name, formId, parameters, resolve)(dispatch, getState));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("https://formio/formId/submission");

package/src/stores/submissions/submissions.actions.ts

@@ -10,35 +10,26 @@ export const requestSubmissions = createAction();
 export const receiveSubmissions = createAction();
 export const failSubmissions = createAction();
 
-export const getSubmissions = (
-  name: string,
-  formId: string,
-  parameters: any = {},
-  done = noop
-) => async (dispatch: any, getState: any) => {
-  dispatch(requestSubmissions(name, { formId, parameters }));
+export const getSubmissions =
+  (name: string, formId: string, parameters: any = {}, done = noop) =>
+  async (dispatch: any, getState: any) => {
+    dispatch(requestSubmissions(name, { formId, parameters }));
 
-  const url = getSubmissionUrl(formId);
-  const formio = new Formio(url);
-  const requestParams = mapRequestParams(
-    selectSubmissionsParameters(name, getState())
-  );
+    const url = getSubmissionUrl(formId);
+    const formio = new Formio(url);
+    const requestParams = mapRequestParams(selectSubmissionsParameters(name, getState()));
 
-  try {
-    const submissions = await formio.loadSubmissions({ params: requestParams });
-    dispatch(receiveSubmissions(name, { submissions }));
-    done(null, submissions);
-  } catch (error) {
-    dispatch(failSubmissions(name, { error }));
-    done(error);
-  }
-};
+    try {
+      const submissions = await formio.loadSubmissions({ params: requestParams });
+      dispatch(receiveSubmissions(name, { submissions }));
+      done(null, submissions);
+    } catch (error) {
+      dispatch(failSubmissions(name, { error }));
+      done(error);
+    }
+  };
 
-export const refreshSubmissions = (
-  name: string,
-  formId: string,
-  done = noop
-) => {
+export const refreshSubmissions = (name: string, formId: string, done = noop) => {
   return async (dispatch: any, getState: any) => {
     const parameters = selectSubmissionsParameters(name, getState());
     return getSubmissions(name, formId, parameters, done)(dispatch, getState);

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

@@ -1,9 +1,4 @@
-import {
-  failSubmissions,
-  receiveSubmissions,
-  requestSubmissions,
-  resetSubmissions
-} from "./submissions.actions";
+import { failSubmissions, receiveSubmissions, requestSubmissions, resetSubmissions } from "./submissions.actions";
 import { submissionsReducer } from "./submissions.reducers";
 
 describe("Submissions reducers", () => {
@@ -42,9 +37,7 @@ describe("Submissions reducers", () => {
       }
     };
 
-    expect(
-      reducer.$emit(requestSubmissions.toString(), state, payload)
-    ).toEqual({
+    expect(reducer.$emit(requestSubmissions.toString(), state, payload)).toEqual({
       error: null,
       formId: undefined,
       name: "name",
@@ -74,9 +67,7 @@ describe("Submissions reducers", () => {
     };
     payload.submissions.serverCount = 100;
 
-    expect(
-      reducer.$emit(receiveSubmissions.toString(), state, payload)
-    ).toEqual({
+    expect(reducer.$emit(receiveSubmissions.toString(), state, payload)).toEqual({
       name: "name",
       data: [
         {

package/src/stores/submissions/submissions.reducers.ts

@@ -1,11 +1,6 @@
 import { createReducer } from "@tsed/redux-utils";
 import { Submission } from "../../interfaces/Submission";
-import {
-  failSubmissions,
-  receiveSubmissions,
-  requestSubmissions,
-  resetSubmissions
-} from "./submissions.actions";
+import { failSubmissions, receiveSubmissions, requestSubmissions, resetSubmissions } from "./submissions.actions";
 
 export interface SubmissionsState {
   error: null | Error;
@@ -22,13 +17,7 @@ export interface SubmissionsState {
   data: Submission[];
 }
 
-export function createInitialState({
-  pageIndex = 0,
-  pageSize = 10,
-  query = {},
-  select = "",
-  sortBy = []
-}: any = {}): SubmissionsState {
+export function createInitialState({ pageIndex = 0, pageSize = 10, query = {}, select = "", sortBy = [] }: any = {}): SubmissionsState {
   return {
     error: null,
     formId: "",
@@ -45,10 +34,7 @@ export function createInitialState({
   };
 }
 
-export const submissionsReducer = createReducer<SubmissionsState>(
-  {},
-  createInitialState
-)
+export const submissionsReducer = createReducer<SubmissionsState>({}, createInitialState)
   .on(resetSubmissions, (_: any, _2: any, reset: any) => {
     return reset();
   })

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

@@ -1,7 +1,4 @@
-import {
-  selectSubmissions,
-  selectSubmissionsParameters
-} from "./submissions.selectors";
+import { selectSubmissions, selectSubmissionsParameters } from "./submissions.selectors";
 
 describe("Submissions Selectors", () => {
   describe("selectSubmissions()", () => {

package/src/stores/submissions/submissions.selectors.ts

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

package/src/utils/getEventValue.ts

@@ -2,10 +2,7 @@ export function getEventValue(event: any) {
   const { target } = event;
 
   if (event.target.multiple && event.target.selectedOptions) {
-    return Array.from(
-      event.target.selectedOptions,
-      (option: any) => option.value
-    );
+    return Array.from(event.target.selectedOptions, (option: any) => option.value);
   }
 
   return target.type === "checkbox" ? target.checked : target.value;

package/src/utils/iconClass.ts

@@ -1,13 +1,5 @@
 import { Templates } from "formiojs";
 
-export function iconClass(
-  iconset: string | undefined,
-  name: string,
-  spinning?: boolean
-): string {
-  return Templates.current.iconClass(
-    iconset || Templates.current.defaultIconset,
-    name,
-    spinning
-  );
+export function iconClass(iconset: string | undefined, name: string, spinning?: boolean): string {
+  return Templates.current.iconClass(iconset || Templates.current.defaultIconset, name, spinning);
 }

package/src/utils/mapPagination.ts

@@ -1,9 +1,4 @@
-export function mapPagination({
-  skip,
-  limit,
-  serverCount,
-  length
-}: any = {}): any {
+export function mapPagination({ skip, limit, serverCount, length }: any = {}): any {
   skip = skip || 0;
   limit = limit || 10;
   serverCount = serverCount || length;