From e8e5f2c93818d5c52b0b9d5d346f912e38124cd5 Mon Sep 17 00:00:00 2001 From: Tilman Haupt <147151040+TilmanHaupt@users.noreply.github.com> Date: Tue, 30 Jul 2024 13:58:55 +0200 Subject: [PATCH] chore(alerts/ui): Update all dependencies from asset server to public npm (#268) * chore(alerts/ui): change juno to npm * chore(alerts/ui): update packages form assset-server to npm * chore(alerts/ui): increment version --- alerts/ui/jest.config.js | 2 +- alerts/ui/package-lock.json | 149 +++++++++--------- alerts/ui/package.json | 16 +- alerts/ui/src/App.jsx | 4 +- alerts/ui/src/AppContent.jsx | 4 +- alerts/ui/src/components/Avatar.jsx | 2 +- alerts/ui/src/components/CustomAppShell.jsx | 7 +- alerts/ui/src/components/HeaderUser.jsx | 2 +- alerts/ui/src/components/WelcomeView.jsx | 2 +- alerts/ui/src/components/alerts/Alert.jsx | 2 +- .../ui/src/components/alerts/AlertDetail.jsx | 2 +- .../src/components/alerts/AlertSilences.jsx | 2 +- .../ui/src/components/alerts/AlertStatus.jsx | 2 +- .../ui/src/components/alerts/AlertsList.jsx | 2 +- .../components/alerts/shared/AlertIcon.jsx | 2 +- .../components/alerts/shared/AlertLabels.jsx | 2 +- .../components/alerts/shared/AlertLinks.jsx | 2 +- .../alerts/shared/AlertSilencesList.jsx | 2 +- .../alerts/shared/AlertTimestamp.jsx | 2 +- .../ui/src/components/filters/FilterPills.jsx | 2 +- .../src/components/filters/FilterSelect.jsx | 2 +- alerts/ui/src/components/filters/Filters.jsx | 2 +- .../components/filters/PredefinedFilters.jsx | 6 +- alerts/ui/src/components/regions/Region.jsx | 2 +- .../src/components/regions/RegionSeverity.jsx | 2 +- .../src/components/silences/ExpireSilence.jsx | 4 +- .../components/silences/RecreateSilence.jsx | 2 +- .../components/silences/SilenceMatchers.jsx | 2 +- .../ui/src/components/silences/SilenceNew.jsx | 2 +- .../silences/SilenceNewAdvanced.jsx | 2 +- .../components/silences/SilenceScheduled.jsx | 4 +- .../silences/SilenceScheduledWrapper.jsx | 6 +- .../src/components/silences/SilencesItem.jsx | 2 +- .../src/components/silences/SilencesList.jsx | 4 +- alerts/ui/src/components/status/StatusBar.jsx | 2 +- alerts/ui/src/hooks/useCommunication.js | 2 +- alerts/ui/src/hooks/useUrlState.js | 2 +- alerts/ui/tailwind.config.js | 2 +- 38 files changed, 127 insertions(+), 133 deletions(-) diff --git a/alerts/ui/jest.config.js b/alerts/ui/jest.config.js index 44fd5311..23210a11 100644 --- a/alerts/ui/jest.config.js +++ b/alerts/ui/jest.config.js @@ -8,7 +8,7 @@ module.exports = { testEnvironment: "jsdom", setupFilesAfterEnv: ["/setupTests.js"], transformIgnorePatterns: [ - "node_modules/(?!(juno-ui-components|communicator|messages-provider|utils)/)", + "node_modules/(?!(@cloudoperators/juno-ui-components|@cloudoperators/juno-communicator|@cloudoperators/juno-messages-provider|@cloudoperators/juno-utils|@cloudoperators/juno-url-state-provider-v1)/)", ], moduleNameMapper: { // Jest currently doesn't support resources with query parameters. diff --git a/alerts/ui/package-lock.json b/alerts/ui/package-lock.json index e7f429b3..4ee75b92 100644 --- a/alerts/ui/package-lock.json +++ b/alerts/ui/package-lock.json @@ -1,14 +1,19 @@ { "name": "supernova", - "version": "0.9.19", + "version": "0.9.20", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "supernova", - "version": "0.9.19", + "version": "0.9.20", "license": "Apache-2.0", "dependencies": { + "@cloudoperators/juno-communicator": "^2.2.11", + "@cloudoperators/juno-messages-provider": "^0.1.17", + "@cloudoperators/juno-ui-components": "^2.15.4", + "@cloudoperators/juno-url-state-provider-v1": "^1.3.2", + "@cloudoperators/juno-utils": "^1.1.12", "react-error-boundary": "^4.0.13" }, "devDependencies": { @@ -26,16 +31,13 @@ "autoprefixer": "^10.4.2", "babel-jest": "^29.3.1", "babel-plugin-transform-import-meta": "^2.2.0", - "communicator": "https://assets.juno.global.cloud.sap/libs/communicator@2.2.6/package.tgz", "esbuild": "^0.20.1", "esbuild-sass-plugin": "^3.0.0", "immer": "^10.0.0", "interweave": "^13.0.0", "jest": "^29.3.1", "jest-environment-jsdom": "^29.3.1", - "juno-ui-components": "https://assets.juno.global.cloud.sap/libs/juno-ui-components@2.13.8/package.tgz", "luxon": "^3.0.0", - "messages-provider": "https://assets.juno.global.cloud.sap/libs/messages-provider@0.1.12/package.tgz", "postcss": "^8.4.21", "postcss-url": "^10.1.3", "prop-types": "^15.8.1", @@ -45,22 +47,16 @@ "sass": "^1.77.5", "shadow-dom-testing-library": "^1.7.1", "tailwindcss": "^3.3.1", - "url-state-provider": "https://assets.juno.global.cloud.sap/libs/url-state-provider@1.3.2/package.tgz", "util": "^0.12.4", - "utils": "https://assets.juno.global.cloud.sap/libs/utils@1.1.6/package.tgz", "zustand": "4.5.2" }, "peerDependencies": { "@tanstack/react-query": "5.36.2", "custom-event-polyfill": "^1.0.7", - "juno-ui-components": "https://assets.juno.global.cloud.sap/libs/juno-ui-components@2.13.8/package.tgz", "luxon": "^2.3.0", - "messages-provider": "https://assets.juno.global.cloud.sap/libs/messages-provider@0.1.12/package.tgz", "prop-types": "^15.8.1", "react": "18.2.0", "react-dom": "18.2.0", - "url-state-provider": "https://assets.juno.global.cloud.sap/libs/url-state-provider@1.3.2/package.tgz", - "utils": "https://assets.juno.global.cloud.sap/libs/utils@1.1.6/package.tgz", "zustand": "4.5.2" } }, @@ -1905,6 +1901,66 @@ "dev": true, "peer": true }, + "node_modules/@cloudoperators/juno-communicator": { + "version": "2.2.11", + "resolved": "https://registry.npmjs.org/@cloudoperators/juno-communicator/-/juno-communicator-2.2.11.tgz", + "integrity": "sha512-dDoqKw3nZuuNMkdmwYDG/l7Uw7a4rDF3RtteuEW9yUhMypocsGmbcgRhaZjUWpL21OPbFDVNi58r3+KO7IN2Ug==", + "engines": { + "node": ">=20.0.0 <21.0.0", + "npm": ">=10.0.0 <11.0.0" + } + }, + "node_modules/@cloudoperators/juno-messages-provider": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/@cloudoperators/juno-messages-provider/-/juno-messages-provider-0.1.17.tgz", + "integrity": "sha512-ZECrpMVr3jx25YdcyayFUSXMHDRp9hjDLLbUSvQqcJLxtscpE14WEqGffelAMfr0Q6AqOi0DlEoSMVFlh7fYZw==", + "dependencies": { + "@cloudoperators/juno-ui-components": "*" + }, + "engines": { + "node": ">=20.0.0 <21.0.0", + "npm": ">=10.0.0 <11.0.0" + }, + "peerDependencies": { + "react": "^18.2.0", + "react-dom": "^18.2.0", + "zustand": "^4.5.2" + } + }, + "node_modules/@cloudoperators/juno-ui-components": { + "version": "2.15.4", + "resolved": "https://registry.npmjs.org/@cloudoperators/juno-ui-components/-/juno-ui-components-2.15.4.tgz", + "integrity": "sha512-lyziFGjtasxqiiZ86Yfn9EtJFtZ/72So1GmCsMdZCOt3WQnv/TcvQMnXCHe5Zg1fXZ/qNQWIac5rH6YbVS75yg==", + "engines": { + "node": ">=20.0.0 <21.0.0", + "npm": ">=10.0.0 <11.0.0" + }, + "peerDependencies": { + "prop-types": "15.8.1", + "react": "^18.2.0", + "react-dom": "^18.2.0" + } + }, + "node_modules/@cloudoperators/juno-url-state-provider-v1": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@cloudoperators/juno-url-state-provider-v1/-/juno-url-state-provider-v1-1.3.2.tgz", + "integrity": "sha512-DVFzP/5actNs6fkfA93U7jUm9rY0/kPzFWrfGof6SGvhNx+WffQ9BBGQA/p9S7M3brgwxtxgHBnRvTDyA7fMDA==", + "dependencies": { + "juri": "^1.0.3" + } + }, + "node_modules/@cloudoperators/juno-utils": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/@cloudoperators/juno-utils/-/juno-utils-1.1.12.tgz", + "integrity": "sha512-thUgU/Kg7gmjhIZ6yALZSLCTKycBZ5y/LwwgSpinAVNbVebK8AassEcqloTgayTn6J3rAryDdSptfqnrzbuFLA==", + "engines": { + "node": ">=20.0.0 <21.0.0", + "npm": ">=10.0.0 <11.0.0" + }, + "peerDependencies": { + "react": "^18.2.0" + } + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", @@ -3825,13 +3881,13 @@ "version": "15.7.12", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==", - "dev": true + "devOptional": true }, "node_modules/@types/react": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz", "integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==", - "dev": true, + "devOptional": true, "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" @@ -4583,13 +4639,6 @@ "node": ">= 6" } }, - "node_modules/communicator": { - "version": "2.2.6", - "resolved": "https://assets.juno.global.cloud.sap/libs/communicator@2.2.6/package.tgz", - "integrity": "sha512-DGjFFgbAr8gXGJlnfvxEYegqtY+ZflKj+4i3uLqDv6J58gIAavOQenfps+Db1m3vM570+h9ZG8do/SNMPIbnWQ==", - "dev": true, - "license": "Apache-2.0" - }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -4810,7 +4859,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", - "dev": true + "devOptional": true }, "node_modules/cuint": { "version": "0.2.2", @@ -5661,7 +5710,7 @@ "version": "10.1.1", "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz", "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==", - "dev": true, + "devOptional": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/immer" @@ -8030,23 +8079,10 @@ "node": ">=6" } }, - "node_modules/juno-ui-components": { - "version": "2.13.8", - "resolved": "https://assets.juno.global.cloud.sap/libs/juno-ui-components@2.13.8/package.tgz", - "integrity": "sha512-ygnXfEt77rshIkpbgvZORO2TCA2ZY//xmkY9NQtA0iazr6M0RbRnKpXycn1RQ6YVjXFfH0xhRcOImKeomrfIjw==", - "dev": true, - "license": "Apache-2.0", - "peerDependencies": { - "prop-types": "15.8.1", - "react": "18.2.0", - "react-dom": "18.2.0" - } - }, "node_modules/juri": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/juri/-/juri-1.0.3.tgz", - "integrity": "sha512-ARxzFFY6FnmMtTejPKLfcHSVV+AN11xquK4aNaWBA/5adTAiSKxs5lIYhft2vxHH6M1HGXTY17PA462sX0zN7g==", - "dev": true + "integrity": "sha512-ARxzFFY6FnmMtTejPKLfcHSVV+AN11xquK4aNaWBA/5adTAiSKxs5lIYhft2vxHH6M1HGXTY17PA462sX0zN7g==" }, "node_modules/kleur": { "version": "3.0.3", @@ -8224,18 +8260,6 @@ "node": ">= 8" } }, - "node_modules/messages-provider": { - "version": "0.1.12", - "resolved": "https://assets.juno.global.cloud.sap/libs/messages-provider@0.1.12/package.tgz", - "integrity": "sha512-8XVowXV8wxBJ10FBEAO2AGMpdaf6C6UKQCAjJELJnJHYwPDBYOnMa4nOwHCwzurH6rh0QTmbAeFz4HpD8Yglrw==", - "dev": true, - "license": "Apache-2.0", - "peerDependencies": { - "juno-ui-components": "*", - "react": "18.2.0", - "zustand": "4.5.2" - } - }, "node_modules/micromatch": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", @@ -8424,7 +8448,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -8959,7 +8982,6 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "dev": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -8969,8 +8991,7 @@ "node_modules/prop-types/node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/psl": { "version": "1.9.0", @@ -9044,7 +9065,6 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", - "dev": true, "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -9748,7 +9768,6 @@ "version": "0.23.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "dev": true, "dependencies": { "loose-envify": "^1.1.0" } @@ -10378,16 +10397,6 @@ "requires-port": "^1.0.0" } }, - "node_modules/url-state-provider": { - "version": "1.3.2", - "resolved": "https://assets.juno.global.cloud.sap/libs/url-state-provider@1.3.2/package.tgz", - "integrity": "sha512-+6ID9hl4YIFiRd4EWy7oZlvFmevBNsIXa8KTZ0+HCj/f48s4NNZKXWooSakXeCmeFCzkcnP/Wv4jYD3RyWFAjg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "juri": "^1.0.3" - } - }, "node_modules/util": { "version": "0.12.5", "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", @@ -10407,16 +10416,6 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, - "node_modules/utils": { - "version": "1.1.6", - "resolved": "https://assets.juno.global.cloud.sap/libs/utils@1.1.6/package.tgz", - "integrity": "sha512-EJY8lT7jRzwlOmHA4YLKdSA8caLVoR4m8giN0+A6wQ2tUFYkBKRbF+pC6On5557tZyi4M2/IHanY0gpwydH3MA==", - "dev": true, - "license": "Apache-2.0", - "peerDependencies": { - "react": "^18.2.0" - } - }, "node_modules/v8-to-istanbul": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", @@ -10771,7 +10770,6 @@ "version": "4.5.2", "resolved": "https://registry.npmjs.org/zustand/-/zustand-4.5.2.tgz", "integrity": "sha512-2cN1tPkDVkwCy5ickKrI7vijSjPksFRfqS6237NzT0vqSsztTNnQdHw9mmN7uBdk3gceVXU0a+21jFzFzAc9+g==", - "dev": true, "dependencies": { "use-sync-external-store": "1.2.0" }, @@ -10799,7 +10797,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz", "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==", - "dev": true, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } diff --git a/alerts/ui/package.json b/alerts/ui/package.json index a3ac50c8..e9996bb4 100644 --- a/alerts/ui/package.json +++ b/alerts/ui/package.json @@ -1,6 +1,6 @@ { "name": "supernova", - "version": "0.9.19", + "version": "0.9.20", "author": "UI-Team", "contributors": [ "Esther Schmitz", @@ -27,16 +27,13 @@ "autoprefixer": "^10.4.2", "babel-jest": "^29.3.1", "babel-plugin-transform-import-meta": "^2.2.0", - "communicator": "https://assets.juno.global.cloud.sap/libs/communicator@2.2.6/package.tgz", "esbuild": "^0.20.1", "esbuild-sass-plugin": "^3.0.0", "immer": "^10.0.0", "interweave": "^13.0.0", "jest": "^29.3.1", "jest-environment-jsdom": "^29.3.1", - "juno-ui-components": "https://assets.juno.global.cloud.sap/libs/juno-ui-components@2.13.8/package.tgz", "luxon": "^3.0.0", - "messages-provider": "https://assets.juno.global.cloud.sap/libs/messages-provider@0.1.12/package.tgz", "postcss": "^8.4.21", "postcss-url": "^10.1.3", "prop-types": "^15.8.1", @@ -46,22 +43,16 @@ "sass": "^1.77.5", "shadow-dom-testing-library": "^1.7.1", "tailwindcss": "^3.3.1", - "url-state-provider": "https://assets.juno.global.cloud.sap/libs/url-state-provider@1.3.2/package.tgz", "util": "^0.12.4", - "utils": "https://assets.juno.global.cloud.sap/libs/utils@1.1.6/package.tgz", "zustand": "4.5.2" }, "peerDependencies": { "@tanstack/react-query": "5.36.2", "custom-event-polyfill": "^1.0.7", - "juno-ui-components": "https://assets.juno.global.cloud.sap/libs/juno-ui-components@2.13.8/package.tgz", "luxon": "^2.3.0", - "messages-provider": "https://assets.juno.global.cloud.sap/libs/messages-provider@0.1.12/package.tgz", "prop-types": "^15.8.1", "react": "18.2.0", "react-dom": "18.2.0", - "url-state-provider": "https://assets.juno.global.cloud.sap/libs/url-state-provider@1.3.2/package.tgz", - "utils": "https://assets.juno.global.cloud.sap/libs/utils@1.1.6/package.tgz", "zustand": "4.5.2" }, "importmapExtras": { @@ -109,6 +100,11 @@ }, "appPreview": true, "dependencies": { + "@cloudoperators/juno-communicator": "^2.2.11", + "@cloudoperators/juno-messages-provider": "^0.1.17", + "@cloudoperators/juno-ui-components": "^2.15.4", + "@cloudoperators/juno-url-state-provider-v1": "^1.3.2", + "@cloudoperators/juno-utils": "^1.1.12", "react-error-boundary": "^4.0.13" } } diff --git a/alerts/ui/src/App.jsx b/alerts/ui/src/App.jsx index b805c064..2794b2e0 100644 --- a/alerts/ui/src/App.jsx +++ b/alerts/ui/src/App.jsx @@ -5,7 +5,7 @@ import React, { useLayoutEffect } from "react" -import { AppShellProvider, CodeBlock } from "juno-ui-components" +import { AppShellProvider, CodeBlock } from "@cloudoperators/juno-ui-components" import AppContent from "./AppContent" import styles from "./styles.scss" import { @@ -16,7 +16,7 @@ import { StoreProvider, } from "./hooks/useAppStore" import AsyncWorker from "./components/AsyncWorker" -import { MessagesProvider } from "messages-provider" +import { MessagesProvider } from "@cloudoperators/juno-messages-provider" import CustomAppShell from "./components/CustomAppShell" import { ErrorBoundary } from "react-error-boundary" diff --git a/alerts/ui/src/AppContent.jsx b/alerts/ui/src/AppContent.jsx index 55bf89ba..ea075ab7 100644 --- a/alerts/ui/src/AppContent.jsx +++ b/alerts/ui/src/AppContent.jsx @@ -4,8 +4,8 @@ */ import React, { useEffect } from "react" -import { useActions, Messages } from "messages-provider" -import { Container, Spinner, Stack } from "juno-ui-components" +import { useActions, Messages } from "@cloudoperators/juno-messages-provider" +import { Container, Spinner, Stack } from "@cloudoperators/juno-ui-components" import { useAlertsError, useAlertsIsLoading, diff --git a/alerts/ui/src/components/Avatar.jsx b/alerts/ui/src/components/Avatar.jsx index c3d5834a..45ce8115 100644 --- a/alerts/ui/src/components/Avatar.jsx +++ b/alerts/ui/src/components/Avatar.jsx @@ -4,7 +4,7 @@ */ import React from "react" -import { Stack } from "juno-ui-components" +import { Stack } from "@cloudoperators/juno-ui-components" const avatarCss = ` h-8 diff --git a/alerts/ui/src/components/CustomAppShell.jsx b/alerts/ui/src/components/CustomAppShell.jsx index 06bc6e66..d588a622 100644 --- a/alerts/ui/src/components/CustomAppShell.jsx +++ b/alerts/ui/src/components/CustomAppShell.jsx @@ -9,7 +9,7 @@ import { PageHeader, TopNavigation, TopNavigationItem, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import { useAuthData, useAuthLoggedIn, @@ -61,10 +61,7 @@ const CustomAppShell = ({ children }) => { ) return ( - + {topNavigation} {children} diff --git a/alerts/ui/src/components/HeaderUser.jsx b/alerts/ui/src/components/HeaderUser.jsx index d1e71c84..0d0cd38e 100644 --- a/alerts/ui/src/components/HeaderUser.jsx +++ b/alerts/ui/src/components/HeaderUser.jsx @@ -4,7 +4,7 @@ */ import React from "react" -import { Stack, Button } from "juno-ui-components" +import { Stack, Button } from "@cloudoperators/juno-ui-components" import Avatar from "./Avatar" const HeaderUser = ({ auth, logout }) => { diff --git a/alerts/ui/src/components/WelcomeView.jsx b/alerts/ui/src/components/WelcomeView.jsx index 5e6912e8..91709b18 100644 --- a/alerts/ui/src/components/WelcomeView.jsx +++ b/alerts/ui/src/components/WelcomeView.jsx @@ -4,7 +4,7 @@ */ import React from "react" -import { Stack, Button, Spinner } from "juno-ui-components" +import { Stack, Button, Spinner } from "@cloudoperators/juno-ui-components" import { useAuthIsProcessing, useAuthActions } from "../hooks/useAppStore" const WelcomeView = () => { diff --git a/alerts/ui/src/components/alerts/Alert.jsx b/alerts/ui/src/components/alerts/Alert.jsx index f29a8c08..f343b02b 100644 --- a/alerts/ui/src/components/alerts/Alert.jsx +++ b/alerts/ui/src/components/alerts/Alert.jsx @@ -5,7 +5,7 @@ import React, { forwardRef, useRef } from "react" -import { DataGridCell, DataGridRow } from "juno-ui-components" +import { DataGridCell, DataGridRow } from "@cloudoperators/juno-ui-components" import { useGlobalsActions, useShowDetailsFor } from "../../hooks/useAppStore" import AlertLabels from "./shared/AlertLabels" diff --git a/alerts/ui/src/components/alerts/AlertDetail.jsx b/alerts/ui/src/components/alerts/AlertDetail.jsx index a992c402..c2afe146 100644 --- a/alerts/ui/src/components/alerts/AlertDetail.jsx +++ b/alerts/ui/src/components/alerts/AlertDetail.jsx @@ -21,7 +21,7 @@ import { TabList, Tab, TabPanel, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import { useShowDetailsFor, useGlobalsActions, diff --git a/alerts/ui/src/components/alerts/AlertSilences.jsx b/alerts/ui/src/components/alerts/AlertSilences.jsx index 5cc24128..3d0dc4e9 100644 --- a/alerts/ui/src/components/alerts/AlertSilences.jsx +++ b/alerts/ui/src/components/alerts/AlertSilences.jsx @@ -13,7 +13,7 @@ import { DataGridCell, DataGridHeadCell, DataGridRow, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import { useAlertsActions, useGlobalsActions } from "../../hooks/useAppStore" import AlertDescription from "./shared/AlertDescription" diff --git a/alerts/ui/src/components/alerts/AlertStatus.jsx b/alerts/ui/src/components/alerts/AlertStatus.jsx index cffff111..332999b5 100644 --- a/alerts/ui/src/components/alerts/AlertStatus.jsx +++ b/alerts/ui/src/components/alerts/AlertStatus.jsx @@ -4,7 +4,7 @@ */ import React, { useMemo } from "react" -import { Stack } from "juno-ui-components" +import { Stack } from "@cloudoperators/juno-ui-components" import { useSilencesItemsHash, useSilencesLocalItems, diff --git a/alerts/ui/src/components/alerts/AlertsList.jsx b/alerts/ui/src/components/alerts/AlertsList.jsx index 3d702028..90732da3 100644 --- a/alerts/ui/src/components/alerts/AlertsList.jsx +++ b/alerts/ui/src/components/alerts/AlertsList.jsx @@ -11,7 +11,7 @@ import { DataGridCell, Icon, Stack, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import Alert from "./Alert" import { useAlertsItemsFiltered, diff --git a/alerts/ui/src/components/alerts/shared/AlertIcon.jsx b/alerts/ui/src/components/alerts/shared/AlertIcon.jsx index d2a56f07..fcfc271f 100644 --- a/alerts/ui/src/components/alerts/shared/AlertIcon.jsx +++ b/alerts/ui/src/components/alerts/shared/AlertIcon.jsx @@ -5,7 +5,7 @@ import React, { forwardRef } from "react" -import { Icon } from "juno-ui-components" +import { Icon } from "@cloudoperators/juno-ui-components" const AlertIcon = ({ severity }, ref) => { const iconColor = () => { diff --git a/alerts/ui/src/components/alerts/shared/AlertLabels.jsx b/alerts/ui/src/components/alerts/shared/AlertLabels.jsx index 0d7b1022..8df97248 100644 --- a/alerts/ui/src/components/alerts/shared/AlertLabels.jsx +++ b/alerts/ui/src/components/alerts/shared/AlertLabels.jsx @@ -5,7 +5,7 @@ import React from "react" -import { Pill, Stack } from "juno-ui-components" +import { Pill, Stack } from "@cloudoperators/juno-ui-components" import { useActiveFilters, diff --git a/alerts/ui/src/components/alerts/shared/AlertLinks.jsx b/alerts/ui/src/components/alerts/shared/AlertLinks.jsx index e9426192..a162726e 100644 --- a/alerts/ui/src/components/alerts/shared/AlertLinks.jsx +++ b/alerts/ui/src/components/alerts/shared/AlertLinks.jsx @@ -5,7 +5,7 @@ import React from "react" -import { Stack } from "juno-ui-components" +import { Stack } from "@cloudoperators/juno-ui-components" const AlertLinks = ({ alert, className }) => { return ( diff --git a/alerts/ui/src/components/alerts/shared/AlertSilencesList.jsx b/alerts/ui/src/components/alerts/shared/AlertSilencesList.jsx index 9e05ea11..86092902 100644 --- a/alerts/ui/src/components/alerts/shared/AlertSilencesList.jsx +++ b/alerts/ui/src/components/alerts/shared/AlertSilencesList.jsx @@ -13,7 +13,7 @@ import { DataGridCell, DataGridHeadCell, DataGridRow, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import { useSilencesActions } from "../../../hooks/useAppStore" diff --git a/alerts/ui/src/components/alerts/shared/AlertTimestamp.jsx b/alerts/ui/src/components/alerts/shared/AlertTimestamp.jsx index 5d5dbc35..194d3dd2 100644 --- a/alerts/ui/src/components/alerts/shared/AlertTimestamp.jsx +++ b/alerts/ui/src/components/alerts/shared/AlertTimestamp.jsx @@ -12,7 +12,7 @@ import { Tooltip, TooltipContent, TooltipTrigger, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" const AlertTimestamp = ({ startTimestamp }) => { const dateFormat = { ...DateTime.DATE_MED } diff --git a/alerts/ui/src/components/filters/FilterPills.jsx b/alerts/ui/src/components/filters/FilterPills.jsx index f698e87b..104ca637 100644 --- a/alerts/ui/src/components/filters/FilterPills.jsx +++ b/alerts/ui/src/components/filters/FilterPills.jsx @@ -5,7 +5,7 @@ import React from "react" -import { Pill, Stack } from "juno-ui-components" +import { Pill, Stack } from "@cloudoperators/juno-ui-components" import { useActiveFilters, useFilterActions } from "../../hooks/useAppStore" const FilterPills = () => { diff --git a/alerts/ui/src/components/filters/FilterSelect.jsx b/alerts/ui/src/components/filters/FilterSelect.jsx index f62375ae..bfa5b822 100644 --- a/alerts/ui/src/components/filters/FilterSelect.jsx +++ b/alerts/ui/src/components/filters/FilterSelect.jsx @@ -12,7 +12,7 @@ import { Select, Stack, SearchInput, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import { useFilterLabels, useFilterLabelValues, diff --git a/alerts/ui/src/components/filters/Filters.jsx b/alerts/ui/src/components/filters/Filters.jsx index 6a453550..770b22f3 100644 --- a/alerts/ui/src/components/filters/Filters.jsx +++ b/alerts/ui/src/components/filters/Filters.jsx @@ -4,7 +4,7 @@ */ import React from "react" -import { Stack } from "juno-ui-components" +import { Stack } from "@cloudoperators/juno-ui-components" import FilterSelect from "./FilterSelect" import FilterPills from "./FilterPills" diff --git a/alerts/ui/src/components/filters/PredefinedFilters.jsx b/alerts/ui/src/components/filters/PredefinedFilters.jsx index 40f2dbf9..b289d56f 100644 --- a/alerts/ui/src/components/filters/PredefinedFilters.jsx +++ b/alerts/ui/src/components/filters/PredefinedFilters.jsx @@ -5,7 +5,11 @@ import React, { useState } from "react" -import { Stack, TabNavigation, TabNavigationItem } from "juno-ui-components" +import { + Stack, + TabNavigation, + TabNavigationItem, +} from "@cloudoperators/juno-ui-components" import { useActivePredefinedFilter, useFilterActions, diff --git a/alerts/ui/src/components/regions/Region.jsx b/alerts/ui/src/components/regions/Region.jsx index 32db2db7..95adaeff 100644 --- a/alerts/ui/src/components/regions/Region.jsx +++ b/alerts/ui/src/components/regions/Region.jsx @@ -5,7 +5,7 @@ import React from "react" -import { Stack } from "juno-ui-components" +import { Stack } from "@cloudoperators/juno-ui-components" import RegionSeverity from "./RegionSeverity" import { useFilterActions, useActiveFilters } from "../../hooks/useAppStore" diff --git a/alerts/ui/src/components/regions/RegionSeverity.jsx b/alerts/ui/src/components/regions/RegionSeverity.jsx index 0dbb1b74..af56ce8b 100644 --- a/alerts/ui/src/components/regions/RegionSeverity.jsx +++ b/alerts/ui/src/components/regions/RegionSeverity.jsx @@ -5,7 +5,7 @@ import React from "react" -import { Icon, Stack } from "juno-ui-components" +import { Icon, Stack } from "@cloudoperators/juno-ui-components" const severityStyles = (severity, count) => { let baseStyles = ` diff --git a/alerts/ui/src/components/silences/ExpireSilence.jsx b/alerts/ui/src/components/silences/ExpireSilence.jsx index 1b46f9d0..4086f2d8 100644 --- a/alerts/ui/src/components/silences/ExpireSilence.jsx +++ b/alerts/ui/src/components/silences/ExpireSilence.jsx @@ -4,13 +4,13 @@ */ import React, { useState } from "react" -import { Button, Modal } from "juno-ui-components" +import { Button, Modal } from "@cloudoperators/juno-ui-components" import { useGlobalsApiEndpoint, useSilencesActions, useSilencesLocalItems, } from "../../hooks/useAppStore" -import { useActions } from "messages-provider" +import { useActions } from "@cloudoperators/juno-messages-provider" import { parseError } from "../../helpers" import { del } from "../../api/client" diff --git a/alerts/ui/src/components/silences/RecreateSilence.jsx b/alerts/ui/src/components/silences/RecreateSilence.jsx index 576ca428..a8799e9c 100644 --- a/alerts/ui/src/components/silences/RecreateSilence.jsx +++ b/alerts/ui/src/components/silences/RecreateSilence.jsx @@ -16,7 +16,7 @@ import { FormRow, Pill, Stack, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import { useAuthData, useGlobalsApiEndpoint, diff --git a/alerts/ui/src/components/silences/SilenceMatchers.jsx b/alerts/ui/src/components/silences/SilenceMatchers.jsx index e8530693..5c210f46 100644 --- a/alerts/ui/src/components/silences/SilenceMatchers.jsx +++ b/alerts/ui/src/components/silences/SilenceMatchers.jsx @@ -5,7 +5,7 @@ import React, { useMemo } from "react" -import { Pill, Stack } from "juno-ui-components" +import { Pill, Stack } from "@cloudoperators/juno-ui-components" // Matchers can be clicked if the matcher is configurable const SilenceMatchers = ({ matchers, onClickCallback, closeable }) => { diff --git a/alerts/ui/src/components/silences/SilenceNew.jsx b/alerts/ui/src/components/silences/SilenceNew.jsx index 8179cefc..bea699ae 100644 --- a/alerts/ui/src/components/silences/SilenceNew.jsx +++ b/alerts/ui/src/components/silences/SilenceNew.jsx @@ -15,7 +15,7 @@ import { SelectOption, Message, FormRow, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import { useAuthData, useSilencesExcludedLabels, diff --git a/alerts/ui/src/components/silences/SilenceNewAdvanced.jsx b/alerts/ui/src/components/silences/SilenceNewAdvanced.jsx index a775a65a..e1570987 100644 --- a/alerts/ui/src/components/silences/SilenceNewAdvanced.jsx +++ b/alerts/ui/src/components/silences/SilenceNewAdvanced.jsx @@ -4,7 +4,7 @@ */ import React, { useState } from "react" -import { Stack, Icon } from "juno-ui-components" +import { Stack, Icon } from "@cloudoperators/juno-ui-components" import SilenceMatchers from "./SilenceMatchers" const detailsCss = (show) => { diff --git a/alerts/ui/src/components/silences/SilenceScheduled.jsx b/alerts/ui/src/components/silences/SilenceScheduled.jsx index d24034ee..46a42d09 100644 --- a/alerts/ui/src/components/silences/SilenceScheduled.jsx +++ b/alerts/ui/src/components/silences/SilenceScheduled.jsx @@ -6,7 +6,7 @@ import React, { useEffect, useState, useMemo } from "react" import { produce } from "immer" import constants from "../../constants" -import { Messages, useActions } from "messages-provider" +import { Messages, useActions } from "@cloudoperators/juno-messages-provider" import { Modal, Box, @@ -21,7 +21,7 @@ import { Pill, FormSection, DateTimePicker, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import { useAuthData, useSilenceTemplates, diff --git a/alerts/ui/src/components/silences/SilenceScheduledWrapper.jsx b/alerts/ui/src/components/silences/SilenceScheduledWrapper.jsx index abe31518..c9a89b9e 100644 --- a/alerts/ui/src/components/silences/SilenceScheduledWrapper.jsx +++ b/alerts/ui/src/components/silences/SilenceScheduledWrapper.jsx @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -import React, { useState, useEffect } from "react" +import React, { useState } from "react" import SilenceScheduled from "./SilenceScheduled" -import { MessagesProvider } from "messages-provider" -import { Button, Icon } from "juno-ui-components" +import { MessagesProvider } from "@cloudoperators/juno-messages-provider" +import { Button } from "@cloudoperators/juno-ui-components" import { useSilenceTemplates } from "../../hooks/useAppStore.js" const SilenceScheduledWrapper = () => { diff --git a/alerts/ui/src/components/silences/SilencesItem.jsx b/alerts/ui/src/components/silences/SilencesItem.jsx index 7fcd17e5..19dff43b 100644 --- a/alerts/ui/src/components/silences/SilencesItem.jsx +++ b/alerts/ui/src/components/silences/SilencesItem.jsx @@ -10,7 +10,7 @@ import { Pill, Stack, Container, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import SilencesTimestamp from "./shared/SilencesTimestamp" import constants from "../../constants" diff --git a/alerts/ui/src/components/silences/SilencesList.jsx b/alerts/ui/src/components/silences/SilencesList.jsx index 5c66c445..fd8b33d9 100644 --- a/alerts/ui/src/components/silences/SilencesList.jsx +++ b/alerts/ui/src/components/silences/SilencesList.jsx @@ -15,9 +15,9 @@ import { SelectOption, Spinner, Icon, -} from "juno-ui-components" +} from "@cloudoperators/juno-ui-components" import constants from "../../constants" -import { useEndlessScrollList } from "utils" +import { useEndlessScrollList } from "@cloudoperators/juno-utils" import { useSilencesItems, useSilencesActions, diff --git a/alerts/ui/src/components/status/StatusBar.jsx b/alerts/ui/src/components/status/StatusBar.jsx index ec7e6e32..3ee9508d 100644 --- a/alerts/ui/src/components/status/StatusBar.jsx +++ b/alerts/ui/src/components/status/StatusBar.jsx @@ -6,7 +6,7 @@ import React from "react" import { DateTime } from "luxon" -import { Spinner, Stack } from "juno-ui-components" +import { Spinner, Stack } from "@cloudoperators/juno-ui-components" const statusBarStyles = ` bg-theme-background-lvl-1 diff --git a/alerts/ui/src/hooks/useCommunication.js b/alerts/ui/src/hooks/useCommunication.js index 78691b7f..77883da4 100644 --- a/alerts/ui/src/hooks/useCommunication.js +++ b/alerts/ui/src/hooks/useCommunication.js @@ -4,7 +4,7 @@ */ import { useEffect } from "react" -import { broadcast, get, watch } from "communicator" +import { broadcast, get, watch } from "@cloudoperators/juno-communicator" import { useUserActivityActions, useAuthAppLoaded, diff --git a/alerts/ui/src/hooks/useUrlState.js b/alerts/ui/src/hooks/useUrlState.js index 139df010..718a0de6 100644 --- a/alerts/ui/src/hooks/useUrlState.js +++ b/alerts/ui/src/hooks/useUrlState.js @@ -4,7 +4,7 @@ */ import { useLayoutEffect, useEffect, useState } from "react" -import { registerConsumer } from "url-state-provider" +import { registerConsumer } from "@cloudoperators/juno-url-state-provider-v1" import { useAuthLoggedIn, useAuthData, diff --git a/alerts/ui/tailwind.config.js b/alerts/ui/tailwind.config.js index 2eb6e49f..3bfe20a6 100644 --- a/alerts/ui/tailwind.config.js +++ b/alerts/ui/tailwind.config.js @@ -18,7 +18,7 @@ function withOpacity(variableName) { module.exports = { presets: [ - require("juno-ui-components/build/lib/tailwind.config"), // important, do not change + require("@cloudoperators/juno-ui-components/build/lib/tailwind.config"), // important, do not change ], prefix: "", // important, do not change content: ["./src/**/*.{js,jsx,ts,tsx}", "./public/index.html"],