Skip to content

Commit bd6f8d2

Browse files
CarsonCookViktorKorladinovDianaKorladinovataban03jandadav
authored
fix: remove hardcoded values from metrics service ui (#1902)
* refactor: Streamline category's content - Wizard Dialog (#1720) * Allows for more inputs where multiple configurations can be present. Updated input data for the Plain Java Enabler. TBD: testing. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * WizardInputs test coverage now at 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Multiple configs of same category now visually divided, wizard-reducer test coverage raised to 100% Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Squashed bug occurring after loading already wrapped in array category content. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Plain Java Enabler data configuration. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard reducer refactoring. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised wizard reducer coverage to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Foundation for YAML generation. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * YAML now shows in its own tab. TBD: lots of bug squashing. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * YAML Visualizer test Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Wizard actions and reducer test coverage raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed Next / Save button bug, added 'Copy' button the the YAML result tab. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Test coverage for wizard files raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Styling of YAML code Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added a missing function after merge. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed npm warning on yaml package Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Moved the yaml dependency to the correct package.json Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Spring Enabler category configuration Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Created a defaults file and configured spring defaults. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Injecting default values operational. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised test coverage to 100% & added a missing category for the Spring Enabler. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Moved different components into separate sub-folders, reduced size of wizard-config.jsx by dividing the data inside into 2 files - wizard_categories.jsx and wizard_onboarding_methods.jsx. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * WizardNavigation component now able to group multiple categories under a single tab. Test coverage raised to 100%. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added comments to wizard-actions and all components' functions that weren't self-explanatory. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed several bugs after merging. TBD: improve test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage of wizard files raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Added comments to wizard-reducer, hopefully reduced cognitive complexity Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Test fixes Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Mechanism for handling optional fields and checking for empty compulsory fields. TBD: Fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard now shows true/false options as checkboxes Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Boolean property fully works. TBD: mountains of testing : ) Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * UI now alerts when a compulsory field is left empty & optional fields are marked as such Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Option property fully works. Fake events substitute the events Select fires. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage for WizardInputs raised. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Redid functions for unfilled compulsory fields. TBD: fix tests Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed failing tests & improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * maxLength and lowercase properties functional. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Tab reorganization. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Dependencies now functional. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Tabs now indicate if they have an unfilled field & improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage of WizardInputs raised Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added mechanism for generating warnings when deleting filled fields & improved test coverage. TBD: Add the actual warnings Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfixes of unfilled validation Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed failing tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Restructuring. TBD: fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised coverage of WizardNavigation, WizardInputs and WizardDialog to 100. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed wizard-reducer tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed some code smells. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Simplified and streamlined the way a category's content is used. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Reduced reducer's cognitive complexity Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed WizardInputs tests Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> Co-authored-by: DianaKorladinova <chanchunche@gmail.com> Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * refactor: GH1625 integration test refactor (#1727) * move access tests to functional Signed-off-by: jandadav <janda.david@gmail.com> * Change to GatewayRequests Signed-off-by: jandadav <janda.david@gmail.com> * cleanup Signed-off-by: jandadav <janda.david@gmail.com> * Move the complexity to the Requests. Signed-off-by: Jakub Balhar <jakub@balhar.net> Co-authored-by: Jakub Balhar <jakub@balhar.net> Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: compress response if service wants to (#1728) * initial commit, compress response if service wants to Signed-off-by: achmelo <a.chmelo@gmail.com> * add unit tests Signed-off-by: achmelo <a.chmelo@gmail.com> * empty gzip body should be 20 bytes Signed-off-by: achmelo <a.chmelo@gmail.com> * test flush buffers Signed-off-by: achmelo <a.chmelo@gmail.com> * test no instances available and close buffers Signed-off-by: achmelo <a.chmelo@gmail.com> * compress per service acceptance test Signed-off-by: achmelo <a.chmelo@gmail.com> * compress per service acceptance test Signed-off-by: achmelo <a.chmelo@gmail.com> * resolve conflicts Signed-off-by: achmelo <a.chmelo@gmail.com> * provide description for filter class Signed-off-by: achmelo <a.chmelo@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * fix: check for correct URI pattern (#1732) Signed-off-by: achmelo <a.chmelo@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * chore: Publish Zowe Conformant Gateway image (#1730) * Set base image to zowe base Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add initial containers structure Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use first shared action for GW image Signed-off-by: Carson Cook <carson.cook@ibm.com> * Set up prepare script Signed-off-by: Carson Cook <carson.cook@ibm.com> * Allow docker to run start script indefinitely Signed-off-by: Carson Cook <carson.cook@ibm.com> * Clean up prepare script Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add default values to start.sh Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add readme for GW image Signed-off-by: Carson Cook <carson.cook@ibm.com> * Rename workflow appropriately Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add ubuntu-s390x workflow Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add ubi amd64 workflow Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add define manifest jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add ubi s390x job Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add image jobs to release workflows Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use strategy.matrix to combine ubi and ubuntu jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix syntax error Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use strategy matrix to combine release jobs for ubuntu and ubi images Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use proper permissions for manifests jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add back pid and wait for java to stop early container exit Signed-off-by: Carson Cook <carson.cook@ibm.com> * Set image artifactory users to delete permission for replacing images Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: SSE - turbine stream access through gateway Signed-off-by: Kumar Saurabh Raj <kumarsaurabhraj.sr@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * fix: Turbine SSE - multi client support Signed-off-by: Kumar Saurabh Raj <kumarsaurabhraj.sr@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * fix: code smells in ServerSentEventProxyHandler Signed-off-by: Kumar Saurabh Raj <kumarsaurabhraj.sr@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * changes for testing Signed-off-by: Carson Cook <carson.cook@ibm.com> * enable turbine Signed-off-by: Carson Cook <carson.cook@ibm.com> * embeded metrics dashboards Signed-off-by: Carson Cook <carson.cook@ibm.com> * Update version Signed-off-by: Carson Cook <carson.cook@ibm.com> * [Gradle Release plugin] Before tag commit 'v1.24.3'. Signed-off-by: Carson Cook <carson.cook@ibm.com> * [Gradle Release plugin] Create new version: 'v1.24.4-SNAPSHOT'. Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: SAF resource access check controller (#1734) * feat: SAF check controller Signed-off-by: jandadav <janda.david@gmail.com> * extend test for coverage Signed-off-by: jandadav <janda.david@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * fix: configurable timeout to verify the zOSMF availability (#1738) Signed-off-by: achmelo <a.chmelo@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * fix: exclude tls_rsa ciphers (#1737) * exclude tls_rsa ciphers Signed-off-by: achmelo <a.chmelo@gmail.com> * remove exclude ciphers Signed-off-by: achmelo <a.chmelo@gmail.com> * revert Signed-off-by: achmelo <a.chmelo@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * chore: Upgrade dependencies for 1.24 release (#1736) * Upgrade spring security to 5.3.11 everywhere Signed-off-by: Jakub Balhar <jakub@balhar.net> * Force upgrade xstream to 1.4.18 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Force upgrade jquery to 3.5.1 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Force upgrade json-smart to 2.4.7 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade micronaut version to 2.5.12 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade jackson databind in zaas client Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade eureka client Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade Spring fox dependency to 2.9.2 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Remove unused jakarta from whole project. Signed-off-by: Jakub Balhar <jakub@balhar.net> * Split build of Zowe confomrant containers Signed-off-by: Jakub Balhar <jakub@balhar.net> Signed-off-by: Carson Cook <carson.cook@ibm.com> * chore: explain override to jwtSecurityInitializer timeout (#1739) Signed-off-by: jandadav <janda.david@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * chore: Zowe Conformant images for all services (#1731) * Set base image to zowe base Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add initial containers structure Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use first shared action for GW image Signed-off-by: Carson Cook <carson.cook@ibm.com> * Set up prepare script Signed-off-by: Carson Cook <carson.cook@ibm.com> * Allow docker to run start script indefinitely Signed-off-by: Carson Cook <carson.cook@ibm.com> * Clean up prepare script Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add default values to start.sh Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add readme for GW image Signed-off-by: Carson Cook <carson.cook@ibm.com> * Rename workflow appropriately Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add ubuntu-s390x workflow Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add ubi amd64 workflow Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add define manifest jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add ubi s390x job Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add image jobs to release workflows Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use strategy.matrix to combine ubi and ubuntu jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix syntax error Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use strategy matrix to combine release jobs for ubuntu and ubi images Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use proper permissions for manifests jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Prepare structure for more services Signed-off-by: Carson Cook <carson.cook@ibm.com> * Test matrix for service name Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix directories for prepare scripts Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add back pid and wait for java to stop early container exit Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix master merge adding unneeded files Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add discovery service to containers Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix directory name in workflow Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add default for DS peers Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add caching service Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add api catalog Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add new services to one workflow as test Signed-off-by: Carson Cook <carson.cook@ibm.com> * Update readme for other service images Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix caching service default port Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add all service images to all jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Run CS and AC in background Signed-off-by: Carson Cook <carson.cook@ibm.com> * WIP debug CS Signed-off-by: Carson Cook <carson.cook@ibm.com> * Update version * [Gradle Release plugin] Before tag commit 'v1.24.3'. * [Gradle Release plugin] Create new version: 'v1.24.4-SNAPSHOT'. * feat: SAF resource access check controller (#1734) * feat: SAF check controller Signed-off-by: jandadav <janda.david@gmail.com> * extend test for coverage Signed-off-by: jandadav <janda.david@gmail.com> * fix: configurable timeout to verify the zOSMF availability (#1738) Signed-off-by: achmelo <a.chmelo@gmail.com> * fix: exclude tls_rsa ciphers (#1737) * exclude tls_rsa ciphers Signed-off-by: achmelo <a.chmelo@gmail.com> * remove exclude ciphers Signed-off-by: achmelo <a.chmelo@gmail.com> * revert Signed-off-by: achmelo <a.chmelo@gmail.com> * chore: Upgrade dependencies for 1.24 release (#1736) * Upgrade spring security to 5.3.11 everywhere Signed-off-by: Jakub Balhar <jakub@balhar.net> * Force upgrade xstream to 1.4.18 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Force upgrade jquery to 3.5.1 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Force upgrade json-smart to 2.4.7 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade micronaut version to 2.5.12 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade jackson databind in zaas client Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade eureka client Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade Spring fox dependency to 2.9.2 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Remove unused jakarta from whole project. Signed-off-by: Jakub Balhar <jakub@balhar.net> * Split build of Zowe confomrant containers Signed-off-by: Jakub Balhar <jakub@balhar.net> * chore: explain override to jwtSecurityInitializer timeout (#1739) Signed-off-by: jandadav <janda.david@gmail.com> * Fix CS default values Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix missing env var in release workflows Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix dockerfile name lables Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add GATEWAY_HOST param for API CATALOG Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix typo Signed-off-by: Carson Cook <carson.cook@ibm.com> Co-authored-by: Zowe Robot <zowe-robot@users.noreply.github.com> Co-authored-by: David Janda <janda.david@gmail.com> Co-authored-by: achmelo <37397715+achmelo@users.noreply.github.com> Co-authored-by: Jakub Balhar <jakub@balhar.net> Signed-off-by: Carson Cook <carson.cook@ibm.com> * refactor: Combine amd64 and s390x image jobs (#1740) * Add if logic to steps to combine amd64 and s390x jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix syntax for if check Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix syntax for if check Signed-off-by: Carson Cook <carson.cook@ibm.com> * Combine s390x and amd64 for release jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: Wizard configuration (#1722) * Allows for more inputs where multiple configurations can be present. Updated input data for the Plain Java Enabler. TBD: testing. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * WizardInputs test coverage now at 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Multiple configs of same category now visually divided, wizard-reducer test coverage raised to 100% Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Squashed bug occurring after loading already wrapped in array category content. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Plain Java Enabler data configuration. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard reducer refactoring. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised wizard reducer coverage to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Foundation for YAML generation. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * YAML now shows in its own tab. TBD: lots of bug squashing. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * YAML Visualizer test Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Wizard actions and reducer test coverage raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed Next / Save button bug, added 'Copy' button the the YAML result tab. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Test coverage for wizard files raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Styling of YAML code Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added a missing function after merge. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed npm warning on yaml package Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Moved the yaml dependency to the correct package.json Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Spring Enabler category configuration Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Created a defaults file and configured spring defaults. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Injecting default values operational. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised test coverage to 100% & added a missing category for the Spring Enabler. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Moved different components into separate sub-folders, reduced size of wizard-config.jsx by dividing the data inside into 2 files - wizard_categories.jsx and wizard_onboarding_methods.jsx. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * WizardNavigation component now able to group multiple categories under a single tab. Test coverage raised to 100%. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added comments to wizard-actions and all components' functions that weren't self-explanatory. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed several bugs after merging. TBD: improve test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage of wizard files raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Added comments to wizard-reducer, hopefully reduced cognitive complexity Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Test fixes Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Mechanism for handling optional fields and checking for empty compulsory fields. TBD: Fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard now shows true/false options as checkboxes Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Boolean property fully works. TBD: mountains of testing : ) Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * UI now alerts when a compulsory field is left empty & optional fields are marked as such Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Option property fully works. Fake events substitute the events Select fires. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage for WizardInputs raised. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Redid functions for unfilled compulsory fields. TBD: fix tests Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed failing tests & improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * maxLength and lowercase properties functional. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Tab reorganization. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Dependencies now functional. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Tabs now indicate if they have an unfilled field & improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage of WizardInputs raised Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added mechanism for generating warnings when deleting filled fields & improved test coverage. TBD: Add the actual warnings Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfixes of unfilled validation Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed failing tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Restructuring. TBD: fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised coverage of WizardNavigation, WizardInputs and WizardDialog to 100. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed wizard-reducer tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed some code smells. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Indentation dependency now available. TBD: fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Array wrapping of some YAML categories for static onboarding. TBD: fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed & added tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard dialog 'Next' button fix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Post-merge fixes. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> Co-authored-by: ViktorKorladinov <v.korladinov@gmail.com> Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * refactor: Remove required LAUNCH_COMPONENT from conformant containers environment variables (#1741) * Set base image to zowe base Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add initial containers structure Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use first shared action for GW image Signed-off-by: Carson Cook <carson.cook@ibm.com> * Set up prepare script Signed-off-by: Carson Cook <carson.cook@ibm.com> * Allow docker to run start script indefinitely Signed-off-by: Carson Cook <carson.cook@ibm.com> * Clean up prepare script Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add default values to start.sh Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add readme for GW image Signed-off-by: Carson Cook <carson.cook@ibm.com> * Rename workflow appropriately Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add ubuntu-s390x workflow Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add ubi amd64 workflow Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add define manifest jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add ubi s390x job Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add image jobs to release workflows Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use strategy.matrix to combine ubi and ubuntu jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix syntax error Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use strategy matrix to combine release jobs for ubuntu and ubi images Signed-off-by: Carson Cook <carson.cook@ibm.com> * Use proper permissions for manifests jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Prepare structure for more services Signed-off-by: Carson Cook <carson.cook@ibm.com> * Test matrix for service name Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix directories for prepare scripts Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add back pid and wait for java to stop early container exit Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix master merge adding unneeded files Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add discovery service to containers Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix directory name in workflow Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add default for DS peers Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add caching service Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add api catalog Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add new services to one workflow as test Signed-off-by: Carson Cook <carson.cook@ibm.com> * Update readme for other service images Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix caching service default port Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add all service images to all jobs Signed-off-by: Carson Cook <carson.cook@ibm.com> * Run CS and AC in background Signed-off-by: Carson Cook <carson.cook@ibm.com> * WIP debug CS Signed-off-by: Carson Cook <carson.cook@ibm.com> * Update version * [Gradle Release plugin] Before tag commit 'v1.24.3'. * [Gradle Release plugin] Create new version: 'v1.24.4-SNAPSHOT'. * feat: SAF resource access check controller (#1734) * feat: SAF check controller Signed-off-by: jandadav <janda.david@gmail.com> * extend test for coverage Signed-off-by: jandadav <janda.david@gmail.com> * fix: configurable timeout to verify the zOSMF availability (#1738) Signed-off-by: achmelo <a.chmelo@gmail.com> * fix: exclude tls_rsa ciphers (#1737) * exclude tls_rsa ciphers Signed-off-by: achmelo <a.chmelo@gmail.com> * remove exclude ciphers Signed-off-by: achmelo <a.chmelo@gmail.com> * revert Signed-off-by: achmelo <a.chmelo@gmail.com> * chore: Upgrade dependencies for 1.24 release (#1736) * Upgrade spring security to 5.3.11 everywhere Signed-off-by: Jakub Balhar <jakub@balhar.net> * Force upgrade xstream to 1.4.18 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Force upgrade jquery to 3.5.1 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Force upgrade json-smart to 2.4.7 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade micronaut version to 2.5.12 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade jackson databind in zaas client Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade eureka client Signed-off-by: Jakub Balhar <jakub@balhar.net> * Upgrade Spring fox dependency to 2.9.2 Signed-off-by: Jakub Balhar <jakub@balhar.net> * Remove unused jakarta from whole project. Signed-off-by: Jakub Balhar <jakub@balhar.net> * Split build of Zowe confomrant containers Signed-off-by: Jakub Balhar <jakub@balhar.net> * chore: explain override to jwtSecurityInitializer timeout (#1739) Signed-off-by: jandadav <janda.david@gmail.com> * Fix CS default values Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix missing env var in release workflows Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix dockerfile name lables Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add GATEWAY_HOST param for API CATALOG Signed-off-by: Carson Cook <carson.cook@ibm.com> * Fix typo Signed-off-by: Carson Cook <carson.cook@ibm.com> * Add start.sh script check for no launch_component set Signed-off-by: Carson Cook <carson.cook@ibm.com> Co-authored-by: Zowe Robot <zowe-robot@users.noreply.github.com> Co-authored-by: David Janda <janda.david@gmail.com> Co-authored-by: achmelo <37397715+achmelo@users.noreply.github.com> Co-authored-by: Jakub Balhar <jakub@balhar.net> Signed-off-by: Carson Cook <carson.cook@ibm.com> * fix: hide logmessages with no value (#1744) Signed-off-by: jandadav <janda.david@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * Update version Signed-off-by: Carson Cook <carson.cook@ibm.com> * [Gradle Release plugin] Before tag commit 'v1.24.4'. Signed-off-by: Carson Cook <carson.cook@ibm.com> * [Gradle Release plugin] Create new version: 'v1.24.5-SNAPSHOT'. Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: Static Definition creation endpoints in API Catalog (#1735) * WIP Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add controller and error handler Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add override controller Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Refactoring and debug log Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add license and fix checkstyle Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add functionality to retrieve static location from discovery env endpoint Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add unit test Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add tests Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix code smell Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix bug Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add more test Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Raise coverage Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Address code review comments Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Address code review comments pt.2 Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Change the logic and add shared volumes mount Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add integration tests Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix location Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add logs Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Set environment variable in docker containers Signed-off-by: at670475 <andrea.tabone@broadcom.com> * more debugging Signed-off-by: at670475 <andrea.tabone@broadcom.com> * additional debug Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix test Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Improve check Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix indentation Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Change the way to get static location Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix IT Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix static def path Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Try the docker URL Signed-off-by: Jakub Balhar <jakub@balhar.net> * Another take on volumes Signed-off-by: Jakub Balhar <jakub@balhar.net> * Fix assertion message Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Revert changes Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Get the first directory defined Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix code smells Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Revert staticApiservice Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Increase code coverage Signed-off-by: at670475 <andrea.tabone@broadcom.com> * revert docker-compose.yml files for local setup Signed-off-by: at670475 <andrea.tabone@broadcom.com> Co-authored-by: Jakub Balhar <jakub@balhar.net> Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: Wizard NodeJS & Micronaut enablers' configurations (#1733) * Allows for more inputs where multiple configurations can be present. Updated input data for the Plain Java Enabler. TBD: testing. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * WizardInputs test coverage now at 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Multiple configs of same category now visually divided, wizard-reducer test coverage raised to 100% Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Squashed bug occurring after loading already wrapped in array category content. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Plain Java Enabler data configuration. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard reducer refactoring. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised wizard reducer coverage to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Foundation for YAML generation. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * YAML now shows in its own tab. TBD: lots of bug squashing. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * YAML Visualizer test Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Wizard actions and reducer test coverage raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed Next / Save button bug, added 'Copy' button the the YAML result tab. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Test coverage for wizard files raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Styling of YAML code Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added a missing function after merge. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed npm warning on yaml package Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Moved the yaml dependency to the correct package.json Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Spring Enabler category configuration Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Created a defaults file and configured spring defaults. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Injecting default values operational. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised test coverage to 100% & added a missing category for the Spring Enabler. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Moved different components into separate sub-folders, reduced size of wizard-config.jsx by dividing the data inside into 2 files - wizard_categories.jsx and wizard_onboarding_methods.jsx. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * WizardNavigation component now able to group multiple categories under a single tab. Test coverage raised to 100%. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added comments to wizard-actions and all components' functions that weren't self-explanatory. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed several bugs after merging. TBD: improve test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage of wizard files raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Added comments to wizard-reducer, hopefully reduced cognitive complexity Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Test fixes Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Mechanism for handling optional fields and checking for empty compulsory fields. TBD: Fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard now shows true/false options as checkboxes Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Boolean property fully works. TBD: mountains of testing : ) Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * UI now alerts when a compulsory field is left empty & optional fields are marked as such Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Option property fully works. Fake events substitute the events Select fires. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage for WizardInputs raised. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Redid functions for unfilled compulsory fields. TBD: fix tests Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed failing tests & improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * maxLength and lowercase properties functional. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Tab reorganization. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Dependencies now functional. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Tabs now indicate if they have an unfilled field & improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage of WizardInputs raised Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added mechanism for generating warnings when deleting filled fields & improved test coverage. TBD: Add the actual warnings Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfixes of unfilled validation Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed failing tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Restructuring. TBD: fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised coverage of WizardNavigation, WizardInputs and WizardDialog to 100. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed wizard-reducer tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed some code smells. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Indentation dependency now available. TBD: fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Array wrapping of some YAML categories for static onboarding. TBD: fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed & added tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard dialog 'Next' button fix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Post-merge fixes. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Node Enabler configuration. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Array indentation mechanism for Micronaut & fixed some tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Micronaut default values. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised test coverage of wizard-reducer and wizard-actions to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Divided category configurations into separate files to improve readability Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed the code smell (hopefully). Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed the code smell (hopefully). Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed the code smell (hopefully). Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Security hotspots. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * remove extra configuration Signed-off-by: jandadav <janda.david@gmail.com> * Updated Node JS configuration. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> Co-authored-by: ViktorKorladinov <v.korladinov@gmail.com> Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com> Co-authored-by: jandadav <janda.david@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * refactor: Discovery service functional test infrastructure (#1749) * add functional test Signed-off-by: jandadav <janda.david@gmail.com> * decouple SslConfig Signed-off-by: jandadav <janda.david@gmail.com> * Introduce test fixture Signed-off-by: jandadav <janda.david@gmail.com> * revert run config Signed-off-by: jandadav <janda.david@gmail.com> * Migrate tests to functional Signed-off-by: jandadav <janda.david@gmail.com> * Migrate additional tests Signed-off-by: jandadav <janda.david@gmail.com> * https config for for dockerized discovery service Signed-off-by: jandadav <janda.david@gmail.com> * Fix code smell Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Allow token refresh for local run Signed-off-by: jandadav <janda.david@gmail.com> Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: Wizard UX tweaks (#1752) * UX tweaks: modified tab warning sign, changed order for checkboxes and labels, fully acceptable tabs now bold. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * 'Done' button disabled till the end of the wizard is reached. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Post-merge fixes Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Code smell fix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> Co-authored-by: DianaKorladinova <chanchunche@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * chore: Automatic update for the Changelog for release (#1748) * Update changelog Signed-off-by: Zowe Robot <zowe-robot@users.noreply.github.com> * Changelog tweaks Signed-off-by: jandadav <janda.david@gmail.com> * Update CHANGELOG.md Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com> * review points Signed-off-by: David Janda <janda.david@gmail.com> Signed-off-by: jandadav <janda.david@gmail.com> * language refacotr Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com> Co-authored-by: Zowe Robot <zowe-robot@users.noreply.github.com> Co-authored-by: David Janda <janda.david@gmail.com> Co-authored-by: Andrew Jandacek <38347291+janan07@users.noreply.github.com> Co-authored-by: David Janda <david.janda@broadcom.com> Co-authored-by: Andrew Jandacek <andrew.jandacek@broadcom.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: possibility to delete static def (#1759) * possibility to delete static def Signed-off-by: achmelo <a.chmelo@gmail.com> * bug fix Signed-off-by: achmelo <a.chmelo@gmail.com> * bug fix Signed-off-by: achmelo <a.chmelo@gmail.com> * assert status code only Signed-off-by: achmelo <a.chmelo@gmail.com> * styles Signed-off-by: achmelo <a.chmelo@gmail.com> * invalid service id test Signed-off-by: achmelo <a.chmelo@gmail.com> * disable test Signed-off-by: achmelo <a.chmelo@gmail.com> * static compile pattern Signed-off-by: achmelo <a.chmelo@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * fix: static generation (#1761) Signed-off-by: jandadav <janda.david@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: static api enpoints protected by SAF check (#1764) * protect static def api with saf resource check Signed-off-by: achmelo <a.chmelo@gmail.com> * correct SC Signed-off-by: achmelo <a.chmelo@gmail.com> * remove access with cert Signed-off-by: achmelo <a.chmelo@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: Provide compression for specific paths only. (#1755) * Limit to Accept-Encoding containing gzip Limit to specific routes. Signed-off-by: Jakub Balhar <jakub@balhar.net> * Test new and old paths alike. Test noncompressed paths Signed-off-by: Jakub Balhar <jakub@balhar.net> * Refactor the Metadata preparation. Signed-off-by: Jakub Balhar <jakub@balhar.net> * Add Acceptance Tests for the Compression per path Signed-off-by: Jakub Balhar <jakub@balhar.net> * Use the provided fulent API Signed-off-by: Jakub Balhar <jakub@balhar.net> * Correctly handle relative paths Signed-off-by: Jakub Balhar <jakub@balhar.net> * Show debug information from the Gradle. Signed-off-by: Jakub Balhar <jakub@balhar.net> * Try just building Signed-off-by: Jakub Balhar <jakub@balhar.net> * Info instead of debug Signed-off-by: Jakub Balhar <jakub@balhar.net> * Get the info about tests Signed-off-by: Jakub Balhar <jakub@balhar.net> * Remove the cached packages. Signed-off-by: Jakub Balhar <jakub@balhar.net> * Limit the amount of time taken Signed-off-by: Jakub Balhar <jakub@balhar.net> * Provide scan after the build Signed-off-by: Jakub Balhar <jakub@balhar.net> * Verify the build of gateway service Signed-off-by: Jakub Balhar <jakub@balhar.net> * Try removing the functional tests Signed-off-by: Jakub Balhar <jakub@balhar.net> * Return one functional test Signed-off-by: Jakub Balhar <jakub@balhar.net> * Return the tests Signed-off-by: Jakub Balhar <jakub@balhar.net> * Limit the tests to the default configuration Signed-off-by: Jakub Balhar <jakub@balhar.net> * Return the previous setup Signed-off-by: Jakub Balhar <jakub@balhar.net> * Test response isn't compressed when client doesn't accept gzip encoding Signed-off-by: Jakub Balhar <jakub@balhar.net> Signed-off-by: Carson Cook <carson.cook@ibm.com> * fix: Zaas client to not send a certificate during authentication (#1763) * Fix usage of empty keystore in https client Signed-off-by: JirkaAichler <jiri.aichler@broadcom.com> * Add unit test Signed-off-by: JirkaAichler <jiri.aichler@broadcom.com> * Comment code Signed-off-by: JirkaAichler <jiri.aichler@broadcom.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: Wizard automatic onboarding & SAF check (#1751) * Allows for more inputs where multiple configurations can be present. Updated input data for the Plain Java Enabler. TBD: testing. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * WizardInputs test coverage now at 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Multiple configs of same category now visually divided, wizard-reducer test coverage raised to 100% Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Squashed bug occurring after loading already wrapped in array category content. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Plain Java Enabler data configuration. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard reducer refactoring. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised wizard reducer coverage to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Foundation for YAML generation. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * YAML now shows in its own tab. TBD: lots of bug squashing. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * YAML Visualizer test Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Wizard actions and reducer test coverage raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed Next / Save button bug, added 'Copy' button the the YAML result tab. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Test coverage for wizard files raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Styling of YAML code Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added a missing function after merge. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed npm warning on yaml package Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Moved the yaml dependency to the correct package.json Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Spring Enabler category configuration Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Created a defaults file and configured spring defaults. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Injecting default values operational. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised test coverage to 100% & added a missing category for the Spring Enabler. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Moved different components into separate sub-folders, reduced size of wizard-config.jsx by dividing the data inside into 2 files - wizard_categories.jsx and wizard_onboarding_methods.jsx. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * WizardNavigation component now able to group multiple categories under a single tab. Test coverage raised to 100%. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added comments to wizard-actions and all components' functions that weren't self-explanatory. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed several bugs after merging. TBD: improve test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage of wizard files raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Added comments to wizard-reducer, hopefully reduced cognitive complexity Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Test fixes Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Mechanism for handling optional fields and checking for empty compulsory fields. TBD: Fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard now shows true/false options as checkboxes Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Boolean property fully works. TBD: mountains of testing : ) Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * UI now alerts when a compulsory field is left empty & optional fields are marked as such Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Option property fully works. Fake events substitute the events Select fires. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage for WizardInputs raised. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Redid functions for unfilled compulsory fields. TBD: fix tests Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed failing tests & improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * maxLength and lowercase properties functional. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Tab reorganization. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfix. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Dependencies now functional. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Tabs now indicate if they have an unfilled field & improved test coverage. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage of WizardInputs raised Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Added mechanism for generating warnings when deleting filled fields & improved test coverage. TBD: Add the actual warnings Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Hotfixes of unfilled validation Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed failing tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Restructuring. TBD: fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised coverage of WizardNavigation, WizardInputs and WizardDialog to 100. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed wizard-reducer tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Fixed some code smells. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Indentation dependency now available. TBD: fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Array wrapping of some YAML categories for static onboarding. TBD: fix tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Simplified and streamlined the way a category's content is used. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed & added tests. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Reduced reducer's cognitive complexity Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed a failing test Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Request now fires with valid YAML as body. Response is handled both for success and error. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * YAML is sent only if data validation checks pass. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Raised test coverage Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fetch-action sends a valid POST request Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fetch-action request body refactored to a plain/text format Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * WIP Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Ready for SAF check. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Add controller and error handler Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add override controller Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Refactoring and debug log Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add license and fix checkstyle Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add functionality to retrieve static location from discovery env endpoint Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add unit test Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add tests Signed-off-by: at670475 <andrea.tabone@broadcom.com> * SAF check determines whether user can onboard APIs or not. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fix code smell Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix bug Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add more test Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Raise coverage Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Address code review comments Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Address code review comments pt.2 Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Change the logic and add shared volumes mount Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add integration tests Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix location Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Add logs Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Set environment variable in docker containers Signed-off-by: at670475 <andrea.tabone@broadcom.com> * more debugging Signed-off-by: at670475 <andrea.tabone@broadcom.com> * additional debug Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix test Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Improve check Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix indentation Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Change the way to get static location Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix IT Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix static def path Signed-off-by: at670475 <andrea.tabone@broadcom.com> * POST requests now contain serviceId in the headers Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Try the docker URL Signed-off-by: Jakub Balhar <jakub@balhar.net> * Another take on volumes Signed-off-by: Jakub Balhar <jakub@balhar.net> * Fix assertion message Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Revert changes Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Get the first directory defined Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Fix code smells Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Revert staticApiservice Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Increase code coverage Signed-off-by: at670475 <andrea.tabone@broadcom.com> * revert docker-compose.yml files for local setup Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Merged backend endpoints and wired them together. Automatic onboarding now successfully handles normal saves & overwrites. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Bugfix Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Test coverage of wizard-actions, wizard-reducer and WizardInputs now at 100%. Raised test coverage for wizard-fetch-actions. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Test coverage of ConfirmDialog raised to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * post-merge fixes Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Fixed bug where all enablers tried to save Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Static onboarding shows up only if user's SAF check passes. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Post-merge fixes (handleIndentationDependency, handleArrayIndentation, tests). Signed-off-by: DianaKorladinova <chanchunche@gmail.com> Co-authored-by: DianaKorladinova <chanchunche@gmail.com> Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com> Co-authored-by: Jakub Balhar <jakub@balhar.net> Co-authored-by: achmelo <a.chmelo@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * Update version Signed-off-by: Carson Cook <carson.cook@ibm.com> * [Gradle Release plugin] Before tag commit 'v1.24.5'. Signed-off-by: Carson Cook <carson.cook@ibm.com> * [Gradle Release plugin] Create new version: 'v1.24.6-SNAPSHOT'. Signed-off-by: Carson Cook <carson.cook@ibm.com> * chore: share filesystem for static definitions (#1765) * share filesystem for static definitions Signed-off-by: jandadav <janda.david@gmail.com> * debug docker logs Signed-off-by: jandadav <janda.david@gmail.com> * debug docker logs 2 Signed-off-by: jandadav <janda.david@gmail.com> * working directory Signed-off-by: jandadav <janda.david@gmail.com> * debug Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * use docker compose Signed-off-by: jandadav <janda.david@gmail.com> * add local docker shared apidef dirs Signed-off-by: jandadav <janda.david@gmail.com> * add gh actions shared apidef dirs Signed-off-by: jandadav <janda.david@gmail.com> * rebuild containers Signed-off-by: jandadav <janda.david@gmail.com> * run full test Signed-off-by: jandadav <janda.david@gmail.com> * move docker compose shared mount Signed-off-by: jandadav <janda.david@gmail.com> * remove nginx Signed-off-by: jandadav <janda.david@gmail.com> * volumes everywhere Signed-off-by: jandadav <janda.david@gmail.com> * volumes everywhere Signed-off-by: jandadav <janda.david@gmail.com> * revert debug changes Signed-off-by: jandadav <janda.david@gmail.com> * revert imports Signed-off-by: jandadav <janda.david@gmail.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * fix: Fix flaky unit test (#1771) Fix flaky test Signed-off-by: at670475 <andrea.tabone@broadcom.com> Signed-off-by: Carson Cook <carson.cook@ibm.com> * chore: Support v2.x.x branch and clean statistics (#1775) Signed-off-by: Jakub Balhar <jakub@balhar.net> Signed-off-by: Carson Cook <carson.cook@ibm.com> * feat: Wizard improvements (#1772) * Allows for more inputs where multiple configurations can be present. Updated input data for the Plain Java Enabler. TBD: testing. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * WizardInputs test coverage now at 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Multiple configs of same category now visually divided, wizard-reducer test coverage raised to 100% Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Squashed bug occurring after loading already wrapped in array category content. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * Plain Java Enabler data configuration. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Wizard reducer refactoring. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Raised wizard reducer coverage to 100%. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * Foundation for YAML generation. Signed-off-by: DianaKorladinova <chanchunche@gmail.com> * YAML now shows in its own tab. TBD: lots of bug squashing. Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> * YAML Visualizer test Signed-off-by: ViktorKorladinov <v.korladinov@gmail.com> …
1 parent a85fc88 commit bd6f8d2

File tree

5 files changed

+82
-42
lines changed

5 files changed

+82
-42
lines changed

‎metrics-service-ui/frontend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"@material-ui/core": "4.11.4",
99
"@material-ui/icons": "4.11.2",
1010
"@wojtekmaj/enzyme-adapter-react-17": "0.6.1",
11+
"axios": "0.24.0",
1112
"eslint": "7.11.0",
1213
"history": "4.10.1",
1314
"lodash": "4.17.21",

‎metrics-service-ui/frontend/public/hystrix-dashboard/monitor/monitor.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ The changes are largely simply taking the monitor.html script elements and provi
1010
// from: http://jquery-howto.blogspot.com/2009/09/get-url-parameters-values-with-jquery.html
1111
function getUrlVars() {
1212
var vars = [], hash;
13-
// CHANGE: currently using hardcoded URL for PoC to set hystrix stream URL
14-
const url = 'https://localhost:10012/discoverableclient/hystrix/monitor?stream=https%3A%2F%2Flocalhost%3A10012%2Fdiscoverabledasclient%2Fapplication%2Fhystrix.stream&title=Discoverable%20Client%20Service';
15-
var hashes = url.slice(url.indexOf('?') + 1).split('&');
13+
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
1614
for(var i = 0; i < hashes.length; i++) {
1715
hash = hashes[i].split('=');
1816
vars.push(hash[0]);
@@ -23,8 +21,16 @@ function getUrlVars() {
2321

2422
var hystrixStreams = [];
2523

26-
function addStreams(proxyStream) {
27-
var urlVars = getUrlVars();
24+
function addStreams(proxyStream, title) {
25+
// CHANGE: rely on function parameters instead of parsing window.location.href
26+
// var urlVars = getUrlVars();
27+
28+
urlVars = {
29+
stream: proxyStream,
30+
title: title
31+
};
32+
33+
// END OF CHANGE
2834

2935
var streams = urlVars.streams ? JSON.parse(decodeURIComponent(urlVars.streams)) :
3036
urlVars.stream ? [{

‎metrics-service-ui/frontend/src/components/Dashboard/Dashboard.jsx

Lines changed: 57 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,53 +11,76 @@
1111
import Typography from '@material-ui/core/Typography';
1212
import Container from '@material-ui/core/Container';
1313
import React, { useEffect, useState } from 'react';
14-
import { makeStyles } from '@material-ui/core/styles';
15-
import FormControl from '@material-ui/core/FormControl';
16-
import Select from '@material-ui/core/Select';
17-
import MenuItem from '@material-ui/core/MenuItem';
18-
import InputLabel from '@material-ui/core/InputLabel';
19-
20-
const useStyles = makeStyles((theme) => ({
21-
formControl: {
22-
margin: theme.spacing(1),
23-
minWidth: 120,
24-
},
25-
selectEmpty: {
26-
marginTop: theme.spacing(2),
27-
},
28-
}));
14+
import Tabs from '@material-ui/core/Tabs';
15+
import Tab from '@material-ui/core/Tab';
16+
import Box from '@material-ui/core/Box';
17+
import axios from 'axios';
2918

3019
export default function Dashboard() {
31-
const classes = useStyles();
32-
const [currentStream, setCurrentStream] = useState('DISCOVERABLECLIENT');
20+
const [availableClusters, setAvailableClusters] = useState([]);
21+
const [currentCluster, setCurrentCluster] = useState(null);
22+
const [haveGottenClusters, setHaveGottenClusters] = useState(false);
23+
24+
function setMetricsDisplay(cluster) {
25+
setCurrentCluster(cluster);
26+
window.addStreams(
27+
`${window.location.origin}/metrics-service/sse/v1/turbine.stream?cluster=${cluster}`,
28+
cluster
29+
);
30+
}
31+
32+
function retrieveAvailableClusters(callback) {
33+
axios.get(`${window.location.origin}/metrics-service/api/v1/clusters`).then((res) => {
34+
callback(res);
35+
});
36+
}
3337

3438
useEffect(() => {
39+
if (!haveGottenClusters && availableClusters.length === 0) {
40+
retrieveAvailableClusters((res) => {
41+
setHaveGottenClusters(true);
42+
43+
const clusters = res.data.map((d) => d.name);
44+
setAvailableClusters(clusters);
45+
46+
if (clusters.length > 0) {
47+
setMetricsDisplay(clusters[0]);
48+
}
49+
});
50+
}
51+
3552
setTimeout(() => {
36-
window.addStreams(`https://localhost:10010/metrics-service/sse/v1/turbine.stream?cluster=${currentStream}`);
37-
}, 0);
38-
}, [currentStream]);
53+
retrieveAvailableClusters((res) => {
54+
const clusters = res.data.map((d) => d.name);
55+
setAvailableClusters(clusters);
56+
});
57+
}, 30000);
58+
});
3959

40-
const handleChange = (event) => {
41-
setCurrentStream(event.target.value);
60+
const handleChange = (event, newValue) => {
61+
setMetricsDisplay(newValue);
4262
};
4363

4464
return (
4565
<React.Fragment>
4666
<Typography id="name" variant="h2" component="h1" gutterBottom align="center">
4767
Metrics Service
4868
</Typography>
49-
<FormControl className={classes.formControl}>
50-
<InputLabel id="demo-simple-select-label">Stream</InputLabel>
51-
<Select
52-
labelId="demo-simple-select-label"
53-
id="demo-simple-select"
54-
value={currentStream}
55-
onChange={handleChange}
56-
>
57-
<MenuItem value="DISCOVERABLECLIENT">DISCOVERABLECLIENT</MenuItem>
58-
<MenuItem value="APICATALOG">APICATALOG</MenuItem>
59-
</Select>
60-
</FormControl>
69+
{availableClusters.length > 0 && (
70+
<Box sx={{ width: '100%' }}>
71+
<Tabs
72+
value={currentCluster}
73+
onChange={handleChange}
74+
aria-label="service tabs"
75+
centered
76+
indicatorColor="primary"
77+
>
78+
{availableClusters.map((stream) => (
79+
<Tab label={stream} value={stream} />
80+
))}
81+
</Tabs>
82+
</Box>
83+
)}
6184
<Container maxWidth="lg" id="content" className="dependencies" />
6285
</React.Fragment>
6386
);

‎metrics-service-ui/frontend/src/components/Error/Error.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
*/
1010

1111
import { Typography } from '@material-ui/core';
12-
import { withStyles } from '@material-ui/core/styles';
1312
import ErrorIcon from '@material-ui/icons/Error';
13+
import { withStyles } from '@material-ui/core/styles';
1414

1515
const CustomErrorIcon = withStyles((theme) => ({
1616
root: {

‎metrics-service-ui/frontend/src/components/Header/Header.jsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,19 @@
1010

1111
import React from 'react';
1212
import { IconButton, Tooltip, Link } from '@material-ui/core';
13-
import { withStyles } from '@material-ui/core/styles';
1413
import PowerSettingsNewIcon from '@material-ui/icons/PowerSettingsNew';
14+
import { makeStyles, withStyles } from '@material-ui/core/styles';
1515

1616
import MetricsIconButton from '../Icons/MetricsIconButton';
1717

18+
const useStyles = makeStyles((theme) => ({
19+
metricsHeaderDiv: {
20+
height: 65,
21+
backgroundColor: theme.palette.primary.main,
22+
display: 'flex',
23+
},
24+
}));
25+
1826
const LogoutIconButton = withStyles((theme) => ({
1927
root: {
2028
color: theme.palette.header.main,
@@ -44,6 +52,8 @@ const ServiceNameHeader = withStyles((theme) => ({
4452
}))(Link);
4553

4654
const Header = (props) => {
55+
const classes = useStyles();
56+
4757
const handleLogout = () => {
4858
const { logout } = props;
4959
logout();
@@ -52,7 +62,7 @@ const Header = (props) => {
5262
const dashboard = '/metrics-service/ui/v1/#/dashboard';
5363

5464
return (
55-
<div className="login-header">
65+
<div className={classes.metricsHeaderDiv}>
5666
<MetricsIconButton />
5767
<ServiceNameHeader id="name" variant="h6" align="left" underline="none" href={dashboard}>
5868
Metrics Service

0 commit comments

Comments
 (0)