Selective Variable Submission in Screens

package.json

@@ -16,6 +16,7 @@
         "prod": "npm run production",
         "production": "mix --production && mix --mix-config=webpack-login.mix.js --production",
         "test": "cross-env NODE_ENV=test jest",
+        "test-submission": "cross-env NODE_ENV=test jest tests/js/SubmissionDataFilter.test.js tests/js/SubmitMethod.test.js",
         "test-watch": "npm run test -- --watch --notify",
         "lint": "eslint --fix --ignore-path .eslintignore resources/",
         "font": "node ./devhub/pm-font/svgtofont.js && cp -f ./devhub/pm-font/dist/*.* ./resources/fonts/pm-font",
@@ -125,24 +126,25 @@
         "setupFiles": [
             "<rootDir>/jest/globals.js"
         ],
-        "testURL": "http://localhost",
+        "testEnvironment": "node",
+        "testEnvironmentOptions": {
+            "url": "http://localhost"
+        },
         "moduleFileExtensions": [
-            "vue",
             "json",
             "js"
         ],
-        "transform": {
-            "^.+\\.js$": "<rootDir>/node_modules/babel-jest",
-            ".*\\.(vue)$": "<rootDir>/node_modules/vue-jest"
-        },
+        "testMatch": [
+            "**/tests/js/SubmissionDataFilter.test.js",
+            "**/tests/js/SubmitMethod.test.js"
+        ],
         "moduleNameMapper": {
             "@pmjs(.*)$": "<rootDir>/resources/js/$1"
         },
         "transformIgnorePatterns": [
-            "node_modules/(?!(vuetable-2)/)"
+            "node_modules/"
         ],
         "roots": [
-            "<rootDir>/resources/js/",
             "<rootDir>/tests/js/"
         ],
         "collectCoverage": true,

resources/js/tasks/edit.js

