matomo-org · sgiehl · Dec 21, 2021 · Nov 26, 2021 · Nov 26, 2021 · Nov 26, 2021
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -77,6 +77,7 @@
     "nock": "^13.1.4",
     "ts-jest": "^26.5.6",
     "typescript": "^4.3.5",
-    "vue-jest": "^5.0.0-0"
+    "vue-jest": "^5.0.0-0",
+    "yet-another-abortcontroller-polyfill": "^0.0.4"
   }
 }
diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement
diff --git a/plugins/Bandwidth b/plugins/Bandwidth
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
@@ -261,8 +261,6 @@ public function getJsFiles(&$jsFiles)
         // we have to load these CorePluginsAdmin files here. If we loaded them in CorePluginsAdmin,
         // there would be JS errors as CorePluginsAdmin is loaded first. Meaning it is loaded before
         // any angular JS file is loaded etc.
-        $jsFiles[] = "plugins/CorePluginsAdmin/angularjs/plugin-settings/plugin-settings.controller.js";
-        $jsFiles[] = "plugins/CorePluginsAdmin/angularjs/plugin-settings/plugin-settings.directive.js";
         $jsFiles[] = "plugins/CorePluginsAdmin/angularjs/form/form.directive.js";
         $jsFiles[] = "plugins/CorePluginsAdmin/angularjs/save-button/save-button.directive.js";
         $jsFiles[] = "plugins/CorePluginsAdmin/angularjs/plugins/plugin-filter.directive.js";

diff --git a/plugins/CoreHome/vue/dist/CoreHome.umd.js b/plugins/CoreHome/vue/dist/CoreHome.umd.js
diff --git a/plugins/CoreHome/vue/dist/CoreHome.umd.min.js b/plugins/CoreHome/vue/dist/CoreHome.umd.min.js
diff --git a/plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts b/plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts
@@ -5,6 +5,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+/* eslint-disable max-classes-per-file */
+
 import { ITimeoutService } from 'angular';
 import jqXHR = JQuery.jqXHR;
 import MatomoUrl from '../MatomoUrl/MatomoUrl';
@@ -15,6 +17,8 @@ interface AjaxOptions {
   postParams?: QueryParameters;
   headers?: Record<string, string>;
   format?: string;
+  createErrorNotification?: boolean;
+  abortController?: AbortController;
 }
 
 window.globalAjaxQueue = [] as unknown as GlobalAjaxQueue;
@@ -74,6 +78,8 @@ function defaultErrorCallback(deferred: XMLHttpRequest, status: string): void {
   }
 }
 
+class ApiResponseError extends Error {}
+
 /**
  * Global ajax helper to handle requests within Matomo
  */
