Merged in bugfix/PMCORE-2853-A (pull request #7860)

PMCORE-2853

Approved-by: Rodrigo Quelca

resources/assets/js/components/search/CasesFilter.vue

@@ -188,6 +188,16 @@ export default {
       itemModel: {},
     };
   },
+  mounted() {
+    // Force to load filters when mounted the component
+    let fils= this.filters;
+    if(_.isArray(this.filters)){
+      _.forEach(fils,(o)=>{
+        o.autoShow = false;
+      });
+      this.setFilters(fils);
+    }
+  },
   watch: {
     filters: function (filters) {
       this.searchTags = [];

resources/assets/js/components/search/MyCasesFilter.vue

@@ -230,6 +230,16 @@ export default {
             itemModel: {}
         };
     },
+    mounted() {
+        // Force to load filters when mounted the component
+        let fils= this.filters;
+        if(_.isArray(this.filters)){
+            _.forEach(fils,(o)=>{
+                o.autoShow = false;
+            });
+            this.setFilters(fils);
+        }
+  },
     watch: {
         filters: function (filters) {
             this.searchTags = [];
@@ -276,6 +286,7 @@ export default {
                     self.searchTags.push(component.id);
                     self.selected = component.id;
                     self.itemModel[component.id] = component;
+                    self.itemModel[component.id].autoShow = typeof item.autoShow !== "undefined" ? item.autoShow : true;
                 }
             });
         },

resources/assets/js/home/Draft.vue

@@ -60,7 +60,7 @@ export default {
     TaskCell,
     CasesFilter,
   },
-  props: ["defaultOption"],
+  props: ["defaultOption", "filters"],
   data() {
     return {
       newCase: {
@@ -80,7 +80,6 @@ export default {
         "actions"
       ],
       tableData: [],
-      filters: {},
       options: {
         filterable: false,
         headings: {
@@ -140,7 +139,7 @@ export default {
         if(this.defaultOption) {
             params = utils.getAllUrlParams(this.defaultOption);
               if (params && params.openapplicationuid) {
-                this.filters =  [
+                this.$emit("onUpdateFilters",[
                     {
                         fieldId: "caseNumber",
                         filterVar: "caseNumber",
@@ -149,7 +148,7 @@ export default {
                         value: params.openapplicationuid,
                         autoShow: false
                     }
-                ];
+                ]);
               }
         }
     },
@@ -302,7 +301,7 @@ export default {
     },
     onRemoveFilter(data) {},
     onUpdateFilters(data) {
-      this.filters = data.params;
+      this.$emit("onUpdateFilters", data.params);
       if (data.refresh) {
         this.$nextTick(() => {
           this.$refs["vueTable"].getData();

resources/assets/js/home/Paused.vue

@@ -76,7 +76,7 @@ export default {
     ModalUnpauseCase,
     CasesFilter,
   },
-  props: ["defaultOption"],
+  props: ["defaultOption", "filters"],
   data() {
     return {
       newCase: {
@@ -98,7 +98,6 @@ export default {
         "actions",
       ],
       tableData: [],
-      filters: {},
       options: {
         filterable: false,
         headings: {
@@ -164,7 +163,7 @@ export default {
         if(this.defaultOption) {
             params = utils.getAllUrlParams(this.defaultOption);
               if (params && params.openapplicationuid) {
-                this.filters =  [
+                this.$emit("onUpdateFilters",[
                     {
                         fieldId: "caseNumber",
                         filterVar: "caseNumber",
@@ -173,7 +172,7 @@ export default {
                         value: params.openapplicationuid,
                         autoShow: false
                     }
-                ];
+                ]);
               }
         }
     },
@@ -337,7 +336,7 @@ export default {
     },
     onRemoveFilter(data) {},
     onUpdateFilters(data) {
-      this.filters = data.params;
+      this.$emit("onUpdateFilters", data.params);
       if (data.refresh) {
         this.$nextTick(() => {
           this.$refs["vueTable"].getData();

resources/assets/js/home/Todo.vue

@@ -70,7 +70,7 @@ export default {
     TaskCell,
     CasesFilter,
   },
-  props: ["defaultOption"],
+  props: ["defaultOption", "filters"],
   data() {
     return {
       newCase: {
@@ -92,7 +92,6 @@ export default {
         "actions",
       ],
       tableData: [],
-      filters: {},
       options: {
         filterable: false,
         headings: {
@@ -157,7 +156,7 @@ export default {
         if(this.defaultOption) {
             params = utils.getAllUrlParams(this.defaultOption);
               if (params && params.openapplicationuid) {
-                this.filters =  [
+                this.$emit("onUpdateFilters", [
                     {
                         fieldId: "caseNumber",
                         filterVar: "caseNumber",
@@ -166,7 +165,7 @@ export default {
                         value: params.openapplicationuid,
                         autoShow: false
                     }
-                ];
+                ]);
               }
         }
     },
@@ -327,7 +326,7 @@ export default {
     },
     onRemoveFilter(data) {},
     onUpdateFilters(data) {
-      this.filters = data.params;
+      this.$emit("onUpdateFilters", data.params);
       if (data.refresh) {
         this.$nextTick(() => {
           this.$refs["vueTable"].getData();

resources/assets/js/home/Unassigned.vue

@@ -70,7 +70,7 @@ export default {
     ModalClaimCase,
     CasesFilter,
   },
-  props: ["defaultOption"],
+  props: ["defaultOption", "filters"],
   data() {
     return {
       newCase: {
@@ -92,7 +92,6 @@ export default {
         "actions",
       ],
       tableData: [],
-      filters: {},
       options: {
         filterable: false,
         headings: {
@@ -158,7 +157,7 @@ export default {
         if(this.defaultOption) {
             params = utils.getAllUrlParams(this.defaultOption);
               if (params && params.openapplicationuid) {
-                this.filters =  [
+                this.$emit("onUpdateFilters",[
                     {
                         fieldId: "caseNumber",
                         filterVar: "caseNumber",
@@ -167,7 +166,7 @@ export default {
                         value: params.openapplicationuid,
                         autoShow: false
                     }
-                ];
+                ]);
               }
         }
     },
@@ -335,7 +334,7 @@ export default {
     },
     onRemoveFilter(data) {},
     onUpdateFilters(data) {
-      this.filters = data.params;
+      this.$emit("onUpdateFilters", data.params);
       if (data.refresh) {
         this.$nextTick(() => {
           this.$refs["vueTable"].getData();