From ae652084a33b26c957e53c20d51f2084ab20b9c9 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelca <rodrigo@processmaker.com>
Date: Wed, 15 Sep 2021 18:33:11 +0000
Subject: [PATCH 1/4] PMCORE-3324: Column Settings and Task Action Ellipses
 Icons should be aligned  PMCORE_3.7.0 build

fix ellipsis aligment

fix ellipsis aligment 2
---
 .../assets/js/components/utils/ellipsis.vue   | 46 ++++++++++---------
 .../vuetable/extends/VtSettingsControl.vue    | 11 ++++-
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/resources/assets/js/components/utils/ellipsis.vue b/resources/assets/js/components/utils/ellipsis.vue
index 3e79bd47e..c47997d9c 100644
--- a/resources/assets/js/components/utils/ellipsis.vue
+++ b/resources/assets/js/components/utils/ellipsis.vue
@@ -1,24 +1,29 @@
 <template>
-    <div class="float-right">
-         <transition name="fade">
-            <div
-                class="v-inline"
-                v-show="showActions"
-                ref="ellipsis"
-            >
-                <div class="buttonGroup">
-                    <b-button
-                        v-for="item in data.buttons"
-                        :key="item.name"
-                        variant="outline-info"
-                        @click="executeFunction(item.fn)"
-                    >
-                        <i class="custom-icon" :class="item.icon" v-bind:style="{color: item.color}"></i>
-                    </b-button>
+    <div>
+        <div class="float-right" v-show="showActions">
+            <transition name="fade">
+                <div
+                    class="v-inline"
+                    v-show="showActions"
+                    ref="ellipsis"
+                >
+                    <div class="buttonGroup">
+                        <b-button
+                            v-for="item in data.buttons"
+                            :key="item.name"
+                            variant="outline-info"
+                            @click="executeFunction(item.fn)"
+                        >
+                            <i class="custom-icon" :class="item.icon" v-bind:style="{color: item.color}"></i>
+                        </b-button>
+                    </div>
                 </div>
-            </div>
-        </transition>
-        <div class="ellipsis-button">
+            </transition>
+        </div>
+        <div 
+            class="ellipsis-button align-middle"
+            v-show="!showActions"
+        >
             <div @click="showActionButtons()">
                 <i class="fas fa-ellipsis-v"></i>
             </div>
