Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Vue] remove use of angularjs from TwoFactorAuth plugin #19382

Merged
merged 50 commits into from Aug 17, 2022

Conversation

diosmosis
Copy link
Member

@diosmosis diosmosis commented Jun 22, 2022

Description:

This PR is based off of #18846.

Changes:

  • Create vue components for loginTwoFactorAuth.twig, setupFinished.twig, showRecoveryCodes.twig, userSettings.twig.
  • Unify setupTwoFactorAuth/setupTwoFactorAuthStandalone.
  • Create vue component for Login/formErrors.twig (since it's used directly in TwoFactorAuth).

Review

…ularjs adapters and modify less styles that use directive attribute names
…ew vue components and add vue component for Logins formErrors.twig template
@diosmosis diosmosis added this to the 5.0.0 milestone Jun 22, 2022
@diosmosis diosmosis marked this pull request as draft June 22, 2022 01:09
@diosmosis
Copy link
Member Author

@sgiehl merged 👍. Thanks for making small fixes in the other PR!

Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments for improvements / fixes. Besides that it looks good. Clicked through the Login and 2FA setup and everything seems to work correctly.

@sgiehl sgiehl removed the Needs Review PRs that need a code review label Jul 28, 2022
diosmosis and others added 4 commits July 28, 2022 13:45
…rAuth.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
…desPage.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
@diosmosis
Copy link
Member Author

@sgiehl committed the suggestions, thanks for the catching those

Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems there are still some tests failing. otherwise looks good

@sgiehl sgiehl merged commit e3655d3 into 5.x-dev Aug 17, 2022
@sgiehl sgiehl deleted the vue-remove-angularjs-TwoFactorAuth branch August 17, 2022 08:27
@justinvelluppillai justinvelluppillai added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Sep 29, 2022
bx80 pushed a commit that referenced this pull request Nov 25, 2022
* convert twig templates using directives to vue components, remove angularjs adapters and modify less styles that use directive attribute names

* built vue files

* move use of angularjs directives in TwoFactorAuth twig templates to new vue components and add vue component for Logins formErrors.twig template

* built vue files

* add missing translations

* fixing UI tests

* more UI test fixex

* remove reference to nonexistant JS file

* updated expected screenshots

* fixing ui test failures

* update expected screenshots

* fixing ui test failures

* fix select on focus use

* fix placement of computed property

* fixing ui test issues

* prevent random failure

* make sure Login plugin UMD is always loaded

* formErrors is an object if supplied

* compile vue entry components in reset API response and modify check for success

* rebuild login

* update expected screenshot

* remove unneeded use of html_attr escape

* remove use of html_attr and remove duplicate client side translation token entries

* sort used js translations and remove duplicates

* Update plugins/TwoFactorAuth/vue/src/LoginTwoFactorAuth/LoginTwoFactorAuth.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/TwoFactorAuth/vue/src/UserSettings/UserSettings.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/TwoFactorAuth/vue/src/ShowRecoveryCodes/ShowRecoveryCodesPage.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/TwoFactorAuth/vue/src/SetupFinished/SetupFinished.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* built vue files

* adds missing sanitize

* fix AssetManagerTest

* try to fix issue with umd asset fetching if Login not loaded

* cs

* updates expected test files

Co-authored-by: sgiehl <stefan@matomo.org>
bx80 pushed a commit that referenced this pull request Nov 25, 2022
* convert twig templates using directives to vue components, remove angularjs adapters and modify less styles that use directive attribute names

* built vue files

* move use of angularjs directives in TwoFactorAuth twig templates to new vue components and add vue component for Logins formErrors.twig template

* built vue files

* add missing translations

* fixing UI tests

* more UI test fixex

* remove reference to nonexistant JS file

* updated expected screenshots

* fixing ui test failures

* update expected screenshots

* fixing ui test failures

* fix select on focus use

* fix placement of computed property

* fixing ui test issues

* prevent random failure

* make sure Login plugin UMD is always loaded

* formErrors is an object if supplied

* compile vue entry components in reset API response and modify check for success

* rebuild login

* update expected screenshot

* remove unneeded use of html_attr escape

* remove use of html_attr and remove duplicate client side translation token entries

* sort used js translations and remove duplicates

* Update plugins/TwoFactorAuth/vue/src/LoginTwoFactorAuth/LoginTwoFactorAuth.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/TwoFactorAuth/vue/src/UserSettings/UserSettings.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/TwoFactorAuth/vue/src/ShowRecoveryCodes/ShowRecoveryCodesPage.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/TwoFactorAuth/vue/src/SetupFinished/SetupFinished.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* built vue files

* adds missing sanitize

* fix AssetManagerTest

* try to fix issue with umd asset fetching if Login not loaded

* cs

* updates expected test files

Co-authored-by: sgiehl <stefan@matomo.org>
bx80 pushed a commit that referenced this pull request Nov 25, 2022
* convert twig templates using directives to vue components, remove angularjs adapters and modify less styles that use directive attribute names

* built vue files

* move use of angularjs directives in TwoFactorAuth twig templates to new vue components and add vue component for Logins formErrors.twig template

* built vue files

* add missing translations

* fixing UI tests

* more UI test fixex

* remove reference to nonexistant JS file

* updated expected screenshots

* fixing ui test failures

* update expected screenshots

* fixing ui test failures

* fix select on focus use

* fix placement of computed property

* fixing ui test issues

* prevent random failure

* make sure Login plugin UMD is always loaded

* formErrors is an object if supplied

* compile vue entry components in reset API response and modify check for success

* rebuild login

* update expected screenshot

* remove unneeded use of html_attr escape

* remove use of html_attr and remove duplicate client side translation token entries

* sort used js translations and remove duplicates

* Update plugins/TwoFactorAuth/vue/src/LoginTwoFactorAuth/LoginTwoFactorAuth.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/TwoFactorAuth/vue/src/UserSettings/UserSettings.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/TwoFactorAuth/vue/src/ShowRecoveryCodes/ShowRecoveryCodesPage.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/TwoFactorAuth/vue/src/SetupFinished/SetupFinished.vue

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* built vue files

* adds missing sanitize

* fix AssetManagerTest

* try to fix issue with umd asset fetching if Login not loaded

* cs

* updates expected test files

Co-authored-by: sgiehl <stefan@matomo.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Do not close PRs with this label won't be marked as stale by the Close Stale Issues action not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants