matomo-org
diff --git a/‎.eslintrc.js
+6 b/‎.eslintrc.js
+6
diff --git a/‎.gitignore
+1-1 b/‎.gitignore
+1-1
diff --git a/‎core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
+5-5 b/‎core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
+5-5
diff --git a/‎plugins/CoreHome/vue/dist/CoreHome.umd.js
+762-594 b/‎plugins/CoreHome/vue/dist/CoreHome.umd.js
+762-594
diff --git a/‎plugins/CoreHome/vue/dist/CoreHome.umd.min.js
+88-76 b/‎plugins/CoreHome/vue/dist/CoreHome.umd.min.js
+88-76
diff --git a/‎plugins/CoreHome/vue/src/AjaxForm/AjaxForm.adapter.ts
+15-10 b/‎plugins/CoreHome/vue/src/AjaxForm/AjaxForm.adapter.ts
+15-10
diff --git a/‎plugins/CoreHome/vue/src/AjaxForm/AjaxForm.vue
+1-1 b/‎plugins/CoreHome/vue/src/AjaxForm/AjaxForm.vue
+1-1
diff --git a/‎plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.adapter.ts
+3-3 b/‎plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.adapter.ts
+3-3
diff --git a/‎plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts
+6-2 b/‎plugins/CoreHome/vue/src/AjaxHelper/AjaxHelper.ts
+6-2
diff --git a/‎plugins/CoreHome/vue/src/Comparisons/Comparisons.adapter.ts
+1-3 b/‎plugins/CoreHome/vue/src/Comparisons/Comparisons.adapter.ts
+1-3
diff --git a/‎plugins/CoreHome/vue/src/Comparisons/Comparisons.vue
+12-5 b/‎plugins/CoreHome/vue/src/Comparisons/Comparisons.vue
+12-5
diff --git a/‎plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue
+7-6 b/‎plugins/CoreHome/vue/src/ContentBlock/ContentBlock.vue
+7-6
diff --git a/‎plugins/CoreHome/vue/src/ContentIntro/ContentIntro.adapter.ts
+1-3 b/‎plugins/CoreHome/vue/src/ContentIntro/ContentIntro.adapter.ts
+1-3
diff --git a/‎plugins/CoreHome/vue/src/ContentTable/ContentTable.adapter.ts
+1-3 b/‎plugins/CoreHome/vue/src/ContentTable/ContentTable.adapter.ts
+1-3
diff --git a/‎plugins/CoreHome/vue/src/DatePicker/DatePicker.adapter.ts
+4-4 b/‎plugins/CoreHome/vue/src/DatePicker/DatePicker.adapter.ts
+4-4
@@ -28,5 +28,11 @@ module.exports = {
     'no-param-reassign': ["error", { "props": false }],
     'camelcase': 'off',
     '@typescript-eslint/no-non-null-assertion': 'off',
+
+    // typescript will provide similar error messages, potentially conflicting ones, for
+    // the following rules, so we disable them
+    'no-undef': 'off',
+    'no-undef-init': 'off',
+    'import/extensions': 'off',
   },
 };
