Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordizzy <diosmosis@users.noreply.github.com>2022-04-08 15:45:34 +0300
committerGitHub <noreply@github.com>2022-04-08 15:45:34 +0300
commit821734c769fb012fc2ee5994b56937988150bc0f (patch)
treed5f7536f9507dd1def2cca0f2e7ff207771b1b26 /plugins/CoreHome/vue/src
parent0087d178e516d16d3346c20f30685fd10d9fe84d (diff)
[Vue] migrate scheduled reports management from twig/angularjs to vue (#19012)
* finish initial migration pass * get changes to build * delete angularjs and twig * extract select phone numbers macro to vue and make sure angularjs directives are initialized in scheduled reports event content * fixing several issues + getting report addition extending working * fix UI tests * possibly provide some BC for inline script use * fix several bugs, use better approach for accessing report in event child vue components, provide backwards compatibility for angularjs/inline javascript potentially used by third party plugins * apply review fixes * decode scheduled report description as it is stored escaped in the DB + remove some vue warnings Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/CoreHome/vue/src')
-rw-r--r--plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts b/plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts
index 560bab3c1e..bd717d9b0f 100644
--- a/plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts
+++ b/plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts
@@ -21,6 +21,7 @@ export interface AjaxOptions {
abortController?: AbortController;
returnResponseObject?: boolean;
errorElement?: HTMLElement|JQuery|JQLite|string;
+ redirectOnSuccess?: QueryParameters|boolean;
}
interface ErrorResponse {
@@ -189,6 +190,11 @@ export default class AjaxHelper<T = any> { // eslint-disable-line
if (options.errorElement) {
helper.setErrorElement(options.errorElement);
}
+ if (options.redirectOnSuccess) {
+ helper.redirectOnSuccess(
+ options.redirectOnSuccess !== true ? options.redirectOnSuccess : undefined,
+ );
+ }
helper.setFormat(options.format || 'json');
if (Array.isArray(params)) {
helper.setBulkRequests(...(params as QueryParameters[]));
@@ -343,7 +349,7 @@ export default class AjaxHelper<T = any> { // eslint-disable-line
* @param [params] to modify in redirect url
* @return {void}
*/
- redirectOnSuccess(params: QueryParameters): void {
+ redirectOnSuccess(params?: QueryParameters): void {
this.setCallback(() => {
piwikHelper.redirect(params);
});