@@ -158,6 +164,8 @@ export default class AjaxHelper<T = any> { // eslint-disable-line
    */
   requestHandle: JQuery.jqXHR|null = null;
 
+  abortController: AbortController|null = null;
+
   defaultParams = ['idSite', 'period', 'date', 'segment'];
 
   // helper method entry point
@@ -178,7 +186,34 @@ export default class AjaxHelper<T = any> { // eslint-disable-line
     if (options.headers) {
       helper.headers = options.headers;
     }
-    return helper.send();
+
+    if (typeof options.createErrorNotification !== 'undefined'
+      && !options.createErrorNotification
+    ) {
+      helper.useCallbackInCaseOfError();
+    }
+
+    if (options.abortController) {
+      helper.abortController = options.abortController;
+    }
+
+    return helper.send().then((data) => {
+      // check for error if not using default notification behavior
+      if (data.result === 'error') {
+        throw new ApiResponseError(data.message);
+      }
+
+      return data;
+    });
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  static post<R = any>(
+    params: QueryParameters,
+    postParams: QueryParameters,
+    options: AjaxOptions = {},
+  ): Promise<R> {
+    return this.fetch<R>(params, { ...options, postParams });
   }
 
   constructor() {
@@ -380,6 +415,10 @@ export default class AjaxHelper<T = any> { // eslint-disable-line
       // ignore
     }
 
+    if (this.abortController) {
+      this.abortController.signal.addEventListener('abort', () => this.requestHandle.abort());
+    }
+
     const result: AbortablePromise<T> = new Promise<T>((resolve, reject) => {
       this.requestHandle!.then((data: unknown) => {
         resolve(data as T); // ignoring textStatus/jqXHR
@@ -396,12 +435,6 @@ export default class AjaxHelper<T = any> { // eslint-disable-line
       });
     }) as AbortablePromise<T>;
 
-    result.abort = () => {
-      if (this.requestHandle) {
-        this.requestHandle.abort();
-      }
-    };
-
     return result;
   }
 

diff --git a/plugins/CoreHome/vue/src/SiteSelector/SitesStore.ts b/plugins/CoreHome/vue/src/SiteSelector/SitesStore.ts
@@ -25,9 +25,9 @@ class SitesStore {
     isInitialized: false,
   });
 
-  private currentRequest: AbortablePromise;
+  private currentRequestAbort: AbortController;
 
-  private limitRequest: AbortablePromise;
+  private limitRequest: Promise<{ value: number|string }>;
 
   public readonly initialSites = computed(() => readonly(this.state.initialSites));
 
@@ -70,8 +70,8 @@ class SitesStore {
       return this.loadInitialSites();
     }
 
-    if (this.currentRequest) {
-      this.currentRequest.abort();
+    if (this.currentRequestAbort) {
+      this.currentRequestAbort.abort();
     }
 
     if (!this.limitRequest) {
@@ -86,21 +86,22 @@ class SitesStore {
         methodToCall = 'SitesManager.getSitesWithAdminAccess';
       }
 
-      this.currentRequest = AjaxHelper.fetch({
+      this.currentRequestAbort = new AbortController();
+      return AjaxHelper.fetch({
         method: methodToCall,
         limit,
         pattern: term,
+      }, {
+        abortController: this.currentRequestAbort,
       });
-
-      return this.currentRequest;
     }).then((response) => {
       if (response) {
         return this.processWebsitesList(response);
       }
 
       return null;
     }).finally(() => {
-      this.currentRequest = null;
+      this.currentRequestAbort = null;
     });
   }
 

diff --git a/plugins/CoreHome/vue/src/WidgetLoader/WidgetLoader.vue b/plugins/CoreHome/vue/src/WidgetLoader/WidgetLoader.vue
@@ -64,7 +64,6 @@ export default defineComponent({
       loading: false,
       loadingFailed: '',
       changeCounter: 0,
-      lastWidgetRequest: null,
       currentScope: null,
     };
   },
@@ -102,9 +101,9 @@ export default defineComponent({
   },
   methods: {
     abortHttpRequestIfNeeded() {
-      if (this.lastWidgetRequest) {
-        this.lastWidgetRequest.abort();
-        this.lastWidgetRequest = null;
+      if (this.lastWidgetAbortController) {
+        this.lastWidgetAbortController.abort();
+        this.lastWidgetAbortController = null;
       }
     },
     cleanupLastWidgetContent() {
@@ -172,20 +171,21 @@ export default defineComponent({
       this.abortHttpRequestIfNeeded();
       this.cleanupL
97AE
astWidgetContent();
 
-      this.lastWidgetRequest = AjaxHelper.fetch(this.getWidgetUrl(parameters), {
+      this.lastWidgetAbortController = new AbortController();
+
+      AjaxHelper.fetch(this.getWidgetUrl(parameters), {
         format: 'html',
         headers: {
           'X-Requested-With': 'XMLHttpRequest',
         },
-      });
-
-      this.lastWidgetRequest.then((response) => {
+        abortController: this.lastWidgetAbortController,
+      }).then((response) => {
         if (thisChangeId !== this.changeCounter || !response || typeof response !== 'string') {
           // another widget was requested meanwhile, ignore this response
           return;
         }
 
-        this.lastWidgetRequest = null;
+        this.lastWidgetAbortController = null;
         this.loading = false;
         this.loadingFailed = false;
 
@@ -226,7 +226,7 @@ export default defineComponent({
           return;
         }
 
-        this.lastWidgetRequest = null;
+        this.lastWidgetAbortController = null;
         this.cleanupLastWidgetContent();
 
         this.loading = false;

diff --git a/plugins/CorePluginsAdmin/CorePluginsAdmin.php b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
@@ -48,7 +48,7 @@ public function addSystemSummaryItems(&$systemSummary)
     public function getStylesheetFiles(&$stylesheets)
     {
         $stylesheets[] = "plugins/CorePluginsAdmin/stylesheets/plugins_admin.less";
-        $stylesheets[] = "plugins/CorePluginsAdmin/angularjs/plugin-settings/plugin-settings.directive.less";
+        $stylesheets[] = "plugins/CorePluginsAdmin/vue/src/PluginSettings/PluginSettings.less";
         $stylesheets[] = "plugins/CorePluginsAdmin/vue/src/FormField/FieldExpandableSelect.less";
         $stylesheets[] = "plugins/CorePluginsAdmin/vue/src/FormField/FieldMultituple.less";
         $stylesheets[] = "plugins/CorePluginsAdmin/vue/src/FormField/FieldSelect.less";

diff --git a/plugins/CorePluginsAdmin/angularjs/plugin-settings/plugin-settings.controller.js b/plugins/CorePluginsAdmin/angularjs/plugin-settings/plugin-settings.controller.js
+0 −1		AnonymousPiwikUsageMeasurement.php
+0 −1		tests/Integration/Tracker/CustomVariablesTest.php