Skip to content

Commit 6b965eb

Browse files
CookiezaursCookiezaurs
authored
Merge branch 'next' into SER-1755
2 parents 44ae7f5 + 1334169 commit 6b965eb

File tree

89 files changed

+7402
-1036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+7402
-1036
lines changed

‎api/parts/data/fetch.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,7 @@ fetch.fetchEvents = function(params) {
13231323
*/
13241324
fetch.fetchTimeObj = function(collection, params, isCustomEvent, options) {
13251325
fetchTimeObj(collection, params, isCustomEvent, options, function(output) {
1326-
if (params?.qstring?.event) {
1326+
if (params.qstring?.event) {
13271327
output.eventName = params.qstring.event;
13281328
}
13291329
common.returnOutput(params, output);

‎frontend/express/public/core/date-presets/templates/preset-management.html‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
>
55
<cly-back-link slot="header-top" link="/" :title="i18n('management.preset.back-to-home')"></cly-back-link>
66
<template v-slot:header-right>
7-
<el-button type="success" icon="el-icon-circle-plus" @click="createNewPreset">{{i18n('management.preset.create-button')}}</el-button>
7+
<el-button type="success" icon="el-icon-circle-plus" @click="createNewPreset" data-test-id="new-date-preset-button">{{i18n('management.preset.create-button')}}</el-button>
88
</template>
99
</cly-header>
1010

1111
<cly-main>
1212
<cly-datatable-n
13-
:display-mode="'list'"
13+
test-id="datatable-date-presets"
1414
:rows="rows"
1515
:resizable="true"
1616
:force-loading="isLoading"
@@ -31,8 +31,9 @@
3131
<el-table-column prop="name" :label="i18n('management.preset.column.name')">
3232
<template v-slot="rowScope">
3333
<div class="bu-is-flex">
34-
<span class="has-ellipsis bu-has-text-weight-medium">{{ unescapeHtml(rowScope.row.name) }}</a></span>
34+
<span class="has-ellipsis bu-has-text-weight-medium" :data-test-id="'datatable-date-presets-name-' + rowScope.$index">{{ unescapeHtml(rowScope.row.name) }}</a></span>
3535
<cly-check
36+
:data-test-id="'datatable-date-presets-star-icon-' + rowScope.$index"
3637
class="bu-pl-1"
3738
element-loading-spinner="el-icon-loading"
3839
@input="toggleFav(scope, rowScope.row)"
@@ -42,15 +43,27 @@
4243
</div>
4344
</template>
4445
</el-table-column>
45-
<el-table-column prop="range_label" :label="i18n('management.preset.column.range')"></el-table-column>
46-
<el-table-column prop="owner_name" :label="i18n('management.preset.column.owner')"></el-table-column>
47-
<el-table-column prop="share_with" :formatter="sharingOption" :label="i18n('management.preset.column.visibility')"></el-table-column>
46+
<el-table-column prop="range_label" :label="i18n('management.preset.column.range')">
47+
<template v-slot="rowScope">
48+
<span class="has-ellipsis" :data-test-id="'datatable-date-presets-range-' + rowScope.$index">{{ rowScope.row.range_label }}</span>
49+
</template>
50+
</el-table-column>
51+
<el-table-column prop="owner_name" :label="i18n('management.preset.column.owner')">
52+
<template v-slot="rowScope">
53+
<span class="has-ellipsis" :data-test-id="'datatable-date-presets-owner-' + rowScope.$index">{{ rowScope.row.owner_name }}</span>
54+
</template>
55+
</el-table-column>
56+
<el-table-column prop="share_with" :formatter="sharingOption" :label="i18n('management.preset.column.visibility')">
57+
<template v-slot="rowScope">
58+
<span class="has-ellipsis" :data-test-id="'datatable-date-presets-visibility-' + rowScope.$index">{{ rowScope.row.share_with }}</span>
59+
</template>
60+
</el-table-column>
4861
<el-table-column type="options" width="90">
4962
<template v-slot="rowScope">
50-
<cly-more-options v-if="rowScope.row.hover" size="small" @command="handleCommand($event, rowScope.row)">
51-
<el-dropdown-item v-if="hasWritePermissions(rowScope.row)" command="edit">{{ i18n('common.edit') }}</el-dropdown-item>
52-
<el-dropdown-item v-if="hasWritePermissions(rowScope.row)" command="duplicate">{{ i18n('common.duplicate') }}</el-dropdown-item>
53-
<el-dropdown-item v-if="hasWritePermissions(rowScope.row)" command="delete">{{ i18n('common.delete') }}</el-dropdown-item>
63+
<cly-more-options v-if="rowScope.row.hover" size="small" @command="handleCommand($event, rowScope.row)" :test-id="'datatable-date-presets-' + rowScope.$index">
64+
<el-dropdown-item v-if="hasWritePermissions(rowScope.row)" :data-test-id="'datatable-more-button-edit-select-' + rowScope.$index" command="edit">{{ i18n('common.edit') }}</el-dropdown-item>
65+
<el-dropdown-item v-if="hasWritePermissions(rowScope.row)" :data-test-id="'datatable-more-button-duplicate-select-' + rowScope.$index" command="duplicate">{{ i18n('common.duplicate') }}</el-dropdown-item>
66+
<el-dropdown-item v-if="hasWritePermissions(rowScope.row)" :data-test-id="'datatable-more-button-delete-select-' + rowScope.$index" command="delete">{{ i18n('common.delete') }}</el-dropdown-item>
5467
</cly-more-options>
5568
</template>
5669
</el-table-column>

‎frontend/express/public/core/events/javascripts/countly.details.models.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@
10811081
.then(function(resp) {
10821082
if (resp) {
10831083
context.commit("setSelectedEventsOverview", countlyAllEvents.helpers.getSelectedEventsOverview(context, resp) || {});
1084-
context.commit("setLegendData", countlyAllEvents.helpers.getLegendData(context || {}));
1084+
context.commit("setLegendData", countlyAllEvents.helpers.getLegendData(context));
10851085
}
10861086
});
10871087
}

‎frontend/express/public/core/events/javascripts/countly.overview.models.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@
107107
return monitorData;
108108
},
109109
getOverviewConfigureList: function(eventsList, groupList) {
110-
var map = eventsList.map || {};
111110
var allEvents = [];
112111
if (eventsList && eventsList.list) {
112+
var map = eventsList.map || {};
113113
eventsList.list.forEach(function(item) {
114114
if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
115115
var label;
@@ -141,9 +141,9 @@
141141
return allEvents;
142142
},
143143
getEventMapping: function(eventsList, groupList) {
144-
var map = eventsList.map || {};
145144
var mapping = {};
146145
if (eventsList && eventsList.list) {
146+
var map = eventsList.map || {};
147147
eventsList.list.forEach(function(item) {
148148
var obj = {
149149
"eventKey": item,

‎frontend/express/public/core/jobs/templates/jobs.html‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,47 @@
55
</cly-header>
66
<cly-main>
77
<cly-section data-test-id="table-jobs">
8-
<cly-datatable-n :data-source="remoteTableDataSource" v-on:row-click="goTo" :isClickable="true" :default-sort="{prop: 'name', order: 'ascending'}">
8+
<cly-datatable-n test-id="datatable-jobs" :data-source="remoteTableDataSource" v-on:row-click="goTo" :isClickable="true" :default-sort="{prop: 'name', order: 'ascending'}">
99
<template v-slot="scope">
1010
<el-table-column sortable="custom" prop="name" :label="i18n('jobs.job-name')" type="clickable">
11+
<template slot-scope="scope">
12+
<span :data-test-id="'datatable-jobs-name-' + scope.$index">
13+
{{ scope.row.name }}
14+
</span>
15+
</template>
1116
</el-table-column>
1217
<el-table-column sortable="custom" prop="status" :label="i18n('jobs.job-status')">
1318
<template slot-scope="scope">
14-
<cly-status-tag :text="scope.row.status" :color="getColor(scope.row)"></cly-status-tag>
19+
<span :data-test-id="'datatable-jobs-status-' + scope.$index">
20+
<cly-status-tag :text="scope.row.status" :color="getColor(scope.row)"></cly-status-tag>
21+
</span>
1522
</template>
1623
</el-table-column>
1724
<el-table-column sortable="custom" prop="schedule" :label="i18n('jobs.job-schedule')">
1825
<template slot-scope="scope">
19-
<p>{{scope.row.scheduleLabel}}</p>
20-
<p style="color:#A7AEB8; font-size: 12px;">{{scope.row.scheduleDetail}}</p>
26+
<p :data-test-id="'datatable-jobs-schedule-' + scope.$index">{{scope.row.scheduleLabel}}</p>
27+
<p :data-test-id="'datatable-jobs-schedule-detail-' + scope.$index" style="color:#A7AEB8; font-size: 12px;">{{scope.row.scheduleDetail}}</p>
2128
</template>
2229
</el-table-column>
2330
<el-table-column sortable="custom" prop="next" :label="i18n('jobs.job-next-run')">
2431
<template slot-scope="scope">
25-
<p>{{scope.row.nextRunDate}}</p>
26-
<p style="color:#A7AEB8; font-size: 12px;">{{scope.row.nextRunTime}}</p>
32+
<p :data-test-id="'datatable-jobs-next-run-date-' + scope.$index">{{scope.row.nextRunDate}}</p>
33+
<p :data-test-id="'datatable-jobs-next-run-time-' + scope.$index" style="color:#A7AEB8; font-size: 12px;">{{scope.row.nextRunTime}}</p>
2734
</template>
2835
</el-table-column>
2936
<el-table-column sortable="custom" prop="finished" :label="i18n('jobs.job-last-run')">
3037
<template slot-scope="scope">
31-
<p v-html="scope.row.lastRun"></p>
38+
<p v-html="scope.row.lastRun" :data-test-id="'datatable-jobs-last-run-' + scope.$index"></p>
3239
</template>
3340
</el-table-column>
3441
<el-table-column sortable="custom" prop="total" :label="i18n('jobs.job-total-scheduled')">
42+
<template slot-scope="scope">
43+
<p :data-test-id="'datatable-jobs-total-' + scope.$index">{{scope.row.total}}</p>
44+
</template>
3545
</el-table-column>
3646
<el-table-column align="center" type="options">
3747
<template v-slot="scope">
38-
<cly-more-options v-if="scope.row.status !== 'RUNNING' && canSuspendJob && scope.row.hover" @command="handleCommand($event, scope.row)" placement="bottom-end">
48+
<cly-more-options v-if="scope.row.status !== 'RUNNING' && canSuspendJob && scope.row.hover" @command="handleCommand($event, scope.row)" placement="bottom-end" :test-id="'datatable-jobs-' + scope.$index">
3949
<el-dropdown-item command="change-job-status">{{scope.row.status === 'SUSPENDED' ? i18n('jobs.schedule') : i18n('jobs.suspend')}}</el-dropdown-item>
4050
</cly-more-options>
4151
</template>

‎frontend/express/public/core/user-management/templates/data-table.html‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<div class="manage-users-table">
22
<cly-datatable-n
3+
test-id= "datatable-users"
34
:rows="filteredRows"
45
:force-loading="loading"
56
:exportFormat="formatExportFunction"
@@ -65,23 +66,30 @@ <h4>{{i18n('management-users.view-title')}}</h4>
6566
<el-table-column
6667
v-if="col.value === 'full_name'"
6768
sortable="true" prop="full_name" :label="i18n('management-users.user')">
69+
<template v-slot="rowScope">
70+
<span class="text-medium" :data-test-id="'datatable-users-user-' + rowScope.$index"> {{rowScope.row.full_name}} </span>
71+
</template>
6872
</el-table-column>
6973
<el-table-column
7074
v-if="col.value === 'username'"
7175
sortable="true" prop="username" :label="i18n('management-users.username')">
76+
<template v-slot="rowScope">
77+
<span class="text-medium" :data-test-id="'datatable-users-username-' + rowScope.$index">{{rowScope.row.username}}</span>
7278
</el-table-column>
7379
<el-table-column
7480
v-if="col.value === 'role'"
7581
prop="dispRole"
7682
sortable="true"
7783
:label="i18n('management-users.role')">
7884
<template v-slot="rowScope">
79-
<span class="text-medium" :data-test-id="'users-data-table-user-role-' + rowScope.$index">{{rowScope.row.dispRole}}</span>
85+
<span class="text-medium" :data-test-id="'datatable-users-role-' + rowScope.$index">{{rowScope.row.dispRole}}</span>
8086
</template>
8187
</el-table-column>
8288
<el-table-column
8389
v-if="col.value === 'email'"
8490
sortable="true" prop="email" :label="i18n('management-users.email')">
91+
<template v-slot="rowScope">
92+
<span class="text-medium" :data-test-id="'datatable-users-email-' + rowScope.$index">{{rowScope.row.email}}</span>
8593
</el-table-column>
8694
<el-table-column v-if="col.value === 'group'" sortable="true" prop="groupNames" :label="i18n('management-users.group')">
8795
<template v-slot="rowScope">
@@ -109,18 +117,18 @@ <h4>{{i18n('management-users.view-title')}}</h4>
109117
prop="last_login"
110118
:label="i18n('management-users.last_login')">
111119
<template v-slot="rowScope">
112-
<span class="text-medium" v-html="rowScope.row.last_login === 0 ? i18n('management-users.not-logged-in-yet') : formatTimeAgo(rowScope.row.last_login)">
120+
<span class="text-medium" :data-test-id="'datatable-users-last-login-' + rowScope.$index" v-html="rowScope.row.last_login === 0 ? i18n('management-users.not-logged-in-yet') : formatTimeAgo(rowScope.row.last_login)">
113121
</span>
114122
</template>
115123
</el-table-column>
116124
</template>
117125
<el-table-column type="options">
118126
<template v-slot="rowScope">
119-
<cly-more-options v-if="rowScope.row.hover" size="small" @command="handleCommand($event, rowScope.row._id)">
120-
<el-dropdown-item command="edit-user">{{ i18n('management-users.edit-user') }}</el-dropdown-item>
121-
<el-dropdown-item v-if="showLogs" command="show-logs">{{ i18n('management-users.view-user-logs') }}</el-dropdown-item>
122-
<el-dropdown-item command="reset-logins">{{ i18n('management-users.reset-failed-logins') }}</el-dropdown-item>
123-
<el-dropdown-item command="delete-user">{{ i18n('management-users.delete-user') }}</el-dropdown-item>
127+
<cly-more-options v-if="rowScope.row.hover" size="small" @command="handleCommand($event, rowScope.row._id)" :test-id="'more-button-' + + rowScope.$index">
128+
<el-dropdown-item command="edit-user" :data-test-id="'datatable-users-more-button-edit-select-' + rowScope.$index">{{ i18n('management-users.edit-user') }}</el-dropdown-item>
129+
<el-dropdown-item v-if="showLogs" command="show-logs" :data-test-id="'datatable-users-more-button-view-logs-select-' + rowScope.$index">{{ i18n('management-users.view-user-logs') }}</el-dropdown-item>
130+
<el-dropdown-item command="reset-logins" :data-test-id="'datatable-users-more-button-reset-logins-select-' + rowScope.$index">{{ i18n('management-users.reset-failed-logins') }}</el-dropdown-item>
131+
<el-dropdown-item command="delete-user" :data-test-id="'datatable-users-more-button-delete-user-select-' + rowScope.$index">{{ i18n('management-users.delete-user') }}</el-dropdown-item>
124132
</cly-more-options>
125133
</template>
126134
</el-table-column>

‎plugins/alerts/frontend/public/javascripts/countly.views.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -992,10 +992,10 @@
992992

993993

994994
if (newState.alertBy === "email") {
995-
if (newState?.allGroups?.length) {
995+
if (newState.allGroups?.length) {
996996
this.selectedRadioButton = "toGroup";
997997
}
998-
if (newState?.alertValues?.length) {
998+
if (newState.alertValues?.length) {
999999
this.selectedRadioButton = "specificAddress";
10001000
}
10011001
}

‎plugins/compare/frontend/public/javascripts/countly.models.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@
201201
return lineLegend;
202202
},
203203
getAllEventsList: function(eventsList, groupList) {
204-
var map = eventsList.map || {};
205204
var allEvents = [];
206205
if (eventsList) {
206+
var map = eventsList.map || {};
207207
eventsList.list.forEach(function(item) {
208208
if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
209209
var label;
@@ -245,9 +245,9 @@
245245
return obj;
246246
},
247247
getTableStateMap: function(eventsList, groupList) {
248-
var map = eventsList.map || {};
249248
var allEvents = {};
250249
if (eventsList) {
250+
var map = eventsList.map || {};
251251
eventsList.list.forEach(function(item) {
252252
if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
253253
allEvents[countlyCompareEvents.helpers.decode(item)] = true;

0 commit comments

Comments
 (0)