conflicts fixed

Author: Bonymol-aot

.github/workflows/forms-flow-documents-ci.yml

@@ -76,6 +76,7 @@ jobs:
       SKIP_IN_CI: "True"
       USE_DOCKER_MOCK: "True"
       JWT_OIDC_TEST_PRIVATE_KEY_PEM: ${{ secrets.JWT_OIDC_TEST_PRIVATE_KEY_PEM }}
+      FORMIO_TEST_JWT_TOKEN: ${{ secrets.FORMIO_TEST_JWT_TOKEN}}
 
     runs-on: ubuntu-24.04
     strategy:

forms-flow-api/tests/unit/api/test_form_process_mapper.py

@@ -1140,7 +1140,7 @@ def test_form_flow_builder_update_invalid_payload(app, client, session, jwt, moc
     # Test with empty payload
     payload = {}
     response = client.put(f"/form/form-flow-builder/{mapper_id}", headers=headers, json=payload)
-    assert response.status_code == 200  # Empty payload should still return success
+    assert response.status_code == 400
 
     # Test with invalid form data (missing _id)
     # Form data must include _id for update

forms-flow-bpm/forms-flow-bpm-camunda/src/main/java/org/camunda/bpm/extension/keycloak/sso/OAuth2LoginSecurityConfig.java

@@ -88,14 +88,14 @@ public SecurityFilterChain httpSecurityFilterChain(HttpSecurity http, JwtDecoder
 		return http
 				.csrf(AbstractHttpConfigurer::disable)
 				.securityMatcher(AntPathRequestMatcher.antMatcher("/engine-rest-ext/**"))
-				.authorizeHttpRequests(auth -> auth
+				.authorizeHttpRequests(auth -> auth				 
 						.requestMatchers(
-								antMatcher(HttpMethod.OPTIONS,"/engine-rest/**"),
-								antMatcher(HttpMethod.OPTIONS,"/engine-rest-ext/**"),
+								antMatcher(HttpMethod.OPTIONS,"/engine-rest-ext/v1/**"),
 								antMatcher(HttpMethod.OPTIONS, "/forms-flow-bpm-socket/**"),
 								antMatcher(HttpMethod.OPTIONS, "/engine-rest/**"),
-								antMatcher("/engine-rest-ext/**"))
+								antMatcher("/engine-rest-ext/v1/**"))
 						.permitAll()
+						.requestMatchers(antMatcher("/engine-rest-ext/**")).denyAll()
 						.anyRequest().authenticated())
 				.oauth2ResourceServer(oauth2ResourceServer -> oauth2ResourceServer
 						.jwt(jwt -> jwt

forms-flow-documents/sample.env

@@ -36,6 +36,7 @@ FORMSFLOW_API_CORS_ORIGINS=*
 ##Env For Unit Testing
 ## JWT_OIDC_TEST_PRIVATE_KEY_PEM=
 ## FLASK_ENV=testing
+## FORMIO_TEST_JWT_TOKEN=
 
 #FORMIO configuration
 FORMIO_DEFAULT_PROJECT_URL=http://{your-ip-address}:3001

forms-flow-documents/tests/conftest.py

@@ -1,4 +1,5 @@
 """Common setup and fixtures for the pytest suite used by this service."""
+import os
 import time
 
 import pytest
@@ -106,3 +107,13 @@ def get(self, key):
         return_value=mock_redis,
     ) as _mock:  # noqa
         yield mock_redis
+
+
+@pytest.fixture(autouse=True)
+def mock_formio_access_token():
+    """Mock formio access token."""
+    with patch(
+        "formsflow_api_utils.services.external.formio.FormioService.get_formio_access_token",
+        return_value=os.getenv("FORMIO_TEST_JWT_TOKEN"),
+    ):
+        yield

forms-flow-web/src/helper/routerHelper.js

@@ -63,8 +63,30 @@ const navigateToResubmit = (dispatch, tenantId, formId, submissionId ) => {
   navigateTo(dispatch,`${getRoute(tenantId).FORM}/${formId}/submissions/${submissionId}/resubmit`);
 };
 
+/* ---------------------------  Process Creation Routes --------------------------- */
+const navigateToSubflowBuild = (dispatch, tenantId) => {
+  navigateTo(dispatch, `${getRoute(tenantId).SUBFLOW}/build`);
+};
 
+const navigateToDecisionTableBuild = (dispatch, tenantId) => {
+  navigateTo(dispatch, `${getRoute(tenantId).DECISIONTABLE}/build`);
+};
 
+const navigateToSubflowCreate = (dispatch, tenantId) => {
+  navigateTo(dispatch, `${getRoute(tenantId).SUBFLOW}/create`);
+};
+
+const navigateToDecisionTableCreate = (dispatch, tenantId) => {
+  navigateTo(dispatch, `${getRoute(tenantId).DECISIONTABLE}/create`);
+};
+
+const navigateToSubflowEdit = (dispatch, tenantId, processKey) => {
+  navigateTo(dispatch, `${getRoute(tenantId).SUBFLOW}/edit/${processKey}`);
+};
+
+const navigateToDecisionTableEdit = (dispatch, tenantId, processKey) => {
+  navigateTo(dispatch, `${getRoute(tenantId).DECISIONTABLE}/edit/${processKey}`);
+};
 
 export {
   navigateToDesignFormsListing,
@@ -79,4 +101,10 @@ export {
   navigateToDraftEdit,
   navigateToViewSubmission,  
   navigateToResubmit,
+  navigateToSubflowBuild,
+  navigateToDecisionTableBuild,
+  navigateToSubflowCreate,
+  navigateToDecisionTableCreate,
+  navigateToSubflowEdit,
+  navigateToDecisionTableEdit,
 };

forms-flow-web/src/routes/Design/Forms/FlowEdit.js

@@ -7,7 +7,7 @@ import React, {
 } from "react";
 import {
   CustomButton,
-  ConfirmModal,
+  PromptModal,
   // HistoryModal,
   //CurlyBracketsIcon,
   VariableSelection,
@@ -343,19 +343,23 @@ const enableWorkflowChange = async () => {
       <>
         {/* <Card> */}
         <div>
-          <ConfirmModal
+          <PromptModal
             show={showDiscardModal}
             title={t(`Discard Flow Changes?`)}
             message={t(
               "Are you sure you want to discard all unsaved changes to the flow of the form?"
             )}
-            messageSecondary={t("This action cannot be undone.")}
             primaryBtnAction={handleDiscardConfirm}
             onClose={handleDiscardModal}
             primaryBtnText={t("Yes, Discard All Unsaved Changes")}
             secondaryBtnText={t("No, Keep The Changes")}
             secondaryBtnAction={handleDiscardModal}
-            size="sm"
+            type="warning"
+            size="md"
+            primaryBtndataTestid="discard-confirm-button"
+            secondoryBtndataTestid="discard-cancel-button"
+            primaryBtnariaLabel={t("Yes, Discard All Unsaved Changes")}
+            secondoryBtnariaLabel={t("No, Keep The Changes")}
           />
           {/* <div className="head">
             {createDesigns && (
@@ -408,9 +412,10 @@ const enableWorkflowChange = async () => {
           {/* </Card> */}
         </div>
         {showMigrationModal && (
-          <ConfirmModal
+          <PromptModal
             show={showMigrationModal}
             title={t("***Migration Notice***")}
+            size="lg"
             message={
               <div>
                 <div className="message-primary mb-3">
@@ -457,7 +462,6 @@ const enableWorkflowChange = async () => {
               </div>
             }
             primaryBtnDisable={!isMigrationChecked}
-            messageSecondary={null} // You can set this to `null` or remove it entirely if unused
             primaryBtnAction={handleMigration}
             onClose={handleCloseMigration}
             primaryBtnText={t(
@@ -466,7 +470,13 @@ const enableWorkflowChange = async () => {
             secondaryBtnText={t("Cancel")}
             secondaryBtnAction={handleCloseMigration}
             buttonLoading={isMigrationLoading}
-            size="sm"
+            type="info"
+            primaryBtndataTestid="migration-confirm-button"
+            secondoryBtndataTestid="migration-cancel-button"
+            primaryBtnariaLabel={t(
+              "Link this form that will keep the current flow and its history"
+            )}
+            secondoryBtnariaLabel={t("Cancel")}
           />
         )}
 

forms-flow-web/src/routes/Design/Process/ProcessCreateEdit.js

@@ -20,8 +20,7 @@ import {
   createNewDecision,
 } from "../../../components/Modeler/helpers/helper";
 import {
-  ConfirmModal,
-  ErrorModal,
+  PromptModal,
   HistoryPage,
   V8CustomButton,
   FormStatusIcon,
@@ -660,17 +659,21 @@ const ProcessCreateEdit = ({ type }) => {
   return (
     <div>
       <NavigateBlocker isBlock={isWorkflowChanged} message={"You have made changes that are not saved yet"}  />
-      <ConfirmModal
+      <PromptModal
         show={showConfirmModal}
         title={modalContent.title}
         message={modalContent.message}
-        messageSecondary={modalContent.messageSecondary || ""}
         primaryBtnAction={modalContent.primaryBtnAction}
         onClose={closeModal}
         secondaryBtnAction={modalContent.secondaryBtnAction}
         primaryBtnText={modalContent.primaryBtnText}
         secondaryBtnText={modalContent.secondaryBtnText}
-        size="md"
+        type="warning"
+        size={modalType === "unpublish" ? "lg" : "md"}
+        primaryBtndataTestid="confirm-primary-button"
+        secondoryBtndataTestid="confirm-secondary-button"
+        primaryBtnariaLabel={modalContent.primaryBtnText}
+        secondoryBtnariaLabel={modalContent.secondaryBtnText}
       />
 
             <BreadCrumbs
@@ -815,16 +818,20 @@ const ProcessCreateEdit = ({ type }) => {
         errorMessage={exportError}
       />
       {showErrorModal && (
-        <ErrorModal
+        <PromptModal
           show={showErrorModal}
           onClose={handleCloseErrorModal}
           title={t("Error(s)")}
           message={errorMessage}
           primaryBtnAction={handleCloseErrorModal}
           primaryBtnText={t("Dismiss")}
+          size="lg"
+          type="error"
+          primaryBtndataTestid="error-dismiss-button"
+          primaryBtnariaLabel={t("Dismiss")}
         />
       )}
-      {/* Inline HistoryPage is rendered within the body based on activeTab */}
+    
       {selectedAction === IMPORT && <ImportProcess
         showModal={selectedAction === IMPORT}
         closeImport={() => setSelectedAction(null)}