@@ -338,7 +338,7 @@ const main = new Vue({
     isMustache(record) {
       return /\{\{.*\}\}/.test(record);
     },
-    submit(task) {
+    submit(task, dataToSubmit = this.formData) {
       if (this.isSelfService) {
         ProcessMaker.alert(this.$t("Claim the Task to continue."), "warning");
       } else {
@@ -354,8 +354,8 @@ const main = new Vue({
           resultCollectionComponent.forEach((result) => {
             if (result.submitCollectionChecked) {
               const collectionKeys = Object.keys(result.collectionFields);
-              const matchingKeys = _.intersection(Object.keys(this.formData), collectionKeys);
-              const collectionsData = _.pick(this.formData, matchingKeys);
+              const matchingKeys = _.intersection(Object.keys(dataToSubmit), collectionKeys);
+              const collectionsData = _.pick(dataToSubmit, matchingKeys);
 
               ProcessMaker.apiClient
                 .put(`collections/${result.collectionId}/records/${result.recordId}`, {
@@ -373,7 +373,7 @@ const main = new Vue({
         const taskId = task.id;
         this.submitting = true;
         ProcessMaker.apiClient
-          .put(`tasks/${taskId}`, { status: "COMPLETED", data: this.formData })
+          .put(`tasks/${taskId}`, { status: "COMPLETED", data: dataToSubmit })
           .then(() => {
             window.ProcessMaker.alert(message, "success", 5, true);
           })

resources/lang/de.json

@@ -713,9 +713,11 @@
   "Scripts": "Skripte",
   "Search...": "Suche ...",
   "Search": "Suche",
+  "Search variables...": "Variablen suchen...",
   "secondary": "sekundär",
   "Select a collection and fill the fields that will be used in the dropdownlist": "Wählen Sie eine Sammlung aus und füllen Sie die Felder aus, die in der Auswahlliste verwendet werden sollen",
   "Select a user to set the API access of the Script": "Wählen Sie einen Benutzer aus, um den API-Zugriff des Skripts festzulegen.",
+  "Select All": "Alle auswählen",
   "Select allowed group": "Zulässige Gruppe auswählen",
   "Select allowed groups": "Zulässige Gruppen auswählen",
   "Select allowed user": "Zulässigen Benutzer auswählen",
@@ -740,6 +742,7 @@
   "Select who may start a Request": "Legen Sie fest, wer eine Anfrage starten darf",
   "Select who may start a Request of this Process": "Legen Sie fest, wer eine Anfrage für diesen Prozess starten darf",
   "Select user or type here to search users": "Wählen Sie den Benutzer aus oder geben Sie hier einen Begriff ein, um nach Benutzern zu suchen",
+  "Select variables to submit, otherwise all variables will be submitted by default.": "Wählen Sie die Variablen aus, die übermittelt werden sollen, andernfalls werden alle Variablen standardmäßig übermittelt.",
   "Select where to send users after this task. Any Non-default destination will disable the “Display Next Assigned Task” function.": "Wählen Sie aus, wohin Benutzer nach dieser Aufgabe gesendet werden sollen. Jedes nicht standardmäßige Ziel deaktiviert die Funktion „Nächste zugewiesene Aufgabe anzeigen“.",
   "Select...": "Auswählen ...",
   "Select": "Auswählen",
@@ -839,6 +842,7 @@
   "The environment variable was saved.": "Die Umgebungsvariable wurde gespeichert.",
   "The following items should be configured to ensure your process is functional.": "Die folgenden Elemente sollten konfiguriert werden, um sicherzustellen, dass Ihr Prozess funktionsfähig ist.",
   "The following items should be configured to ensure your process is functional": "Die folgenden Elemente sollten konfiguriert werden, um sicherzustellen, dass Ihr Prozess funktionsfähig ist",
+  "The following required fields are not included in the submitted data.": "Die folgenden erforderlichen Felder sind nicht in den übermittelten Daten enthalten.",
   "The form to be displayed is not assigned.": "Das anzuzeigende Formular ist nicht zugeordnet.",
   "The form to use for adding/editing records": "Das Formular zum Hinzufügen / Bearbeiten von Datensätzen",
   "The group was created.": "Die Gruppe wurde erstellt.",
@@ -1224,6 +1228,8 @@
   "Validate that an attribute has a valid URL format.": "Bestätigen, dass ein Attribut ein gültiges URL-Format hat.",
   "Add Rule": "Regel hinzufügen",
   "No validation rule(s)": "Keine Validierungsregel(n)",
+  "No variables match your search.": "Keine Variablen entsprechen Ihrer Suche.",
+  "No variables available. Variables will be available after you add form fields to your screen.": "Keine Variablen verfügbar. Variablen werden verfügbar, nachdem Sie Felder zum Bildschirm hinzugefügt haben.",
   "New Select List": "Neue Auswahlliste",
   "New Array of Objects": "Neues Objektarray",
   "Existing Array": "Vorhandenes Array",
@@ -1874,6 +1880,7 @@
   "Invalid code.": "Invalid code.",
   "Security Code": "Security Code",
   "This is your security code: :code": "This is your security code: :code",
+  "This may cause validation errors during submission.": "Dies kann zu Validierungsfehlern während der Übermittlung führen.",
   "Configure the authenticator app": "Configure the authenticator app",
   "1.- Download the Google Authenticator App": "1.- Download the Google Authenticator App",
   "2.- On the Google Authenticator app click on the + icon": "2.- On the Google Authenticator app click on the + icon",
@@ -2179,6 +2186,7 @@
   "If you want to establish an automatic submit for this rule,": "Wenn Sie eine automatische Übermittlung für diese Regel einrichten möchten,",
   "complete all the necessary fields and select you preferred submit action.": "Füllen Sie alle notwendigen Felder aus und wählen Sie Ihre bevorzugte Absendeaktion aus.",
   "Submit after filling": "Absenden nach dem Ausfüllen",
+  "Submit Information": "Informationen einreichen",
   "Choose the submit action you want to use by clicking on it in the form*": "Wählen Sie die Absendeaktion, die Sie verwenden möchten, indem Sie darauf im Formular* klicken",
   "Submit action": "Aktion einreichen",
   "Enter your name": "Geben Sie Ihren Namen ein",

resources/lang/en.json

@@ -1435,6 +1435,8 @@
   "No translations found": "No translations found",
   "No user selected": "No user selected",
   "No validation rule(s)": "No validation rule(s)",
+  "No variables match your search.": "No variables match your search.",
+  "No variables available. Variables will be available after you add form fields to your screen.": "No variables available. Variables will be available after you add form fields to your screen.",
   "no warnings to report": "No Warnings To Report",
   "Node Identifier": "Node Identifier",
   "Non-array data will result in an error.": "Non-array data will result in an error.",
@@ -1852,6 +1854,7 @@
   "Search using natural language or PMQL": "Search using natural language or PMQL",
   "Search...": "Search...",
   "Search": "Search",
+  "Search variables...": "Search variables...",
   "secondary": "secondary",
   "Secondary": "Secondary",
   "Seconds to wait before retrying. Leave empty to use script default. Set to 0 for no retry wait time. This setting is only used when running a script task in a process.": "Seconds to wait before retrying. Leave empty to use script default. Set to 0 for no retry wait time. This setting is only used when running a script task in a process.",
@@ -1882,6 +1885,7 @@
   "Select a screen": "Select a screen",
   "Select a target language": "Select a target language",
   "Select a user to set the API access of the Script": "Select a user to set the API access of the Script",
+  "Select All": "Select All",
   "Select allowed group": "Select allowed group",
   "Select allowed groups": "Select allowed groups",
   "Select allowed user": "Select allowed user",
@@ -1932,6 +1936,7 @@
   "Select the variable to watch on this screen or type any request variable name": "Select the variable to watch on this screen or type any request variable name",
   "Select to interrupt the current Request workflow and route to the alternate workflow, thereby preventing parallel workflow": "Select to interrupt the current Request workflow and route to the alternate workflow, thereby preventing parallel workflow",
   "Select user or type here to search users": "Select user or type here to search users",
+  "Select variables to submit, otherwise all variables will be submitted by default.": "Select variables to submit, otherwise all variables will be submitted by default.",
   "Select where to send users after this task. Any Non-default destination will disable the “Display Next Assigned Task” function.": "Select where to send users after this task. Any Non-default destination will disable the “Display Next Assigned Task” function.",
   "Select whether a signal should be thrown when a user is created": "Select whether a signal should be thrown when a user is created",
   "Select whether a signal should be thrown when a user is deleted": "Select whether a signal should be thrown when a user is deleted",
@@ -2092,6 +2097,7 @@
   "Subject": "Subject",
   "Submit action": "Submit action",
   "Submit after filling": "Submit after filling",
+  "Submit Information": "Submit Information",
   "Submit Button": "Submit Button",
   "Submit Configuration": "Submit Configuration",
   "Submit": "Submit",
@@ -2218,6 +2224,7 @@
   "The file you are importing was made with an older version of ProcessMaker. Advanced import is not available. All assets will be copied.": "The file you are importing was made with an older version of ProcessMaker. Advanced import is not available. All assets will be copied.",
   "The following items should be configured to ensure your process is functional.": "The following items should be configured to ensure your process is functional.",
   "The following items should be configured to ensure your process is functional": "The following items should be configured to ensure your process is functional",
+  "The following required fields are not included in the submitted data.": "The following required fields are not included in the submitted data.",
   "The form to be displayed is not assigned.": "The form to be displayed is not assigned.",
   "The form to use for adding/editing records": "The form to use for adding/editing records",
   "The Genie name must be unique.": "The Genie name must be unique.",
@@ -2346,6 +2353,7 @@
   "This is a Beta version and when using Quickfill, it may replace the pre-filled information in the form.": "This is a Beta version and when using Quickfill, it may replace the pre-filled information in the form.",
   "This is an AI feature and can provide inaccurate or biased responses.": "This is an AI feature and can provide inaccurate or biased responses.",
   "This is your security code: :code": "This is your security code: :code",
+  "This may cause validation errors during submission.": "This may cause validation errors during submission.",
   "This must be valid JSON": "This must be valid JSON",
   "This password reset link will expire in :count minutes.": "This password reset link will expire in :count minutes.",
   "This password reset token is invalid.": "This password reset token is invalid.",

resources/lang/es.json

@@ -1388,6 +1388,8 @@
   "No translations found": "No se encontraron traducciones",
   "No user selected": "Ningún usuario seleccionado",
   "No validation rule(s)": "Sin regla(s) de validación",
+  "No variables match your search.": "No se encontraron variables que coincidan con su búsqueda.",
+  "No variables available. Variables will be available after you add form fields to your screen.": "No hay variables disponibles. Las variables estarán disponibles después de agregar campos de formulario a su pantalla.",
   "no warnings to report": "No hay advertencias para informar",
   "Node Identifier": "Identificador de nodo",
   "Non-array data will result in an error.": "Los datos que no sean de una matriz darán lugar a un error.",
@@ -1798,6 +1800,7 @@
   "Search using natural language or PMQL": "Buscar usando lenguaje natural o PMQL",
   "Search...": "Buscar...",
   "Search": "Buscar",
+  "Search variables...": "Buscar variables...",
   "secondary": "secundario",
   "Secondary": "secundario",
   "Seconds to wait before retrying. Leave empty to use script default. Set to 0 for no retry wait time. This setting is only used when running a script task in a process.": "Segundos a esperar antes de volver a intentar. Deje vacío para usar el valor predeterminado del script. Establezca en 0 para no esperar tiempo de reintento. Esta configuración solo se utiliza al ejecutar una tarea de script en un proceso.",
@@ -1826,6 +1829,7 @@
   "Select a screen": "Seleccione una pantalla",
   "Select a target language": "Seleccione un idioma objetivo",
   "Select a user to set the API access of the Script": "Seleccione un usuario para configurar el acceso a la API del script",
+  "Select All": "Seleccionar Todo",
   "Select allowed group": "Seleccionar el Grupo autorizado",
   "Select allowed groups": "Seleccionar grupos permitidos",
   "Select allowed user": "Seleccionar el Usuario autorizado",
@@ -1875,6 +1879,7 @@
   "Select the variable to watch on this screen or type any request variable name": "Seleccione la variable que se observará en esta pantalla o escriba cualquier nombre de variable de solicitud",
   "Select to interrupt the current Request workflow and route to the alternate workflow, thereby preventing parallel workflow": "Seleccionar para interrumpir el flujo de trabajo de la solicitud actual y enrutar al flujo de trabajo alternativo, evitando así un flujo de trabajo en paralelo",
   "Select user or type here to search users": "Seleccionar un usuario o escribir aquí para buscar usuarios",
+  "Select variables to submit, otherwise all variables will be submitted by default.": "Seleccione las variables que se enviarán, de lo contrario, se enviarán todas las variables por defecto.",
   "Select where to send users after this task. Any Non-default destination will disable the “Display Next Assigned Task” function.": "Seleccionar a dónde enviar a los usuarios después de esta tarea. Cualquier destino no predeterminado deshabilitará la función “Mostrar la próxima tarea asignada”.",
   "Select whether a signal should be thrown when a user is created": "Seleccione si se debe lanzar una señal cuando se crea un usuario",
   "Select whether a signal should be thrown when a user is deleted": "Seleccione si se debe lanzar una señal cuando se elimina un usuario",
@@ -2033,6 +2038,7 @@
   "Subject": "Asunto",
   "Submit action": "Enviar acción",
   "Submit after filling": "Envíe después de llenar",
+  "Submit Information": "Enviar Información",
   "Submit Button": "Botón para enviar",
   "Submit Configuration": "Enviar Configuración",
   "Submit": "Enviar",
@@ -2157,6 +2163,7 @@
   "The file you are importing was made with an older version of ProcessMaker. Advanced import is not available. All assets will be copied.": "El archivo que está importando se creó con una versión anterior de ProcessMaker. La importación avanzada no está disponible. Se copiarán todos los activos.",
   "The following items should be configured to ensure your process is functional.": "Los siguientes elementos deben configurarse para garantizar que su proceso sea funcional.",
   "The following items should be configured to ensure your process is functional": "Los siguientes elementos deben configurarse para garantizar que su proceso sea funcional",
+  "The following required fields are not included in the submitted data.": "Los siguientes campos requeridos no están incluidos en los datos enviados.",
   "The form to be displayed is not assigned.": "El formulario a mostrar no está asignado.",
   "The form to use for adding/editing records": "El formulario a utilizar para agregar/editar registros",
   "The Genie name must be unique.": "El nombre Genie debe ser único.",
@@ -2287,6 +2294,7 @@
   "This is a Beta version and when using Quickfill, it may replace the pre-filled information in the form.": "Esta es una versión Beta y al usar Quickfill, puede reemplazar la información previamente llenada en el formulario.",
   "This is an AI feature and can provide inaccurate or biased responses.": "Esta es una función de IA y puede proporcionar respuestas inexactas o sesgadas.",
   "This is your security code: :code": "This is your security code: :code",
+  "This may cause validation errors during submission.": "Esto puede causar errores de validación durante la presentación.",
   "This must be valid JSON": "Este debe ser un JSON válido",
   "This password reset link will expire in :count minutes.": "Este enlace de restablecimiento de contraseña expirará en :count minutos.",
   "This password reset token is invalid.": "Este token de restablecimiento de contraseña no es válido.",