Skip to content

7829 Read hiddenVariables, mode, FNDashboard from grfana's state #44

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
Merged
merged 1 commit into from
Jan 16, 2023
Merged

7829 Read hiddenVariables, mode, FNDashboard from grfana's state #44

merged 1 commit into from
Jan 16, 2023

Conversation

ziomecka
Copy link

@ziomecka ziomecka commented Jan 11, 2023 •
edited by harjotgill
Loading

Ref: https://github.com/fluxninja/cloud/issues/7829

Use global grafana's state (redux) to propagate mode, hiddenVariables, FNDashboard

This change is Reviewable

@ziomecka ziomecka requested a review from gurinder39 January 11, 2023 16:35
@ziomecka ziomecka self-assigned this Jan 11, 2023
@ziomecka ziomecka requested a review from yohadams January 11, 2023 16:35
@ziomecka ziomecka added the bug Something isn't working label Jan 11, 2023
@ziomecka ziomecka force-pushed the 7829-use-state-to-pass-hidden-variables-mode-FNDashboard branch 2 times, most recently from e9dd1ec to ec06dee Compare January 11, 2023 16:48
@ziomecka ziomecka force-pushed the 7829-use-state-to-pass-hidden-variables-mode-FNDashboard branch from ec06dee to 60c04f4 Compare January 11, 2023 16:53
gurinder39
gurinder39 reviewed Jan 11, 2023
View reviewed changes
public/app/fn-app/fn-dashboard-page/fn-dashboard.tsx
return <RenderPortal ID="grafana-portal">{content}</RenderPortal>;
};

export const DashboardPortal = connect(mapStateToProps())(DashboardPortalComponent);
Copy link

Choose a reason for hiding this comment

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

Instead of using connect we can simply use useSelector hook from react-redux inside dashboardPortal component to get fnGlobalState.

