Merge pull request #38 from matomo-org/vue-manage-custom-vars

[Vue] migrate manage-custom-vars model and directive to Vue
matomo-org · Apr 25, 2022 · 2942767 · 2942767
2 parents 1729512 + 98b0cd7
commit 2942767
Show file tree

Hide file tree

Showing 19 changed files with 797 additions and 183 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,6 @@
-tests/System/processed/*xml
+tests/System/processed/*xml
+tests/System/processed/*text
+/vue/dist/demo.html
+/vue/dist/*.common.js
+/vue/dist/*.map
+/vue/dist/*.development.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,3 @@
+# CHANGELOG
+
+* 4.1.0 migrate from AngularJS to Vue.
diff --git a/CustomVariables.php b/CustomVariables.php
@@ -20,7 +20,6 @@ class CustomVariables extends \Piwik\Plugin
     public function registerEvents()
     {
         return array(
-            'AssetManager.getJavaScriptFiles' => 'getJsFiles',
             'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
             'AssetManager.getStylesheetFiles'  => 'getStylesheetFiles',
             'Dimension.addDimensions' => 'addDimensions',
@@ -137,14 +136,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
 
     public function getStylesheetFiles(&$stylesheets)
     {
-        $stylesheets[] = "plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.less";
-    }
-
-    public function getJsFiles(&$jsFiles)
-    {
-        $jsFiles[] = "plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.model.js";
-        $jsFiles[] = "plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.controller.js";
-        $jsFiles[] = "plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.js";
+        $stylesheets[] = "plugins/CustomVariables/vue/src/ManageCustomVars/ManageCustomVars.less";
     }
 
     public function provideActionDimensionFields(&$fields, &$joins)

diff --git a/angularjs/manage-custom-vars/manage-custom-vars.controller.js b/angularjs/manage-custom-vars/manage-custom-vars.controller.js
diff --git a/angularjs/manage-custom-vars/manage-custom-vars.directive.html b/angularjs/manage-custom-vars/manage-custom-vars.directive.html
diff --git a/angularjs/manage-custom-vars/manage-custom-vars.directive.js b/angularjs/manage-custom-vars/manage-custom-vars.directive.js
diff --git a/angularjs/manage-custom-vars/manage-custom-vars.model.js b/angularjs/manage-custom-vars/manage-custom-vars.model.js
diff --git a/plugin.json b/plugin.json
@@ -1,12 +1,12 @@
 {
     "name": "CustomVariables",
     "description": "Categorise your visitors and actions with custom name-value pairs. Segment by these values and get more insights to draw the right conclusions.",
-    "version": "4.0.1",
+    "version": "4.1.0",
     "keywords": ["custom variables"],
     "license": "GPL v3+",
     "homepage": "https://matomo.org",
     "require": {
-        "matomo": ">=4.0.0-b1,<5.0.0-b1"
+        "matomo": ">=4.10.0-b1,<5.0.0-b1"
     },
     "support": {
         "email": "[email protected]",

diff --git a/templates/manage.twig b/templates/manage.twig
@@ -7,5 +7,5 @@
 {% endblock %}
 
 {% block content %}
-    <div piwik-manage-custom-vars>
+    <div vue-entry="CustomVariables.ManageCustomVars"></div>
 {% endblock %}
diff --git a/tests/UI/expected-ui-screenshots/CustomVariables_manage.png b/tests/UI/expected-ui-screenshots/CustomVariables_manage.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# CHANGELOG

		* 4.1.0 migrate from AngularJS to Vue.