Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/FOUR-12253: Add Metric defined in Launchpad Setting - Chart. #5878

Merged
merged 17 commits into from
Jan 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
41 changes: 24 additions & 17 deletions resources/js/components/shared/EllipsisMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -224,6 +226,11 @@ export default {
}
});
},
isProcessesCatalogueInUrl() {
const currentUrl = window.location.href;
const isInUrl = currentUrl.includes("processes-catalogue");
return isInUrl;
}
},
};
</script>
Expand Down
1 change: 1 addition & 0 deletions resources/js/components/shared/ModalSaveVersion.vue
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ export default {
type: "add",
};
ProcessMaker.EventBus.$emit("getLaunchpadImagesEvent", params);
ProcessMaker.EventBus.$emit("getChartId");
this.hideModal();
})
.catch((error) => {
Expand Down
Loading
Loading