Skip to content

fixes for diff messages #5590

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 3 commits into from
Sep 20, 2024
Merged

fixes for diff messages #5590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a66296
fixes for diff messages
Cookiezaurs Sep 20, 2024
e65fff1
fx
Cookiezaurs Sep 20, 2024
41247a0
Merge branch 'next' into anna/next
Cookiezaurs Sep 20, 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
8 changes: 5 additions & 3 deletions frontend/express/public/core/app-management/templates/app-management.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ <h2 class="bu-mb-4" data-test-id="selected-app-name-title"> {{apps[selectedApp]
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{compare(formScope.editedObject,apps[selectedApp]).length}}</span>
<span v-if="compare(formScope.editedObject,apps[selectedApp]).length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
<span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
<span v-if="compare(formScope.editedObject,apps[selectedApp]).length" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<span v-if="compare(formScope.editedObject,apps[selectedApp]).length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
</span>
<span class="vertical-divider bu-mr-4 bu-ml-4"></span>
Expand Down Expand Up @@ -391,8 +391,10 @@ <h3 class="bu-mb-2" v-if="!newApp && hasAppAdminRights">{{i18n('management-appli
<div class="bu-mr-0 bu-is-flex bu-is-justify-content-flex-end bu-is-align-items-center cly-vue-user-selected" style="height: 100%;">
<span class="selected-count-blue bu-pl-1 text-medium">
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{changeKeys.length}}</span>
<span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
<span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<span v-if="changeKeys.length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
<span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
<span v-if="changeKeys.length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
</span>
<span class="vertical-divider bu-mr-4 bu-ml-4"></span>
<el-button skin="red" class="bu-mr-2" size="small" type="default" @click="saveSettings">
Expand Down
28 changes: 27 additions & 1 deletion plugins/crashes/frontend/public/javascripts/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,33 @@
promise = this.$store.dispatch("countlyCrashes/overview/setSelectedAsShown", this.$data.selectedCrashgroups);
}
else if (state === "delete") {
promise = this.$store.dispatch("countlyCrashes/overview/setSelectedAsDeleted", this.$data.selectedCrashgroups);
CountlyHelpers.confirm(jQuery.i18n.prop("crashes.confirm-delete", 1), "red", function(result) {
if (result) {
self.$store.dispatch("countlyCrashes/overview/setSelectedAsDeleted", self.$data.selectedCrashgroups)
.then(function(response) {
if (Array.isArray(response.result)) {
var itemList = response.result.reduce(function(acc, curr) {
acc += "<li>" + curr + "</li>";
return acc;
}, "");
CountlyHelpers.alert("<ul>" + itemList + "</ul>", "red", { title: CV.i18n("crashes.alert-fails") });
}
else {
CountlyHelpers.notify({
title: jQuery.i18n.map["systemlogs.action.crash_deleted"],
message: jQuery.i18n.map["systemlogs.action.crash_deleted"]
});
}
}).finally(function() {
// Reset selection if command is delete or hide
// if (["delete", "hide"].includes(state)) {
self.selectedCrashgroups = [];
self.$refs.dataTable.$refs.elTable.clearSelection();
// }
});
}
});

}

if (typeof promise !== "undefined") {
Expand Down
1 change: 1 addition & 0 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 @@ -782,6 +782,7 @@
var delKey = row.key || row.e || row.name;
events.push(delKey);
});
this.unpatchSelectedEvents();
this.$store.dispatch('countlyDataManager/deleteEvents', events).then(function() {
countlyEvent.refreshEvents();
});
Expand Down
2 changes: 1 addition & 1 deletion plugins/plugins/frontend/public/templates/configurations.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ <h3 v-if="config.groups.length > 1 || group.label" class="bu-my-4">
<span class="selected-count-blue bu-pl-1 text-medium">
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{diff.length}}</span>
<span v-if="diff.length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
<span v-elseclass="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
<span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
<span v-if="diff.length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
</span>
Expand Down
Loading