[Vue] convert remaining usersmanager controllers to Vue (#18584)

* fix overlay test

* remove unintended changes

* remove unintended changes

* migrate archiving controller

* do not do a passthrough transpile of vue typescript, and fix many typescript errors in existing code

* more typescript fixes

* even more fixes

* workarounds to fix recursive typing issues

* get corehome to build w/ full typescript build and output type definitions to local dir

* get outputted typings to be used when compiling other plugins and fix typescript issues in CorePluginsAdmin

* readd corehome umd

* fix typescript errors in ExampleVue plugin

* fix feedback typescript errors

* rebuild

* migrate branding controller and get to build

* fix issues and get to work

* rebuild

* fix notification scroll

* migrate smtp settings controller in coreadminhome

* get to work

* migrate js tracking code generator and get to build

* migrate image tracking code generator and get to build

* get to work in UI

* get UI tests to pass locally

* forgot to add files + rebuild vue

* update screenshots

* Show a summary of new features (#18065)

* Added "What is new" notification display, populated by a new event

* Removed test example event hook

* Added support for applying a link attribute to menu items, fixes layout issue for mobile with html menu items

* Updated UI test screenshots

* Revert accidental edit

* Hide the "What's new" icon if there are no new features to show

* Changed to use changes.json, track user last viewed, added ui test

* Fix UserManager unit tests broken by new ts_changes_viewed user field

* Moved getChanges to separate helper class, added unit test, added user view access check

* Updated to add new changes table and populate only on plugin update/install

* Added missing fixture class, updated UI screenshots

* Updated matomo font to add ringing bell and new releases icons

* Fix for integration test

* Reworked class structure, removed unnecessary angular directive, merged templates, other tidy ups

* built vue files

* built vue files

* Added null user check, missing table exception handling, show plugin name in change title, better handling of missing change fields

* Added sample changes file, moved UserChanges db code to changes model, added return type hints, better db error code handling, various other improvements

* Revert accidental UI screenshot commit

* Fix for incorrect link name parameter in sample changes, switched back to using $db->query for INSERT IGNORE

* Integration test fix, UI screenshot updates

* Test fix

* Added link styling, show CoreHome changes without plugin prefix in title

* Update UI test screenshot

* Added styles to the popover, added event for filtering changes

* Test fix

* UI test screenshot updates

Co-authored-by: sgiehl <stefan@matomo.org>
Co-authored-by: bx80 <bx80@users.noreply.github.com>

* Update test translation (#18531)

update a test failed XML

* updates all submodules (#18541)

Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>

* Translations update from Hosted Weblate (#18529)

* Translated using Weblate (Greek)

Currently translated at 100.0% (162 of 162 strings)

Translation: Matomo/Plugin CoreAdminHome
Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-coreadminhome/el/

[ci skip]

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Vasilis Lourdas <dev@lourdas.eu>

* Translated using Weblate (Chinese (Simplified))

Currently translated at 83.9% (136 of 162 strings)

Translation: Matomo/Plugin CoreAdminHome
Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-coreadminhome/zh_Hans/

[ci skip]

Translated using Weblate (Chinese (Simplified))

Currently translated at 99.6% (620 of 622 strings)

Translation: Matomo/Matomo Base
Translate-URL: https://hosted.weblate.org/projects/matomo/matomo-base/zh_Hans/

[ci skip]

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: 刘韬 <lyuutau@outlook.com>

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Matomo/Plugin CoreAdminHome
Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-coreadminhome/

[ci skip]

Co-authored-by: Vasilis Lourdas <dev@lourdas.eu>
Co-authored-by: 刘韬 <lyuutau@outlook.com>

* [Vue] migrate report export directive and popover (#18440)

* update files

* sidenav start

* make getRef a utility method

* tweak

* add return type

* finish converting side-nav directive

* starting on reporting menu conversion

* remove unused properties

* convert reporting pages service

* migrate report metadata store

* remove angularjs files

* migrating reporting pages store

* make store adapters more immutable

* get service adapters to work

* fix a UI test

* another html fix

* migrate most of reporting menu directive and model

* Use themed font family for input forms to override materialize.css styling

* rebuild vue

* add a missing div

* ui test fixes

* update styling

* get to build

* get to load in the UI w/o error

* clone result of functions

* fix compile issue

* migrate widget loader and get to load in UI

* rebuild vue

* migrate widgetcontainer

* migrate widget bydimension container

* migrate widget + add tooltips directive

* quick fix

* Updating version to 4.6.0

* loading in page

* update expected screenshot

* add wait just in case travis is slow

* fix ordering bug

* add another wait

* rebuild vue

* css tweak

* fix some bugs and tests

* undo screenshot changes

* Menus test passing locally

* [Vue] date picker viewDate property is not kept up to date (#18385)

* viewDate ref is not kept up to date

* rebuild corehome

* reporting menu subcategory items are meant to be normal links

* update some screenshots

* use innerText instead of text() since angularjs maintains newlines in HTML that vue does not add

* trigger angularjs digest after ajaxhelper request

* rebuild vue

* update screenshots, fix bug in link generation in reporting menu and allow syncing multiple screenshot regexes at a time

* undo box-shadow change for UI tests

* fix more issues & update more tests

* update some screenshots

* fix some tests

* rebuild CoreHome

* quick fix

* built vue files

* fix angularjs issue

* add comment

* update umd files

* 4.6.1-rc1

* 4.6.1

* fix field array title

* apply some pr feedback

* apply more pr feedback

* another fix

* tweak

* fix ng-change not executed before ng-model

* fix another set of issues

* fix another issue

* rebuild vue

* better ng-change/ng-model fix

* update some screenshots

* rebuild vue

* remove some TODOs

* initiate initial ng-change ONLY for site selectors where this behavior applies

* emit/broadcast on correct scope in wrapper

* rebuild vue

* fix some issues

* couple more fixes

* fix another title issue

* rebuild vue

* do not report on ajax errors in notifications if not logged in

* migrate reporting page and model

* rebuild vue

* create sites selector model adapter

* fix siteselector vue bug, initial site is only set if there is just one site available

* rebuild vue

* migrate plugin settings directive

* remove TODO

* migrate plugin filter directive

* migrate two more plugins directives

* migrate save button

* fix a bunch of bugs

* fix another widget bug

* allow change event name between angularjs and vue

* rebuild vue

* migrate plugin form directive

* get to work

* migrate select-on-focus directive and start migrating report-export directive

* finish migrating report export directive & popover component + create reusable function to create vue app and add globals to it

* rebuild vue

* remove angularjs files and move less contents to vue dir

* built vue files

* fix function signature

* fix vue warning

* fix ajax request race condition

* rebuild vue

* add new notification type "help" so the help notification is not cleared when clearing transient notifications

* fix some bugs and tests

* update screenshot

* update screenshot & fix a test

* allow using unminified jquery ui + fix bug in last fix

* fix error when enrichedheadline is used in modal

* add polyfill min.js

* remove two todos

* fix widget url logic

* update some screenshots and fix sanitization/escape issue

* update screenshots

* rebuild vue

* fix url location updating regression in MatomoUrl.updateLocation use

* submodule

* update screenshots and fix possible error in json parse

* built vue files

* Merge branch 'vue-period-selector-regression' into vue-reporting-menu

* rebuild vue

* use correct variable

* rebuild vue

* fix widget url logic

* segment parameter can be undefined now for some reason

* fix ngmodel binding in siteselector adapter (for last time hopefully)

* the original site selector only set the first site to the first site in the initial sites query if there was only one site in the entire matomo instance

* fix sitesmanager ui test failure

* fix usersettings test failure

* rebuild vue

* more siteselector tweaks.

* build CoreHome

* more siteselector tweaks.

* another siteselector issue

* update screenshots

* update screenshot and try to fix random failure

* fix some issues in widget.vue when containerid is specified

* fix couple tests

* fix several test failures

* fix string concat

* fix test failure

* extra change

* fix last change and random failure

* styling fix

* fix last fix

* real fix this time

* fix stray request

* proper fix

* update build files

* try to fix random failure

* do not submit form

* check for api errors in promise chain in ajaxhelper.ts

* force a digest after a location change

* use proper abortcontroller method instead of promise hack, have to add new polyfill + try to fix random test failure

* some UI test fixes

* fix some report export issues

* several save button fixes + make replace approximation in createAngularJsAdapter better

* apply after manual click triggering in savebutton

* add names to divs so they can still be queried as they were in angularjs

* rebuild vue

* now that format_metrics checkbox works, need to check it

* fix unintended changes

* updated expected screenshots

* update two more

* go back to previous format_metrics behavior in popover

Co-authored-by: Justin Velluppillai <justin@innocraft.com>
Co-authored-by: justinvelluppillai <justinvelluppillai@users.noreply.github.com>
Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>

* [Vue] remove support in vue for FormField.allSettings (#18542)

* deprecate support in vue for FormField.allSettings since deep watching the property doesnt quite work

* built vue files

* update screenshots

* update screenshot

* Show a summary of new features (#18065)

* Added "What is new" notification display, populated by a new event

* Removed test example event hook

* Added support for applying a link attribute to menu items, fixes layout issue for mobile with html menu items

* Updated UI test screenshots

* Revert accidental edit

* Hide the "What's new" icon if there are no new features to show

* Changed to use changes.json, track user last viewed, added ui test

* Fix UserManager unit tests broken by new ts_changes_viewed user field

* Moved getChanges to separate helper class, added unit test, added user view access check

* Updated to add new changes table and populate only on plugin update/install

* Added missing fixture class, updated UI screenshots

* Updated matomo font to add ringing bell and new releases icons

* Fix for integration test

* Reworked class structure, removed unnecessary angular directive, merged templates, other tidy ups

* built vue files

* built vue files

* Added null user check, missing table exception handling, show plugin name in change title, better handling of missing change fields

* Added sample changes file, moved UserChanges db code to changes model, added return type hints, better db error code handling, various other improvements

* Revert accidental UI screenshot commit

* Fix for incorrect link name parameter in sample changes, switched back to using $db->query for INSERT IGNORE

* Integration test fix, UI screenshot updates

* Test fix

* Added link styling, show CoreHome changes without plugin prefix in title

* Update UI test screenshot

* Added styles to the popover, added event for filtering changes

* Test fix

* UI test screenshot updates

Co-authored-by: sgiehl <stefan@matomo.org>
Co-authored-by: bx80 <bx80@users.noreply.github.com>

* Update test translation (#18531)

update a test failed XML

* updates all submodules (#18541)

Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>

* Translations update from Hosted Weblate (#18529)

* Translated using Weblate (Greek)

Currently translated at 100.0% (162 of 162 strings)

Translation: Matomo/Plugin CoreAdminHome
Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-coreadminhome/el/

[ci skip]

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Vasilis Lourdas <dev@lourdas.eu>

* Translated using Weblate (Chinese (Simplified))

Currently translated at 83.9% (136 of 162 strings)

Translation: Matomo/Plugin CoreAdminHome
Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-coreadminhome/zh_Hans/

[ci skip]

Translated using Weblate (Chinese (Simplified))

Currently translated at 99.6% (620 of 622 strings)

Translation: Matomo/Matomo Base
Translate-URL: https://hosted.weblate.org/projects/matomo/matomo-base/zh_Hans/

[ci skip]

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: 刘韬 <lyuutau@outlook.com>

* Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Matomo/Plugin CoreAdminHome
Translate-URL: https://hosted.weblate.org/projects/matomo/plugin-coreadminhome/

[ci skip]

Co-authored-by: Vasilis Lourdas <dev@lourdas.eu>
Co-authored-by: 刘韬 <lyuutau@outlook.com>

* [Vue] migrate report export directive and popover (#18440)

* update files

* sidenav start

* make getRef a utility method

* tweak

* add return type

* finish converting side-nav directive

* starting on reporting menu conversion

* remove unused properties

* convert reporting pages service

* migrate report metadata store

* remove angularjs files

* migrating reporting pages store

* make store adapters more immutable

* get service adapters to work

* fix a UI test

* another html fix

* migrate most of reporting menu directive and model

* Use themed font family for input forms to override materialize.css styling

* rebuild vue

* add a missing div

* ui test fixes

* update styling

* get to build

* get to load in the UI w/o error

* clone result of functions

* fix compile issue

* migrate widget loader and get to load in UI

* rebuild vue

* migrate widgetcontainer

* migrate widget bydimension container

* migrate widget + add tooltips directive

* quick fix

* Updating version to 4.6.0

* loading in page

* update expected screenshot

* add wait just in case travis is slow

* fix ordering bug

* add another wait

* rebuild vue

* css tweak

* fix some bugs and tests

* undo screenshot changes

* Menus test passing locally

* [Vue] date picker viewDate property is not kept up to date (#18385)

* viewDate ref is not kept up to date

* rebuild corehome

* reporting menu subcategory items are meant to be normal links

* update some screenshots

* use innerText instead of text() since angularjs maintains newlines in HTML that vue does not add

* trigger angularjs digest after ajaxhelper request

* rebuild vue

* update screenshots, fix bug in link generation in reporting menu and allow syncing multiple screenshot regexes at a time

* undo box-shadow change for UI tests

* fix more issues & update more tests

* update some screenshots

* fix some tests

* rebuild CoreHome

* quick fix

* built vue files

* fix angularjs issue

* add comment

* update umd files

* 4.6.1-rc1

* 4.6.1

* fix field array title

* apply some pr feedback

* apply more pr feedback

* another fix

* tweak

* fix ng-change not executed before ng-model

* fix another set of issues

* fix another issue

* rebuild vue

* better ng-change/ng-model fix

* update some screenshots

* rebuild vue

* remove some TODOs

* initiate initial ng-change ONLY for site selectors where this behavior applies

* emit/broadcast on correct scope in wrapper

* rebuild vue

* fix some issues

* couple more fixes

* fix another title issue

* rebuild vue

* do not report on ajax errors in notifications if not logged in

* migrate reporting page and model

* rebuild vue

* create sites selector model adapter

* fix siteselector vue bug, initial site is only set if there is just one site available

* rebuild vue

* migrate plugin settings directive

* remove TODO

* migrate plugin filter directive

* migrate two more plugins directives

* migrate save button

* fix a bunch of bugs

* fix another widget bug

* allow change event name between angularjs and vue

* rebuild vue

* migrate plugin form directive

* get to work

* migrate select-on-focus directive and start migrating report-export directive

* finish migrating report export directive & popover component + create reusable function to create vue app and add globals to it

* rebuild vue

* remove angularjs files and move less contents to vue dir

* built vue files

* fix function signature

* fix vue warning

* fix ajax request race condition

* rebuild vue

* add new notification type "help" so the help notification is not cleared when clearing transient notifications

* fix some bugs and tests

* update screenshot

* update screenshot & fix a test

* allow using unminified jquery ui + fix bug in last fix

* fix error when enrichedheadline is used in modal

* add polyfill min.js

* remove two todos

* fix widget url logic

* update some screenshots and fix sanitization/escape issue

* update screenshots

* rebuild vue

* fix url location updating regression in MatomoUrl.updateLocation use

* submodule

* update screenshots and fix possible error in json parse

* built vue files

* Merge branch 'vue-period-selector-regression' into vue-reporting-menu

* rebuild vue

* use correct variable

* rebuild vue

* fix widget url logic

* segment parameter can be undefined now for some reason

* fix ngmodel binding in siteselector adapter (for last time hopefully)

* the original site selector only set the first site to the first site in the initial sites query if there was only one site in the entire matomo instance

* fix sitesmanager ui test failure

* fix usersettings test failure

* rebuild vue

* more siteselector tweaks.

* build CoreHome

* more siteselector tweaks.

* another siteselector issue

* update screenshots

* update screenshot and try to fix random failure

* fix some issues in widget.vue when containerid is specified

* fix couple tests

* fix several test failures

* fix string concat

* fix test failure

* extra change

* fix last change and random failure

* styling fix

* fix last fix

* real fix this time

* fix stray request

* proper fix

* update build files

* try to fix random failure

* do not submit form

* check for api errors in promise chain in ajaxhelper.ts

* force a digest after a location change

* use proper abortcontroller method instead of promise hack, have to add new polyfill + try to fix random test failure

* some UI test fixes

* fix some report export issues

* several save button fixes + make replace approximation in createAngularJsAdapter better

* apply after manual click triggering in savebutton

* add names to divs so they can still be queried as they were in angularjs

* rebuild vue

* now that format_metrics checkbox works, need to check it

* fix unintended changes

* updated expected screenshots

* update two more

* go back to previous format_metrics behavior in popover

Co-authored-by: Justin Velluppillai <justin@innocraft.com>
Co-authored-by: justinvelluppillai <justinvelluppillai@users.noreply.github.com>
Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>

* [Vue] remove support in vue for FormField.allSettings (#18542)

* deprecate support in vue for FormField.allSettings since deep watching the property doesnt quite work

* built vue files

* update screenshots

* update screenshot

* fix tests

* rebuild

* rebuild

* order plugins by dependencies in vue:build and fix warning in corehome build

* built vue files

* built vue files

* remove unused imports

* built vue files

* remove multilinefield component, fieldtextareaarray does the same thing

* edit-trigger is not used anywhere

* migrate sitetypes model to store

* do not load nonexistant files

* remove reference nonexistant files

* start converting sitefields component

* more work on sitefields component

* undo submodule change

* rebuild

* get sitesmanager to build

* get SiteFields component to work in UI

* datepicker does not format times

* export other stores

* fix some typing issues and rebuild

* start on site management conversion

* add more comma delimited props to list + remove controller JS

* rebuild

* convert sites manager controller to sitesmanagement component

* remove TODOs

* finish migrating sitesmanager

* remove some TODO

* get to build

* fixes from testing

* rebuild

* rebuild and fix issue w/ globalsettings hash detection

* migrate capabilities-edit component.

* some fixes and get to build

* get to work

* built vue files

* get to work and rebuild

* migrate user edit form component

* some fixes

* fixes

* another fix

* more fixes

* update file

* more fixes

* fix ref

* rebuild vue

* couple more fixes

* migrate paged users list and get to build

* fixing issues

* workaround vue issue w/ directives that modify css classes on elements that also bind to :class

* dropdownmenu directive should be aware of data-target parameter that is required by materialize

* handle disabled options in fieldselect

* fix issues and rebuild vue

* migrate usersmanager component and get to build

* forgot to add files, fix some issues + rebuild

* migrate usersmanager controllers and twig template parts

* fix compile issues and get to build

* fix issues and rebuild

* fix bug and rebuild

* fix bug and rebuild

* fix issue

* fix issues and rebuild

* fix ui test

* fix UI test failure

* fixing some issues

* complete fixes

* fix some more issues

* fix ui test failures

* another fix

* several more fixes

* fix delete dialog

* more fixes

* fix styling issue

* more fixes

* fix another ui test + update other UI tests

* fixing edisiteid handling

* update screenshots

* fix UI tests somre more

* fix random failure

* fixes

* reference css class not attribute (since that is what is added in vue)

* fixing more ui tests

* try to fix vue css class in directive issue

* tweak

* in groupedsetting handle templateFile property for angularjs BC

* rebuild vue

* fix view tracking code link

* fixing UI tests

* fix selector in test for this branch only

* Update screenshot.

* update screenshot

* update screenshots

* style fix

* fix selectors and update screenshot

* built vue files

* Update screenshot + fix title and spacing.

* fix password changing

* fixing tests

* fix more issues

* fix styling

* built vue files

* more fixes

* more styling fixes

* more fixes

* Fix tests locally.

* Fixing more issues + getting UI tests to pass locally.

* update tagmanger module?

* fix UI tests

* remove unneeded event

* update screenshots

* fix siteselector query selector in test + fix html double encoding + update UI tests

* update submodule

* update submodule and use separate Field name for current user password

* fix test selectors

Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com>
Co-authored-by: sgiehl <stefan@matomo.org>
Co-authored-by: bx80 <bx80@users.noreply.github.com>
Co-authored-by: Peter Zhang <peter@innocraft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Weblate (bot) <hosted@weblate.org>
Co-authored-by: Vasilis Lourdas <dev@lourdas.eu>
Co-authored-by: 刘韬 <lyuutau@outlook.com>
Co-authored-by: Justin Velluppillai <justin@innocraft.com>
Co-authored-by: justinvelluppillai <justinvelluppillai@users.noreply.github.com>
Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>

2 files changed, 28 insertions, 144 deletions

diff --git a/plugins/UsersManager/templates/anonymousSettings.twig b/plugins/UsersManager/templates/anonymousSettings.twig
index 0e8369a8b9..e030c3f3fc 100644
--- a/plugins/UsersManager/templates/anonymousSettings.twig
+++ b/plugins/UsersManager/templates/anonymousSettings.twig
@@ -4,42 +4,15 @@
 
 {% block content %}
 {% if isSuperUser %}
-<div piwik-content-block content-title="{{ title|e('html_attr') }}">
-    {% if anonymousSites|length == 0 %}
-
-        <div class="alert alert-info">
-            {{ 'UsersManager_NoteNoAnonymousUserAccessSettingsWontBeUsed2'|translate }}
-        </div>
-
-    {% else %}
-
-        <div piwik-form ng-controller="AnonymousSettingsController as anonymousSettings">
-
-            <div piwik-field uicontrol="radio" name="anonymousDefaultReport"
-                 ng-model="anonymousSettings.defaultReport"
-                 introduction="{{ 'UsersManager_WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess'|translate|e('html_attr') }}"
-                 value="{{ anonymousDefaultReport }}"
-                 options="{{ defaultReportOptions|json_encode }}">
-            </div>
-
-            <div piwik-field uicontrol="select" name="anonymousDefaultReportWebsite"
-                 ng-model="anonymousSettings.defaultReportWebsite"
-                 options="{{ anonymousSites|json_encode }}"
-                 value="{{ anonymousDefaultSite }}">
-            </div>
-
-            <div piwik-field uicontrol="radio" name="anonymousDefaultDate"
-                 ng-model="anonymousSettings.defaultDate"
-                 introduction="{{ 'UsersManager_ForAnonymousUsersReportDateToLoadByDefault'|translate|e('html_attr') }}"
-                 value="{{ anonymousDefaultDate }}"
-                 options="{{ availableDefaultDates|json_encode }}">
-            </div>
-
-            <div piwik-save-button saving="anonymousSettings.loading" onconfirm="anonymousSettings.save()"></div>
-
-        </div>
-
-    {% endif %}
-</div>
+<div
+    matomo-anonymous-settings
+    title="{{ title|json_encode|e('html_attr') }}"
+    anonymous-sites="{{ anonymousSites|json_encode|e('html_attr') }}"
+    anonymous-default-report="{{ anonymousDefaultReport|json_encode|e('html_attr') }}"
+    anonymous-default-site="{{ anonymousDefaultSite|json_encode|e('html_attr') }}"
+    anonymous-default-date="{{ anonymousDefaultDate|json_encode|e('html_attr') }}"
+    available-default-dates="{{ availableDefaultDates|json_encode|e('html_attr') }}"
+    default-report-options="{{ defaultReportOptions|json_encode|e('html_attr') }}"
+></div>
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 237f6c21af..7bc6199b33 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -3,115 +3,26 @@
 {% set title %}{{ 'UsersManager_PersonalSettings'|translate }}{% endset %}
 
 {% block content %}
-
-<div piwik-content-block content-title="{{ title|e('html_attr') }}" feature="true">
-    <form id="userSettingsTable" piwik-form ng-controller="PersonalSettingsController as personalSettings">
-
-        <div piwik-field uicontrol="text" name="username"
-             data-title="{{ 'General_Username'|translate|e('html_attr') }}"
-             value="{{ userLogin }}" data-disabled="true"
-             ng-model="personalSettings.username"
-             inline-help="{{ 'UsersManager_YourUsernameCannotBeChanged'|translate|e('html_attr') }}">
-        </div>
-
-        {% if isUsersAdminEnabled %}
-        <div piwik-field uicontrol="text" name="email"
-             ng-model="personalSettings.email"
-             ng-change="personalSettings.requirePasswordConfirmation()"
-             maxlength="100"
-             data-title="{{ 'UsersManager_Email'|translate|e('html_attr') }}"
-             value="{{ userEmail }}">
-        </div>
-        {% endif %}
-
-        <div id="languageHelp" class="inline-help-node">
-            <a target="_blank" rel="noreferrer noopener" href="https://matomo.org/translations/">
-                {{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a>
-        </div>
-
-        <div piwik-field uicontrol="select" name="language"
-             ng-model="personalSettings.language"
-             data-title="{{ 'General_Language'|translate|e('html_attr') }}"
-             options="{{ languageOptions|json_encode }}"
-             inline-help="#languageHelp"
-             value="{{ currentLanguageCode }}">
-        </div>
-
-        <div piwik-field uicontrol="select" name="timeformat"
-             ng-model="personalSettings.timeformat"
-             data-title="{{ 'General_TimeFormat'|translate|e('html_attr') }}"
-             value="{{ currentTimeformat }}" options="{{ timeFormats|json_encode }}">
-        </div>
-
-        <div piwik-field uicontrol="radio" name="defaultReport"
-             ng-model="personalSettings.defaultReport"
-             introduction="{{ 'UsersManager_ReportToLoadByDefault'|translate|e('html_attr') }}"
-             data-title="{{ 'General_AllWebsitesDashboard'|translate|e('html_attr') }}"
-             value="{{ defaultReport }}" options="{{ defaultReportOptions|json_encode }}">
-        </div>
-
-        <div piwik-siteselector
-             ng-model="personalSettings.site"
-             show-selected-site="true"
-             class="sites_autocomplete"
-             siteid="{{ defaultReportIdSite }}"
-             sitename="{{ defaultReportSiteName|rawSafeDecoded }}"
-             switch-site-on-select="false"
-             show-all-sites-item="false"
-             showselectedsite="true"
-             id="defaultReportSiteSelector"
-        ></div>
-
-        <div piwik-field uicontrol="radio" name="defaultDate"
-             ng-model="personalSettings.defaultDate"
-             introduction="{{ 'UsersManager_ReportDateToLoadByDefault'|translate|e('html_attr') }}"
-             value="{{ defaultDate }}" options="{{ availableDefaultDates|json_encode }}">
-        </div>
-
-        <div piwik-save-button onconfirm="personalSettings.save()"
-             saving="personalSettings.loading"></div>
-
-        <div class="modal" id="confirmChangesWithPassword">
-            <div class="modal-content">
-                <h2>{{ 'UsersManager_ConfirmWithPassword'|translate }}</h2>
-
-                <div piwik-field uicontrol="password" name="currentPassword" autocomplete="off"
-                     ng-model="personalSettings.passwordCurrent"
-                     full-width="true"
-                     data-title="{{ 'UsersManager_YourCurrentPassword'|translate|e('html_attr') }}"
-                     value="">
-                </div>
-            </div>
-            <div class="modal-footer">
-                <a href="javascript:void(0)" class="modal-action btn" ng-click="personalSettings.save()">{{ 'General_Ok'|translate }}</a>
-                <a href="javascript:void(0)" class="modal-action modal-close modal-no"  ng-click="personalSettings.cancelSave()">{{ 'General_Cancel'|translate }}</a>
-            </div>
-        </div>
-
-    </form>
-</div>
+<div
+    matomo-personal-settings
+    is-users-admin-enabled="{{ isUsersAdminEnabled|json_encode|e('html_attr') }}"
+    title="{{ title|json_encode|e('html_attr') }}"
+    user-login="{{ userLogin|json_encode|e('html_attr') }}"
+    user-email="{{ userEmail|json_encode|e('html_attr') }}"
+    current-language-code="{{ currentLanguageCode|json_encode|e('html_attr') }}"
+    language-options="{{ languageOptions|json_encode|e('html_attr') }}"
+    current-timeformat="{{ currentTimeformat|json_encode|e('html_attr') }}"
+    time-formats="{{ timeFormats|json_encode|e('html_attr') }}"
+    default-report="{{ defaultReport|json_encode|e('html_attr') }}"
+    default-report-options="{{ defaultReportOptions|json_encode|e('html_attr') }}"
+    default-report-id-site="{{ defaultReportIdSite|json_encode|e('html_attr') }}"
+    default-report-site-name="{{ defaultReportSiteName|json_encode|e('html_attr') }}"
+    default-date="{{ defaultDate|json_encode|e('html_attr') }}"
+    available-default-dates="{{ availableDefaultDates|json_encode|e('html_attr') }}"
+></div>
 
 {% if showNewsletterSignup %}
-    <div ng-controller="PersonalSettingsController as personalSettings">
-        <div piwik-content-block id="newsletterSignup"
-             ng-show="personalSettings.showNewsletterSignup"
-             content-title="{{ 'UsersManager_NewsletterSignupTitle'|translate|e('html_attr') }}">
-
-            <div piwik-field uicontrol="checkbox" name="newsletterSignupCheckbox" id="newsletterSignupCheckbox"
-                 ng-model="personalSettings.newsletterSignupCheckbox"
-                 full-width="true"
-                 data-title="{{ 'UsersManager_NewsletterSignupMessage'|translate('<a href="https://matomo.org/privacy-policy/" target="_blank">', '</a>')|e('html_attr') }}"
-            >
-            </div>
-
-            <div piwik-save-button id="newsletterSignupBtn"
-                 onconfirm="personalSettings.signupForNewsletter()"
-                 data-disabled="!personalSettings.newsletterSignupCheckbox"
-                 value="{{ '{{ personalSettings.newsletterSignupButtonTitle }}'|raw }}"
-                 saving="personalSettings.isProcessingNewsletterSignup">
-            </div>
-        </div>
-    </div>
+    <div matomo-newsletter-settings></div>
 {% endif %}
 
 <div piwik-plugin-settings mode="user"></div>