Merge pull request #5878 from ProcessMaker/feature/FOUR-12253

Feature/FOUR-12253: Add Metric defined in Launchpad Setting - Chart.
ProcessMaker · Jan 5, 2024 · 62018ce · 62018ce
2 parents a8b2976 + b569332
commit 62018ce
Show file tree

Hide file tree

Showing 15 changed files with 1,840 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -83,6 +83,7 @@
         "tooltip.js": "^1.3.3",
         "v-tooltip": "^2.0.3",
         "vue": "^2.6.14",
+        "vue-chartjs": "^3.5.0",
         "vue-color": "^2.7.1",
         "vue-cookies": "^1.8.2",
         "vue-croppie": "1.3.12",

diff --git a/resources/js/components/shared/EllipsisMenu.vue b/resources/js/components/shared/EllipsisMenu.vue
@@ -75,23 +75,25 @@
           />
         </b-input-group>
       </div>
-      <div v-for="action in filterActions">
-        <b-dropdown-divider v-if="action.value == 'divider'"/>
-        <b-dropdown-item
-          v-else
-          :key="action.value"
-          :href="action.link ? itemLink(action, data) : null"
-          class="ellipsis-dropdown-item mx-auto"
-          @click="!action.link ? onClick(action, data) : null"
-        >
-          <div class="ellipsis-dropdown-content">
-            <i
-              class="pr-1 fa-fw"
-              :class="action.icon"
-            />
-            <span>{{ $t(action.content) }}</span>
-          </div>
-        </b-dropdown-item>
+      <div v-for="action in filterActions" :key="action.value">
+        <div v-if="action.value !== 'edit-launchpad' || isProcessesCatalogueInUrl()">
+          <b-dropdown-divider v-if="action.value == 'divider'"/>
+          <b-dropdown-item
+            v-else
+            :key="action.value"
+            :href="action.link ? itemLink(action, data) : null"
+            class="ellipsis-dropdown-item mx-auto"
+            @click="!action.link ? onClick(action, data) : null"
+          >
+            <div class="ellipsis-dropdown-content">
+              <i
+                class="pr-1 fa-fw"
+                :class="action.icon"
+              />
+              <span>{{ $t(action.content) }}</span>
+            </div>
+          </b-dropdown-item>
+        </div>
       </div>
     </div>
   </b-dropdown>
@@ -224,6 +226,11 @@ export default {
         }
       });
     },
+    isProcessesCatalogueInUrl() {
+      const currentUrl = window.location.href;
+      const isInUrl = currentUrl.includes("processes-catalogue");
+      return isInUrl;
+    }
   },
 };
 </script>

diff --git a/resources/js/components/shared/ModalSaveVersion.vue b/resources/js/components/shared/ModalSaveVersion.vue
@@ -667,6 +667,7 @@ export default {
             type: "add",
           };
           ProcessMaker.EventBus.$emit("getLaunchpadImagesEvent", params);
+          ProcessMaker.EventBus.$emit("getChartId");
           this.hideModal();
         })
         .catch((error) => {