Merge pull request AOT-Technologies#2565 from arun-s-aot/feature/FWF-…

…4347-folder-structure-rearrange

FWF-4347 [Feature] - Folder structure rearrange of designer and submitter routes

forms-flow-web/src/_tests_/unit/list.test.js

@@ -7,7 +7,7 @@ import { configureStore } from '@reduxjs/toolkit';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import rootReducer from './rootReducer';
 import { mockstate } from './mockState';
-import List from '../../components/Form/List';
+import List from '../../routes/Design/Forms/List';
 import { createMemoryHistory } from 'history';
 import { Router, Route } from 'react-router-dom';
 import { Switch } from 'react-router-dom/cjs/react-router-dom.min';

forms-flow-web/src/components/Application/ViewApplication.js

@@ -12,7 +12,7 @@ import {
   setApplicationDetailStatusCode,
 } from "../../actions/applicationActions";
 import History from "./ApplicationHistory";
-import View from "../Form/Item/Submission/Item/View";
+import View from "../../routes/Submit/Submission/Item/View";
 import { getForm, getSubmission } from "@aot-technologies/formio-react";
 import NotFound from "../NotFound";
 import { Translation,useTranslation } from "react-i18next";

forms-flow-web/src/components/Draft/Edit.js

@@ -19,7 +19,7 @@ import {RESOURCE_BUNDLES_DATA} from "../../resourceBundles/i18n";
 
 import useInterval from "../../customHooks/useInterval";
 import { CUSTOM_EVENT_TYPE } from "../ServiceFlow/constants/customEventTypes";
-import selectApplicationCreateAPI from "../Form/Item/apiSelectHelper";
+import selectApplicationCreateAPI from "../Form/constants/apiSelectHelper";
 import {
   setFormSubmissionError,
   setFormSubmissionLoading,
@@ -49,6 +49,7 @@ import { setDraftDelete } from "../../actions/draftActions";
 import { setFormStatusLoading } from "../../actions/processActions";
 import { getFormProcesses } from "../../apiManager/services/processServices";
 import { textTruncate } from "../../helper/helper";
+import PropTypes from "prop-types";
 
 const View = React.memo((props) => {
   const { t } = useTranslation();
@@ -348,6 +349,20 @@ const executeAuthSideEffects = (dispatch, redirectUrl) => {
   dispatch(push(`${redirectUrl}draft`));
 };
 
+View.propTypes = {
+  isAuthenticated: PropTypes.bool,
+  form: PropTypes.object,
+  submission: PropTypes.object,
+  url: PropTypes.string,
+  options: PropTypes.object,
+  hideComponents: PropTypes.array,
+  onSubmit: PropTypes.func,
+  onCustomEvent: PropTypes.func,
+  submissionError: PropTypes.object,
+  onConfirm: PropTypes.func,
+  errors: PropTypes.array,
+};
+
 // eslint-disable-next-line no-unused-vars
 const doProcessActions = (submission, ownProps) => {
   return (dispatch, getState) => {
@@ -360,15 +375,15 @@ const doProcessActions = (submission, ownProps) => {
     const origin = `${window.location.origin}${redirectUrl}`;
     const data = getProcessReq(form, submission._id, origin, submission?.data);
     let draft_id = state.draft.submission?.id;
-    let isDraftCreated = draft_id ? true : false;
+    let isDraftCreated = !!draft_id;
     const applicationCreateAPI = selectApplicationCreateAPI(
       isAuth,
       isDraftCreated,
       DRAFT_ENABLED
     );
 
     dispatch(
-      applicationCreateAPI(data, draft_id ? draft_id : null, (err) => {
+      applicationCreateAPI(data, draft_id, (err) => {
         dispatch(setFormSubmissionLoading(false));
         if (!err) {
           toast.success(

forms-flow-web/src/components/Draft/ViewDraft.js

@@ -6,7 +6,7 @@ import startCase from "lodash/startCase";
 import { Tabs, Tab } from "react-bootstrap";
 import Details from "./Details";
 import Loading from "../../containers/Loading";
-import View from "../Form/Item/Submission/Item/View";
+import View from "../../routes/Submit/Submission/Item/View";
 import { getForm } from "@aot-technologies/formio-react";
 import NotFound from "../NotFound";
 import { Translation, useTranslation } from "react-i18next";