@@ -106,4 +106,4 @@ docker-compose.yml
 /plugins/*/vue/dist/*.map
 /plugins/*/vue/dist/*.development.*
 /plugins/CoreVue/polyfills/dist/MatomoPolyfills.min.js.map
-
+/@types
@@ -99,7 +99,7 @@ protected function getPriorityOrder()
 
     private function addUmdFilesIfDetected($plugins)
     {
-        $plugins = $this->orderPluginsByPluginDependencies($plugins);
+        $plugins = self::orderPluginsByPluginDependencies($plugins);
 
         foreach ($plugins as $plugin) {
             $devUmd = "plugins/$plugin/vue/dist/$plugin.development.umd.js";
@@ -117,18 +117,18 @@ private function addUmdFilesIfDetected($plugins)
         }
     }
 
-    private function orderPluginsByPluginDependencies($plugins)
+    public static function orderPluginsByPluginDependencies($plugins)
     {
         $result = [];
 
         while (!empty($plugins)) {
-            $this->visitPlugin(reset($plugins), $plugins, $result);
+            self::visitPlugin(reset($plugins), $plugins, $result);
         }
 
         return $result;
     }
 
-    private function visitPlugin($plugin, &$plugins, &$result)
+    private static function visitPlugin($plugin, &$plugins, &$result)
     {
         // remove the plugin from the array of plugins to visit
         $index = array_search($plugin, $plugins);
@@ -149,7 +149,7 @@ private function visitPlugin($plugin, &$plugins, &$result)
         if (!empty($pluginDependencies['dependsOn'])) {
             // visit each plugin this one depends on first, so it is loaded first
             foreach ($pluginDependencies['dependsOn'] as $pluginDependency) {
-                $this->visitPlugin($pluginDependency, $plugins, $result);
+                self::visitPlugin($pluginDependency, $plugins, $result);
             }
         }
 
 
@@ -6,9 +6,12 @@
  */
 
 import { DirectiveBinding, ref } from 'vue';
+import { IDirective, IDirectiveLinkFn, IParseService } from 'angular';
 import createVueApp from '../createVueApp';
 import AjaxForm from './AjaxForm.vue';
 
+const { $ } = window;
+
 /**
  * AngularJS directive that manages an AJAX form.
  *
@@ -57,7 +60,7 @@ import AjaxForm from './AjaxForm.vue';
  * @deprecated
  */
 
