Skip to content

[SER-1680] Make dropdown item clickable, not only the text #5757

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Nov 13, 2024
Merged

[SER-1680] Make dropdown item clickable, not only the text #5757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2599586
Make dropdown item clickable, not just text
ayasayadi1 Nov 11, 2024
2bd4def
Handled download attribute
ayasayadi1 Nov 11, 2024
fb0c821
eslint
ayasayadi1 Nov 11, 2024
b89023a
Merge branch 'next' into SER-1680
Cookiezaurs Nov 12, 2024
fe3a658
reversed accidental change
ayasayadi1 Nov 12, 2024
a39ffc7
Merge branch 'SER-1680' of https://github.com/Countly/countly-server …
ayasayadi1 Nov 12, 2024
45bc3d3
Merge branch 'next' into SER-1680
Cookiezaurs Nov 13, 2024
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
5 changes: 1 addition & 4 deletions frontend/express/public/core/app-resolution/templates/app-resolution.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
Expand Down
5 changes: 1 addition & 4 deletions frontend/express/public/core/app-version/templates/app-version.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
Expand Down
5 changes: 1 addition & 4 deletions frontend/express/public/core/carrier/templates/carrier.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
Expand Down
5 changes: 1 addition & 4 deletions frontend/express/public/core/device-and-type/templates/devices-and-types.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
<template v-slot:header-tabs>
Expand Down
5 changes: 1 addition & 4 deletions frontend/express/public/core/geo-countries/templates/countries.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
Expand Down
5 changes: 1 addition & 4 deletions frontend/express/public/core/platform/templates/platform.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
Expand Down
5 changes: 1 addition & 4 deletions frontend/express/public/core/user-analytics-overview/templates/overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ <h2> {{i18n('user-analytics.overview-title')}} </h2>
</template>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
Expand Down
6 changes: 6 additions & 0 deletions frontend/express/public/javascripts/countly/countly.helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,12 @@
if (options.isExternalLink) {
window.open(options.url, '_blank', 'noopener,noreferrer');
}
else if (options.download) {
var a = document.createElement('a');
a.href = options.url;
a.download = options.download;
a.click();
}
else {
app.backlinkUrl = options.from;
app.backlinkTitle = options.title;
Expand Down
9 changes: 7 additions & 2 deletions frontend/express/public/javascripts/countly/vue/components/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* global jQuery, Vue, ELEMENT, CV */
/* global jQuery, Vue, ELEMENT, CV, CountlyHelpers */

(function(countlyVue) {

Expand Down Expand Up @@ -612,7 +612,12 @@
methods: {
handleMenuItemClick: function(command, instance) {
if (!this.disabled) {
this.$emit('command', command, instance);
if (command && command.url) {
CountlyHelpers.goTo({url: command.url, download: !!command.download, isExternalLink: !!command.isExternalLink});
}
else {
this.$emit('command', command, instance);
}
this.$refs.dropdown.handleClose();
}
},
Expand Down
5 changes: 1 addition & 4 deletions plugins/browser/frontend/public/templates/browser.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
Expand Down
18 changes: 14 additions & 4 deletions plugins/compliance-hub/frontend/public/javascripts/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
this.$store.dispatch("countlyConsentManager/fetchUserDataResource");
},
methods: {
switchToConsentHistory: function(uid) {
window.location.hash = "#/manage/compliance/history/" + uid;
},
deleteUserData: function(uid) {
var self = this;
CountlyHelpers.confirm(this.i18n("app-users.delete-userdata-confirm"), "popStyleGreen", function(result) {
Expand Down Expand Up @@ -77,8 +74,21 @@
downloadExportedData: function(uid) {
var win = window.open(countlyCommon.API_PARTS.data.r + "/app_users/download/appUser_" + countlyCommon.ACTIVE_APP_ID + "_" + uid + "?auth_token=" + countlyGlobal.auth_token + "&app_id=" + countlyCommon.ACTIVE_APP_ID, '_blank');
win.focus();
},
handleCommand: function(command, uid) {
if (command === "deleteUserData") {
this.deleteUserData(uid);
}
else if (command === "exportUserData") {
this.exportUserData(uid);
}
else if (command === "deleteExport") {
this.deleteExport(uid);
}
else if (command === "downloadExportedData") {
this.downloadExportedData(uid);
}
}

}
});
var ConsentView = countlyVue.views.create({
Expand Down
28 changes: 6 additions & 22 deletions plugins/compliance-hub/frontend/public/templates/user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,12 @@
</el-table-column>
<el-table-column type="options">
<template v-slot="rowScope">
<cly-more-options test-id="compliance-hub-users" v-if="rowScope.row.hover" size="small">
<el-dropdown-item>
<el-link v-if="canUserRead" class="bu-ml-1" plain @click="switchToConsentHistory(rowScope.row.uid)" :data-test-id="'datatable-more-button-go-to-consent-history-select-' + rowScope.$index"> {{i18n("consent.go-history")}} </el-link>
</el-dropdown-item>
<el-dropdown-item v-if="!rowScope.row.appUserExport && canUserRead">
<el-link class="bu-ml-1" plain @click="exportUserData(rowScope.row.uid)" :data-test-id="'datatable-more-button-export-user-data-select-' + rowScope.$index">
{{i18n("app-users.export-userdata")}}</el-link>
</el-dropdown-item>
<el-dropdown-item v-if="rowScope.row.appUserExport && canUserRead">
<el-link class="bu-ml-1" plain @click="downloadExportedData(rowScope.row.uid)" :data-test-id="'datatable-more-button-download-export-select-' + rowScope.$index">
{{i18n("app-users.download-export")}}</span>
</el-link>
</el-dropdown-item>
<el-dropdown-item v-if="rowScope.row.appUserExport && canUserDelete">
<el-link class="bu-ml-1" plain @click="deleteExport(rowScope.row.uid)" :data-test-id="'datatable-more-button-delete-export-' + rowScope.$index">
{{i18n("app-users.delete-export")}}</span>
</el-link>
</el-dropdown-item>
<el-dropdown-item v-if="canUserDelete">
<el-link class="bu-ml-1" @click="deleteUserData(rowScope.row.uid)" :data-test-id="'datatable-more-button-delete-user-data-' + rowScope.$index" plain>
{{i18n("app-users.delete-userdata")}}</el-link>
</el-dropdown-item>
<cly-more-options test-id="compliance-hub-users" v-if="rowScope.row.hover" size="small" @command="handleCommand($event, rowScope.row.uid)">
<el-dropdown-item v-if="canUserRead" :command="{url: '#/manage/compliance/history/' + rowScope.row.uid}" :data-test-id="'datatable-more-button-go-to-consent-history-select-' + rowScope.$index"> {{i18n("consent.go-history")}} </el-dropdown-item>
<el-dropdown-item v-if="!rowScope.row.appUserExport && canUserRead" command="exportUserData" :data-test-id="'datatable-more-button-export-user-data-select-' + rowScope.$index">{{i18n("app-users.export-userdata")}}</el-dropdown-item>
<el-dropdown-item v-if="rowScope.row.appUserExport && canUserRead" command="downloadExportedData" :data-test-id="'datatable-more-button-download-export-select-' + rowScope.$index">{{i18n("app-users.download-export")}}</el-dropdown-item>
<el-dropdown-item v-if="rowScope.row.appUserExport && canUserDelete" command="deleteExport" :data-test-id="'datatable-more-button-delete-export-' + rowScope.$index">{{i18n("app-users.delete-export")}}</el-dropdown-item>
<el-dropdown-item v-if="canUserDelete" command="deleteUserData" :data-test-id="'datatable-more-button-delete-user-data-' + rowScope.$index">{{i18n("app-users.delete-userdata")}}</el-dropdown-item>
</cly-more-options>
</template>

Expand Down
36 changes: 12 additions & 24 deletions plugins/crashes/frontend/public/templates/crashgroup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,14 @@ <h2 class="crashes-crashgroup-header__name bu-mr-2" v-html="crashgroupName"></h2
{{!crashgroupUnsymbolicatedStacktrace ? i18n("crash_symbolication.symbolicate_error") : i18n("crash_symbolication.resymbolicate")}}
</span>
</el-dropdown-item>
<el-dropdown-item v-if="symbolicationEnabled && !crashgroup._symbol_id">
<a href="#/crash/symbols/">
{{i18n("crash_symbolication.should-upload")}}
</a>
<el-dropdown-item v-if="symbolicationEnabled && !crashgroup._symbol_id" :command="{url: '#/crash/symbols/'}">
{{i18n("crash_symbolication.should-upload")}}
</el-dropdown-item>
<el-dropdown-item v-if="!!crashgroup.binary_images">
<a :href="'/dashboard#/crashes/' + crashgroup._id + '/binary-images/' + crashgroup.lrid">
{{i18n("crashes.show-binary-images")}}
</a>
<el-dropdown-item v-if="!!crashgroup.binary_images" :command="{url: '/dashboard#/crashes/' + crashgroup._id + '/binary-images/' + crashgroup.lrid}">
{{i18n("crashes.show-binary-images")}}
</el-dropdown-item>
<el-dropdown-item>
<a :href="'/o/crashes/download_stacktrace?auth_token=' + authToken +'&app_id=' + appId + '&crash_id=' + crashgroup.lrid" download>
{{i18n("crashes.download-stacktrace")}}
</a>
<el-dropdown-item :command="{url: '/o/crashes/download_stacktrace?auth_token=' + authToken +'&app_id=' + appId + '&crash_id=' + crashgroup.lrid, download: true}">
{{i18n("crashes.download-stacktrace")}}
</el-dropdown-item>
</cly-more-options>
</template>
Expand Down Expand Up @@ -332,20 +326,14 @@ <h4 class="bu-ml-2" v-if="'unit' in mobileDiagnostics[diagnosticKey]">
{{!props.row.symbolicated ? i18n("crash_symbolication.symbolicate_error") : i18n("crash_symbolication.resymbolicate")}}
</span>
</el-dropdown-item>
<el-dropdown-item v-if="symbolicationEnabled && !props.row._symbol_id">
<a href="#/crash/symbols/">
{{i18n("crash_symbolication.should-upload")}}
</a>
<el-dropdown-item v-if="symbolicationEnabled && !props.row._symbol_id" :command="{url: '#/crash/symbols/'}">
{{i18n("crash_symbolication.should-upload")}}
</el-dropdown-item>
<el-dropdown-item v-if="!!props.row.binary_images">
<a :href="'/dashboard#/crashes/' + crashgroup._id + '/binary-images/' + props.row._id">
{{i18n('crashes.show-binary-images')}}
</a>
<el-dropdown-item v-if="!!props.row.binary_images" :command="{url: '/dashboard#/crashes/' + crashgroup._id + '/binary-images/' + props.row._id}">
{{i18n('crashes.show-binary-images')}}
</el-dropdown-item>
<el-dropdown-item>
<a :href="'/o/crashes/download_stacktrace?auth_token=' + authToken +'&app_id=' + appId + '&crash_id=' + props.row._id" download>
{{i18n('crashes.download-stacktrace')}}
</a>
<el-dropdown-item :command="{url: '/o/crashes/download_stacktrace?auth_token=' + authToken +'&app_id=' + appId + '&crash_id=' + props.row._id, download: true}">
{{i18n('crashes.download-stacktrace')}}
</el-dropdown-item>
</cly-more-options>
</template>
Expand Down
3 changes: 0 additions & 3 deletions plugins/data-manager/frontend/public/javascripts/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,9 +1052,6 @@
else if (event === 'import-schema') {
this.importDialogVisible = true;
}
else if (event === 'navigate-settings') {
app.navigate("#/manage/configurations/data-manager", true);
}
},
onSaveImport: function() {
var self = this;
Expand Down
4 changes: 1 addition & 3 deletions plugins/data-manager/frontend/public/templates/events.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
<el-dropdown-item v-if="canUserUpdate" command="regnerate">{{i18n('data-manager.regenerate')}}</el-dropdown-item>
<el-dropdown-item v-if="canUserCreate" command="export-schema">{{i18n('data-manager.export-schema')}}</el-dropdown-item>
<el-dropdown-item v-if="canUserUpdate" command="import-schema">{{i18n('data-manager.import-schema')}}</el-dropdown-item>
<el-dropdown-item v-if="isUserGlobalAdmin" command="navigate-settings">
<a href="#/manage/configurations/data-manager" > {{i18n('plugins.configs')}} </a>
</el-dropdown-item>
<el-dropdown-item v-if="isUserGlobalAdmin" :command="{url: '#/manage/configurations/data-manager'}">{{i18n('plugins.configs')}}</el-dropdown-item>
</cly-more-options>
</div>
</template>
Expand Down
7 changes: 2 additions & 5 deletions plugins/density/frontend/public/templates/density.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
</cly-more-options>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
<cly-main>
Expand Down
5 changes: 1 addition & 4 deletions plugins/locale/frontend/public/templates/language.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
Expand Down
5 changes: 1 addition & 4 deletions plugins/sdk/frontend/public/templates/stats.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{item.label}}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
Expand Down
10 changes: 2 additions & 8 deletions plugins/sources/frontend/public/templates/sources-tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,8 @@
>
<template v-slot:header-right>
<cly-more-options v-if="topDropdown" size="small">
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown">
<!--<span :class="item.icon"></span>-->
<a :href="item.value" class="bu-ml-1">{{item.label}}</a>
</el-dropdown-item>
<el-dropdown-item>
<!--<span class="ion-settings"></span>-->
<a href="#/manage/configurations/sources" class="bu-ml-1">{{ i18n('sources.plugin-settings') }}</a>
</el-dropdown-item>
<el-dropdown-item :key="idx" v-for="(item, idx) in topDropdown" :command="{url: item.value}">{{ item.label }}</el-dropdown-item>
<el-dropdown-item :command="{url: '#/manage/configurations/sources'}">{{ i18n('sources.plugin-settings') }}</el-dropdown-item>
</cly-more-options>
</template>
</cly-header>
Expand Down
Loading
Loading