From 03c32e22eaa5e9ebc7872267fc157ef210f2509f Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 24 Jan 2024 18:12:34 +0000 Subject: [PATCH 01/11] fix: upgrade vitest from 1.1.0 to 1.1.1 Snyk has created this PR to upgrade vitest from 1.1.0 to 1.1.1. See this package in npm: https://www.npmjs.com/package/vitest See this project in Snyk: https://app.snyk.io/org/radix-team/project/9b8fdaaf-c458-4968-afc1-34794da22873?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 68 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdd582887..8d79229f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,7 +60,7 @@ "ts-node": "^10.9.2", "typescript": "^5.3.3", "vite-plugin-eslint": "^1.8.1", - "vitest": "^1.1.0" + "vitest": "^1.1.1" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -2731,13 +2731,13 @@ } }, "node_modules/@vitest/expect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.1.0.tgz", - "integrity": "sha512-9IE2WWkcJo2BR9eqtY5MIo3TPmS50Pnwpm66A6neb2hvk/QSLfPXBz2qdiwUOQkwyFuuXEUj5380CbwfzW4+/w==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.1.1.tgz", + "integrity": "sha512-Qpw01C2Hyb3085jBkOJLQ7HRX0Ncnh2qV4p+xWmmhcIUlMykUF69zsnZ1vPmAjZpomw9+5tWEGOQ0GTfR8U+kA==", "dev": true, "dependencies": { - "@vitest/spy": "1.1.0", - "@vitest/utils": "1.1.0", + "@vitest/spy": "1.1.1", + "@vitest/utils": "1.1.1", "chai": "^4.3.10" }, "funding": { @@ -2745,12 +2745,12 @@ } }, "node_modules/@vitest/runner": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.1.0.tgz", - "integrity": "sha512-zdNLJ00pm5z/uhbWF6aeIJCGMSyTyWImy3Fcp9piRGvueERFlQFbUwCpzVce79OLm2UHk9iwaMSOaU9jVHgNVw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.1.1.tgz", + "integrity": "sha512-8HokyJo1SnSi3uPFKfWm/Oq1qDwLC4QDcVsqpXIXwsRPAg3gIDh8EbZ1ri8cmQkBxdOu62aOF9B4xcqJhvt4xQ==", "dev": true, "dependencies": { - "@vitest/utils": "1.1.0", + "@vitest/utils": "1.1.1", "p-limit": "^5.0.0", "pathe": "^1.1.1" }, @@ -2786,9 +2786,9 @@ } }, "node_modules/@vitest/snapshot": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.1.0.tgz", - "integrity": "sha512-5O/wyZg09V5qmNmAlUgCBqflvn2ylgsWJRRuPrnHEfDNT6tQpQ8O1isNGgo+VxofISHqz961SG3iVvt3SPK/QQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.1.1.tgz", + "integrity": "sha512-WnMHjv4VdHLbFGgCdVVvyRkRPnOKN75JJg+LLTdr6ah7YnL75W+7CTIMdzPEPzaDxA8r5yvSVlc1d8lH3yE28w==", "dev": true, "dependencies": { "magic-string": "^0.30.5", @@ -2826,9 +2826,9 @@ } }, "node_modules/@vitest/spy": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.1.0.tgz", - "integrity": "sha512-sNOVSU/GE+7+P76qYo+VXdXhXffzWZcYIPQfmkiRxaNCSPiLANvQx5Mx6ZURJ/ndtEkUJEpvKLXqAYTKEY+lTg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.1.1.tgz", + "integrity": "sha512-hDU2KkOTfFp4WFFPWwHFauddwcKuGQ7gF6Un/ZZkCogoAiTMN7/7YKvUDbywPZZ754iCQGjdUmXN3t4k0jm1IQ==", "dev": true, "dependencies": { "tinyspy": "^2.2.0" @@ -2838,9 +2838,9 @@ } }, "node_modules/@vitest/utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.1.0.tgz", - "integrity": "sha512-z+s510fKmYz4Y41XhNs3vcuFTFhcij2YF7F8VQfMEYAAUfqQh0Zfg7+w9xdgFGhPf3tX3TicAe+8BDITk6ampQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.1.1.tgz", + "integrity": "sha512-E9LedH093vST/JuBSyHLFMpxJKW3dLhe/flUSPFedoyj4wKiFX7Jm8gYLtOIiin59dgrssfmFv0BJ1u8P/LC/A==", "dev": true, "dependencies": { "diff-sequences": "^29.6.3", @@ -3499,9 +3499,9 @@ } }, "node_modules/chai": { - "version": "4.3.10", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", - "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz", + "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==", "dev": true, "dependencies": { "assertion-error": "^1.1.0", @@ -10186,9 +10186,9 @@ } }, "node_modules/vite-node": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.1.0.tgz", - "integrity": "sha512-jV48DDUxGLEBdHCQvxL1mEh7+naVy+nhUUUaPAZLd3FJgXuxQiewHcfeZebbJ6onDqNGkP4r3MhQ342PRlG81Q==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.1.1.tgz", + "integrity": "sha512-2bGE5w4jvym5v8llF6Gu1oBrmImoNSs4WmRVcavnG2me6+8UQntTqLiAMFyiAobp+ZXhj5ZFhI7SmLiFr/jrow==", "dev": true, "dependencies": { "cac": "^6.7.14", @@ -10238,16 +10238,16 @@ } }, "node_modules/vitest": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.1.0.tgz", - "integrity": "sha512-oDFiCrw7dd3Jf06HoMtSRARivvyjHJaTxikFxuqJjO76U436PqlVw1uLn7a8OSPrhSfMGVaRakKpA2lePdw79A==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.1.1.tgz", + "integrity": "sha512-Ry2qs4UOu/KjpXVfOCfQkTnwSXYGrqTbBZxw6reIYEFjSy1QUARRg5pxiI5BEXy+kBVntxUYNMlq4Co+2vD3fQ==", "dev": true, "dependencies": { - "@vitest/expect": "1.1.0", - "@vitest/runner": "1.1.0", - "@vitest/snapshot": "1.1.0", - "@vitest/spy": "1.1.0", - "@vitest/utils": "1.1.0", + "@vitest/expect": "1.1.1", + "@vitest/runner": "1.1.1", + "@vitest/snapshot": "1.1.1", + "@vitest/spy": "1.1.1", + "@vitest/utils": "1.1.1", "acorn-walk": "^8.3.0", "cac": "^6.7.14", "chai": "^4.3.10", @@ -10262,7 +10262,7 @@ "tinybench": "^2.5.1", "tinypool": "^0.8.1", "vite": "^5.0.0", - "vite-node": "1.1.0", + "vite-node": "1.1.1", "why-is-node-running": "^2.2.2" }, "bin": { diff --git a/package.json b/package.json index da0cffed9..f87de7c64 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "ts-node": "^10.9.2", "typescript": "^5.3.3", "vite-plugin-eslint": "^1.8.1", - "vitest": "^1.1.0" + "vitest": "^1.1.1" }, "jest": { "transformIgnorePatterns": [ From e01f972540a2fb04ce4b4b0beaa90a24a75f9683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Gustav=20Str=C3=A5b=C3=B8?= Date: Mon, 19 Feb 2024 09:40:00 +0100 Subject: [PATCH 02/11] upgrade oauth2-proxy to 7.6.0 --- docker-compose-host-macos.yml | 3 ++- docker-compose-host.yml | 3 ++- docker-compose.yml | 3 ++- radixconfig.yaml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker-compose-host-macos.yml b/docker-compose-host-macos.yml index 6ad445784..32fa8109c 100644 --- a/docker-compose-host-macos.yml +++ b/docker-compose-host-macos.yml @@ -55,7 +55,7 @@ services: - "8080:8080" auth: - image: quay.io/oauth2-proxy/oauth2-proxy:v7.2.1 + image: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0 container_name: radix-auth_container environment: # See the `radixconfig.yaml` file for a description of these settings @@ -67,6 +67,7 @@ services: - OAUTH2_PROXY_EMAIL_DOMAINS=* - OAUTH2_PROXY_HTTP_ADDRESS=http://:8000 - OAUTH2_PROXY_OIDC_ISSUER_URL=https://login.microsoftonline.com/3aa4a235-b6e2-48d5-9195-7fcf05b459b0/v2.0 + - OAUTH2_PROXY_SKIP_CLAIMS_FROM_PROFILE_URL=true - OAUTH2_PROXY_PASS_ACCESS_TOKEN=true - OAUTH2_PROXY_PASS_BASIC_AUTH=false - OAUTH2_PROXY_PASS_USER_HEADERS=false diff --git a/docker-compose-host.yml b/docker-compose-host.yml index c0507636c..3ef1e4396 100644 --- a/docker-compose-host.yml +++ b/docker-compose-host.yml @@ -37,7 +37,7 @@ services: - "8080:8080" auth: - image: quay.io/oauth2-proxy/oauth2-proxy:v7.2.1 + image: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0 container_name: radix-auth_container environment: # See the `radixconfig.yaml` file for a description of these settings @@ -49,6 +49,7 @@ services: - OAUTH2_PROXY_EMAIL_DOMAINS=* - OAUTH2_PROXY_HTTP_ADDRESS=http://:8000 - OAUTH2_PROXY_OIDC_ISSUER_URL=https://login.microsoftonline.com/3aa4a235-b6e2-48d5-9195-7fcf05b459b0/v2.0 + - OAUTH2_PROXY_SKIP_CLAIMS_FROM_PROFILE_URL=true - OAUTH2_PROXY_PASS_ACCESS_TOKEN=true - OAUTH2_PROXY_PASS_BASIC_AUTH=false - OAUTH2_PROXY_PASS_USER_HEADERS=false diff --git a/docker-compose.yml b/docker-compose.yml index a0b97bf3c..3499e26a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,7 @@ services: - "8080:8080" auth: - image: quay.io/oauth2-proxy/oauth2-proxy:v7.2.1 + image: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0 container_name: radix-auth_container environment: # See the `radixconfig.yaml` file for a description of these settings @@ -53,6 +53,7 @@ services: - OAUTH2_PROXY_EMAIL_DOMAINS=* - OAUTH2_PROXY_HTTP_ADDRESS=http://:8000 - OAUTH2_PROXY_OIDC_ISSUER_URL=https://login.microsoftonline.com/3aa4a235-b6e2-48d5-9195-7fcf05b459b0/v2.0 + - OAUTH2_PROXY_SKIP_CLAIMS_FROM_PROFILE_URL=true - OAUTH2_PROXY_PASS_ACCESS_TOKEN=true - OAUTH2_PROXY_PASS_BASIC_AUTH=false - OAUTH2_PROXY_PASS_USER_HEADERS=false diff --git a/radixconfig.yaml b/radixconfig.yaml index 60aabdb6c..7d7d1e7e0 100644 --- a/radixconfig.yaml +++ b/radixconfig.yaml @@ -38,7 +38,7 @@ spec: - DYNATRACE_API_TOKEN # Token to use for display of availability metrics - OAUTH2_CLIENT_ID # Azure Application ID - name: auth - image: quay.io/oauth2-proxy/oauth2-proxy:v7.2.1 # see https://github.com/oauth2-proxy/oauth2-proxy/blob/master/docs/docs/configuration/overview.md + image: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0 # see https://github.com/oauth2-proxy/oauth2-proxy/blob/master/docs/docs/configuration/overview.md ports: - name: http port: 8000 @@ -63,6 +63,7 @@ spec: OAUTH2_PROXY_EMAIL_DOMAINS: "*" # Any email address registered in AD should be accepted OAUTH2_PROXY_HTTP_ADDRESS: "http://:8000" # The port oauth2_proxy listens on OAUTH2_PROXY_OIDC_ISSUER_URL: "https://login.microsoftonline.com/3aa4a235-b6e2-48d5-9195-7fcf05b459b0/v2.0" # That's the Equinor tenant ID + OAUTH2_PROXY_SKIP_CLAIMS_FROM_PROFILE_URL: "true" OAUTH2_PROXY_PASS_ACCESS_TOKEN: "true" # Pass the access token upstream (to the proxy component) OAUTH2_PROXY_PASS_BASIC_AUTH: "false" # Disable unused default OAUTH2_PROXY_PASS_USER_HEADERS: "false" # Disable unused default From 1073698196d70ae27b7678d1299e34952ce0bfca Mon Sep 17 00:00:00 2001 From: Sergey Smolnikov Date: Mon, 19 Feb 2024 14:37:53 +0100 Subject: [PATCH 03/11] Added confirmation dialog to re-generate deploy-key (#964) --- .../configure-application-github/index.tsx | 44 ++++++++++++++++--- .../configure-application-github/style.css | 16 +++++++ 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/src/components/configure-application-github/index.tsx b/src/components/configure-application-github/index.tsx index f3ee5e88c..2d2ec0a8c 100644 --- a/src/components/configure-application-github/index.tsx +++ b/src/components/configure-application-github/index.tsx @@ -28,6 +28,7 @@ import { import { pollingInterval } from '../../store/defaults'; import { handlePromiseWithToast } from '../global-top-nav/styled-toaster'; import { getFetchErrorMessage } from '../../store/utils'; +import { ScrimPopup } from '../scrim-popup'; const radixZoneDNS = configVariables.RADIX_CLUSTER_BASE; @@ -53,7 +54,8 @@ export const ConfigureApplicationGithub = ({ const isExpanded = !!startVisible; const webhookURL = `https://webhook.${radixZoneDNS}/events/github?appName=${app.name}`; const [useOtherCiTool, setUseOtherCiTool] = useState(false); - + const [visibleRegenerateScrim, setVisibleRegenerateScrim] = + useState(false); const [regenerateSecrets, { isLoading, error }] = useRegenerateDeployKeyMutation(); const { data: secrets, refetch: refetchSecrets } = @@ -63,13 +65,14 @@ export const ConfigureApplicationGithub = ({ ); const onRegenerate = handlePromiseWithToast(async () => { + setVisibleRegenerateScrim(false); await regenerateSecrets({ appName: app.name, regenerateDeployKeyAndSecretData: { sharedSecret: nanoid() }, }).unwrap(); await refetchSecrets(); await refetch?.(); - }); + }, 'Successfully re-generated deploy key and webhook secret'); return (
@@ -130,9 +133,40 @@ export const ConfigureApplicationGithub = ({ Regenerating… ) : ( - + <> + setVisibleRegenerateScrim(false)} + isDismissable + > +
+
+ + Do you want to re-generate{' '} + deploy key and webhook secret? + + + New deploy key and webhook secret need to be put + to the GitHub repository settings + +
+ + + + + +
+ + + )}
diff --git a/src/components/configure-application-github/style.css b/src/components/configure-application-github/style.css index 6b78d972b..1fed62dfd 100644 --- a/src/components/configure-application-github/style.css +++ b/src/components/configure-application-github/style.css @@ -34,3 +34,19 @@ filter: invert(0); } } + +.regenerate-content { + padding: var(--eds_spacing_medium); + padding-top: 0; + overflow: auto; +} +@media (min-width: 150rem) { + .regenerate-content { + margin: auto; + } +} + +.regenerate-options { + margin-top: auto; + margin-bottom: auto; +} From 87c853a5759fcfe13ffd3626b6a420bc2d353df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Gustav=20Str=C3=A5b=C3=B8?= Date: Tue, 20 Feb 2024 10:37:10 +0100 Subject: [PATCH 04/11] ignore external dns alias click when using automation --- src/components/page-active-component/external-dns.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/page-active-component/external-dns.tsx b/src/components/page-active-component/external-dns.tsx index 48e3f1f67..3f1d07a50 100644 --- a/src/components/page-active-component/external-dns.tsx +++ b/src/components/page-active-component/external-dns.tsx @@ -143,6 +143,9 @@ export const ExternalDNSAccordion: FunctionComponent<{ { + if (v.tls.useAutomation) { + return; + } setSelectedExternalDns(v); setVisibleScrim(true); }} From 62e05e92140b21ef68a70a51c6566d1cbe5b68f4 Mon Sep 17 00:00:00 2001 From: Sergey Smolnikov Date: Tue, 27 Feb 2024 16:53:55 +0100 Subject: [PATCH 05/11] Show ext alias links (#972) * Added ext alias to component * Added ext alias to app * Ext alias in app changed to accordeon * Ext alias added to env * Removed duplicate component * Added collapsable DNSs for components * Fixed fail --- src/components/app-overview/dns-aliases.tsx | 59 ------- src/components/app-overview/index.tsx | 29 +++- .../default-app-alias.tsx | 0 src/components/component/dns-aliases.tsx | 71 ++++++++ src/components/component/dns_alias.tsx | 38 +++++ .../active-component-overview.tsx | 1 + .../page-active-component/dns-alias.tsx | 40 ++--- .../page-active-component/dns-aliases.tsx | 53 ++++++ .../page-active-component/overview.tsx | 152 ++++++++++-------- .../page-environment/environment-overview.tsx | 27 +++- src/store/radix-api.ts | 10 ++ 11 files changed, 320 insertions(+), 160 deletions(-) delete mode 100644 src/components/app-overview/dns-aliases.tsx rename src/components/{app-overview => component}/default-app-alias.tsx (100%) create mode 100644 src/components/component/dns-aliases.tsx create mode 100644 src/components/component/dns_alias.tsx create mode 100644 src/components/page-active-component/dns-aliases.tsx diff --git a/src/components/app-overview/dns-aliases.tsx b/src/components/app-overview/dns-aliases.tsx deleted file mode 100644 index f8c59fc63..000000000 --- a/src/components/app-overview/dns-aliases.tsx +++ /dev/null @@ -1,59 +0,0 @@ -import { Icon, List, Typography } from '@equinor/eds-core-react'; -import { link } from '@equinor/eds-icons'; -import { FunctionComponent } from 'react'; -import { Link } from 'react-router-dom'; - -import { getActiveComponentUrl, getEnvUrl } from '../../utils/routing'; -import { DnsAlias } from '../../store/radix-api'; - -export interface DefaultAppAliasProps { - appName: string; - dnsAliases?: DnsAlias[]; -} - -export const DnsAliases: FunctionComponent = ({ - appName, - dnsAliases, -}) => ( - <> - {dnsAliases && ( -
- - DNS alias{dnsAliases.length > 1 ? 'es' : ''} - - - {dnsAliases?.map((dnsAlias, index) => ( -
- - - - {dnsAlias.url} - {' '} - is mapped to component{' '} - - {dnsAlias.componentName} - {' '} - in environment{' '} - - {dnsAlias.environmentName} - - -
- ))} - -
- )} - -); diff --git a/src/components/app-overview/index.tsx b/src/components/app-overview/index.tsx index b6bf54c8b..5f0ace26a 100644 --- a/src/components/app-overview/index.tsx +++ b/src/components/app-overview/index.tsx @@ -1,7 +1,7 @@ import { Typography } from '@equinor/eds-core-react'; -import { DefaultAppAlias } from './default-app-alias'; -import { DnsAliases } from './dns-aliases'; +import { DefaultAppAlias } from '../component/default-app-alias'; +import { DNSAliases } from '../component/dns-aliases'; import { Alert } from '../alert'; import ApplicationCost from '../application-cost'; import { FutureApplicationCost } from '../application-future-cost'; @@ -25,8 +25,14 @@ export function AppOverview({ appName }: { appName: string }) { { skip: !appName, pollingInterval } ); - const { appAlias, dnsAliases, environments, jobs, registration } = - application ?? {}; + const { + appAlias, + dnsAliases, + dnsExternalAliases, + environments, + jobs, + registration, + } = application ?? {}; return (
@@ -47,7 +53,20 @@ export function AppOverview({ appName }: { appName: string }) { {appAlias && } - {dnsAliases && } + {dnsAliases && ( + + )} + {DNSAliases && ( + + )} {environments?.length > 0 && ( Environments )} diff --git a/src/components/app-overview/default-app-alias.tsx b/src/components/component/default-app-alias.tsx similarity index 100% rename from src/components/app-overview/default-app-alias.tsx rename to src/components/component/default-app-alias.tsx diff --git a/src/components/component/dns-aliases.tsx b/src/components/component/dns-aliases.tsx new file mode 100644 index 000000000..4dbd30d71 --- /dev/null +++ b/src/components/component/dns-aliases.tsx @@ -0,0 +1,71 @@ +import { Accordion, List, Typography } from '@equinor/eds-core-react'; +import { FunctionComponent } from 'react'; +import { DnsAlias, DnsExternalAlias } from '../../store/radix-api'; +import { DNSAlias } from './dns_alias'; + +export interface DefaultAppAliasProps { + appName: string; + dnsAliases?: DnsAlias[] | DnsExternalAlias[]; + title: string; +} + +export const DNSAliases: FunctionComponent = ({ + appName, + dnsAliases, + title, +}) => ( + <> + {dnsAliases?.length > 0 && + (dnsAliases.length == 1 ? ( +
+ {title} + + + +
+ ) : ( + <> + + {title} + + + + + + + + + + + + + {dnsAliases.slice(1)?.map((dnsAlias, index) => ( +
+ + + +
+ ))} + + + + + + ))} + +); diff --git a/src/components/component/dns_alias.tsx b/src/components/component/dns_alias.tsx new file mode 100644 index 000000000..341a57644 --- /dev/null +++ b/src/components/component/dns_alias.tsx @@ -0,0 +1,38 @@ +import { Icon, Typography } from '@equinor/eds-core-react'; +import { link } from '@equinor/eds-icons'; +import { FunctionComponent } from 'react'; +import { Link } from 'react-router-dom'; + +import { getActiveComponentUrl, getEnvUrl } from '../../utils/routing'; +export interface EnvironmentComponentProps { + appName: string; + url: string; + componentName: string; + environmentName: string; +} + +export const DNSAlias: FunctionComponent = ({ + appName, + url, + componentName, + environmentName, +}) => ( + <> + + + {url} + {' '} + is mapped to component{' '} + + {componentName} + {' '} + in environment{' '} + + {environmentName} + + +); diff --git a/src/components/page-active-component/active-component-overview.tsx b/src/components/page-active-component/active-component-overview.tsx index bbf5af3ea..39b5fab1a 100644 --- a/src/components/page-active-component/active-component-overview.tsx +++ b/src/components/page-active-component/active-component-overview.tsx @@ -79,6 +79,7 @@ export const ActiveComponentOverview: FunctionComponent<{ = ({ dnsAliases }) => ( +export const DNSAlias: FunctionComponent = ({ + url, +}) => ( <> - {dnsAliases && ( -
- DNS alias{dnsAliases.length > 1 ? 'es' : ''} - - {dnsAliases.map((dnsAlias, index) => ( -
- - - - {dnsAlias.url} - - -
- ))} - -
- )} + + {url} + ); - -DnsAlias.propTypes = { - dnsAliases: PropTypes.arrayOf( - PropTypes.object as PropTypes.Validator - ).isRequired, -}; diff --git a/src/components/page-active-component/dns-aliases.tsx b/src/components/page-active-component/dns-aliases.tsx new file mode 100644 index 000000000..d70725d62 --- /dev/null +++ b/src/components/page-active-component/dns-aliases.tsx @@ -0,0 +1,53 @@ +import { Accordion, List, Typography } from '@equinor/eds-core-react'; +import { FunctionComponent } from 'react'; +import { DNSAlias } from './dns-alias'; + +export interface DefaultAppAliasProps { + urls?: string[]; + title: string; +} + +export const DNSAliases: FunctionComponent = ({ + urls, + title, +}) => ( + <> + {urls.length > 0 && + (urls.length == 1 ? ( +
+ {title} + + + +
+ ) : ( + <> + + {title} + + + + + + + + + + + + + {urls.slice(1)?.map((url, index) => ( +
+ + + +
+ ))} + + + + + + ))} + +); diff --git a/src/components/page-active-component/overview.tsx b/src/components/page-active-component/overview.tsx index db1d6ca33..84f198328 100644 --- a/src/components/page-active-component/overview.tsx +++ b/src/components/page-active-component/overview.tsx @@ -4,102 +4,124 @@ import * as PropTypes from 'prop-types'; import { FunctionComponent } from 'react'; import { DefaultAlias } from './default-alias'; -import { DnsAlias } from './dns-alias'; import { Alert } from '../alert'; import { ComponentIdentity } from '../component/component-identity'; import { ComponentPorts } from '../component/component-ports'; import { DockerImage } from '../docker-image'; import { ComponentStatusBadge } from '../status-badges'; + import { ApplicationAlias, Component, Deployment, DnsAlias as DnsAliasModel, + ExternalDns, } from '../../store/radix-api'; - import './style.css'; +import { DNSAliases } from './dns-aliases'; const URL_VAR_NAME = 'RADIX_PUBLIC_DOMAIN_NAME'; export const Overview: FunctionComponent<{ appAlias?: ApplicationAlias; dnsAliases?: DnsAliasModel[]; + dnsExternalAliases?: ExternalDns[]; envName: string; component: Component; deployment: Deployment; -}> = ({ appAlias, dnsAliases, envName, component, deployment }) => ( -
- Overview +}> = ({ + appAlias, + dnsAliases, + dnsExternalAliases, + envName, + component, + deployment, +}) => { + const dnsAliasUrls = dnsAliases ? dnsAliases.map((alias) => alias.url) : []; + const dnsExternalAliasUrls = dnsExternalAliases + ? dnsExternalAliases.map((alias) => alias.fqdn) + : []; + return ( +
+ Overview - {component.status === 'Stopped' && ( - - Component has been manually stopped; please note that a new deployment - will cause it to be restarted unless you set replicas of - the component to 0 in{' '} - - radixconfig.yaml - - - )} - -
-
- - Component {component.name} - - - Image - - {component.identity && ( - - )} -
+ {component.status === 'Stopped' && ( + + Component has been manually stopped; please note that a new deployment + will cause it to be restarted unless you set replicas of + the component to 0 in{' '} + + radixconfig.yaml + + + )} -
-
- Status - -
- {component.variables?.[URL_VAR_NAME] && ( +
+
- Publicly available{' '} - - link - + Component {component.name} - )} - {appAlias && ( - - )} - {dnsAliases?.length > 0 && ( - <> - - - )} - + + Image + + {component.identity && ( + + )} +
+ +
+
+ Status + +
+ {component.variables?.[URL_VAR_NAME] && ( + + Publicly available{' '} + + link + + + )} + {appAlias && ( + + )} + {dnsAliasUrls?.length > 0 && ( + + )} + {dnsExternalAliasUrls?.length > 0 && ( + + )} + +
-
-); + ); +}; Overview.propTypes = { appAlias: PropTypes.object as PropTypes.Validator, + dnsExternalAliases: PropTypes.arrayOf( + PropTypes.object as PropTypes.Validator + ), envName: PropTypes.string.isRequired, component: PropTypes.object.isRequired as PropTypes.Validator, deployment: PropTypes.object.isRequired as PropTypes.Validator, diff --git a/src/components/page-environment/environment-overview.tsx b/src/components/page-environment/environment-overview.tsx index 667d2f55d..865e0c890 100644 --- a/src/components/page-environment/environment-overview.tsx +++ b/src/components/page-environment/environment-overview.tsx @@ -41,6 +41,8 @@ import { import './style.css'; import { GitCommitTags } from '../component/git-commit-tags'; +import { DefaultAppAlias } from '../component/default-app-alias'; +import { DNSAliases } from '../component/dns-aliases'; export const EnvironmentOverview: FunctionComponent<{ appName: string; @@ -64,6 +66,13 @@ export const EnvironmentOverview: FunctionComponent<{ ); const [deleteEnvTrigger, deleteEnvState] = radixApi.endpoints.deleteEnvironment.useMutation(); + const { appAlias, dnsAliases, dnsExternalAliases } = application ?? {}; + const envDNSAliases = dnsAliases + ? dnsAliases.filter((alias) => alias.environmentName == envName) + : []; + const envDNSExternalAliases = dnsExternalAliases + ? dnsExternalAliases.filter((alias) => alias.environmentName == envName) + : []; const isLoaded = application && environment; const isOrphan = environment?.status === 'Orphan'; @@ -126,7 +135,6 @@ export const EnvironmentOverview: FunctionComponent<{ )}
)} - {isLoaded && ( <> @@ -255,6 +263,23 @@ export const EnvironmentOverview: FunctionComponent<{
+ {appAlias?.environmentName == envName && ( + + )} + {envDNSAliases?.length > 0 && ( + + )} + {envDNSExternalAliases?.length > 0 && ( + + )} {deployment && ( Date: Tue, 30 Jan 2024 02:13:05 +0000 Subject: [PATCH 06/11] fix: upgrade @azure/msal-browser from 3.6.0 to 3.7.0 Snyk has created this PR to upgrade @azure/msal-browser from 3.6.0 to 3.7.0. See this package in npm: https://www.npmjs.com/package/@azure/msal-browser See this project in Snyk: https://app.snyk.io/org/radix-team/project/9b8fdaaf-c458-4968-afc1-34794da22873?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdd582887..c42b2cb48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "4.17.1", "license": "MIT", "dependencies": { - "@azure/msal-browser": "^3.6.0", + "@azure/msal-browser": "^3.7.0", "@azure/msal-react": "^2.0.8", "@equinor/eds-core-react": "^0.35.1", "@equinor/eds-icons": "^0.20.0", @@ -130,20 +130,20 @@ } }, "node_modules/@azure/msal-browser": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.6.0.tgz", - "integrity": "sha512-FrFBJXRJMyWXjAjg4cUNZwEKktzfzD/YD9+S1kj2ors67hKoveam4aL0bZuCZU/jTiHTn0xDQGQh2ksCMXTXtA==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.7.0.tgz", + "integrity": "sha512-ktDB/Gf7UDgYBJOnoIlh70lxIo4e1/D2UgHuayB4RntN1IlusfTtIVH3k8NpJMdl+38tfTXIaUoR+qlr5voZEg==", "dependencies": { - "@azure/msal-common": "14.5.0" + "@azure/msal-common": "14.6.0" }, "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-common": { - "version": "14.5.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.5.0.tgz", - "integrity": "sha512-Gx5rZbiZV/HiZ2nEKfjfAF/qDdZ4/QWxMvMo2jhIFVz528dVKtaZyFAOtsX2Ak8+TQvRsGCaEfuwJFuXB6tu1A==", + "version": "14.6.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.6.0.tgz", + "integrity": "sha512-AGusT/JvxdzJIYi5u0n97cmhd3pUT6UuI6rEkT5iDeT2FGcV0/EB8pk+dy6GLPpYg9vhDCuyoYrEZGd+2UeCCQ==", "engines": { "node": ">=0.8.0" } diff --git a/package.json b/package.json index da0cffed9..6e129a42d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "apigen:service-now": "npx @rtk-query/codegen-openapi ./src/store/configs/service-now-openapi-config.ts" }, "dependencies": { - "@azure/msal-browser": "^3.6.0", + "@azure/msal-browser": "^3.7.0", "@azure/msal-react": "^2.0.8", "@equinor/eds-core-react": "^0.35.1", "@equinor/eds-icons": "^0.20.0", From d371815471d9a8b4bab8f7e07ab6a1cbeaf32881 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 30 Jan 2024 02:13:09 +0000 Subject: [PATCH 07/11] fix: upgrade @azure/msal-react from 2.0.8 to 2.0.9 Snyk has created this PR to upgrade @azure/msal-react from 2.0.8 to 2.0.9. See this package in npm: https://www.npmjs.com/package/@azure/msal-react See this project in Snyk: https://app.snyk.io/org/radix-team/project/9b8fdaaf-c458-4968-afc1-34794da22873?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 24 ++++++++++++------------ package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdd582887..17b685d3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@azure/msal-browser": "^3.6.0", - "@azure/msal-react": "^2.0.8", + "@azure/msal-react": "^2.0.9", "@equinor/eds-core-react": "^0.35.1", "@equinor/eds-icons": "^0.20.0", "@microsoft/microsoft-graph-client": "^3.0.7", @@ -130,33 +130,33 @@ } }, "node_modules/@azure/msal-browser": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.6.0.tgz", - "integrity": "sha512-FrFBJXRJMyWXjAjg4cUNZwEKktzfzD/YD9+S1kj2ors67hKoveam4aL0bZuCZU/jTiHTn0xDQGQh2ksCMXTXtA==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.7.1.tgz", + "integrity": "sha512-EZnk81zn1/5/jv/VVN2Tp+dUVchHmwbbt7pn654Eqa+ua7wtEIg1btuW/mowB13BV2nGYcvniY9Mf+3Sbe0cCg==", "dependencies": { - "@azure/msal-common": "14.5.0" + "@azure/msal-common": "14.6.1" }, "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-common": { - "version": "14.5.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.5.0.tgz", - "integrity": "sha512-Gx5rZbiZV/HiZ2nEKfjfAF/qDdZ4/QWxMvMo2jhIFVz528dVKtaZyFAOtsX2Ak8+TQvRsGCaEfuwJFuXB6tu1A==", + "version": "14.6.1", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.6.1.tgz", + "integrity": "sha512-yL97p2La0WrgU3MdXThOLOpdmBMvH8J69vwQ/skOqORYwOW/UYPdp9nZpvvfBO+zFZB5M3JkqA2NKtn4GfVBHw==", "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-react": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@azure/msal-react/-/msal-react-2.0.8.tgz", - "integrity": "sha512-Kmbq2Mm6vrXfemxf8+q1PWU7dhx8Ck4lB6gXFFDR+Bn1odoLzxksOqm8CKEk+y9Bq1iR54H0raTQ3Avan43oMw==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@azure/msal-react/-/msal-react-2.0.9.tgz", + "integrity": "sha512-z8EvGIjJpVMgk97elUDedPLcByCibe3chipn9b8Ja//SJksovAhNW0ic7bvdDNsmKFK+H0e8PXciSnwZDtk52A==", "engines": { "node": ">=10" }, "peerDependencies": { - "@azure/msal-browser": "^3.6.0", + "@azure/msal-browser": "^3.7.0", "react": "^16.8.0 || ^17 || ^18" } }, diff --git a/package.json b/package.json index da0cffed9..3edb08a1a 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "@azure/msal-browser": "^3.6.0", - "@azure/msal-react": "^2.0.8", + "@azure/msal-react": "^2.0.9", "@equinor/eds-core-react": "^0.35.1", "@equinor/eds-icons": "^0.20.0", "@microsoft/microsoft-graph-client": "^3.0.7", From 85fda9611e1e93d074b2a2928d6aeaa64e467eed Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Fri, 26 Jan 2024 12:07:09 +0000 Subject: [PATCH 08/11] fix: upgrade date-fns from 3.0.6 to 3.1.0 Snyk has created this PR to upgrade date-fns from 3.0.6 to 3.1.0. See this package in npm: https://www.npmjs.com/package/date-fns See this project in Snyk: https://app.snyk.io/org/radix-team/project/9b8fdaaf-c458-4968-afc1-34794da22873?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c42b2cb48..ad59db390 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@microsoft/microsoft-graph-client": "^3.0.7", "@reduxjs/toolkit": "^1.9.7", "clsx": "^2.1.0", - "date-fns": "^3.0.6", + "date-fns": "^3.1.0", "http-status-codes": "^2.3.0", "jdenticon": "^3.2.0", "lodash": "^4.17.21", @@ -3793,9 +3793,9 @@ } }, "node_modules/date-fns": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.0.6.tgz", - "integrity": "sha512-W+G99rycpKMMF2/YD064b2lE7jJGUe+EjOES7Q8BIGY8sbNdbgcs9XFTZwvzc9Jx1f3k7LB7gZaZa7f8Agzljg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.1.0.tgz", + "integrity": "sha512-ZO7yefXV/wCWzd3I9haCHmfzlfA3i1a2HHO7ZXjtJrRjXt8FULKJ2Vl8wji3XYF4dQ0ZJ/tokXDZeYlFvgms9Q==", "funding": { "type": "github", "url": "https://github.com/sponsors/kossnocorp" diff --git a/package.json b/package.json index 6e129a42d..dd023e478 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@microsoft/microsoft-graph-client": "^3.0.7", "@reduxjs/toolkit": "^1.9.7", "clsx": "^2.1.0", - "date-fns": "^3.0.6", + "date-fns": "^3.1.0", "http-status-codes": "^2.3.0", "jdenticon": "^3.2.0", "lodash": "^4.17.21", From da707f772152ee3b29e2d4d2c6fe12818985476b Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 27 Jan 2024 07:41:30 +0000 Subject: [PATCH 09/11] fix: upgrade jsdom from 23.0.1 to 23.1.0 Snyk has created this PR to upgrade jsdom from 23.0.1 to 23.1.0. See this package in npm: https://www.npmjs.com/package/jsdom See this project in Snyk: https://app.snyk.io/org/radix-team/project/9b8fdaaf-c458-4968-afc1-34794da22873?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 26 +++++++++++++------------- package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad59db390..6119f71d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,7 +52,7 @@ "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.6.0", "fetch-mock": "^9.11.0", - "jsdom": "^23.0.1", + "jsdom": "^23.1.0", "license-checker": "^25.0.1", "miragejs": "^0.1.48", "mock-socket": "^9.3.1", @@ -3729,15 +3729,15 @@ } }, "node_modules/cssstyle": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz", - "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz", + "integrity": "sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==", "dev": true, "dependencies": { "rrweb-cssom": "^0.6.0" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/csstype": { @@ -6178,12 +6178,12 @@ } }, "node_modules/jsdom": { - "version": "23.0.1", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.0.1.tgz", - "integrity": "sha512-2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ==", + "version": "23.1.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.1.0.tgz", + "integrity": "sha512-wRscu8dBFxi7O65Cvi0jFRDv0Qa7XEHPix8Qg/vlXHLAMQsRWV1EDeQHBermzXf4Dt7JtFgBLbva3iTcBZDXEQ==", "dev": true, "dependencies": { - "cssstyle": "^3.0.0", + "cssstyle": "^4.0.1", "data-urls": "^5.0.0", "decimal.js": "^10.4.3", "form-data": "^4.0.0", @@ -6202,7 +6202,7 @@ "whatwg-encoding": "^3.1.1", "whatwg-mimetype": "^4.0.0", "whatwg-url": "^14.0.0", - "ws": "^8.14.2", + "ws": "^8.16.0", "xml-name-validator": "^5.0.0" }, "engines": { @@ -10570,9 +10570,9 @@ "dev": true }, "node_modules/ws": { - "version": "8.15.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz", - "integrity": "sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "dev": true, "engines": { "node": ">=10.0.0" diff --git a/package.json b/package.json index dd023e478..3a91bbf08 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.6.0", "fetch-mock": "^9.11.0", - "jsdom": "^23.0.1", + "jsdom": "^23.1.0", "license-checker": "^25.0.1", "miragejs": "^0.1.48", "mock-socket": "^9.3.1", From 857ff6e0bc0e6d728e8a759d461708fd99066a85 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 29 Feb 2024 05:29:45 +0000 Subject: [PATCH 10/11] fix: upgrade @azure/msal-browser from 3.7.0 to 3.9.0 Snyk has created this PR to upgrade @azure/msal-browser from 3.7.0 to 3.9.0. See this package in npm: https://www.npmjs.com/package/@azure/msal-browser See this project in Snyk: https://app.snyk.io/org/radix-team/project/9b8fdaaf-c458-4968-afc1-34794da22873?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4d2206792..ca15d66bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "4.17.1", "license": "MIT", "dependencies": { - "@azure/msal-browser": "^3.7.0", + "@azure/msal-browser": "^3.9.0", "@azure/msal-react": "^2.0.8", "@equinor/eds-core-react": "^0.35.1", "@equinor/eds-icons": "^0.20.0", @@ -130,20 +130,20 @@ } }, "node_modules/@azure/msal-browser": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.7.0.tgz", - "integrity": "sha512-ktDB/Gf7UDgYBJOnoIlh70lxIo4e1/D2UgHuayB4RntN1IlusfTtIVH3k8NpJMdl+38tfTXIaUoR+qlr5voZEg==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.9.0.tgz", + "integrity": "sha512-Ts+Q3fw9u92koCkk+oZgL6lhwDrwWSyXBcKdsKJko1Ra7ZzDl0z7pod+1g+v4Qbt8l1YqSX4wXbXs5sWUv0VWw==", "dependencies": { - "@azure/msal-common": "14.6.0" + "@azure/msal-common": "14.7.0" }, "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-common": { - "version": "14.6.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.6.0.tgz", - "integrity": "sha512-AGusT/JvxdzJIYi5u0n97cmhd3pUT6UuI6rEkT5iDeT2FGcV0/EB8pk+dy6GLPpYg9vhDCuyoYrEZGd+2UeCCQ==", + "version": "14.7.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.7.0.tgz", + "integrity": "sha512-WexujW5jKWib7xtIxR7fEVyd5xcA3FNwenELy2HO4YC/ivTFdsEcDhtpKQuRUHqXRwxoqBblyZzTAhBm4v6fHA==", "engines": { "node": ">=0.8.0" } diff --git a/package.json b/package.json index 4fb3c3270..4a4cd23db 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "apigen:service-now": "npx @rtk-query/codegen-openapi ./src/store/configs/service-now-openapi-config.ts" }, "dependencies": { - "@azure/msal-browser": "^3.7.0", + "@azure/msal-browser": "^3.9.0", "@azure/msal-react": "^2.0.8", "@equinor/eds-core-react": "^0.35.1", "@equinor/eds-icons": "^0.20.0", From 5d6fb0f95783da1252d52eda38087862567b50da Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 29 Feb 2024 05:29:42 +0000 Subject: [PATCH 11/11] fix: upgrade @typescript-eslint/eslint-plugin from 6.19.1 to 6.21.0 Snyk has created this PR to upgrade @typescript-eslint/eslint-plugin from 6.19.1 to 6.21.0. See this package in npm: https://www.npmjs.com/package/@typescript-eslint/eslint-plugin See this project in Snyk: https://app.snyk.io/org/radix-team/project/9b8fdaaf-c458-4968-afc1-34794da22873?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 126 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/package-lock.json b/package-lock.json index c5aa1e15c..25fbf181a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "@types/react": "^18.2.48", "@types/react-dom": "^18.2.18", "@types/react-router-dom": "^5.3.3", - "@typescript-eslint/eslint-plugin": "^6.19.1", + "@typescript-eslint/eslint-plugin": "^6.21.0", "@vitejs/plugin-react-swc": "^3.5.0", "depcheck": "^1.4.7", "eslint": "^8.56.0", @@ -2289,9 +2289,9 @@ "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" }, "node_modules/@types/semver": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, "node_modules/@types/stylis": { @@ -2310,16 +2310,16 @@ "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.1.tgz", - "integrity": "sha512-roQScUGFruWod9CEyoV5KlCYrubC/fvG8/1zXuT0WTcxX87GnMMmnksMwSg99lo1xiKrBzw2icsJPMAw1OtKxg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz", + "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.19.1", - "@typescript-eslint/type-utils": "6.19.1", - "@typescript-eslint/utils": "6.19.1", - "@typescript-eslint/visitor-keys": "6.19.1", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/type-utils": "6.21.0", + "@typescript-eslint/utils": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -2345,13 +2345,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.1.tgz", - "integrity": "sha512-4CdXYjKf6/6aKNMSly/BP4iCSOpvMmqtDzRtqFyyAae3z5kkqEjKndR5vDHL8rSuMIIWP8u4Mw4VxLyxZW6D5w==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz", + "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.19.1", - "@typescript-eslint/visitor-keys": "6.19.1" + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2362,9 +2362,9 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.1.tgz", - "integrity": "sha512-6+bk6FEtBhvfYvpHsDgAL3uo4BfvnTnoge5LrrCj2eJN8g3IJdLTD4B/jK3Q6vo4Ql/Hoip9I8aB6fF+6RfDqg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz", + "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2375,12 +2375,12 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.1.tgz", - "integrity": "sha512-gkdtIO+xSO/SmI0W68DBg4u1KElmIUo3vXzgHyGPs6cxgB0sa3TlptRAAE0hUY1hM6FcDKEv7aIwiTGm76cXfQ==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz", + "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.19.1", + "@typescript-eslint/types": "6.21.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -2439,13 +2439,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.19.1.tgz", - "integrity": "sha512-0vdyld3ecfxJuddDjACUvlAeYNrHP/pDeQk2pWBR2ESeEzQhg52DF53AbI9QCBkYE23lgkhLCZNkHn2hEXXYIg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz", + "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.19.1", - "@typescript-eslint/utils": "6.19.1", + "@typescript-eslint/typescript-estree": "6.21.0", + "@typescript-eslint/utils": "6.21.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -2466,9 +2466,9 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.1.tgz", - "integrity": "sha512-6+bk6FEtBhvfYvpHsDgAL3uo4BfvnTnoge5LrrCj2eJN8g3IJdLTD4B/jK3Q6vo4Ql/Hoip9I8aB6fF+6RfDqg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz", + "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2479,13 +2479,13 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.1.tgz", - "integrity": "sha512-aFdAxuhzBFRWhy+H20nYu19+Km+gFfwNO4TEqyszkMcgBDYQjmPJ61erHxuT2ESJXhlhrO7I5EFIlZ+qGR8oVA==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz", + "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.19.1", - "@typescript-eslint/visitor-keys": "6.19.1", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2507,12 +2507,12 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.1.tgz", - "integrity": "sha512-gkdtIO+xSO/SmI0W68DBg4u1KElmIUo3vXzgHyGPs6cxgB0sa3TlptRAAE0hUY1hM6FcDKEv7aIwiTGm76cXfQ==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz", + "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.19.1", + "@typescript-eslint/types": "6.21.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -2581,17 +2581,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.1.tgz", - "integrity": "sha512-JvjfEZuP5WoMqwh9SPAPDSHSg9FBHHGhjPugSRxu5jMfjvBpq5/sGTD+9M9aQ5sh6iJ8AY/Kk/oUYVEMAPwi7w==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz", + "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.19.1", - "@typescript-eslint/types": "6.19.1", - "@typescript-eslint/typescript-estree": "6.19.1", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/typescript-estree": "6.21.0", "semver": "^7.5.4" }, "engines": { @@ -2606,13 +2606,13 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.1.tgz", - "integrity": "sha512-4CdXYjKf6/6aKNMSly/BP4iCSOpvMmqtDzRtqFyyAae3z5kkqEjKndR5vDHL8rSuMIIWP8u4Mw4VxLyxZW6D5w==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz", + "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.19.1", - "@typescript-eslint/visitor-keys": "6.19.1" + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2623,9 +2623,9 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.1.tgz", - "integrity": "sha512-6+bk6FEtBhvfYvpHsDgAL3uo4BfvnTnoge5LrrCj2eJN8g3IJdLTD4B/jK3Q6vo4Ql/Hoip9I8aB6fF+6RfDqg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz", + "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2636,13 +2636,13 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.1.tgz", - "integrity": "sha512-aFdAxuhzBFRWhy+H20nYu19+Km+gFfwNO4TEqyszkMcgBDYQjmPJ61erHxuT2ESJXhlhrO7I5EFIlZ+qGR8oVA==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz", + "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.19.1", - "@typescript-eslint/visitor-keys": "6.19.1", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2664,12 +2664,12 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.19.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.1.tgz", - "integrity": "sha512-gkdtIO+xSO/SmI0W68DBg4u1KElmIUo3vXzgHyGPs6cxgB0sa3TlptRAAE0hUY1hM6FcDKEv7aIwiTGm76cXfQ==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz", + "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.19.1", + "@typescript-eslint/types": "6.21.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { diff --git a/package.json b/package.json index 2ffeffbdd..2372a60d3 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "@types/react": "^18.2.48", "@types/react-dom": "^18.2.18", "@types/react-router-dom": "^5.3.3", - "@typescript-eslint/eslint-plugin": "^6.19.1", + "@typescript-eslint/eslint-plugin": "^6.21.0", "@vitejs/plugin-react-swc": "^3.5.0", "depcheck": "^1.4.7", "eslint": "^8.56.0",