@processmaker/screen-builder 2.28.0 → 2.28.1-RC4.patch.FOUR.6050

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.28.0",
+  "version": "2.28.1-RC4.patch.FOUR.6050",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/renderer/file-download.vue

@@ -198,7 +198,7 @@ export default {
           this.filesInfo.push(fileInfo);
         } else {
           window.ProcessMaker.alert(
-            this.$t('File Download Missing File'),
+            this.$t('File ID does not exist'),
             'danger'
           );
         }

package/src/components/renderer/file-upload.vue

@@ -18,7 +18,7 @@
     >
       <uploader-unsupport/>
 
-      <uploader-drop v-if="this.$refs['uploader']" class="form-control-file">
+      <uploader-drop v-if="uploaderLoaded" class="form-control-file">
         <p>{{ $t('Drop a file here to upload or') }}</p>
         <uploader-btn
           :attrs="nativeButtonAttrs"
@@ -46,7 +46,7 @@
                   <div v-if="nativeFiles[file.id]" style="flex: 1" class="overflow-hidden" :data-cy="file.file_name.replace(/[^0-9a-zA-Z\-]/g, '-')">
                     <uploader-file :file="nativeFiles[file.id]" :list="true" />
                   </div>
-                  <div v-else style="flex: 1">
+                  <div v-else class="text-truncate" :title="file.file_name" style="flex: 1">
                     <i class="fas fa-paperclip"/> {{ file.file_name }}
                   </div>
                   <div class="pt-1">
@@ -287,10 +287,13 @@ export default {
       disabled: false,
       files: [],
       nativeFiles: {},
-      uploading: false, 
+      uploading: false,
     };
   },
   methods: {
+    uploaderLoaded() {
+      return this.$refs['uploader'];
+    },
     setFiles() {
       if (_.isEqual(this.filesData, this.files)) {
         return;

package/src/components/renderer/form-button.vue

@@ -38,10 +38,11 @@ export default {
   computed: {
     classList() {
       let variant = this.variant || 'primary';
+      let isInvalid = this.$store.getters['globalErrorsModule/isValidScreen'] === false;
       return {
         btn: true,
         ['btn-' + variant]: true,
-        disabled: this.errors,
+        disabled: this.event === 'submit' && isInvalid,
       };
     },
     options() {

package/src/components/task.vue

@@ -327,17 +327,25 @@ export default {
               this.redirecting = task.process_request_id;
               this.$emit('redirect', task.id, true);
               return;
-            } else if (this.task && requestId == this.task.process_request_id && this.parentRequest && this.task.process_request.status === 'COMPLETED') {
-              // Only emit completed after getting the subprocess tasks and there are no tasks and process is completed
-              this.$emit('completed', this.parentRequest);
+            } else {
+              this.emitIfTaskCompleted(requestId);
             }
             this.taskId = task.id;
             this.nodeId = task.element_id;
-          } else if (this.parentRequest) {
+          } else if (this.parentRequest && ['COMPLETED', 'CLOSED'].includes(this.task.process_request.status)) {
             this.$emit('completed', this.parentRequest);
           }
         });
     },
+    emitIfTaskCompleted(requestId) {
+      // Only emit completed after getting the subprocess tasks and there are no tasks and process is completed
+      if (this.task
+          && this.parentRequest
+          && requestId == this.task.process_request_id
+          && this.task.process_request.status === 'COMPLETED') {
+        this.$emit('completed',  this.parentRequest);
+      }
+    },
     classHeaderCard(status) {
       let header = 'bg-success';
       switch (status) {

package/src/mixins/extensions/PageNavigate.js

@@ -4,6 +4,7 @@ export default {
     pageNavigate() {},
     pageNavigationProperties({ properties }) {
       properties['@page-navigate'] = 'pageNavigate';
+      properties[':validate'] = '$v';
     },
     pageNavigationBuild(screen) {
       this.addData(screen, 'currentPage__', 'this._initialPage');
@@ -19,7 +20,7 @@ export default {
   mounted() {
     this.extensions.push({
       onloadproperties(params) {
-        if (params.componentName === 'FormButton') {
+        if (params.element.component === 'FormButton' && params.element.config.event === 'pageNavigate') {
           this.pageNavigationProperties(params);
         }
       },