Skip to content

web/admin: fix chart label on dashboard user page#7434

Merged
BeryJu merged 3 commits intogoauthentik:mainfrom
macmoritz:web/fix-chart-label-dashboarduserpage
Nov 6, 2023
Merged

web/admin: fix chart label on dashboard user page#7434
BeryJu merged 3 commits intogoauthentik:mainfrom
macmoritz:web/fix-chart-label-dashboarduserpage

Conversation

@macmoritz
Copy link
Contributor

@macmoritz macmoritz commented Nov 4, 2023

Sets labels in user statistics/dashboard user page charts via an optional parameter label for AdminModelPerDay-Component.
Includes a fallback to "Objects created" if label is not given.

Checklist

  • Local tests pass (ak test authentik/)
  • The code has been formatted (make lint-fix)

If an API change has been made

  • The API schema has been updated (make gen-build)

If changes to the frontend have been made

  • The code has been formatted (make web)
  • The translation files have been updated (make i18n-extract)

If applicable

  • The documentation has been updated
  • The documentation has been formatted (make website)

@macmoritz macmoritz requested a review from a team as a code owner November 4, 2023 21:35
@netlify
Copy link

netlify bot commented Nov 4, 2023 •
edited
Loading

✅ Deploy Preview for authentik-storybook ready!

Name Link
🔨 Latest commit b7988e7
🔍 Latest deploy log https://app.netlify.com/sites/authentik-storybook/deploys/6546bfd3850d0b000868f005
😎 Deploy Preview https://deploy-preview-7434--authentik-storybook.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@codecov
Copy link

codecov bot commented Nov 4, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (dd4e903) 92.58% compared to head (b7988e7) 92.56%.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #7434      +/-   ##
==========================================
- Coverage   92.58%   92.56%   -0.03%     
==========================================
  Files         587      587              
  Lines       28898    28898              
==========================================
- Hits        26756    26749       -7     
- Misses       2142     2149       +7
Flag Coverage Δ
e2e 50.91% <ø> (-0.03%) ⬇️
integration 26.01% <ø> (ø)
unit 89.59% <ø> (ø)

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

see 3 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@BeryJu BeryJu changed the title web: fix chart label on dashboard user page web/admin: fix chart label on dashboard user page Nov 6, 2023
@BeryJu
Copy link
Member

BeryJu commented Nov 6, 2023

/cherry-pick version-2023.10

@BeryJu BeryJu merged commit 90b8217 into goauthentik:main Nov 6, 2023
@gcp-cherry-pick-bot
Copy link
Contributor

gcp-cherry-pick-bot bot commented Nov 6, 2023

Cherry-pick failed with Merge error 90b8217eb2ee1d441922012d950aa0b938eb0f42 into temp-cherry-pick-98a45d-version-2023.10