-function piwikAjaxForm($parse) {
+function piwikAjaxForm($parse: IParseService): IDirective {
   return {
     restrict: 'A',
     scope: {
@@ -69,10 +72,11 @@ function piwikAjaxForm($parse) {
     },
     require: '?ngModel',
     transclude: true,
-    compile: function piwikAjaxFormCompile(compileElement, compileAttrs) {
+    compile: function piwikAjaxFormCompile(compileElement, compileAttrs): IDirectiveLinkFn {
       compileAttrs.noErrorNotification = !!compileAttrs.noErrorNotification;
 
-      return function piwikAjaxFormLink(scope, element, attrs, ngModel, transclude) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      return function piwikAjaxFormLink(scope: any, element, attrs, ngModel, transclude) {
         if (!scope.submitApiMethod) {
           throw new Error('submitApiMethod is required');
         }
@@ -139,8 +143,7 @@ function piwikAjaxForm($parse) {
         });
 
         function setFormValueFromInput(inputElement: HTMLElement, skipScopeApply?: boolean) {
-          const $ = angular.element;
-          const name = $(inputElement).attr('name');
+          const name = $(inputElement).attr('name')!;
           let val;
 
           if ($(inputElement).attr('type') === 'checkbox') {
@@ -161,22 +164,24 @@ function piwikAjaxForm($parse) {
         // on change of any input, change appropriate value in model, but only if requested
         if (!scope.useCustomDataBinding) {
           element.on('change', 'input,select', (event) => {
-            setFormValueFromInput(event.target);
+            setFormValueFromInput(event.target as HTMLElement);
           });
         }
 
         // make sure child elements can access this directive's scope
-        transclude(scope, (clone, transcludeScope) => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        transclude!(scope, (clone, transcludeScope: any) => {
           if (!transcludeScope.useCustomDataBinding) {
-            const $inputs = clone.find('input,select').not('[type=submit]');
+            const $inputs = clone!.find('input,select').not('[type=submit]');
 
             // initialize form data to input values (include <select>s
             $inputs.each(function inputEach() {
               setFormValueFromInput(this, true);
             });
           }
 
-          $(vm.transcludeTarget).append(clone);
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          $((vm as any).transcludeTarget as HTMLElement).append(clone!);
         });
       };
     },
@@ -185,4 +190,4 @@ function piwikAjaxForm($parse) {
 
 piwikAjaxForm.$inject = ['$parse'];
 
-angular.module('piwikApp').directive('piwikAjaxForm', piwikAjaxForm);
+window.angular.module('piwikApp').directive('piwikAjaxForm', piwikAjaxForm);
@@ -66,7 +66,7 @@ export default defineComponent({
   emits: ['update:modelValue'],
   mounted() {
     // on submit call controller submit method
-    $(this.$refs.root).on('click', 'input[type=submit]', () => {
+    $(this.$refs.root as HTMLElement).on('click', 'input[type=submit]', () => {
       this.submitForm();
     });
   },
 
@@ -2,14 +2,14 @@ import AjaxHelper from './AjaxHelper';
 
 declare global {
   interface Window {
-    ajaxHelper: AjaxHelper;
+    ajaxHelper: typeof AjaxHelper;
   }
 }
 
 window.ajaxHelper = AjaxHelper;
 
 function ajaxQueue() {
-  return globalAjaxQueue;
+  return window.globalAjaxQueue;
 }
 
-angular.module('piwikApp.service').service('globalAjaxQueue', ajaxQueue);
+window.angular.module('piwikApp.service').service('globalAjaxQueue', ajaxQueue);
@@ -174,7 +174,10 @@ export default class AjaxHelper<T = any> { // eslint-disable-line
   defaultParams = ['idSite', 'period', 'date', 'segment'];
 
   // helper method entry point
-  static fetch<R = any>(params: QueryParameters, options: AjaxOptions = {}): Promise<R> { // eslint-disable-line
+  static fetch<R = any>( // eslint-disable-line
+    params: QueryParameters,
+    options: AjaxOptions = {},
+  ): Promise<R> {
     const helper = new AjaxHelper<R>();
     if (options.withTokenInUrl) {
       helper.withTokenInUrl();
@@ -215,7 +218,8 @@ export default class AjaxHelper<T = any> { // eslint-disable-line
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   static post<R = any>(
     params: QueryParameters,
-    postParams: QueryParameters,
+    // eslint-disable-next-line
+    postParams: any,
     options: AjaxOptions = {},
   ): Promise<R> {
     return this.fetch<R>(params, { ...options, postParams });
 
@@ -13,9 +13,7 @@ function ComparisonFactory() {
   return ComparisonsStoreInstance;
 }
 
-ComparisonFactory.$inject = [];
-
-angular.module('piwikApp.service').factory('piwikComparisonsService', ComparisonFactory);
+window.angular.module('piwikApp.service').factory('piwikComparisonsService', ComparisonFactory);
 
 export default createAngularJsAdapter({
   component: Comparisons,
 
@@ -94,13 +94,17 @@ interface ProcessedReportResponse {
   reportData: ProcessedReportData;
 }
 
+interface ComparisonState {
+  comparisonTooltips: Record<string, Record<string, string>>|null;
+}
+
 export default defineComponent({
   props: {
   },
   directives: {
     Tooltips,
   },
-  data() {
+  data(): ComparisonState {
     return {
       comparisonTooltips: null,
     };
@@ -113,8 +117,11 @@ export default defineComponent({
     const periodComparisons = computed(() => ComparisonsStoreInstance.getPeriodComparisons());
     const getSeriesColor = ComparisonsStoreInstance.getSeriesColor.bind(ComparisonsStoreInstance);
 
-    function transformTooltipContent() {
+    function transformTooltipContent(this: HTMLElement) {
       const title = window.$(this).attr('title');
+      if (!title) {
+        return title;
+      }
       return window.vueSanitize(title.replace(/\n/g, '<br />'));
     }
 
@@ -132,7 +139,7 @@ export default defineComponent({
     },
     removeSegmentComparison(index: number) {
       // otherwise the tooltip will be stuck on the screen
-      window.$(this.$refs.root).tooltip('destroy');
+      window.$(this.$refs.root as HTMLElement).tooltip('destroy');
       ComparisonsStoreInstance.removeSegmentComparison(index);
     },
     getComparisonPeriodType(comparison: AnyComparison) {
@@ -186,11 +193,11 @@ export default defineComponent({
       }).then((report) => {
         this.comparisonTooltips = {};
         periodComparisons.forEach((periodComp) => {
-          this.comparisonTooltips[periodComp.index] = {};
+          this.comparisonTooltips![periodComp.index] = {};
 
           segmentComparisons.forEach((segmentComp) => {
             const tooltip = this.generateComparisonTooltip(report, periodComp, segmentComp);
-            this.comparisonTooltips[periodComp.index][segmentComp.index] = tooltip;
+            this.comparisonTooltips![periodComp.index][segmentComp.index] = tooltip;
           });
         });
       });
 
@@ -62,9 +62,10 @@ export default defineComponent({
     },
   },
   mounted() {
-    const { root, content } = this.$refs;
+    const root = this.$refs.root as HTMLElement;
+    const content = this.$refs.content as HTMLElement;
 
-    if (this.anchor) {
+    if (this.anchor && root && root.parentElement) {
       const anchorElement = document.createElement('a');
       anchorElement.id = this.anchor;
       root.parentElement.prepend(anchorElement);
@@ -78,7 +79,7 @@ export default defineComponent({
       }
     }, 0);
 
-    if (this.actualFeature && (this.actualFeature === true || this.actualFeature === 'true')) {
+    if (this.actualFeature && this.actualFeature === 'true') {
       this.actualFeature = this.contentTitle;
     }
 
@@ -87,13 +88,13 @@ export default defineComponent({
       adminContent = document.querySelector('#content.admin');
     }
 
-    let contentTopPosition: number;
+    let contentTopPosition: number|null = null;
     if (adminContent) {
       contentTopPosition = adminContent.offsetTop;
     }
 
     if (contentTopPosition || contentTopPosition === 0) {
-      const parents = root.closest('[piwik-widget-loader]');
+      const parents = root.closest('[piwik-widget-loader]') as HTMLElement;
 
       // when shown within the widget loader, we need to get the offset of that element
       // as the widget loader might be still shown. Would otherwise not position correctly
@@ -103,7 +104,7 @@ export default defineComponent({
       if (topThis - contentTopPosition < 17) {
         // we make sure to display the first card with no margin-top to have it on same as line as
         // navigation
-        root.style.marginTop = 0;
+        root.style.marginTop = '0';
       }
     }
   },
 
@@ -17,6 +17,4 @@ export default function piwikContentIntro(): IDirective {
   };
 }
 
-piwikContentIntro.$inject = [];
-
-angular.module('piwikApp').directive('piwikContentIntro', piwikContentIntro);
+window.angular.module('piwikApp').directive('piwikContentIntro', piwikContentIntro);
@@ -17,6 +17,4 @@ export default function piwikContentTable(): IDirective {
   };
 }
 
-piwikContentTable.$inject = [];
-
-angular.module('piwikApp').directive('piwikContentTable', piwikContentTable);
+window.angular.module('piwikApp').directive('piwikContentTable', piwikContentTable);
@@ -9,7 +9,7 @@ import { ITimeoutService } from 'angular';
 import createAngularJsAdapter from '../createAngularJsAdapter';
 import DatePicker from './DatePicker.vue';
 
-export default createAngularJsAdapter({
+export default createAngularJsAdapter<[ITimeoutService]>({
   component: DatePicker,
   scope: {
     selectedDateStart: {
@@ -48,13 +48,13 @@ export default createAngularJsAdapter({
   },
   directiveName: 'piwikDatePicker',
   events: {
-    'cell-hover': (event, scope, element, attrs, $timeout: ITimeoutService) => {
+    'cell-hover': (event, vm, scope, element, attrs, controller, $timeout) => {
       $timeout(); // trigger new digest
     },
-    'cell-hover-leave': (event, scope, element, attrs, $timeout: ITimeoutService) => {
+    'cell-hover-leave': (event, vm, scope, element, attrs, controller, $timeout) => {
       $timeout(); // trigger new digest
     },
-    'date-select': (event, scope, element, attrs, $timeout: ITimeoutService) => {
+    'date-select': (event, vm, scope, element, attrs, controller, $timeout) => {
       $timeout(); // trigger new digest
     },
   },
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ protected function getPriorityOrder()`
`99`	`99`
`100`	`100`	`private function addUmdFilesIfDetected($plugins)`
`101`	`101`	`{`
`102`		`- $plugins = $this->orderPluginsByPluginDependencies($plugins);`
	`102`	`+ $plugins = self::orderPluginsByPluginDependencies($plugins);`
`103`	`103`
`104`	`104`	`foreach ($plugins as $plugin) {`
`105`	`105`	`$devUmd = "plugins/$plugin/vue/dist/$plugin.development.umd.js";`
`@@ -117,18 +117,18 @@ private function addUmdFilesIfDetected($plugins)`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`- private function orderPluginsByPluginDependencies($plugins)`
	`120`	`+ public static function orderPluginsByPluginDependencies($plugins)`
`121`	`121`	`{`
`122`	`122`	`$result = [];`
`123`	`123`
`124`	`124`	`while (!empty($plugins)) {`
`125`		`- $this->visitPlugin(reset($plugins), $plugins, $result);`
	`125`	`+ self::visitPlugin(reset($plugins), $plugins, $result);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`return $result;`
`129`	`129`	`}`
`130`	`130`
`131`		`- private function visitPlugin($plugin, &$plugins, &$result)`
	`131`	`+ private static function visitPlugin($plugin, &$plugins, &$result)`
`132`	`132`	`{`
`133`	`133`	`// remove the plugin from the array of plugins to visit`
`134`	`134`	`$index = array_search($plugin, $plugins);`
`@@ -149,7 +149,7 @@ private function visitPlugin($plugin, &$plugins, &$result)`
`149`	`149`	`if (!empty($pluginDependencies['dependsOn'])) {`
`150`	`150`	`// visit each plugin this one depends on first, so it is loaded first`
`151`	`151`	`foreach ($pluginDependencies['dependsOn'] as $pluginDependency) {`
`152`		`- $this->visitPlugin($pluginDependency, $plugins, $result);`
	`152`	`+ self::visitPlugin($pluginDependency, $plugins, $result);`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@ import AjaxHelper from './AjaxHelper';`
`2`	`2`
`3`	`3`	`declare global {`
`4`	`4`	`interface Window {`
`5`		`- ajaxHelper: AjaxHelper;`
	`5`	`+ ajaxHelper: typeof AjaxHelper;`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`window.ajaxHelper = AjaxHelper;`
`10`	`10`
`11`	`11`	`function ajaxQueue() {`
`12`		`- return globalAjaxQueue;`
	`12`	`+ return window.globalAjaxQueue;`
`13`	`13`	`}`
`14`	`14`
`15`		`-angular.module('piwikApp.service').service('globalAjaxQueue', ajaxQueue);`
	`15`	`+window.angular.module('piwikApp.service').service('globalAjaxQueue', ajaxQueue);`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,7 @@ function ComparisonFactory() {`
`13`	`13`	`return ComparisonsStoreInstance;`
`14`	`14`	`}`
`15`	`15`
`16`		`-ComparisonFactory.$inject = [];`
`17`		`-`
`18`		`-angular.module('piwikApp.service').factory('piwikComparisonsService', ComparisonFactory);`
	`16`	`+window.angular.module('piwikApp.service').factory('piwikComparisonsService', ComparisonFactory);`
`19`	`17`
`20`	`18`	`export default createAngularJsAdapter({`
`21`	`19`	`component: Comparisons,`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,4 @@ export default function piwikContentIntro(): IDirective {`
`17`	`17`	`};`
`18`	`18`	`}`
`19`	`19`
`20`		`-piwikContentIntro.$inject = [];`
`21`		`-`
`22`		`-angular.module('piwikApp').directive('piwikContentIntro', piwikContentIntro);`
	`20`	`+window.angular.module('piwikApp').directive('piwikContentIntro', piwikContentIntro);`