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.

Sign up for GitHub

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

Jump to bottom

Refactor page tree and add page based statistics #3325

Draft
wants to merge 54 commits into
base: develop
Choose a base branch
from
Draft

Refactor page tree and add page based statistics #3325

wants to merge 54 commits into from

Conversation

JoeyStk
Copy link
Contributor

@JoeyStk JoeyStk commented Jan 11, 2025 •
edited
Loading

Short description

This PR refactors parts of the page tree and adds the page based statistics to statistics.

Proposed changes

  • Refactor page tree
    • Split page tree into partial_page_tree, pages_page_tree and statistics_page_tree
    • Adjust naming
  • Add page based statistics
    • Call to Matomo
    • Show page based statistics in statistics view

Side effects

  • In collaboration with @jarlhengstmengel
  • Refactoring page tree is always dangerous, thorough testing is very, very welcome
  • I would propose that this PR gets at least three reviews
  • Please test this with a database dump

Resolved issues

Fixes: #3130

Pull Request Review Guidelines

jarlhengstmengel and others added 30 commits November 27, 2024 18:23
@jarlhengstmengel @JoeyStk
Merge page_tree_archived into page_tree
39de968
@JoeyStk
Fix translation format
63219f4
@JoeyStk
Add template for statistics about viewed pages
8eb7279
@JoeyStk
Add _generic_page_tree.html
94fcc30
@JoeyStk
Add additional column to page tree on statistics
3c12cc7
@jarlhengstmengel
Fix missing backend titles for root pages in page tree and deleting t…
b1545cc 
…ags for archive nodes
@jarlhengstmengel
Merging page_tree_node and page_tree_archived_node
9edae89
@jarlhengstmengel
Disable dragable tree node for archived tree nodes
e3c0d63
@JoeyStk
[WIP] Page based access
8466b66
@JoeyStk
[WIP] Restored commit
813b751
@jarlhengstmengel
Fix loading of childnodes
04ce650
@jarlhengstmengel
Fix codestyle
aed75ed
@jarlhengstmengel
Add _generic_page_tree_node.hmtl
05c2ad1
@jarlhengstmengel
update translations
7128904
@jarlhengstmengel
Cleaning up and deleting page_tree_archived files
718358e
@jarlhengstmengel
Rename page_tree to pages_page_tree
4fd9720
@JoeyStk
Add page accesses calls
feb7a64
@JoeyStk
Merge branch 'feature/refactor_page_tree_and_add_statistics_to_collap…
a41035d 
…sible_box' of https://github.com/digitalfabrik/integreat-cms into feature/refactor_page_tree_and_add_statistics_to_collapsible_box
@JoeyStk
Fix pylint
bbfb58c
@JoeyStk
[WIP] Include page tree to statistics
c375fde
@JoeyStk
Javascript code
68ccfe1
@JoeyStk
[WIP] First idea for graph
a9fa6ae
@JoeyStk
Show bars
edc3114
@jarlhengstmengel
Merge page_tree_archived into page_tree
0308511
@JoeyStk @jarlhengstmengel
Fix translation format
562f952
@JoeyStk @jarlhengstmengel
Add template for statistics about viewed pages
836506b
@JoeyStk @jarlhengstmengel
Add _generic_page_tree.html
bc93bc6
@JoeyStk @jarlhengstmengel
Add additional column to page tree on statistics
ce301cc
@jarlhengstmengel
Fix missing backend titles for root pages in page tree and deleting t…
4f4c99d 
…ags for archive nodes
@jarlhengstmengel
Merging page_tree_node and page_tree_archived_node
4f91410
JoeyStk and others added 21 commits December 20, 2024 12:40
@JoeyStk @jarlhengstmengel
[WIP] Restored commit
ef21cf8
@JoeyStk @jarlhengstmengel
Add page accesses calls
4801e17
@jarlhengstmengel
Fix loading of childnodes
b882d07
@jarlhengstmengel
Fix codestyle
5b66426
@jarlhengstmengel
Add _generic_page_tree_node.hmtl
160d621
@jarlhengstmengel
update translations
89fd0fd
@jarlhengstmengel
Cleaning up and deleting page_tree_archived files
962f0c5
@jarlhengstmengel
Rename page_tree to pages_page_tree
5df5e37
@JoeyStk @jarlhengstmengel
Fix pylint
495e71b
@JoeyStk @jarlhengstmengel
[WIP] Include page tree to statistics
7a82550
@JoeyStk @jarlhengstmengel
Javascript code
71c19ab
@JoeyStk @jarlhengstmengel
[WIP] First idea for graph
b0ffcc6
@JoeyStk @jarlhengstmengel
Show bars
c502c28
@JoeyStk
Add option to change time range and language selection
b1da1bc
@jarlhengstmengel
Disable editable page tree in statistics
424448f
@jarlhengstmengel
Upgrade lucide dependicy
9305396
@jarlhengstmengel
Update translations
b183cc5
@jarlhengstmengel
Merge branch 'feature/refactor_page_tree_and_add_statistics_to_collap…
4d0ff3e 
…sible_box' of https://github.com/digitalfabrik/integreat-cms into feature/refactor_page_tree_and_add_statistics_to_collapsible_box
@jarlhengstmengel
Fix page tree
29809d1
@jarlhengstmengel
Fix archived page tree
4990aea
@JoeyStk
Fix code styles
7af0938
@JoeyStk JoeyStk marked this pull request as draft January 11, 2025 17:40
@JoeyStk JoeyStk marked this pull request as ready for review January 13, 2025 14:50
@JoeyStk JoeyStk marked this pull request as draft January 13, 2025 15:02
@JoeyStk
Copy link
Contributor Author

JoeyStk commented Jan 19, 2025

Current state of this PR: @jarlhengstmengel is still working on fixing the tests. As soon as this is done, this PR is ready to be reviewed :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PeterNerlich PeterNerlich Awaiting requested review from PeterNerlich

@charludo charludo Awaiting requested review from charludo

@MizukiTemma MizukiTemma Awaiting requested review from MizukiTemma

@jonbulz jonbulz Awaiting requested review from jonbulz

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[2024-12-18] Refactor page tree and add it to to statistics as a collapsible box
2 participants
@JoeyStk @jarlhengstmengel