From c7370754c6b0835f453161fe9207da6b44ac273f Mon Sep 17 00:00:00 2001 From: Gabriel Bernal Date: Thu, 2 Jan 2025 13:58:10 +0100 Subject: [PATCH] use pf v5 variables and table component --- web/cypress/e2e/spec.cy.ts | 131 ++-- web/package-lock.json | 588 +++++++----------- web/package.json | 12 +- .../IncidentsChart/IncidentsChart.jsx | 6 +- .../components/Incidents/IncidentsPage.jsx | 4 +- web/src/components/_monitoring.scss | 168 ++--- web/src/components/alerting.tsx | 17 +- .../components/alerting/AlertsDetailPage.tsx | 6 +- web/src/components/alerting/AlertsPage.tsx | 10 +- .../alerting/SilencesDetailPage.tsx | 9 +- web/src/components/alerting/SilencesUtils.tsx | 12 +- web/src/components/console/graphs/bar.tsx | 22 +- .../components/console/utils/status-box.tsx | 10 +- web/src/components/dashboards/graph.tsx | 1 - web/src/components/dashboards/index.tsx | 4 +- web/src/components/dashboards/single-stat.tsx | 2 +- web/src/components/dashboards/table.tsx | 60 +- web/src/components/metrics.tsx | 84 ++- .../components/promql-expression-input.tsx | 58 +- web/src/components/query-browser-theme.ts | 22 +- web/src/components/query-browser.tsx | 2 +- web/src/components/silence-form.tsx | 2 +- web/src/components/targets.tsx | 14 +- 23 files changed, 606 insertions(+), 638 deletions(-) diff --git a/web/cypress/e2e/spec.cy.ts b/web/cypress/e2e/spec.cy.ts index 04f16115..921fce56 100644 --- a/web/cypress/e2e/spec.cy.ts +++ b/web/cypress/e2e/spec.cy.ts @@ -27,54 +27,56 @@ const SILENCE_COMMENT = 'test comment'; describe('Monitoring: Alerts', () => { beforeEach(() => { - cy.intercept( - 'GET', - '/api/prometheus/api/v1/rules?', - { - data: { - groups: [{ - "file": "dummy-file", - "interval": 30, - "name": "general.rules", - "rules": [ + cy.intercept('GET', '/api/prometheus/api/v1/rules?', { + data: { + groups: [ + { + file: 'dummy-file', + interval: 30, + name: 'general.rules', + rules: [ { - "state": "firing", - "name": "Watchdog", - "query": "vector(1)", - "duration": 0, - "labels": { - "namespace": "openshift-monitoring", - "prometheus": "openshift-monitoring/k8s", - "severity": "none" + state: 'firing', + name: 'Watchdog', + query: 'vector(1)', + duration: 0, + labels: { + namespace: 'openshift-monitoring', + prometheus: 'openshift-monitoring/k8s', + severity: 'none', }, - "annotations": { - "description": "This is an alert meant to ensure that the entire alerting pipeline is functional.\nThis alert is always firing, therefore it should always be firing in Alertmanager\nand always fire against a receiver. There are integrations with various notification\nmechanisms that send a notification when this alert is not firing. For example the\n\"DeadMansSnitch\" integration in PagerDuty.\n", - "summary": "An alert that should always be firing to certify that Alertmanager is working properly." + annotations: { + description: + 'This is an alert meant to ensure that the entire alerting pipeline is functional.\nThis alert is always firing, therefore it should always be firing in Alertmanager\nand always fire against a receiver. There are integrations with various notification\nmechanisms that send a notification when this alert is not firing. For example the\n"DeadMansSnitch" integration in PagerDuty.\n', + summary: + 'An alert that should always be firing to certify that Alertmanager is working properly.', }, - "alerts": [ + alerts: [ { - "labels": { - "alertname": "Watchdog", - "namespace": "openshift-monitoring", - "severity": "none" + labels: { + alertname: 'Watchdog', + namespace: 'openshift-monitoring', + severity: 'none', }, - "annotations": { - "description": "This is an alert meant to ensure that the entire alerting pipeline is functional.\nThis alert is always firing, therefore it should always be firing in Alertmanager\nand always fire against a receiver. There are integrations with various notification\nmechanisms that send a notification when this alert is not firing. For example the\n\"DeadMansSnitch\" integration in PagerDuty.\n", - "summary": "An alert that should always be firing to certify that Alertmanager is working properly." + annotations: { + description: + 'This is an alert meant to ensure that the entire alerting pipeline is functional.\nThis alert is always firing, therefore it should always be firing in Alertmanager\nand always fire against a receiver. There are integrations with various notification\nmechanisms that send a notification when this alert is not firing. For example the\n"DeadMansSnitch" integration in PagerDuty.\n', + summary: + 'An alert that should always be firing to certify that Alertmanager is working properly.', }, - "state": "firing", - "activeAt": "2023-04-10T12:00:00.123456789Z", - "value": "1e+00", - } + state: 'firing', + activeAt: '2023-04-10T12:00:00.123456789Z', + value: '1e+00', + }, ], - "health": "ok", - "type": "alerting" - } + health: 'ok', + type: 'alerting', + }, ], - }], - }, - } - ); + }, + ], + }, + }); cy.visit('/'); }); @@ -115,38 +117,39 @@ describe('Monitoring: Alerts', () => { }); it('creates and expires a Silence', () => { - cy.intercept('GET', '/api/alertmanager/api/v2/silences', [{ + cy.intercept('GET', '/api/alertmanager/api/v2/silences', [ + { id: SILENCE_ID, status: { - state: "active", + state: 'active', }, - updatedAt: "2023-04-10T12:00:00.123Z", + updatedAt: '2023-04-10T12:00:00.123Z', comment: SILENCE_COMMENT, - createdBy: "kube:admin", - endsAt: "2023-04-10T14:00:00.123Z", + createdBy: 'kube:admin', + endsAt: '2023-04-10T14:00:00.123Z', matchers: [ { isEqual: true, isRegex: false, - name: "alertname", - value: "Watchdog" + name: 'alertname', + value: 'Watchdog', }, { isEqual: true, isRegex: false, - name: "namespace", - value: "openshift-monitoring" + name: 'namespace', + value: 'openshift-monitoring', }, { isEqual: true, isRegex: false, - name: "severity", - value: "none" - } + name: 'severity', + value: 'none', + }, ], - startsAt: "2023-04-10T12:00:00.123Z", - }] - ).as('getSilences'); + startsAt: '2023-04-10T12:00:00.123Z', + }, + ]).as('getSilences'); cy.intercept('POST', '/api/alertmanager/api/v2/silences', { silenceID: SILENCE_ID }); @@ -164,7 +167,9 @@ describe('Monitoring: Alerts', () => { // shouldBeWatchdogAlertDetailsPage(); // detailsPage.clickPageActionButton('Silence alert'); - cy.visit('/monitoring/silences/~new?alertname=Watchdog&namespace=openshift-monitoring&severity=none'); + cy.visit( + '/monitoring/silences/~new?alertname=Watchdog&namespace=openshift-monitoring&severity=none', + ); // Launches create silence form cy.log('silence Watchdog alert'); @@ -175,9 +180,7 @@ describe('Monitoring: Alerts', () => { // Change duration cy.byTestID('silence-for-toggle').click(); cy.byTestID('silence-for').should('contain', '1h'); - cy.byTestID('silence-for') - .contains(/^1h$/) - .click(); + cy.byTestID('silence-for').contains(/^1h$/).click(); cy.byTestID('silence-until').should('have.value', '1h from now'); // Change to not start now cy.byTestID('silence-start-immediately').click(); @@ -204,14 +207,12 @@ describe('Monitoring: Alerts', () => { // Change duration back again cy.byTestID('silence-for-toggle').click(); cy.byTestID('silence-for').should('contain', '2h'); - cy.byTestID('silence-for') - .contains(/^2h$/) - .click(); + cy.byTestID('silence-for').contains(/^2h$/).click(); cy.byTestID('silence-until').should('have.value', '2h from now'); // Add comment and submit cy.byTestID('silence-comment').type(SILENCE_COMMENT); cy.get('button[type=submit]').click(); - cy.get('.pf-c-alert').should('not.exist'); + cy.get('.pf-v5-c-alert').should('not.exist'); // After creating the Silence, should be redirected to its details page shouldBeWatchdogSilencePage(); @@ -237,8 +238,8 @@ describe('Monitoring: Alerts', () => { //cy.byTestID('silence-actions') // .contains('Expire silence') // .click(); - //cy.get('button.pf-m-primary').click(); - //cy.get('.pf-c-alert').should('not.exist'); + //cy.get('button.pf-v5-m-primary').click(); + //cy.get('.pf-v5-c-alert').should('not.exist'); // Wait for expired silence icon to exist //cy.byLegacyTestID('ban-icon').should('exist'); }); diff --git a/web/package-lock.json b/web/package-lock.json index 5780276f..b77a9515 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -21,10 +21,10 @@ "@openshift-console/dynamic-plugin-sdk": "^1.6.0", "@openshift-console/dynamic-plugin-sdk-internal": "^1.0.0", "@openshift-console/dynamic-plugin-sdk-webpack": "^1.0.2", - "@patternfly/react-charts": "6.94.19", + "@patternfly/react-charts": "^7.2.2", "@patternfly/react-core": "5.4.0", "@patternfly/react-icons": "^5.4.0", - "@patternfly/react-table": "4.113.0", + "@patternfly/react-table": "5.4.13", "@prometheus-io/codemirror-promql": "^0.37.0", "classnames": "2.x", "fuzzysearch": "1.0.x", @@ -46,14 +46,15 @@ }, "devDependencies": { "@types/node": "^17.0.21", - "@types/react": "^18.0.0", - "@types/react-helmet": "^6.1.4", + "@types/react": "17.0.83", + "@types/react-helmet": "^6.1.11", "@types/react-router-dom": "^5.3.2", "@types/webpack-dev-server": "^4.7.2", "@typescript-eslint/eslint-plugin": "^5.15.0", "@typescript-eslint/parser": "^5.15.0", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.7.1", + "csstype": "^3.1.3", "cypress": "^12.3.0", "eslint": "8.44.0", "eslint-config-prettier": "^8.5.0", @@ -786,36 +787,37 @@ } }, "node_modules/@patternfly/react-charts": { - "version": "6.94.19", - "resolved": "https://registry.npmjs.org/@patternfly/react-charts/-/react-charts-6.94.19.tgz", - "integrity": "sha512-+yYwXAy/GBH2bTHFzMpdVKc8LUJCCNEqqS7bqovNkNLd0m3FP3q9fKJ22QxNnP9NeFHK6UFa4KfouQAb2fInfQ==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-charts/-/react-charts-7.2.2.tgz", + "integrity": "sha512-1PFuvXz3mm/o/O+BQ2/2e66ncvtV8XIYxFaimurslCLTygodOvjBDDu/D/5tNa3HLxvA+fm2Q58893POGZi+bw==", "license": "MIT", "dependencies": { - "@patternfly/react-styles": "^4.92.6", - "@patternfly/react-tokens": "^4.94.6", + "@patternfly/react-styles": "^5.2.1", + "@patternfly/react-tokens": "^5.2.1", "hoist-non-react-statics": "^3.3.0", - "lodash": "^4.17.19", - "tslib": "^2.0.0", - "victory-area": "^36.6.7", - "victory-axis": "^36.6.7", - "victory-bar": "^36.6.7", - "victory-chart": "^36.6.7", - "victory-core": "^36.6.7", - "victory-create-container": "^36.6.7", - "victory-cursor-container": "^36.6.7", - "victory-group": "^36.6.7", - "victory-legend": "^36.6.7", - "victory-line": "^36.6.7", - "victory-pie": "^36.6.7", - "victory-scatter": "^36.6.7", - "victory-stack": "^36.6.7", - "victory-tooltip": "^36.6.7", - "victory-voronoi-container": "^36.6.7", - "victory-zoom-container": "^36.6.7" + "lodash": "^4.17.21", + "tslib": "^2.5.0", + "victory-area": "^36.9.1", + "victory-axis": "^36.9.1", + "victory-bar": "^36.9.1", + "victory-box-plot": "^36.9.1", + "victory-chart": "^36.9.1", + "victory-core": "^36.9.1", + "victory-create-container": "^36.9.1", + "victory-cursor-container": "^36.9.1", + "victory-group": "^36.9.1", + "victory-legend": "^36.9.1", + "victory-line": "^36.9.1", + "victory-pie": "^36.9.1", + "victory-scatter": "^36.9.1", + "victory-stack": "^36.9.1", + "victory-tooltip": "^36.9.1", + "victory-voronoi-container": "^36.9.1", + "victory-zoom-container": "^36.9.1" }, "peerDependencies": { - "react": "^16.8 || ^17 || ^18", - "react-dom": "^16.8 || ^17 || ^18" + "react": "^17 || ^18", + "react-dom": "^17 || ^18" } }, "node_modules/@patternfly/react-core": { @@ -836,147 +838,71 @@ "react-dom": "^17 || ^18" } }, - "node_modules/@patternfly/react-core/node_modules/@patternfly/react-styles": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.4.0.tgz", - "integrity": "sha512-4ZE0s6LkX/0KsN0FOeogrDoj18m+BPA73YKnabZGB4SDRzrBNeBh2a6bSt546ZseEjkoJ+S81kOG0G8YckPQYg==", - "license": "MIT" - }, - "node_modules/@patternfly/react-core/node_modules/@patternfly/react-tokens": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.4.0.tgz", - "integrity": "sha512-KONkwCVOMyklhuuaYeYgcAsGtCBQXnsBGZeolhOdSzr2Mj0RVSW0oMrQPgZuPVzhhC/kbqgClHJJl6xuG9xheA==", - "license": "MIT" - }, - "node_modules/@patternfly/react-core/node_modules/tslib": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", - "license": "0BSD" - }, "node_modules/@patternfly/react-icons": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.4.0.tgz", - "integrity": "sha512-2M3qN/naultvRHeG2laJMmoIroFCGAyfwTVrnCjSkG6/KnRoXV0+dqd+Xrh7xzpzvIJB1klvifC0oX42cEkDrA==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.4.2.tgz", + "integrity": "sha512-CMQ5oHYzW6TPVTs2jpNJmP2vGCAKR/YeTPwHGO9dLkAUej1IcIxtCCWK2Fdo2UJsnBjuZihasyw2b6ehvbUm9Q==", + "license": "MIT", "peerDependencies": { "react": "^17 || ^18", "react-dom": "^17 || ^18" } }, "node_modules/@patternfly/react-styles": { - "version": "4.92.6", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.92.6.tgz", - "integrity": "sha512-b8uQdEReMyeoMzjpMri845QxqtupY/tIFFYfVeKoB2neno8gkcW1RvDdDe62LF88q45OktCwAe/8A99ker10Iw==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.4.1.tgz", + "integrity": "sha512-XA8PXksD8uiA3RTwxdUwJXOCf+V6sVd+2HKapWAdRLvtSV+Sdk7NgCvalb4IAQncsddLopjPQD8gAHA298+N8w==", "license": "MIT" }, "node_modules/@patternfly/react-table": { - "version": "4.113.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.113.0.tgz", - "integrity": "sha512-qxa3NWCdYasqQQL1rqEd8DyNa8oWr6HNveNW5YJRakE7imWZhUPG2Nd6Op60+KYX8kbCSl7gwSmgAZAYMBMZkQ==", + "version": "5.4.13", + "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-5.4.13.tgz", + "integrity": "sha512-cYw+pgpZXKGg3dZxudteUURqmj5O0ec7aNE80NLqFTcnI0MAOnfrFzCNApXJErn+MjD0VolMcC+H48eaRkT8TA==", "license": "MIT", "dependencies": { - "@patternfly/react-core": "^4.276.8", - "@patternfly/react-icons": "^4.93.6", - "@patternfly/react-styles": "^4.92.6", - "@patternfly/react-tokens": "^4.94.6", - "lodash": "^4.17.19", - "tslib": "^2.0.0" + "@patternfly/react-core": "^5.4.12", + "@patternfly/react-icons": "^5.4.2", + "@patternfly/react-styles": "^5.4.1", + "@patternfly/react-tokens": "^5.4.1", + "lodash": "^4.17.21", + "tslib": "^2.7.0" }, "peerDependencies": { - "react": "^16.8 || ^17 || ^18", - "react-dom": "^16.8 || ^17 || ^18" + "react": "^17 || ^18", + "react-dom": "^17 || ^18" } }, "node_modules/@patternfly/react-table/node_modules/@patternfly/react-core": { - "version": "4.276.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.276.8.tgz", - "integrity": "sha512-dn322rEzBeiVztZEuCZMUUittNb8l1hk30h9ZN31FLZLLVtXGlThFNV9ieqOJYA9zrYxYZrHMkTnOxSWVacMZg==", + "version": "5.4.12", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.4.12.tgz", + "integrity": "sha512-RI1xS1JGJdE/FvpkMzawaE21oeTc/e+WbxvFXqZfLhTz60P8RzVG1nYWXDL747Onkz3SYtY79PhQ8nsLeO5sJQ==", "license": "MIT", "dependencies": { - "@patternfly/react-icons": "^4.93.6", - "@patternfly/react-styles": "^4.92.6", - "@patternfly/react-tokens": "^4.94.6", - "focus-trap": "6.9.2", - "react-dropzone": "9.0.0", - "tippy.js": "5.1.2", - "tslib": "^2.0.0" + "@patternfly/react-icons": "^5.4.2", + "@patternfly/react-styles": "^5.4.1", + "@patternfly/react-tokens": "^5.4.1", + "focus-trap": "7.6.2", + "react-dropzone": "^14.2.3", + "tslib": "^2.7.0" }, "peerDependencies": { - "react": "^16.8 || ^17 || ^18", - "react-dom": "^16.8 || ^17 || ^18" - } - }, - "node_modules/@patternfly/react-table/node_modules/@patternfly/react-icons": { - "version": "4.93.6", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.93.6.tgz", - "integrity": "sha512-ZrXegc/81oiuTIeWvoHb3nG/eZODbB4rYmekBEsrbiysyO7m/sUFoi/RLvgFINrRoh6YCJqL5fj06Jg6d7jX1g==", - "license": "MIT", - "peerDependencies": { - "react": "^16.8 || ^17 || ^18", - "react-dom": "^16.8 || ^17 || ^18" - } - }, - "node_modules/@patternfly/react-table/node_modules/attr-accept": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.3.tgz", - "integrity": "sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ==", - "license": "MIT", - "dependencies": { - "core-js": "^2.5.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@patternfly/react-table/node_modules/file-selector": { - "version": "0.1.19", - "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.19.tgz", - "integrity": "sha512-kCWw3+Aai8Uox+5tHCNgMFaUdgidxvMnLWO6fM5sZ0hA2wlHP5/DHGF0ECe84BiB95qdJbKNEJhWKVDvMN+JDQ==", - "license": "MIT", - "dependencies": { - "tslib": "^2.0.1" - }, - "engines": { - "node": ">= 10" + "react": "^17 || ^18", + "react-dom": "^17 || ^18" } }, "node_modules/@patternfly/react-table/node_modules/focus-trap": { - "version": "6.9.2", - "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.2.tgz", - "integrity": "sha512-gBEuXOPNOKPrLdZpMFUSTyIo1eT2NSZRrwZ9r/0Jqw5tmT3Yvxfmu8KBHw8xW2XQkw6E/JoG+OlEq7UDtSUNgw==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz", + "integrity": "sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==", "license": "MIT", "dependencies": { - "tabbable": "^5.3.2" - } - }, - "node_modules/@patternfly/react-table/node_modules/react-dropzone": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-9.0.0.tgz", - "integrity": "sha512-wZ2o9B2qkdE3RumWhfyZT9swgJYJPeU5qHEcMU8weYpmLex1eeWX0CC32/Y0VutB+BBi2D+iePV/YZIiB4kZGw==", - "license": "MIT", - "dependencies": { - "attr-accept": "^1.1.3", - "file-selector": "^0.1.8", - "prop-types": "^15.6.2", - "prop-types-extra": "^1.1.0" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "react": ">=0.14.0" + "tabbable": "^6.2.0" } }, - "node_modules/@patternfly/react-table/node_modules/tabbable": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz", - "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==", - "license": "MIT" - }, "node_modules/@patternfly/react-tokens": { - "version": "4.94.6", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.94.6.tgz", - "integrity": "sha512-tm7C6nat+uKMr1hrapis7hS3rN9cr41tpcCKhx6cod6FLU8KwF2Yt5KUxakhIOCEcE/M/EhXhAw/qejp8w0r7Q==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.4.1.tgz", + "integrity": "sha512-eygdHE7Krta1mijAv/E8RHiKIgysD0eeNTo8EXUYC8/M4e5K6sqpr2p6rQBF8QiRMN8FnbXvZT3K2OQ28pYt9Q==", "license": "MIT" }, "node_modules/@prometheus-io/codemirror-promql": { @@ -1130,66 +1056,66 @@ } }, "node_modules/@types/d3-array": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.3.tgz", - "integrity": "sha512-Reoy+pKnvsksN0lQUlcH6dOGjRZ/3WRwXR//m+/8lt1BXeI4xyaUZoqULNjyXXRuh0Mj4LNpkCvhUpQlY3X5xQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz", + "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==", "license": "MIT" }, "node_modules/@types/d3-color": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.0.tgz", - "integrity": "sha512-HKuicPHJuvPgCD+np6Se9MQvS6OCbJmOjGvylzMJRlDwUXjKTTXs6Pwgk79O09Vj/ho3u1ofXnhFOaEWWPrlwA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz", + "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==", "license": "MIT" }, "node_modules/@types/d3-ease": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.0.tgz", - "integrity": "sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz", + "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==", "license": "MIT" }, "node_modules/@types/d3-interpolate": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz", - "integrity": "sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", + "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", "license": "MIT", "dependencies": { "@types/d3-color": "*" } }, "node_modules/@types/d3-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.0.tgz", - "integrity": "sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz", + "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==", "license": "MIT" }, "node_modules/@types/d3-scale": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.2.tgz", - "integrity": "sha512-Yk4htunhPAwN0XGlIwArRomOjdoBFXC3+kCxK2Ubg7I9shQlVSJy/pG/Ht5ASN+gdMIalpk8TJ5xV74jFsetLA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz", + "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==", "license": "MIT", "dependencies": { "@types/d3-time": "*" } }, "node_modules/@types/d3-shape": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.0.tgz", - "integrity": "sha512-jYIYxFFA9vrJ8Hd4Se83YI6XF+gzDL1aC5DCsldai4XYYiVNdhtpGbA/GM6iyQ8ayhSp3a148LY34hy7A4TxZA==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz", + "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==", "license": "MIT", "dependencies": { "@types/d3-path": "*" } }, "node_modules/@types/d3-time": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz", - "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz", + "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==", "license": "MIT" }, "node_modules/@types/d3-timer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.0.tgz", - "integrity": "sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz", + "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==", "license": "MIT" }, "node_modules/@types/eslint": { @@ -1375,21 +1301,21 @@ "license": "MIT" }, "node_modules/@types/react": { - "version": "18.0.26", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz", - "integrity": "sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==", + "version": "17.0.83", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.83.tgz", + "integrity": "sha512-l0m4ArKJvmFtR4e8UmKrj1pB4tUgOhJITf+mADyF/p69Ts1YAR/E+G9XEM0mHXKVRa1dQNHseyyDNzeuAXfXQw==", "dev": true, "license": "MIT", "dependencies": { "@types/prop-types": "*", - "@types/scheduler": "*", + "@types/scheduler": "^0.16", "csstype": "^3.0.2" } }, "node_modules/@types/react-helmet": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.1.6.tgz", - "integrity": "sha512-ZKcoOdW/Tg+kiUbkFCBtvDw0k3nD4HJ/h/B9yWxN4uDO8OkRksWTO+EL+z/Qu3aHTeTll3Ro0Cc/8UhwBCMG5A==", + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.1.11.tgz", + "integrity": "sha512-0QcdGLddTERotCXo3VFlUSWO3ztraw8nZ6e3zJSgG7apwV5xt+pJUS8ewPBqT4NYB1optGLprNQzFleIY84u/g==", "dev": true, "license": "MIT", "dependencies": { @@ -3393,13 +3319,6 @@ "node": ">=10.13.0" } }, - "node_modules/core-js": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", - "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", - "hasInstallScript": true, - "license": "MIT" - }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", @@ -3580,9 +3499,9 @@ } }, "node_modules/csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", "dev": true, "license": "MIT" }, @@ -3690,9 +3609,9 @@ } }, "node_modules/d3-array": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.0.tgz", - "integrity": "sha512-3yXFQo0oG3QCxbF06rMPFyGRMGJNS7NvsV1+2joOjbBE+9xvWQ8+GcMJAjRCzw06zQ3/arXeJgbPYcjUCuC+3g==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", + "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", "license": "ISC", "dependencies": { "internmap": "1 - 2" @@ -3741,9 +3660,9 @@ } }, "node_modules/d3-path": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz", - "integrity": "sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz", + "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", "license": "ISC", "engines": { "node": ">=12" @@ -3766,21 +3685,21 @@ } }, "node_modules/d3-shape": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.1.0.tgz", - "integrity": "sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz", + "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==", "license": "ISC", "dependencies": { - "d3-path": "1 - 3" + "d3-path": "^3.1.0" }, "engines": { "node": ">=12" } }, "node_modules/d3-time": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz", - "integrity": "sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz", + "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==", "license": "ISC", "dependencies": { "d3-array": "2 - 3" @@ -5263,12 +5182,6 @@ "node": ">= 12" } }, - "node_modules/file-selector/node_modules/tslib": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", - "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", - "license": "0BSD" - }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -8351,16 +8264,6 @@ "node": ">=4" } }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/postcss": { "version": "8.4.21", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", @@ -8561,19 +8464,6 @@ "react-is": "^16.13.1" } }, - "node_modules/prop-types-extra": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz", - "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==", - "license": "MIT", - "dependencies": { - "react-is": "^16.3.2", - "warning": "^4.0.0" - }, - "peerDependencies": { - "react": ">=0.14.0" - } - }, "node_modules/property-expr": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.6.tgz", @@ -10646,15 +10536,6 @@ "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==", "license": "MIT" }, - "node_modules/tippy.js": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-5.1.2.tgz", - "integrity": "sha512-Qtrv2wqbRbaKMUb6bWWBQWPayvcDKNrGlvihxtsyowhT7RLGEh1STWuy6EMXC6QLkfKPB2MLnf8W2mzql9VDAw==", - "license": "MIT", - "dependencies": { - "popper.js": "^1.16.0" - } - }, "node_modules/tlds": { "version": "1.233.0", "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.233.0.tgz", @@ -10837,9 +10718,9 @@ } }, "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "license": "0BSD" }, "node_modules/tsutils": { @@ -11189,281 +11070,278 @@ "license": "MIT" }, "node_modules/victory-area": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-area/-/victory-area-36.6.8.tgz", - "integrity": "sha512-aIyMuzUqiDcpTCB7FUOYDJvqiDPiluEXLOw6Lh1vrUYmV7CNqMDOIBtTau2vI41Ao0o0YJdCAcyzBib9e3UYbw==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-area/-/victory-area-36.9.2.tgz", + "integrity": "sha512-32aharvPf2RgdQB+/u1j3/ajYFNH/7ugLX9ZRpdd65gP6QEbtXL+58gS6CxvFw6gr/y8a0xMlkMKkpDVacXLpw==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8", - "victory-vendor": "^36.6.8" + "victory-core": "^36.9.2", + "victory-vendor": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-axis": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-axis/-/victory-axis-36.6.8.tgz", - "integrity": "sha512-tClVJEay1YOJAh9rRyyLx8pei7Sr1/xTz04bJmfzFoAxFoPBtvgfFwXhfZ1YjGIl7m5Wh2CiYMY3figueLzYtg==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-axis/-/victory-axis-36.9.2.tgz", + "integrity": "sha512-4Odws+IAjprJtBg2b2ZCxEPgrQ6LgIOa22cFkGghzOSfTyNayN4M3AauNB44RZyn2O/hDiM1gdBkEg1g9YDevQ==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8" + "victory-core": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-bar": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-bar/-/victory-bar-36.6.8.tgz", - "integrity": "sha512-jLLPm3IW8/2uSLPvQD9bxzXnTraUYBIDTkbZPZy7oHP01OVzP1sj+MMHcINCWcUbyUyLZDL3u8CvViXjS273JQ==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-bar/-/victory-bar-36.9.2.tgz", + "integrity": "sha512-R3LFoR91FzwWcnyGK2P8DHNVv9gsaWhl5pSr2KdeNtvLbZVEIvUkTeVN9RMBMzterSFPw0mbWhS1Asb3sV6PPw==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8", - "victory-vendor": "^36.6.8" + "victory-core": "^36.9.2", + "victory-vendor": "^36.9.2" + }, + "peerDependencies": { + "react": ">=16.6.0" + } + }, + "node_modules/victory-box-plot": { + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-box-plot/-/victory-box-plot-36.9.2.tgz", + "integrity": "sha512-nUD45V/YHDkAKZyak7YDsz+Vk1F9N0ica3jWQe0AY0JqD9DleHa8RY/olSVws26kLyEj1I+fQqva6GodcLaIqQ==", + "license": "MIT", + "dependencies": { + "lodash": "^4.17.19", + "victory-core": "^36.9.2", + "victory-vendor": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-brush-container": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-brush-container/-/victory-brush-container-36.6.8.tgz", - "integrity": "sha512-PN5zQ6kjVwZca1qV41WlV6J2IEyQh+2hykRe6c/wERDotVVbSrX3sJVAzUbN+7x2rrK0CL6a/XUI8jDsWTMM2A==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-brush-container/-/victory-brush-container-36.9.2.tgz", + "integrity": "sha512-KcQjzFeo40tn52cJf1A02l5MqeR9GKkk3loDqM3T2hfi1PCyUrZXEUjGN5HNlLizDRvtcemaAHNAWlb70HbG/g==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", "react-fast-compare": "^3.2.0", - "victory-core": "^36.6.8" + "victory-core": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-chart": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-chart/-/victory-chart-36.6.8.tgz", - "integrity": "sha512-kC1jL63PAmqUrvZNOfwAXNuaIwz4nvXYUuEPu59WRBCOIGDGRgv2wJ1O7O0xYXqDkI57EtAYf9KUK+miEn/Btg==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-chart/-/victory-chart-36.9.2.tgz", + "integrity": "sha512-dMNcS0BpqL3YiGvI4BSEmPR76FCksCgf3K4CSZ7C/MGyrElqB6wWwzk7afnlB1Qr71YIHXDmdwsPNAl/iEwTtA==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", "react-fast-compare": "^3.2.0", - "victory-axis": "^36.6.8", - "victory-core": "^36.6.8", - "victory-polar-axis": "^36.6.8", - "victory-shared-events": "^36.6.8" + "victory-axis": "^36.9.2", + "victory-core": "^36.9.2", + "victory-polar-axis": "^36.9.2", + "victory-shared-events": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-core": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-core/-/victory-core-36.6.8.tgz", - "integrity": "sha512-SkyEszZKGyxjqfptfFWYdI22CvCuE9LhkaDpikzIhT2gcE3SuOBO5fk/740XMYE2ZUsJ4Fu/Vy4+8jZi17y44A==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-core/-/victory-core-36.9.2.tgz", + "integrity": "sha512-AzmMy+9MYMaaRmmZZovc/Po9urHne3R3oX7bbXeQdVuK/uMBrlPiv11gVJnuEH2SXLVyep43jlKgaBp8ef9stQ==", "license": "MIT", "dependencies": { "lodash": "^4.17.21", - "prop-types": "^15.8.1", "react-fast-compare": "^3.2.0", - "victory-vendor": "^36.6.8" + "victory-vendor": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-create-container": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-create-container/-/victory-create-container-36.6.8.tgz", - "integrity": "sha512-H2BsdTbJ/RxxcEg5lzk3TDlihtOs7I/5KaIBP3yosPs702i40mL2qndkRkj08QeiZhkaKfQ2GOUvyP+t7DSdmg==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-create-container/-/victory-create-container-36.9.2.tgz", + "integrity": "sha512-uA0dh1R0YDzuXyE/7StZvq4qshet+WYceY7R1UR5mR/F9079xy+iQsa2Ca4h97/GtVZoLO6r1eKLWBt9TN+U7A==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "victory-brush-container": "^36.6.8", - "victory-core": "^36.6.8", - "victory-cursor-container": "^36.6.8", - "victory-selection-container": "^36.6.8", - "victory-voronoi-container": "^36.6.8", - "victory-zoom-container": "^36.6.8" + "victory-brush-container": "^36.9.2", + "victory-core": "^36.9.2", + "victory-cursor-container": "^36.9.2", + "victory-selection-container": "^36.9.2", + "victory-voronoi-container": "^36.9.2", + "victory-zoom-container": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-cursor-container": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-cursor-container/-/victory-cursor-container-36.6.8.tgz", - "integrity": "sha512-3WIBRl+7jnZok6syLfW8RK23nliDcoD/JUTN0YZo6bKBqHeFc4+ur3mlwCfghH7sGoxJRYuOJxTd9x2MwM5HQQ==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-cursor-container/-/victory-cursor-container-36.9.2.tgz", + "integrity": "sha512-jidab4j3MaciF3fGX70jTj4H9rrLcY8o2LUrhJ67ZLvEFGGmnPtph+p8Fe97Umrag7E/DszjNxQZolpwlgUh3g==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8" + "victory-core": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-group": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-group/-/victory-group-36.6.8.tgz", - "integrity": "sha512-CiupDIGPPWVgwif3ayd8glSlR41mVbuT0Nl0ay9q42w2fiM32syiJAoifIw47X4tL8ow/DXH+/5Pd8eEyA2trA==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-group/-/victory-group-36.9.2.tgz", + "integrity": "sha512-wBmpsjBTKva8mxHvHNY3b8RE58KtnpLLItEyyAHaYkmExwt3Uj8Cld3sF3vmeuijn2iR64NPKeMbgMbfZJzycw==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", "react-fast-compare": "^3.2.0", - "victory-core": "^36.6.8", - "victory-shared-events": "^36.6.8" + "victory-core": "^36.9.2", + "victory-shared-events": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-legend": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-legend/-/victory-legend-36.6.8.tgz", - "integrity": "sha512-OnkzB82Mvt5/1LYNsrfZQoXaVvgfp1rCsFRI3imq257Sh/UPy0/eZehCMQs/SVbU0z0EuIpXokhZb3BBdoJgpw==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-legend/-/victory-legend-36.9.2.tgz", + "integrity": "sha512-cucFJpv6fty+yXp5pElQFQnHBk1TqA4guGUMI+XF/wLlnuM4bhdAtASobRIIBkz0mHGBaCAAV4PzL9azPU/9dg==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8" + "victory-core": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-line": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-line/-/victory-line-36.6.8.tgz", - "integrity": "sha512-MozOejQRZPdzFaru5zUfqVB4TEff6nZjtQhOs+F5yyhXjLgM89zGX30r3jK5cjVdAPbTu4KPUrwktvlw+AkPRA==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-line/-/victory-line-36.9.2.tgz", + "integrity": "sha512-kmYFZUo0o2xC8cXRsmt/oUBRQSZJVT2IJnAkboUepypoj09e6CY5tRH4TSdfEDGkBk23xQkn7d4IFgl4kAGnSA==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8", - "victory-vendor": "^36.6.8" + "victory-core": "^36.9.2", + "victory-vendor": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-pie": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-pie/-/victory-pie-36.6.8.tgz", - "integrity": "sha512-dUHWiiKd60dlt7OjFa+YYwanHAkP/T0abzy6O3SFxGre52oeqd8px1EoVhlLKpn4ao8L35koG9mvz6/pGyr8Dw==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-pie/-/victory-pie-36.9.2.tgz", + "integrity": "sha512-i3zWezvy5wQEkhXKt4rS9ILGH7Vr9Q5eF9fKO4GMwDPBdYOTE3Dh2tVaSrfDC8g9zFIc0DKzOtVoJRTb+0AkPg==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8", - "victory-vendor": "^36.6.8" + "victory-core": "^36.9.2", + "victory-vendor": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-polar-axis": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-polar-axis/-/victory-polar-axis-36.6.8.tgz", - "integrity": "sha512-aU+Wp5six21POhI9oXeREnZHljpqcmwFHHnliVGrwgRsuc7TAjfXPWVOX9guEFfh6zQW6IZWWWTTLAN/PIEm9w==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-polar-axis/-/victory-polar-axis-36.9.2.tgz", + "integrity": "sha512-HBR90FF4M56yf/atXjSmy3DMps1vSAaLXmdVXLM/A5g+0pUS7HO719r5x6dsR3I6Rm+8x6Kk8xJs0qgpnGQIEw==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8" + "victory-core": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-scatter": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-scatter/-/victory-scatter-36.6.8.tgz", - "integrity": "sha512-GKSNneBxIWLsF3eBSTW5IwT5S4YdsfFl4PVCP3/wTa2myfS5DIS9FufEnJp/FEZGalEXYWxeR47rlWqABxAj5A==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-scatter/-/victory-scatter-36.9.2.tgz", + "integrity": "sha512-hK9AtbJQfaW05i8BH7Lf1HK7vWMAfQofj23039HEQJqTKbCL77YT+Q0LhZw1a1BRCpC/5aSg9EuqblhfIYw2wg==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8" + "victory-core": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-selection-container": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-selection-container/-/victory-selection-container-36.6.8.tgz", - "integrity": "sha512-kudYbSX+o7fr64oeN7+EG/c+lqO22aypxVdCwa6BagAGoqqLR4jXxTqqIdp8tvxCgfCCXxopnTKYr46nubypGw==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-selection-container/-/victory-selection-container-36.9.2.tgz", + "integrity": "sha512-chboroEwqqVlMB60kveXM2WznJ33ZM00PWkFVCoJDzHHlYs7TCADxzhqet2S67SbZGSyvSprY2YztSxX8kZ+XQ==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8" + "victory-core": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-shared-events": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-shared-events/-/victory-shared-events-36.6.8.tgz", - "integrity": "sha512-hWPOVqMD3Sv6Rl1iyO6ibQrwYF9/eLCnRo0T59/Hsid6On0AJJjL9gv0oEIM5fqz7R7zx9PJmMk877IctEOemw==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-shared-events/-/victory-shared-events-36.9.2.tgz", + "integrity": "sha512-W/atiw3Or6MnpBuhluFv6007YrixIRh5NtiRvtFLGxNuQJLYjaSh6koRAih5xJer5Pj7YUx0tL9x67jTRcJ6Dg==", "license": "MIT", "dependencies": { "json-stringify-safe": "^5.0.1", "lodash": "^4.17.19", - "prop-types": "^15.8.1", "react-fast-compare": "^3.2.0", - "victory-core": "^36.6.8" + "victory-core": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-stack": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-stack/-/victory-stack-36.6.8.tgz", - "integrity": "sha512-Pkux46IqAealOi0KvqQpaJKKKpHCfZ/sh5IeUKYFy+QKWAjiQjG6hFZeHgr2YaS7OfdbvHhoAdvp03KntWzpbw==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-stack/-/victory-stack-36.9.2.tgz", + "integrity": "sha512-imR6FniVlDFlBa/B3Est8kTryNhWj2ZNpivmVOebVDxkKcVlLaDg3LotCUOI7NzOhBQaro0UzeE9KmZV93JcYA==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", "react-fast-compare": "^3.2.0", - "victory-core": "^36.6.8", - "victory-shared-events": "^36.6.8" + "victory-core": "^36.9.2", + "victory-shared-events": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-tooltip": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-tooltip/-/victory-tooltip-36.6.8.tgz", - "integrity": "sha512-9P+QeAGyDpP0trJnQ1NtnbDhpoJB0Ghc2boYEehvL12p0OzolY9/Nq5SDP0tu5i1BBujwFXtnoCDqt+mOH25fA==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-tooltip/-/victory-tooltip-36.9.2.tgz", + "integrity": "sha512-76seo4TWD1WfZHJQH87IP3tlawv38DuwrUxpnTn8+uW6/CUex82poQiVevYdmJzhataS9jjyCWv3w7pOmLBCLg==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8" + "victory-core": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-vendor": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.6.8.tgz", - "integrity": "sha512-H3kyQ+2zgjMPvbPqAl7Vwm2FD5dU7/4bCTQakFQnpIsfDljeOMDojRsrmJfwh4oAlNnWhpAf+mbAoLh8u7dwyQ==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.9.2.tgz", + "integrity": "sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==", "license": "MIT AND ISC", "dependencies": { "@types/d3-array": "^3.0.3", @@ -11483,31 +11361,29 @@ } }, "node_modules/victory-voronoi-container": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-voronoi-container/-/victory-voronoi-container-36.6.8.tgz", - "integrity": "sha512-x9/OOZdMm4dh38jNhSfBYT0nG6ribsINU0/WNzIn3QcDXFBInsJ7jRySxYmdmk45OdXfbDRwDMqVHk72sWQyUw==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-voronoi-container/-/victory-voronoi-container-36.9.2.tgz", + "integrity": "sha512-NIVYqck9N4OQnEz9mgQ4wILsci3OBWWK7RLuITGHyoD7Ne/+WH1i0Pv2y9eIx+f55rc928FUTugPPhkHvXyH3A==", "license": "MIT", "dependencies": { "delaunay-find": "0.0.6", "lodash": "^4.17.19", - "prop-types": "^15.8.1", "react-fast-compare": "^3.2.0", - "victory-core": "^36.6.8", - "victory-tooltip": "^36.6.8" + "victory-core": "^36.9.2", + "victory-tooltip": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" } }, "node_modules/victory-zoom-container": { - "version": "36.6.8", - "resolved": "https://registry.npmjs.org/victory-zoom-container/-/victory-zoom-container-36.6.8.tgz", - "integrity": "sha512-gxX5iJUaxrFFZ2IGS0sQnUI+3Mhj6bVLqtOlQd3Krld+9f/ieuUbxl+P+eIyhQU/VyHSlirIZeOGOXJeYcU9jQ==", + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-zoom-container/-/victory-zoom-container-36.9.2.tgz", + "integrity": "sha512-pXa2Ji6EX/pIarKT6Hcmmu2n7IG/x8Vs0D2eACQ/nbpvZa+DXWIxCRW4hcg2Va35fmXcDIEpGaX3/soXzZ+pbw==", "license": "MIT", "dependencies": { "lodash": "^4.17.19", - "prop-types": "^15.8.1", - "victory-core": "^36.6.8" + "victory-core": "^36.9.2" }, "peerDependencies": { "react": ">=16.6.0" diff --git a/web/package.json b/web/package.json index 2f4ee436..f6896fd4 100644 --- a/web/package.json +++ b/web/package.json @@ -38,10 +38,10 @@ "@openshift-console/dynamic-plugin-sdk": "^1.6.0", "@openshift-console/dynamic-plugin-sdk-internal": "^1.0.0", "@openshift-console/dynamic-plugin-sdk-webpack": "^1.0.2", - "@patternfly/react-charts": "6.94.19", + "@patternfly/react-charts": "^7.2.2", "@patternfly/react-core": "5.4.0", "@patternfly/react-icons": "^5.4.0", - "@patternfly/react-table": "4.113.0", + "@patternfly/react-table": "5.4.13", "@prometheus-io/codemirror-promql": "^0.37.0", "classnames": "2.x", "fuzzysearch": "1.0.x", @@ -63,14 +63,15 @@ }, "devDependencies": { "@types/node": "^17.0.21", - "@types/react": "^18.0.0", - "@types/react-helmet": "^6.1.4", + "@types/react": "17.0.83", + "@types/react-helmet": "^6.1.11", "@types/react-router-dom": "^5.3.2", "@types/webpack-dev-server": "^4.7.2", "@typescript-eslint/eslint-plugin": "^5.15.0", "@typescript-eslint/parser": "^5.15.0", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.7.1", + "csstype": "^3.1.3", "cypress": "^12.3.0", "eslint": "8.44.0", "eslint-config-prettier": "^8.5.0", @@ -99,6 +100,9 @@ "path-to-regexp": "^1.9.0", "cross-spawn": "^7.0.5" }, + "resolutions": { + "@types/react": "17.0.83" + }, "consolePlugin": { "name": "monitoring-plugin", "version": "1.0.0", diff --git a/web/src/components/Incidents/IncidentsChart/IncidentsChart.jsx b/web/src/components/Incidents/IncidentsChart/IncidentsChart.jsx index 07ec7d41..710bdcb9 100644 --- a/web/src/components/Incidents/IncidentsChart/IncidentsChart.jsx +++ b/web/src/components/Incidents/IncidentsChart/IncidentsChart.jsx @@ -55,11 +55,11 @@ const IncidentsChart = ({ incidentsData, chartDays }) => { function getAdjustedFillColor(datum) { if (isHidden(datum.group_id)) { switch (datum.fill) { - case 'var(--pf-global--warning-color--100)': + case 'var(--pf-v5-global--warning-color--100)': return '#F8DFA7'; // Less transparent for warning - case 'var(--pf-global--info-color--100)': + case 'var(--pf-v5-global--info-color--100)': return '#B2D1F0'; // Less transparent for info - case 'var(--pf-global--danger-color--100)': + case 'var(--pf-v5-global--danger-color--100)': return '#EFBAB6'; // Less transparent for danger } } diff --git a/web/src/components/Incidents/IncidentsPage.jsx b/web/src/components/Incidents/IncidentsPage.jsx index f861a22c..124ee7d7 100644 --- a/web/src/components/Incidents/IncidentsPage.jsx +++ b/web/src/components/Incidents/IncidentsPage.jsx @@ -253,7 +253,7 @@ const IncidentsPage = () => {
@@ -315,7 +315,7 @@ const IncidentsPage = () => { } /> - + - - + + + {columns.map((col, columnIndex) => { + const sortParams = + columnIndex !== 0 + ? { + sort: { + sortBy, + onSort, + columnIndex, + }, + } + : {}; + return ( + + ); + })} + + + + {tableRows.map((row, rowIndex) => ( + + {row.cells?.map((cell, cellIndex) => ( + + ))} + + ))} +
+ {col.title} +
+ {typeof cell === 'string' ? cell : cell?.title} +
@@ -1192,7 +1222,7 @@ const QueryBrowserPage_: React.FC = () => { return (
-
+
@@ -1233,7 +1263,7 @@ const QueryBrowserPage_: React.FC = () => {
- + diff --git a/web/src/components/promql-expression-input.tsx b/web/src/components/promql-expression-input.tsx index 4c07a114..3264a432 100644 --- a/web/src/components/promql-expression-input.tsx +++ b/web/src/components/promql-expression-input.tsx @@ -71,7 +71,7 @@ export const theme = EditorView.theme({ outline: 'none', }, '.cm-tooltip.cm-completionInfo': { - backgroundColor: 'var(--pf-global--BackgroundColor--200)', + backgroundColor: 'var(--pf-v5-global--BackgroundColor--200)', border: 'none', marginTop: '-11px', padding: '10px', @@ -86,7 +86,7 @@ export const theme = EditorView.theme({ borderWidth: '10px', borderStyle: 'solid', borderColor: 'transparent', - borderRightColor: 'var(--pf-global--BackgroundColor--200)', + borderRightColor: 'var(--pf-v5-global--BackgroundColor--200)', }, marginLeft: '12px', }, @@ -100,7 +100,7 @@ export const theme = EditorView.theme({ borderWidth: '10px', borderStyle: 'solid', borderColor: 'transparent', - borderLeftColor: 'var(--pf-global--BackgroundColor--200)', + borderLeftColor: 'var(--pf-v5-global--BackgroundColor--200)', }, marginRight: '12px', }, @@ -110,24 +110,24 @@ export const theme = EditorView.theme({ verticalAlign: 'middle', }, '.cm-selectionMatch': { - backgroundColor: 'var(--pf-global--BackgroundColor--100)', + backgroundColor: 'var(--pf-v5-global--BackgroundColor--100)', }, '.cm-completionDetail': { float: 'right', - color: 'var(--pf-global--palette--black-500)', + color: 'var(--pf-v5-global--palette--black-500)', }, '.cm-tooltip': { - backgroundColor: 'var(--pf-global--BackgroundColor--100)', - borderColor: 'var(--pf-global--BorderColor--100)', + backgroundColor: 'var(--pf-v5-global--BackgroundColor--100)', + borderColor: 'var(--pf-v5-global--BorderColor--100)', }, '.cm-tooltip.cm-tooltip-autocomplete': { - boxShadow: 'var(--pf-global--BoxShadow--sm)', + boxShadow: 'var(--pf-v5-global--BoxShadow--sm)', '& > ul': { - fontFamily: 'var(--pf-c-code-block__pre--FontFamily), monospace', - fontSize: 'var(--pf-global--FontSize--sm)', + fontFamily: 'var(--pf-v5-c-code-block__pre--FontFamily), monospace', + fontSize: 'var(--pf-v5-global--FontSize--sm)', }, '& > ul > li[aria-selected]': { - backgroundColor: 'var(--pf-global--BackgroundColor--200)', + backgroundColor: 'var(--pf-v5-global--BackgroundColor--200)', color: 'unset', }, '& > ul > li': { @@ -137,11 +137,11 @@ export const theme = EditorView.theme({ '.cm-completionMatchedText': { textDecoration: 'none', fontWeight: 'bold', - color: 'var(--pf-global--palette--blue-400)', + color: 'var(--pf-v5-global--palette--blue-400)', }, '.cm-completionIcon-function, .cm-completionIcon-method': { '&:after': { content: "'\\ea8c'" }, - color: 'var(--pf-global--palette--purple-500)', + color: 'var(--pf-v5-global--palette--purple-500)', }, '.cm-completionIcon-class': { '&:after': { content: "'○'" }, @@ -154,7 +154,7 @@ export const theme = EditorView.theme({ }, '.cm-completionIcon-constant': { '&:after': { content: "'\\eb5f'" }, - color: 'var(--pf-global--primary-color--100)', + color: 'var(--pf-v5-global--primary-color--100)', }, '.cm-completionIcon-type': { '&:after': { content: "'𝑡'" }, @@ -167,14 +167,14 @@ export const theme = EditorView.theme({ }, '.cm-completionIcon-keyword': { '&:after': { content: "'\\eb62'" }, - color: 'var(--pf-global--palette--black-600)', + color: 'var(--pf-v5-global--palette--black-600)', }, '.cm-completionIcon-namespace': { '&:after': { content: "'▢'" }, }, '.cm-completionIcon-text': { '&:after': { content: "'\\ea95'" }, - color: 'var(--pf-global--palette--gold-400)', + color: 'var(--pf-v5-global--palette--gold-400)', }, }); @@ -228,17 +228,17 @@ export const selectAutocompleteOnHoverPlugin = ViewPlugin.fromClass( export const promqlHighlighter = HighlightStyle.define([ { tag: tags.name, color: '#000' }, - { tag: tags.number, color: 'var(--pf-global--success-color--100)' }, - { tag: tags.string, color: 'var(--pf-global--danger-color--200)' }, - { tag: tags.keyword, color: 'var(--pf-global--default-color--200)', fontWeight: 'bold' }, + { tag: tags.number, color: 'var(--pf-v5-global--success-color--100)' }, + { tag: tags.string, color: 'var(--pf-v5-global--danger-color--200)' }, + { tag: tags.keyword, color: 'var(--pf-v5-global--custom-color--200)', fontWeight: 'bold' }, { tag: tags.function(tags.variableName), - color: 'var(--pf-global--default-color--200)', + color: 'var(--pf-v5-global--custom-color--200)', fontWeight: 'bold', }, - { tag: tags.labelName, color: 'var(--pf-global--warning-color--200)' }, + { tag: tags.labelName, color: 'var(--pf-v5-global--warning-color--200)' }, { tag: tags.operator }, - { tag: tags.modifier, color: 'var(--pf-global--default-color--200)', fontWeight: 'bold' }, + { tag: tags.modifier, color: 'var(--pf-v5-global--custom-color--200)', fontWeight: 'bold' }, { tag: tags.paren }, { tag: tags.squareBracket }, { tag: tags.brace }, @@ -403,22 +403,22 @@ export const PromQLExpressionInput: React.FC = ({ }; return ( -
+
{errorMessage && (
-
-
- - {errorMessage} +
+
+ + {errorMessage}
diff --git a/web/src/components/query-browser-theme.ts b/web/src/components/query-browser-theme.ts index aad16669..b0e6701c 100644 --- a/web/src/components/query-browser-theme.ts +++ b/web/src/components/query-browser-theme.ts @@ -1,14 +1,14 @@ -import { ChartThemeColor, ChartThemeVariant, getCustomTheme } from '@patternfly/react-charts'; -import { global_palette_black_300 as globalBlack300 } from '@patternfly/react-tokens/dist/js/global_palette_black_300'; +import { ChartThemeColor, ChartThemeDefinition, getCustomTheme } from '@patternfly/react-charts'; +import { global_palette_black_300 as globalBlack300 } from '@patternfly/react-tokens/dist/esm/global_palette_black_300'; -const pfDependentAxisTickLabels = { +const pfDependentAxisTickLabels: Record = { padding: 5, - fontFamily: 'var(--pf-chart-global--FontFamily)', - letterSpacing: 'var(--pf-chart-global--letter-spacing)', - fill: 'var(--pf-global--Color--200)', + fontFamily: 'var(--pf-v5-chart-global--FontFamily)', + letterSpacing: 'var(--pf-v5-chart-global--letter-spacing)', + fill: 'var(--pf-v5-global--Color--200)', }; -const theme = { +const theme: ChartThemeDefinition = { chart: { padding: { bottom: 0, @@ -32,7 +32,7 @@ const theme = { style: { ticks: { size: 5, - strokeWidth: 1, + strokeWidth: '1', stroke: globalBlack300.value, }, tickLabels: Object.assign({}, pfDependentAxisTickLabels, { padding: 2 }), @@ -50,8 +50,4 @@ const theme = { }, }; -export const queryBrowserTheme = getCustomTheme( - ChartThemeColor.multiUnordered, - ChartThemeVariant.light, - theme, -); +export const queryBrowserTheme = getCustomTheme(ChartThemeColor.multiOrdered, theme); diff --git a/web/src/components/query-browser.tsx b/web/src/components/query-browser.tsx index 770be010..6934ee42 100644 --- a/web/src/components/query-browser.tsx +++ b/web/src/components/query-browser.tsx @@ -504,7 +504,7 @@ const Graph: React.FC = React.memo( itemsPerRow={4} orientation="vertical" style={{ - labels: { fontSize: 11, fill: 'var(--pf-global--Color--100)' }, + labels: { fontSize: 11, fill: 'var(--pf-v5-global--Color--100)' }, }} symbolSpacer={4} /> diff --git a/web/src/components/silence-form.tsx b/web/src/components/silence-form.tsx index 2b9adf70..fb56a204 100644 --- a/web/src/components/silence-form.tsx +++ b/web/src/components/silence-form.tsx @@ -428,7 +428,7 @@ const SilenceForm_: React.FC = ({ defaults, history, Info, tit