-
Notifications
You must be signed in to change notification settings - Fork 1
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
More than 3 layers; Load layers from discreet URLs; Shore up tests; Bug Fixes #51
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…he Network Map Plugin (#33) * TERR-355 - formatted existing code in module.spec.js * TERR-355 - added initial tests for edge and node prior to apply button press * TERR-355 - fixed test for comparing delta drag in view mode prior to edit mode and after the edit in view mode, not edit mode * TERR-355 - bumped version of grafana for docker-compose to 10.4.0 * TERR-355 - refactored to helper fn getNetworkMapPanelUrl to fetch either edit or view URLs based on new 5th fn parameter isEdit - added tsdoc for above * TERR-355 - removed some commented code - added in routine to set edit modes to edit nodes, not edges in e2e node integration testing - added in aria attributes for edit nodes/edges toggle buttons to EditingInterface.component render * TERR-355 - updated docker-compose to use fixed version of grafana 10.4.0 - updated packages to align with grafana 10.4.0 - updated yarn lock file - updated auth setup script to align with grafana 10.4.0 changes to login - updated locators in plugin.spec to align with changes in grafana 10.4.0 UI - added in code to possibly comment in/enable WRT to event subscribers to eventBus instead of relying on direct dom action listener to apply button. - updates to sidebar component, adding in aria attributes to allow for targeting via playwright scripts without relying on CSS selectors * TERR-355 - added in checks on drag and drop nodes within the edit screen to confirm changes are actually made within edit mode scope - removed unneeded import for RefreshEvent pending Apply button functionality for forcing refresh of render in view mode * TERR-355 - final cleanup, removal of commented code and console.log invocations * TERR-355 - restored package.json from main, leaving E2E testing to rely on Node 18 - updated Makefile to only execute E2E testing via Make explicitly - updated development.md for documentation * TERR-355 - removed uneeded type hinting for subscription in MapPanel - updated docker-compose to utilize variable override when utilized - removed unneeded semicolon * TERR-355 - removed the duplication of functionality by removal of the DOM query selector and binding of the event listeneer. * TERR-355 - fixed docker-compose yaml; missing hyphen before version in services.grafana.build.args.grafana_version * TERR-355 - restored invocation of self.updateMap in MapPanel.constructor's subscription to topologyRefresh * TERR-355 - removed use of aria-labelledby in generated renders of SideBar.component's toggle container - replaced use of waitForSelector at end of test "confirm node changes upon clicking Grafana's Apply button" with locator - removed some unused variables * TERR-355 - restored SideBar to former rendering
- added marcusolsson-csv-datasource to services.grafana.environment in docker-compose.yaml - updated auth.setup and plugin.spec to test in two diffent cases: before and after Grafana 10 - updated config.info.getHostInfo to detect version of grafana via Health API and to be async function - updated usage of above globally to use await/async - added fileId to e2e.config for google file - removed some unused assigned variables - added interfaces for Topology.interface, TopologyEdge.interface, and TopologyNode.interface
- removed deprecated version line from docker-compose.yaml - added sleep line to test target in Makefile to allow for container spin-up - simplified config.info.getGoogleSheetInfo fn to only fetch data flows URL - added topologySheetUrl to e2e.config - refactored folderDashboardInit to defer to existing dashboard if found - added code to add in topology via API in folderDashboardInit.getFolderDashboardTargets - added interfaces to help better match against Dashboard and DataSource JSON schema - added mock.panel.json for mock panel - added makeDashboard fn to create a default dashboard - added fetches to get topology from e2e.config specified URL - removed Panel.interface
- removed unneeded import for IDataSource - refactored initCSVDatasource fn out of folderDashboardInit module into grafana-api module as fn createDatasource - fixed population of panel data into dashboard object structure to agree with requirements of Grafana API updateDashboard - updated mock.panel.json to contain layer options in order to agree with NetworkMapPanel schema requirements - fixed missing title ref in plugin.spec test for load plugin edit page - view options
…workmap-panel into feat/TERR-362-e2e-upon-empty-grafana-instance
…workMapPanelUrl in plugin.spec module
…b.com:esnet/grafana-esnet-networkmap-panel into feat/TERR-364-ci-github-actions-integration
- updated YAML docker-compose to use infinity datasource grafana plugin - reconfigured config.info.getGoogleSheetInfo fn to delegate all URL computation to e2e config - refactored e2e.config fileId out and replaced with flowSheetUrl prop - refactored folderDashboardInit.getFolderDashboardTargets to utilize infinity datasource plugin and reconfigure type to TSV and data flow URL. - simplified use of getGoogleSheetInfo in grafana-api.createDatasource - updated mock.panel and networkMapPanel JSON to use infinity plugin instead of CSV data source. - added ITarget interface to plugin-def - updated INetworkMapPanel interface to use a Partial<IDataSource> interface for datasource prop - added props url and queryType in object parameter when invoking getFolderDashboardTargets. - added props url and queryType to INetworkPanelParams
…coverage test: [TERR-425] React Component Code Coverage and Error Validation
…JSON. Revert CustomTextArea to main. Use NormalModuleReplacementPlugin strategy to monkey patch @grafana/ui for test build. Move LAYER_LIMIT and DEFAULT_LAYER_LIMIT to constants.js. New signals for layer load success/failure. Add a number of tests: autodetect topology, switch between topology load methods, traffic accounting, more than 3 layers.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.