@ziomecka ziomecka merged commit c28003a into fluxninja_micro_frontends-v9.3.1 Jan 16, 2023
@ziomecka ziomecka deleted the 7829-use-state-to-pass-hidden-variables-mode-FNDashboard branch January 16, 2023 12:04
GurinderRawala pushed a commit that referenced this pull request Aug 27, 2024
@ziomecka @GurinderRawala
7829 Read hiddenVariables, mode, FNDashboard from grfana's state (#44)
867df86 
Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>
GurinderRawala added a commit that referenced this pull request Sep 3, 2024
@GurinderRawala @grafanabot
@mgyongyosi @JoaoSilvaGrafana @ashharrison90 @sunker @kwapik @DanCech @hdkshingala @gurinder39 @ziomecka @sbienkow-ninja @jmichalak-fluxninja @harjotgill @DariaKunoichi @Spikatrix @dikshant-infracloud @dikshant-devops
Update to latest (#184)
68b353a 
* [v9.3.x] OAuth: Refactor OAuth parameters handling to support obtaining refresh tokens for Google OAuth (grafana#58940)

OAuth: Refactor OAuth parameters handling to support obtaining refresh tokens for Google OAuth (grafana#58782)

* Add ApprovalForce to AuthCodeOptions

* Extract access token validity check to a function

* Refactor

* Oauth: set options internally instead of exposing new function

* Align tests

* Remove unused function

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
(cherry picked from commit 9c98314)

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

* [v9.3.x] Preferences: Add confirmation modal when saving org preferences (grafana#59119) (grafana#59141)

* Navigation: share logic between `buildBreadcrumbs` and `usePageTitle`… (grafana#59155)

Navigation: share logic between `buildBreadcrumbs` and `usePageTitle` (grafana#58819)

* simplify usePageTitle logic a bit

* use buildBreadcrumbs logic in usePageTitle

* always add home item to navTree, fix some tests

* fix remaining unit tests

(cherry picked from commit 824a562)

* [v9.3.x] CloudWatch: Cross-account querying support  (grafana#59389)

* add cross-account querying support

* fix tests

* FN FluxNinja changes

* Run `go mod tidy`

* Fix druid plugin registration

* FN FluxNinja changes

* FN FluxNinja changes

* Build: Streamline and sync dockerfiles (grafana#58101)

* streamline and sync dockerfiles

* improve go dependency cacheability

* unify alpine and ubuntu Dockerfiles

* include glibc support in locally-built alpine images

* FN Remove internationalization provider

* FN Update sankey panel (30b5be0b5bf03ee8c7)

* FN Render filters and time selector, hide loader despite pageNav and sectionNav

* FN Remove tenary expressions with explicit booleans in DashNav

* FN Use optional chaining - keybindingSrv in initDashboard

* FN Set isPublicDashboardView to false

* FN Set hiddenVariables in initial FN state

* FN Lint RenderFnDashboard

* FN Lint create-mfe

* Updated SSH Keys (#43)

* Time range selector changes (#42)

* changed time picker dropdown designs

* change time setting button

* added dark and light

* 7829 Read hiddenVariables, mode, FNDashboard from grfana's state (#44)

Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>

* Add tool versions (#45)

Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>

* Added support for updating nightly environment (#46)

* 7911 Add graphql datasource plugin (#47)

* 7911 Update FN_README

* 7911 Add graphql plugin

* 7911 Add graphql plugin

Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>

* 7911 Allow loading unsigned graphql plugin (#49)

Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>

* 7911 Modify url in graphql datasource plugin (#50)

Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>

* Minor grafadruid fixes (#51)

* Support Druid GroupBy queries (#52)

* 8225 Fix missing grafana loader (#53)

Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>

* Fix ad hoc filters (#54)

* 8238 Remove panel header menu (#55)

Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>

* added presisted time range (#56)

* Updates to latest instead of demo environment (#57)

* Loading dashboards with update function (#58)

* changed dashboard loading to use update fn

* removed extra package

* changed query filter designs (#59)

* Add ChatGPT-based PR Reviewer and Summarizer (#62)

* fix (#63)

* 8822 ci (#66)

* 8822 Remove dashes from dashboard filter labels

* 8822 Empty commit

---------

Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>

* 8740 Fix variables in titles by using PanelHeader component to render panel header (#64)

Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>

* update action

* update review job name (#69)

* Load dashboard with specific version passed from FN UI (#68)

* Add full metadata for versions query too (#70)

* 8963 Remove edit icons in dashboard row (#71)

Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>

* Update openai-review.yml (#73)

* Update openai-review.yml

* update action

* Fix table panel (#75)

* Grafana firefox (#77)

* vscode fix

* fixed firefox bugs

---------

Co-authored-by: Gurinder Singh <gurnder.rawala@fluxninja.com>

* Pull latest time range changes from upstream grafana (#78)

* Support math expressions for druid granularity (#81)

* Remove font size from global styles (#82)

* Add fnLoader in grafana instead of prop from parent mfe (#83)

* Fixed CircleCI config (#84)

* Font update, bug fixes (#85)

* Fix grafana bugs

* Update grafana font to source sans pro

* Revert code format change

* replace function error fix (#87)

* Add missing config in opsninja.yaml (#88)

* Update font to Source Sans Pro (#90)

* filter label design fix (#92)

* druid datasource fixes (#93)

* druid datasource fixes

* wire gen fix

* page definations fix (#94)

* Fix headers in Druid DS (#97)

Co-authored-by: Jakub Michalak <jakub.michalak@fluxninja.com>

* Pass headers to Druid query (#99)

* Fix headers in Druid variable queries (#100)

* typing error fix and modifications (#101)

* typing error fix and modifications

* react-use module installed

* Fix type error and adhoc filter alignment

* Fix one more type error

---------

Co-authored-by: Spikatrix <12792882+Spikatrix@users.noreply.github.com>

* render time range selector any where, removed dead code (#103)

* removed graphql data source, updated local test info in fn readme

* portal for time range selector

* Enable panel resizing (#105)

* Adhoc filter fix, update sankey plugin (#106)

* Adhoc filter style fix

* Update sankey plugin

* confirm grafana initialization (#107)

* window event to confirm initialization

* grafana start up status events

* Show filters icon only when there are some variables to show (#116)

* Don't panic on empty var Druid query (#123)

* Remove not needed GH Actions (#124)

* changed to cirular progress (#148)

* changed to cirular progress

* codeRabbit suggestions

* remove reviewer

* loader color fix (#150)

* page title Flux Ninja -> FluxNinja

* Add allowed cookies field in druid datasource settings (#171)

* Fix sentry heatmap crash (#168)

Co-authored-by: Gurinder Singh <gurinder.rawala@fluxninja.com>

* removed make doc workflow (#172)

* Coderabbit theme and fixes (#175)

* coderabbit theme

* theme change

* checkpoint

* fixes

* added coderabbit authentication

* Create deploy-cloud-run-grafana.yaml (#176)

* Update deploy-cloud-run-grafana.yaml

* Update deploy-cloud-run-grafana.yaml with CD

* webpack fix for prod (#177)

* added GH for prod (#178)

Co-authored-by: dikshant <raidikshant2@gmail.com>

* Deploy grafana image to cloud run

* Update deploy-cloud-run-grafana-prod.yaml

* dashboard style changes (#179)

* disabled drag for mfe (#180)

* changed error message to no data (#182)

* fix

* log fix

* rebase issues resolved

* webpack changes

* mfe fix

* checkpoint

* tooltip, icons fix

* deleted github actions

* dependency updates fix

* fixes

---------

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
Co-authored-by: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
Co-authored-by: Katarzyna Ziomek-Zdanowicz <katarzyna.ziomek-zdanowicz@fluxninja.com>
Co-authored-by: Krzysztof Kwapisiewicz <krzysztof.kwapisiewicz@fluxninja.com>
Co-authored-by: Dan Cech <dcech@grafana.com>
Co-authored-by: Hardik Shingala <34568645+hdkshingala@users.noreply.github.com>
Co-authored-by: Gurinder Singh <108446046+gurinder39@users.noreply.github.com>
Co-authored-by: Kasia <24753130+ziomecka@users.noreply.github.com>
Co-authored-by: Szymon Bieńkowski <szymon.bienkowski@fluxninja.com>
Co-authored-by: Jakub Michalak <jakub.michalak@fluxninja.com>
Co-authored-by: Harjot Gill <harjot.gill@fluxninja.com>
Co-authored-by: Daria Bialobrzeska <88393714+DariaKunoichi@users.noreply.github.com>
Co-authored-by: Gurinder Singh <gurnder.rawala@fluxninja.com>
Co-authored-by: Jaseel <12792882+Spikatrix@users.noreply.github.com>
Co-authored-by: Gurinder Singh <gurinder.rawala@fluxninja.com>
Co-authored-by: dikshant-infracloud <160205839+dikshant-infracloud@users.noreply.github.com>
Co-authored-by: dikshant <raidikshant2@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yohadams yohadams Awaiting requested review from yohadams

1 more reviewer

@gurinder39 gurinder39 gurinder39 left review comments

Reviewers whose approvals may not affect merge requirements
Assignees

@ziomecka ziomecka

Labels
bug Something isn't working size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ziomecka @gurinder39