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:
authordiosmosis <diosmosis@users.noreply.github.com>2020-06-08 02:46:56 +0300
committerGitHub <noreply@github.com>2020-06-08 02:46:56 +0300
commitd0aaab95f1ef6d8b748b0e8d54f811a366864249 (patch)
tree86820438b4b56c764912316ebe8152362aa3e2dd /plugins/Dashboard
parentd10c4e89dc5d1081a3755497c45d366b470eeec7 (diff)
Switch from bower to npm and update JS libraries (#14082)
* Starting to replace bower with npm: use updated jquery-ui from npm. * Use jquery from npm./ * Use angular from npm. * Add more angular libraries. * Use chroma-js from npm. * Remove html5shiv, does not appear to be used. * Use iframe resizer library from npm. * Add jquery-mousewheel * Add jquery.dotdotdot from npm. * Get jquery.scrollto from npm. * Get jscrollpane from npm. * Get materialize-css from npm. * Get mousetrap from npm. * Remove ngDialog, as it is no longer used. * Install qrcode.js from npm. * Get sprintf-js from npm. * Get visibillityjs from npm. * Remove bower.json. * Getting parts of matomo to work w/ new versions of libraries installed by npm. * Ignore node_modules subfolders in node_modules since we only use npm for frontend dependencies + fix a test. * Fix button padding. * Fix series picker checkboxes. * Fix karma conf. * Fix CSS in right place. * Fixing more css/less issues. * More test fixes. * Limit selection style fix. * Fix more tests + materializecss issues. * Fix a couple more tests. * Fix annotation styling. * remove error * add ng-dialog files * try to fix some tests * Fix several UI tests. * fixing more build issues * Fix several more tests and issues. * fixing more tests * split ui tests into 3 groups * fix several more issues and tests * Fix some console warnings on chrome. * Updating more test files. * fix some tests * yet more fixes * couple more fixes * another form fix * Fix some tests. * update screenshot * update more expected files * Fix two more form issues. * test commit (travis is not fetching submodules for some reason...) * remove scripts removed in merge * three travis builds * split UIIntegrationTest into multiple suites * lets try this again * updae several expected screenshots * fix some more tests * fix plugin details material select and tabs initiaialization * update screenshots + css fix * re-initialize materialize tabs since we load jquery-ui afterwards for datepicker which unsets materialize tabs * update more screenshots and fix couple more issues * update more screenshots + tweak to test * more fixes and screenshot updates * fix some issues and update more screenshots * update submodules * more fixes + more updated screenshots * more css fixes and test fixes * couple fixes & updated screenshots * update screenshots * fix random failure * Map old bower_component files to new ones in AssetManager. * Remove node_modules from PR and ignore node_modules in .gitignore and remove libs/jquery (adding new required libs). * Update .travis.yml. * update screenshots * fixing some more issues * fix copy pasta * update screenshots * fix more modal issues * Update css & screenshots. * correct close modal calls * fixing more issues * data-target instead of data-activates * fix more tests * trigger build that works? * fix more tests * update submodule * debugging travis * more debugging * try to fix test * fix modal no button click in test * update more screenshots * couple more test fixes * some more fixes and updated screenshots * update screenshots * apply some review feedback * Fix modal centering and initial top position. * apply some more pr feedback * another pr fix * update submodule * remove style * fix color of checkbox mark * Fix centering the popover Note: centering the popover relative to body doesn't work poperly anymore, maybe because of the fixed position of the widget overlay. Using the ui-widget-overlay to position the dialog centered seems to work * ignore line endings check for node modules * updates expected UI files * submodule updates * use minified file of jquery.browser.js * updates expected test files * ensure to hide parent tooltips when row action tooltips are shown * tweak less for datatable navigation * style is only useful for dashboard * update some screenshots * update submodules Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/Dashboard')
-rw-r--r--plugins/Dashboard/javascripts/dashboardWidget.js1
-rw-r--r--plugins/Dashboard/stylesheets/dashboard.less5
-rw-r--r--plugins/Dashboard/tests/UI/Dashboard_spec.js2
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rowevolution.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png4
11 files changed, 23 insertions, 17 deletions
diff --git a/plugins/Dashboard/javascripts/dashboardWidget.js b/plugins/Dashboard/javascripts/dashboardWidget.js
index 44ae768aff..58de03cad8 100644
--- a/plugins/Dashboard/javascripts/dashboardWidget.js
+++ b/plugins/Dashboard/javascripts/dashboardWidget.js
@@ -336,7 +336,6 @@
dialogClass: 'widgetoverlay',
modal: true,
width: width,
- position: ['center', 'center'],
resizable: true,
autoOpen: true,
close: function (event, ui) {
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
index 80d1583f1a..eba7a02835 100644
--- a/plugins/Dashboard/stylesheets/dashboard.less
+++ b/plugins/Dashboard/stylesheets/dashboard.less
@@ -14,6 +14,11 @@ body#standalone {
}
#dashboard {
+ #dashboardWidgetsArea {
+ margin-left: auto;
+ margin-right: auto;
+ }
+
#dashboardWidgetsArea > .col {
min-height: 100px;
// Customize Bootstrap gutter between columns
diff --git a/plugins/Dashboard/tests/UI/Dashboard_spec.js b/plugins/Dashboard/tests/UI/Dashboard_spec.js
index 8adb962b45..1a59213095 100644
--- a/plugins/Dashboard/tests/UI/Dashboard_spec.js
+++ b/plugins/Dashboard/tests/UI/Dashboard_spec.js
@@ -77,6 +77,8 @@ describe("Dashboard", function () {
await page.waitFor(100);
await page.mouse.move(-10, -10);
+ await page.waitForNetworkIdle();
+
expect(await page.screenshot({ fullPage: true })).to.matchImage('widget_move');
});
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
index 2eee5a776a..9c181c8f05 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:38d947c12e5e179ed608ae854d7e4328c38e03dbcd7b4ca166874bd994d1a6b3
-size 313153
+oid sha256:11fc208937a2f5749da9475858ebec3a61ef0cb80618c962665f7f5c35607382
+size 314844
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
index bc5a77d86c..63f8f1b2b3 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f3f5466eb4242f52bc02c661eec97d05d4ed04d4d4a7541fd7eb29a1bf0e0c5a
-size 471018
+oid sha256:71bc670bb16dd52f5ebbc98193c812f1db3658cad5a78da3c640f46d689a3f41
+size 472641
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
index d8e26253c8..887edd9e19 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f4f2e454a129e6e834c506b13a569789a9c430021c6b5d95a208e6a86717c1fc
-size 70727
+oid sha256:0fadb0a32a0315c3e078d4792387ceb0f9b52dfb25d3fd6000148f8850353eb1
+size 70677
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png
index d2e7b67237..9cace76e8b 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fcb564225d8f61fe6593786f145ab0577ec8a7fa2d02594c4241124a130c4848
-size 32431
+oid sha256:9f5a85118fa48e68a0a794066b2a81e6226410a61c951ee62845332139044737
+size 32264
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png
index 56a1788660..5c4d9568ec 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b906690bbb52e769dbcce603fd9b9984274b0ec0482bb34c1e70e73f597aeb92
-size 375084
+oid sha256:8c45e5703dc1e9d3fd34b60036ed1c5dfc1fc0d2a80bb5396bb067bbd3d93ebe
+size 375632
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rowevolution.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rowevolution.png
index 961c7bc562..0adff1b9a2 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rowevolution.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rowevolution.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c0fedf748f622a703b01e596991f42bc734903c8a14e2d445098ecd322684a35
-size 71530
+oid sha256:171c4b01ef9c363be024e122f5fb2a56200009564e932016ac8d136a7f05ca13
+size 70595
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png
index cc62e1b618..296b02264e 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:331927b385522d3eef5fba9933ae0b767ec008997dd457ac3b48b676ad989a0c
-size 31323
+oid sha256:98a579476b4aac45499beff3e5bdd4f48576a0ad0c2c71c745f5223977a75e1b
+size 31414
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png
index 89317166c0..0ac0485743 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a22f3cfaf968005a671e4f6440aec5cb024ac42d7e3c1b61cae13ee1781c805f
-size 30462
+oid sha256:74256d5ad3e09a43c173a76c9156e65039fac38e6e84ca27b05549d2e3456889
+size 30412