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

Extract NavigationTree->fastFilterHtml()'s HTML to Twig #16878

Merged
merged 1 commit into from
May 6, 2021
Merged

Extract NavigationTree->fastFilterHtml()'s HTML to Twig #16878

merged 1 commit into from
May 6, 2021

Conversation

danielTiringer
Copy link
Contributor

@danielTiringer danielTiringer commented May 4, 2021

Description

Extract HTML from libraries/classes/Navigation/NavigationTree.php's fastFilterHtml() to Twig templates

Ref #14801

Before submitting pull request, please review the following checklist:

  • Make sure you have read our CONTRIBUTING.md document.
  • Make sure you are making a pull request against the correct branch. For example, for bug fixes in a released version use the corresponding QA branch and for new features use the master branch. If you have a doubt, you can ask as a comment in the bug report or on the mailing list.
  • Every commit has proper Signed-off-by line as described in our DCO. This ensures that the work you're submitting is your own creation.
  • Every commit has a descriptive commit message.
  • Every commit is needed on its own, if you have just minor fixes to previous commits, you can squash them.
  • Any new functionality is covered by tests.

@codecov
Copy link

codecov bot commented May 4, 2021

Codecov Report

Merging #16878 (cfa1d17) into master (2204ef7) will increase coverage by 0.00%.
The diff coverage is 58.82%.

❗ Current head cfa1d17 differs from pull request most recent head d47cf0e. Consider uploading reports for the commit d47cf0e to get more accurate results
Impacted file tree graph

@@            Coverage Diff            @@
##             master   #16878   +/-   ##
=========================================
  Coverage     56.61%   56.61%           
+ Complexity    15146    15140    -6     
=========================================
  Files           475      475           
  Lines         60537    60499   -38     
=========================================
- Hits          34270    34251   -19     
+ Misses        26267    26248   -19     
Flag Coverage Δ Complexity Δ
dbase-extension 56.30% <62.50%> (+<0.01%) 15102.00 <0.00> (-6.00) ⬆️
recode-extension 56.25% <62.50%> (+<0.01%) 15102.00 <0.00> (-6.00) ⬆️
unit-7.2-ubuntu-latest 56.25% <62.50%> (+<0.01%) 15102.00 <0.00> (-6.00) ⬆️
unit-7.3-ubuntu-latest 59.92% <62.50%> (+<0.01%) 14879.00 <0.00> (-6.00) ⬆️
unit-7.4-ubuntu-latest 59.93% <62.50%> (+<0.01%) 14879.00 <0.00> (-6.00) ⬆️
unit-8.0-ubuntu-latest 60.08% <58.82%> (+<0.01%) 14879.00 <0.00> (-6.00) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
libraries/classes/Navigation/NavigationTree.php 43.08% <58.82%> (+0.68%) 249.00 <0.00> (-4.00) ⬆️
libraries/classes/Footer.php 81.55% <0.00%> (-3.07%) 46.00% <0.00%> (-2.00%)
libraries/classes/Display/Results.php 47.84% <0.00%> (+0.02%) 539.00% <0.00%> (ø%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d260e34...d47cf0e. Read the comment docs.

Copy link
Member

@williamdes williamdes left a comment

Choose a reason for hiding this comment

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

💯
I left one small comment

libraries/classes/Navigation/NavigationTree.php Outdated Show resolved Hide resolved
libraries/classes/Navigation/NavigationTree.php Outdated Show resolved Hide resolved
templates/navigation/tree/fast_filter.twig Outdated Show resolved Hide resolved
templates/navigation/tree/fast_filter.twig Outdated Show resolved Hide resolved
Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Extract NavigationTree->fastFilter, create twig

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Remove debug data

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Rename variables and refactor template logic

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>

Remove unnecessary ternary

Signed-off-by: Daniel Tiringer <tiringerdaniel@tutanota.com>
@MauricioFauth MauricioFauth self-assigned this May 6, 2021
@MauricioFauth MauricioFauth merged commit 7d7e867 into phpmyadmin:master May 6, 2021
@MauricioFauth
Copy link
Member

Merged, thanks for your contribution!

@danielTiringer danielTiringer deleted the 14801-extract-navigationtree-fastfilter-html-to-twig branch May 6, 2021 15:53
@williamdes williamdes added this to the 5.2.0 milestone May 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants