@processmaker/screen-builder 2.77.17 → 2.78.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.77.17",
+  "version": "2.78.0",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/renderer/card.vue

@@ -115,11 +115,7 @@ export default {
         .then((response) => {
           this.spin = 0;
           const instance = response.data;
-          if (this.$cookies.get("isMobile")) {
-            window.location = `/requests/mobile/${instance.id}?fromRedirect=true`;
-          } else {
-            window.location = `/requests/${instance.id}?fromRedirect=true`;
-          }
+          window.location = `/requests/${instance.id}?fromRedirect=true`;
         })
         .catch((err) => {
           this.disabled = false;

package/src/components/renderer/form-new-request.vue

@@ -6,14 +6,6 @@
         :key="`category-${index}`"
         class="mt-3"
       >
-        <!--
-        <h5 class="mb-n2">
-          {{ index }}
-          <span class="badge badge-pill badge-secondary">
-            {{ category.length }}
-          </span>
-        </h5>
-        -->
         <b-container fluid>
           <b-card-group>
             <template v-for="(process, id) in category">
@@ -64,40 +56,37 @@ export default {
     },
     fetch() {
       Vue.nextTick(() => {
-
-      window.ProcessMaker.apiClient
-        .get(
-          `start_processes?page=${this.page}&per_page=${this.perPage}&filter=${
-            this.filter
-          }&order_by=category.name,name` +
-            "&order_direction=asc,asc" +
-            "&include=events,categories" +
-            "&without_event_definitions=true"
-        )
-        .then((response) => {
-          const { data } = response;
-          // Empty processes
-          this.processes = {};
-          // Now populate our processes array with data for rendering
-          this.populate(data.data);
-          // Do initial filter
-          // Set data in paginate
-          data.meta.from -= 1;
-          this.$refs.listProcess.data = data;
-          this.$refs.listProcess.setPaginationData(data.meta);
-          const dataControls = {
-            count: "0",
-            showControl: true,
-            showAvatar: false,
-            colorTextStart: "color: #57646F",
-            url: ""
-          };
-          const tasksDropdown = [];
-          this.$emit("startControl", { dataControls, tasksDropdown });
-        })
-        .catch(() => {
-          this.error = true;
-        });
+        window.ProcessMaker.apiClient
+          .get(
+            `start_processes?page=${this.page}&per_page=${this.perPage}&filter=${this.filter}&order_by=category.name,name` +
+              "&order_direction=asc,asc" +
+              "&include=events,categories" +
+              "&without_event_definitions=true"
+          )
+          .then((response) => {
+            const { data } = response;
+            // Empty processes
+            this.processes = {};
+            // Now populate our processes array with data for rendering
+            this.populate(data.data);
+            // Do initial filter
+            // Set data in paginate
+            data.meta.from -= 1;
+            this.$refs.listProcess.data = data;
+            this.$refs.listProcess.setPaginationData(data.meta);
+            const dataControls = {
+              count: "0",
+              showControl: true,
+              showAvatar: false,
+              colorTextStart: "color: #57646F",
+              url: ""
+            };
+            const tasksDropdown = [];
+            this.$emit("startControl", { dataControls, tasksDropdown });
+          })
+          .catch(() => {
+            this.error = true;
+          });
       });
     },
     populate(data) {

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

@@ -84,7 +84,7 @@ export default {
   },
   mounted() {
     this.setFields();
-    this.pmql = `(user_id = ${ProcessMaker.user.id})`;
+    this.pmql = `(user_id = ${ProcessMaker.user.id}) AND (status = "In Progress")`;
     this.fetch();
     this.$root.$on("dropdownSelectionTask", this.fetchData);
     this.$root.$on("searchTask", this.fetchSearch);
@@ -293,17 +293,12 @@ export default {
         : "text-dark";
     },
     fetchData(selectedOption) {
-      if (selectedOption === "In Progress") {
+      if (selectedOption === "In Progress" || selectedOption === "all") {
         this.filterDropdowns = "";
         this.pmql = `(user_id = ${ProcessMaker.user.id}) AND (status = "In Progress")`;
       }
-      if (selectedOption === "all") {
-        this.filterDropdowns = "";
-        this.pmql = `(user_id = ${ProcessMaker.user.id})`;
-      }
       if (selectedOption === "Overdue") {
         this.filterDropdowns = "overdue=true";
-        this.pmql = "";
       }
       this.fetch();
     },