@@ -116,10 +121,7 @@ export default {
     }
     .ellipsis-button {
         font-size: 22px;
-        width: 15px;
         text-align: center;
-        float: inherit;
-        margin-top: 9px;
     }
     .buttonGroup {
         position: relative;
diff --git a/resources/assets/js/components/vuetable/extends/VtSettingsControl.vue b/resources/assets/js/components/vuetable/extends/VtSettingsControl.vue
index 1bd6c61a0..42d522333 100644
--- a/resources/assets/js/components/vuetable/extends/VtSettingsControl.vue
+++ b/resources/assets/js/components/vuetable/extends/VtSettingsControl.vue
@@ -1,5 +1,7 @@
 <template>
-  <span v-if="settings()" :class="classObject" :id="id"> </span>
+    <div class="align-middle table-settings">
+        <span v-if="settings()" :class="classObject" :id="id"> </span>
+    </div>
 </template>
 <script>
 export default {
@@ -26,4 +28,9 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>
+<style>
+.table-settings {
+  text-align: center;
+}
+</style>
\ No newline at end of file

From c109c6e18c3cce7d1caa328936390a9006cb17a9 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelca <rodrigo@processmaker.com>
Date: Fri, 17 Sep 2021 22:02:18 +0000
Subject: [PATCH 2/4] =?UTF-8?q?=C3=82PMCORE-3324:=20Column=20Settings=20an?=
 =?UTF-8?q?d=20Task=20Action=20Ellipses=20Icons=20should=20be=20aligned=20?=
 =?UTF-8?q?PMCORE=5F3.7.0=20build?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/js/home/CustomCaseList/CustomCaseList.vue      | 8 +++++---
 resources/assets/js/home/CustomCaseList/defaultMixins.js  | 7 +++++--
 resources/assets/js/home/Home.vue                         | 5 +++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
index 027ce6ad1..fc16090a0 100644
--- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
+++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
@@ -836,12 +836,12 @@ export default {
                             columns.push(item.field);
                         });
                         that.filterItems = newItems;
-                        that.settingOptions = that.formatColumnSettings(columns);
                         dt = that.formatDataResponse(response.data.data);
                         that.cardColumns = columns;
                         if (that.isFistTime) {
-                            that.filters = that.settings && that.settings.filters ? that.settings.filters : {};
-                            that.columns = that.settings && that.settings.columns ? that.settings.columns :  that.getTableColumns(columns);
+                            that.filters = that.data.settings && that.data.settings.filters ? that.data.settings.filters : {};
+                            that.columns = that.data.settings && that.data.settings.columns ? that.data.settings.columns :  that.getTableColumns(columns);
+                            that.settingOptions = that.formatColumnSettings(columns);
                         }
                         resolutionFunc({
                             data: dt,
@@ -1065,6 +1065,8 @@ export default {
                     color: newData.color
                 }
                 this.data.settings = newData.settings;
+                // this.settings = newData.settings;
+                
                 this.filters = {};
             }
             if (this.typeView === "GRID" && this.$refs["vueTable"]) {
diff --git a/resources/assets/js/home/CustomCaseList/defaultMixins.js b/resources/assets/js/home/CustomCaseList/defaultMixins.js
index f3234b2c6..616449dbf 100644
--- a/resources/assets/js/home/CustomCaseList/defaultMixins.js
+++ b/resources/assets/js/home/CustomCaseList/defaultMixins.js
@@ -207,8 +207,11 @@ export default {
      * @returns 
      */
     formatColumnSettings(columns) {
-      return _.map(_.pick(this.headings, columns), (value, key) => {
-        return { value, key }
+      return _.map(columns, (value, key) => {
+        if (this.headings[value]) {
+          return { value: this.headings[value], key: value };
+        }
+        return { value, key: value }
       });
     }
   }
diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue
index 455195399..779e81dcd 100755
--- a/resources/assets/js/home/Home.vue
+++ b/resources/assets/js/home/Home.vue
@@ -387,6 +387,7 @@ export default {
          * @param {object} item
          */
         pageFactory(item){
+            debugger;
             this.filters = [];
             this.page = item.item.page;
             this.filters = item.item.filters;
@@ -407,9 +408,9 @@ export default {
             if (!this.menuMap[item.item.id] && item.item.page !== "LegacyFrame" && item.item.page !== "advanced-search" ) {
                 this.page = "custom-case-list";
                 if (this.config.setting[item.item.page] && this.config.setting[item.item.page]["customCaseList"]) {
-                    this.settings = this.config.setting[item.item.page]["customCaseList"][item.item.id];
+                    this.pageData.settings = this.config.setting[item.item.page]["customCaseList"][item.item.id];
                 } else {
-                    this.settings = {};
+                    this.pageData.settings  = {};
                 }
             }
             if (this.page === this.lastPage

From 509341faec0c7d2478f6055a4fe6f632d27f1ae6 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelca <rodrigo@processmaker.com>
Date: Fri, 17 Sep 2021 22:06:38 +0000
Subject: [PATCH 3/4] fix code style

---
 resources/assets/js/home/CustomCaseList/CustomCaseList.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
index fc16090a0..d6729f5a0 100644
--- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
+++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
@@ -1064,9 +1064,7 @@ export default {
                     icon: newData.pageIcon,
                     color: newData.color
                 }
-                this.data.settings = newData.settings;
-                // this.settings = newData.settings;
-                
+                this.data.settings = newData.settings;              
                 this.filters = {};
             }
             if (this.typeView === "GRID" && this.$refs["vueTable"]) {

From 4b4b2a18ef1d6bb93b38848a8cf3591fd3e43018 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelca <rodrigo@processmaker.com>
Date: Fri, 17 Sep 2021 22:08:18 +0000
Subject: [PATCH 4/4] fix code style

---
 resources/assets/js/home/CustomCaseList/CustomCaseList.vue | 2 +-
 resources/assets/js/home/Home.vue                          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
index d6729f5a0..dc746c53b 100644
--- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
+++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
@@ -1064,7 +1064,7 @@ export default {
                     icon: newData.pageIcon,
                     color: newData.color
                 }
-                this.data.settings = newData.settings;              
+                this.data.settings = newData.settings;
                 this.filters = {};
             }
             if (this.typeView === "GRID" && this.$refs["vueTable"]) {
diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue
index 779e81dcd..34cfa201b 100755
--- a/resources/assets/js/home/Home.vue
+++ b/resources/assets/js/home/Home.vue
@@ -387,7 +387,6 @@ export default {
          * @param {object} item
          */
         pageFactory(item){
-            debugger;
             this.filters = [];
             this.page = item.item.page;
             this.filters = item.item.filters;