From 18f39b8db9122b0c51faccce4af2029caa3089e0 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelca <rodrigo@processmaker.com>
Date: Fri, 20 Aug 2021 03:50:06 +0000
Subject: [PATCH] fix code style

---
 .../components/menu/CustomSidebarMenuItem.vue |  2 +-
 .../js/components/utils/CustomTooltip.vue     | 49 +++++++------------
 .../src/ProcessMaker/Model/UserConfig.php     |  2 +-
 3 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue
index a7deefaf1..d50054e9a 100644
--- a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue
+++ b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue
@@ -140,7 +140,7 @@
 
                 <template #modal-footer="{ cancel }">
                     <b-button size="sm" variant="danger" @click="cancel()">
-                        {{ $t("ID_CLOSE")}}
+                        {{ $t("ID_CLOSE") }}
                     </b-button>
                 </template>
             </b-modal>
diff --git a/resources/assets/js/components/utils/CustomTooltip.vue b/resources/assets/js/components/utils/CustomTooltip.vue
index 992417f51..05f85d0db 100644
--- a/resources/assets/js/components/utils/CustomTooltip.vue
+++ b/resources/assets/js/components/utils/CustomTooltip.vue
@@ -4,14 +4,11 @@
         @mouseover="hoverHandler"
         :title="labelTooltip"
     >
-        {{ data.title }}    
-    <b-tooltip
-        :target="`label-${data.id}`"
-        :ref="`tooltip-${data.id}`"
-    >
-        {{ labelTooltip }}
-    </b-tooltip>
-    </span>   
+        {{ data.title }}
+        <b-tooltip :target="`label-${data.id}`" :ref="`tooltip-${data.id}`">
+            {{ labelTooltip }}
+        </b-tooltip>
+    </span>
 </template>
 
 <script>
@@ -25,9 +22,6 @@ export default {
     data() {
         return {
             labelTooltip: "",
-            hovering: "",
-            show: false,
-            disabled: true,
             menuMap: {
                 CASES_INBOX: "inbox",
                 CASES_DRAFT: "draft",
@@ -36,43 +30,36 @@ export default {
                 todo: "inbox",
                 draft: "draft",
                 paused: "paused",
-                unassigned: "unassigned"
-            }
-        }
+                unassigned: "unassigned",
+            },
+        };
     },
     methods: {
         /**
          * Delay the hover event
          */
         hoverHandler() {
-            // this.hovering = setTimeout(() => { this.setTooltip() }, 3000);
             this.setTooltip();
         },
         /**
          * Reset the delay and hide the tooltip
          */
         unhoverHandler() {
-            let key =`tooltip-${this.data.id}`;
+            let key = `tooltip-${this.data.id}`;
             this.labelTooltip = "";
-            // this.show = false;
-            this.disabled = true;
-            this.$refs[key].$emit('close');
-            clearTimeout(this.hovering);
+            this.$refs[key].$emit("close");
         },
         /**
          * Set the label to show in the tooltip
-         */     
+         */
         setTooltip() {
             let that = this;
-            api.menu
-                .getTooltip(that.menuMap[that.data.id])
-                .then((response) => {
-                    let key =`tooltip-${that.data.id}`;
-                    that.disabled = false;
-                    that.labelTooltip = response.data.label;
-                    that.$refs[key].$emit('open');
-                });     
+            api.menu.getTooltip(that.menuMap[that.data.id]).then((response) => {
+                let key = `tooltip-${that.data.id}`;
+                that.labelTooltip = response.data.label;
+                that.$refs[key].$emit("open");
+            });
         },
-    }
-}
+    },
+};
 </script>
diff --git a/workflow/engine/src/ProcessMaker/Model/UserConfig.php b/workflow/engine/src/ProcessMaker/Model/UserConfig.php
index c76a8339d..1977f07f8 100644
--- a/workflow/engine/src/ProcessMaker/Model/UserConfig.php
+++ b/workflow/engine/src/ProcessMaker/Model/UserConfig.php
@@ -53,7 +53,7 @@ class UserConfig extends Model
         $model = new UserConfig();
         $model->USR_ID = $id;
         $model->USC_NAME = $name;
-        $model->USC_SETTING = json_encode($setting, JSON_FORCE_OBJECT);
+        $model->USC_SETTING = json_encode($setting);
         $model->save();
         $userConfig = UserConfig::getSetting($id, $name);
         return $userConfig;