@tsed/react-formio 1.11.2 → 1.12.0

package/src/stores/auth/auth.utils.tsx

@@ -23,19 +23,13 @@ export function isAuthorized(auth: AuthState, roles: string[] = []): boolean {
   return false;
 }
 
-export function checkRoleFormAccess(
-  auth: AuthState,
-  form?: Partial<FormSchema>,
-  roles?: string[]
-) {
+export function checkRoleFormAccess(auth: AuthState, form?: Partial<FormSchema>, roles?: string[]) {
   if (roles && roles.length) {
     if (isAuthorized(auth, roles)) {
       return true;
     }
 
-    return !!(
-      roles.includes("owner") && get(form, "owner") === get(auth, "user._id")
-    );
+    return !!(roles.includes("owner") && get(form, "owner") === get(auth, "user._id"));
   }
 
   return true;

package/src/stores/auth/getAccess.action.spec.ts

@@ -1,10 +1,5 @@
 import { Formio } from "formiojs";
-import {
-  formAccessUser,
-  submissionAccessUser,
-  userForms,
-  userRoles
-} from "./auth.actions";
+import { formAccessUser, submissionAccessUser, userForms, userRoles } from "./auth.actions";
 import { AUTH } from "./auth.constant";
 import { getAccess } from "./getAccess.action";
 
@@ -49,11 +44,7 @@ describe("getAccess()", () => {
           path: "user",
           access: [
             {
-              roles: [
-                "6016dd751c62ca370d59f0ba",
-                "6016dd751c62ca370d59f0b9",
-                "6016dd751c62ca370d59f0b8"
-              ],
+              roles: ["6016dd751c62ca370d59f0ba", "6016dd751c62ca370d59f0b9", "6016dd751c62ca370d59f0b8"],
               type: "read_all"
             }
           ],
@@ -75,11 +66,7 @@ describe("getAccess()", () => {
           path: "admin",
           access: [
             {
-              roles: [
-                "6016dd751c62ca370d59f0ba",
-                "6016dd751c62ca370d59f0b9",
-                "6016dd751c62ca370d59f0b8"
-              ],
+              roles: ["6016dd751c62ca370d59f0ba", "6016dd751c62ca370d59f0b9", "6016dd751c62ca370d59f0b8"],
               type: "read_all"
             }
           ],
@@ -101,11 +88,7 @@ describe("getAccess()", () => {
           path: "todo",
           access: [
             {
-              roles: [
-                "6016dd751c62ca370d59f0b8",
-                "6016dd751c62ca370d59f0b9",
-                "6016dd751c62ca370d59f0ba"
-              ],
+              roles: ["6016dd751c62ca370d59f0b8", "6016dd751c62ca370d59f0b9", "6016dd751c62ca370d59f0ba"],
               type: "read_all"
             }
           ],
@@ -128,9 +111,7 @@ describe("getAccess()", () => {
     await getAccess(dispatch);
 
     expect(Formio.getProjectUrl).toHaveBeenCalledWith();
-    expect(Formio.makeStaticRequest).toHaveBeenCalledWith(
-      "https://api.form.io/access"
-    );
+    expect(Formio.makeStaticRequest).toHaveBeenCalledWith("https://api.form.io/access");
 
     expect(submissionAccessUser).toHaveBeenCalledWith(AUTH, {
       submissionAccess: {
@@ -169,25 +150,13 @@ describe("getAccess()", () => {
     expect(formAccessUser).toHaveBeenCalledWith(AUTH, {
       formAccess: {
         admin: {
-          read_all: [
-            "6016dd751c62ca370d59f0ba",
-            "6016dd751c62ca370d59f0b9",
-            "6016dd751c62ca370d59f0b8"
-          ]
+          read_all: ["6016dd751c62ca370d59f0ba", "6016dd751c62ca370d59f0b9", "6016dd751c62ca370d59f0b8"]
         },
         todo: {
-          read_all: [
-            "6016dd751c62ca370d59f0b8",
-            "6016dd751c62ca370d59f0b9",
-            "6016dd751c62ca370d59f0ba"
-          ]
+          read_all: ["6016dd751c62ca370d59f0b8", "6016dd751c62ca370d59f0b9", "6016dd751c62ca370d59f0ba"]
         },
         user: {
-          read_all: [
-            "6016dd751c62ca370d59f0ba",
-            "6016dd751c62ca370d59f0b9",
-            "6016dd751c62ca370d59f0b8"
-          ]
+          read_all: ["6016dd751c62ca370d59f0ba", "6016dd751c62ca370d59f0b9", "6016dd751c62ca370d59f0b8"]
         }
       }
     });
@@ -219,11 +188,7 @@ describe("getAccess()", () => {
           _id: "6016e1fb4ce825382505947e",
           access: [
             {
-              roles: [
-                "6016dd751c62ca370d59f0ba",
-                "6016dd751c62ca370d59f0b9",
-                "6016dd751c62ca370d59f0b8"
-              ],
+              roles: ["6016dd751c62ca370d59f0ba", "6016dd751c62ca370d59f0b9", "6016dd751c62ca370d59f0b8"],
               type: "read_all"
             }
           ],
@@ -245,11 +210,7 @@ describe("getAccess()", () => {
           _id: "6016e1fb4ce825382505947f",
           access: [
             {
-              roles: [
-                "6016dd751c62ca370d59f0b8",
-                "6016dd751c62ca370d59f0b9",
-                "6016dd751c62ca370d59f0ba"
-              ],
+              roles: ["6016dd751c62ca370d59f0b8", "6016dd751c62ca370d59f0b9", "6016dd751c62ca370d59f0ba"],
               type: "read_all"
             }
           ],
@@ -271,11 +232,7 @@ describe("getAccess()", () => {
           _id: "6016e1fb4ce825382505947d",
           access: [
             {
-              roles: [
-                "6016dd751c62ca370d59f0ba",
-                "6016dd751c62ca370d59f0b9",
-                "6016dd751c62ca370d59f0b8"
-              ],
+              roles: ["6016dd751c62ca370d59f0ba", "6016dd751c62ca370d59f0b9", "6016dd751c62ca370d59f0b8"],
               type: "read_all"
             }
           ],

package/src/stores/auth/getAccess.action.ts

@@ -1,12 +1,7 @@
 import { Formio } from "formiojs";
 import { RoleSchema } from "../../interfaces";
 import { FormSchema } from "../../interfaces/FormSchema";
-import {
-  formAccessUser,
-  submissionAccessUser,
-  userForms,
-  userRoles
-} from "./auth.actions";
+import { formAccessUser, submissionAccessUser, userForms, userRoles } from "./auth.actions";
 import { AUTH } from "./auth.constant";
 
 function transformSubmissionAccess(forms: Record<string, FormSchema>) {

package/src/stores/auth/initAuth.action.ts

@@ -7,24 +7,22 @@ import { getProjectAccess } from "./getProjectAccess.action";
 import { logout } from "./logout.action";
 import { setUser } from "./setUser.action";
 
-export const initAuth = (done = noop) => async (dispatch: any) => {
-  dispatch(requestUser(AUTH));
+export const initAuth =
+  (done = noop) =>
+  async (dispatch: any) => {
+    dispatch(requestUser(AUTH));
 
-  try {
-    const [user] = await Promise.all([
-      Formio.currentUser(),
-      getAccess(dispatch),
-      getProjectAccess(dispatch)
-    ]);
+    try {
+      const [user] = await Promise.all([Formio.currentUser(), getAccess(dispatch), getProjectAccess(dispatch)]);
 
-    if (user) {
-      dispatch(setUser(user));
-    } else {
-      dispatch(logout());
+      if (user) {
+        dispatch(setUser(user));
+      } else {
+        dispatch(logout());
+      }
+    } catch (error) {
+      dispatch(failUser(AUTH, { error }));
     }
-  } catch (error) {
-    dispatch(failUser(AUTH, { error }));
-  }
 
-  done();
-};
+    done();
+  };

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

@@ -1,27 +1,16 @@
 import { Formio } from "formiojs";
-import {
-  deleteForm,
-  failForm,
-  getForm,
-  receiveForm,
-  requestForm,
-  resetForm,
-  saveForm,
-  sendForm
-} from "./form.actions";
+import { deleteForm, failForm, getForm, receiveForm, requestForm, resetForm, saveForm, sendForm } from "./form.actions";
 
 jest.mock("formiojs");
 
 describe("Form actions", () => {
   describe("getForm", () => {
     beforeEach(() => {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
       // @ts-ignore
       Formio.mockClear();
     });
     it("should return a result", async () => {
       // GIVEN
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
       // @ts-ignore
       Formio.prototype.loadForm.mockReturnValue(Promise.resolve({}));
 
@@ -34,9 +23,7 @@ describe("Form actions", () => {
       });
 
       // WHEN
-      await new Promise((resolve) =>
-        getForm(name, formId, resolve)(dispatch, getState)
-      );
+      await new Promise((resolve) => getForm(name, formId, resolve)(dispatch, getState));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("/formId");
@@ -60,7 +47,6 @@ describe("Form actions", () => {
     });
     it("should do nothing when submission is already loaded", async () => {
       // GIVEN
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
       // @ts-ignore
       Formio.prototype.loadForm.mockReturnValue(Promise.resolve({}));
 
@@ -85,11 +71,8 @@ describe("Form actions", () => {
     });
     it("should throw error", async () => {
       // GIVEN
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
       // @ts-ignore
-      Formio.prototype.loadForm.mockReturnValue(
-        Promise.reject(new Error("message"))
-      );
+      Formio.prototype.loadForm.mockReturnValue(Promise.reject(new Error("message")));
 
       const dispatch = jest.fn();
       const name = "name";
@@ -100,9 +83,7 @@ describe("Form actions", () => {
       });
 
       // WHEN
-      await new Promise((resolve) =>
-        getForm(name, formId, resolve)(dispatch, getState)
-      );
+      await new Promise((resolve) => getForm(name, formId, resolve)(dispatch, getState));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("/formId");
@@ -124,7 +105,6 @@ describe("Form actions", () => {
       const formId = "formId";
       const data = { _id: formId };
 
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
       // @ts-ignore
       Formio.prototype.saveForm.mockReturnValue(Promise.resolve(data));
       // WHEN
@@ -151,11 +131,8 @@ describe("Form actions", () => {
     });
     it("should throw error", async () => {
       // GIVEN
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
       // @ts-ignore
-      Formio.prototype.saveForm.mockReturnValue(
-        Promise.reject(new Error("message"))
-      );
+      Formio.prototype.saveForm.mockReturnValue(Promise.reject(new Error("message")));
 
       const dispatch = jest.fn();
       const name = "name";
@@ -180,7 +157,6 @@ describe("Form actions", () => {
   describe("deleteForm", () => {
     it("should return a result", async () => {
       // GIVEN
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
       // @ts-ignore
       Formio.prototype.deleteForm.mockReturnValue(Promise.resolve({}));
 
@@ -189,9 +165,7 @@ describe("Form actions", () => {
       const formId = "formId";
 
       // WHEN
-      await new Promise((resolve) =>
-        deleteForm(name, formId, resolve)(dispatch)
-      );
+      await new Promise((resolve) => deleteForm(name, formId, resolve)(dispatch));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("/formId");
@@ -203,20 +177,15 @@ describe("Form actions", () => {
     });
     it("should throw error", async () => {
       // GIVEN
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
       // @ts-ignore
-      Formio.prototype.deleteForm.mockReturnValue(
-        Promise.reject(new Error("message"))
-      );
+      Formio.prototype.deleteForm.mockReturnValue(Promise.reject(new Error("message")));
 
       const dispatch = jest.fn();
       const name = "name";
       const formId = "formId";
 
       // WHEN
-      await new Promise((resolve) =>
-        deleteForm(name, formId, resolve)(dispatch)
-      );
+      await new Promise((resolve) => deleteForm(name, formId, resolve)(dispatch));
 
       // THEN
       expect(Formio).toHaveBeenCalledWith("/formId");

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;