kensternberg-authentik added a commit that referenced this pull request Nov 6, 2023
@kensternberg-authentik
Merge branch 'main' into dev
242e5b4 
* main:
  web/flows: attempt to fix bitwareden android compatibility (#7455)
  sources/oauth: fix patreon (#7454)
  website: bump the docusaurus group in /website with 3 updates (#7400)
  web/admin: fix chart label on dashboard user page (#7434)
  core: bump github.com/gorilla/sessions from 1.2.1 to 1.2.2 (#7446)
  core: bump github.com/gorilla/mux from 1.8.0 to 1.8.1 (#7443)
  core: bump github.com/spf13/cobra from 1.7.0 to 1.8.0 (#7442)
  core: bump github.com/gorilla/websocket from 1.5.0 to 1.5.1 (#7445)
  core: bump golang.org/x/sync from 0.4.0 to 0.5.0 (#7441)
  core: bump github.com/gorilla/securecookie from 1.1.1 to 1.1.2 (#7440)
  core: bump github.com/gorilla/handlers from 1.5.1 to 1.5.2 (#7444)
  web: bump rollup from 4.2.0 to 4.3.0 in /web (#7448)
  web: bump the eslint group in /web with 2 updates (#7447)
  core: bump uvicorn from 0.23.2 to 0.24.0 (#7450)
  core: bump selenium from 4.15.1 to 4.15.2 (#7449)
  core: bump ruff from 0.1.3 to 0.1.4 (#7451)
  web: bump the eslint group in /tests/wdio with 2 updates (#7452)
kensternberg-authentik added a commit that referenced this pull request Nov 6, 2023
@kensternberg-authentik
Merge branch 'dev' into localize-012
8b8dc7f 
* dev: (55 commits)
  web/flows: attempt to fix bitwareden android compatibility (#7455)
  sources/oauth: fix patreon (#7454)
  website: bump the docusaurus group in /website with 3 updates (#7400)
  web/admin: fix chart label on dashboard user page (#7434)
  core: bump github.com/gorilla/sessions from 1.2.1 to 1.2.2 (#7446)
  core: bump github.com/gorilla/mux from 1.8.0 to 1.8.1 (#7443)
  core: bump github.com/spf13/cobra from 1.7.0 to 1.8.0 (#7442)
  core: bump github.com/gorilla/websocket from 1.5.0 to 1.5.1 (#7445)
  core: bump golang.org/x/sync from 0.4.0 to 0.5.0 (#7441)
  core: bump github.com/gorilla/securecookie from 1.1.1 to 1.1.2 (#7440)
  core: bump github.com/gorilla/handlers from 1.5.1 to 1.5.2 (#7444)
  web: bump rollup from 4.2.0 to 4.3.0 in /web (#7448)
  web: bump the eslint group in /web with 2 updates (#7447)
  core: bump uvicorn from 0.23.2 to 0.24.0 (#7450)
  core: bump selenium from 4.15.1 to 4.15.2 (#7449)
  core: bump ruff from 0.1.3 to 0.1.4 (#7451)
  web: bump the eslint group in /tests/wdio with 2 updates (#7452)
  providers/proxy: fix closed redis client (#7385)
  ci: explicitly give write permissions to packages (#7428)
  core: bump selenium from 4.15.0 to 4.15.1 (#7422)
  ...
@macmoritz
Copy link
Contributor Author

macmoritz commented Nov 6, 2023

@BeryJu the above message does not look good. Is this intended or nothing to worry about?
But the merge on main looks correct.

kensternberg-authentik added a commit that referenced this pull request Nov 6, 2023
@kensternberg-authentik
Merge branch 'main' into web/revise-wizard-form-handling
64b8246 
* main: (60 commits)
  web/flows: attempt to fix bitwareden android compatibility (#7455)
  sources/oauth: fix patreon (#7454)
  website: bump the docusaurus group in /website with 3 updates (#7400)
  web/admin: fix chart label on dashboard user page (#7434)
  core: bump github.com/gorilla/sessions from 1.2.1 to 1.2.2 (#7446)
  core: bump github.com/gorilla/mux from 1.8.0 to 1.8.1 (#7443)
  core: bump github.com/spf13/cobra from 1.7.0 to 1.8.0 (#7442)
  core: bump github.com/gorilla/websocket from 1.5.0 to 1.5.1 (#7445)
  core: bump golang.org/x/sync from 0.4.0 to 0.5.0 (#7441)
  core: bump github.com/gorilla/securecookie from 1.1.1 to 1.1.2 (#7440)
  core: bump github.com/gorilla/handlers from 1.5.1 to 1.5.2 (#7444)
  web: bump rollup from 4.2.0 to 4.3.0 in /web (#7448)
  web: bump the eslint group in /web with 2 updates (#7447)
  core: bump uvicorn from 0.23.2 to 0.24.0 (#7450)
  core: bump selenium from 4.15.1 to 4.15.2 (#7449)
  core: bump ruff from 0.1.3 to 0.1.4 (#7451)
  web: bump the eslint group in /tests/wdio with 2 updates (#7452)
  providers/proxy: fix closed redis client (#7385)
  ci: explicitly give write permissions to packages (#7428)
  core: bump selenium from 4.15.0 to 4.15.1 (#7422)
  ...
@macmoritz macmoritz deleted the web/fix-chart-label-dashboarduserpage branch November 10, 2023 22:23
kensternberg-authentik added a commit that referenced this pull request Nov 20, 2023
@kensternberg-authentik
Merge branch 'main' into web/playground/table-architecture-2
c91ac4a 
* main:
  web/flows: attempt to fix bitwareden android compatibility (#7455)
  sources/oauth: fix patreon (#7454)
  website: bump the docusaurus group in /website with 3 updates (#7400)
  web/admin: fix chart label on dashboard user page (#7434)
  core: bump github.com/gorilla/sessions from 1.2.1 to 1.2.2 (#7446)
  core: bump github.com/gorilla/mux from 1.8.0 to 1.8.1 (#7443)
  core: bump github.com/spf13/cobra from 1.7.0 to 1.8.0 (#7442)
  core: bump github.com/gorilla/websocket from 1.5.0 to 1.5.1 (#7445)
  core: bump golang.org/x/sync from 0.4.0 to 0.5.0 (#7441)
  core: bump github.com/gorilla/securecookie from 1.1.1 to 1.1.2 (#7440)
  core: bump github.com/gorilla/handlers from 1.5.1 to 1.5.2 (#7444)
  web: bump rollup from 4.2.0 to 4.3.0 in /web (#7448)
  web: bump the eslint group in /web with 2 updates (#7447)
  core: bump uvicorn from 0.23.2 to 0.24.0 (#7450)
  core: bump selenium from 4.15.1 to 4.15.2 (#7449)
  core: bump ruff from 0.1.3 to 0.1.4 (#7451)
  web: bump the eslint group in /tests/wdio with 2 updates (#7452)
@macmoritz
Copy link
Contributor Author

macmoritz commented Jan 13, 2024

@maintainers: This pr is merged to main but was never merged into a version. Could you merge this into the next release?

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

Reviewers

@BeryJu BeryJu BeryJu approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@macmoritz @BeryJu