From 019086268b16199b3efe16c4c57f4c9694d72528 Mon Sep 17 00:00:00 2001 From: Agata Kucharska Date: Thu, 30 Jan 2025 10:37:43 +0100 Subject: [PATCH 1/2] feat: Add statics config with modules banner (#3635) * Add statics config with modules banner * Add configs for each environment * Fixes --- kyma/environments/dev/statics.json | 6 +++- kyma/environments/prod/statics.json | 6 +++- kyma/environments/stage/statics.json | 6 +++- kyma/extensions/statics/modules-banner.yaml | 37 +++++++++++++++++++++ 4 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 kyma/extensions/statics/modules-banner.yaml diff --git a/kyma/environments/dev/statics.json b/kyma/environments/dev/statics.json index fe51488c70..3f3b8a6ddc 100644 --- a/kyma/environments/dev/statics.json +++ b/kyma/environments/dev/statics.json @@ -1 +1,5 @@ -[] +[ + { + "source": "extensions/statics/modules-banner.yaml" + } +] diff --git a/kyma/environments/prod/statics.json b/kyma/environments/prod/statics.json index fe51488c70..3f3b8a6ddc 100644 --- a/kyma/environments/prod/statics.json +++ b/kyma/environments/prod/statics.json @@ -1 +1,5 @@ -[] +[ + { + "source": "extensions/statics/modules-banner.yaml" + } +] diff --git a/kyma/environments/stage/statics.json b/kyma/environments/stage/statics.json index fe51488c70..3f3b8a6ddc 100644 --- a/kyma/environments/stage/statics.json +++ b/kyma/environments/stage/statics.json @@ -1 +1,5 @@ -[] +[ + { + "source": "extensions/statics/modules-banner.yaml" + } +] diff --git a/kyma/extensions/statics/modules-banner.yaml b/kyma/extensions/statics/modules-banner.yaml new file mode 100644 index 0000000000..c572a77993 --- /dev/null +++ b/kyma/extensions/statics/modules-banner.yaml @@ -0,0 +1,37 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: modules-banner + namespace: kube-public + labels: + app.kubernetes.io/name: modules-banner + busola.io/extension: statics + busola.io/extension-version: '0.5' +data: + dataSources: |- + kymas: + resource: + kind: Kyma + group: operator.kyma-project.io + version: v1beta2 + injections: |- + - title: Introducing Modules + name: Modules + description: Modules add functionalities to your cluster. Consume SAP BTP services, monitor your cluster, build serverless applications and more. + widget: FeaturedCard + visibility: '$count($kymas().items)>0' + source: $ + id: ModulesBanner + order: 0 + illustration: Modules + design: information-1 + children: + - widget: ResourceButton + source: "'Add Modules'" + resource: + customUrl: kymamodules + - widget: ExternalLinkButton + link: https://help.sap.com/docs/btp/sap-business-technology-platform/kyma-s-modular-approach + targets: + - slot: banner + location: ClusterOverview From 83cc4ac67fc87240d22baa67b8927fb70c3447ce Mon Sep 17 00:00:00 2001 From: Oliwia Gowor <72342415+OliwiaGowor@users.noreply.github.com> Date: Thu, 30 Jan 2025 11:30:13 +0100 Subject: [PATCH 2/2] feat: Link to the release of the currently deployed version in kyma-dashboard version (#3644) * feat: add link to kyma dashboard version * use githubLink * add blank --- src/header/Header.tsx | 3 +++ src/header/SidebarMenu/useGetBusolaVersion.ts | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/header/Header.tsx b/src/header/Header.tsx index e709b4ecaf..f537b0086e 100644 --- a/src/header/Header.tsx +++ b/src/header/Header.tsx @@ -265,6 +265,9 @@ export function Header() { /> ))} { + window.open(githubLink, '_blank', 'noopener, noreferrer'); + }} text={t('common.labels.version')} additionalText={busolaVersion} icon="inspect" diff --git a/src/header/SidebarMenu/useGetBusolaVersion.ts b/src/header/SidebarMenu/useGetBusolaVersion.ts index 5ac93a0fe3..32f550a3ad 100644 --- a/src/header/SidebarMenu/useGetBusolaVersion.ts +++ b/src/header/SidebarMenu/useGetBusolaVersion.ts @@ -6,6 +6,8 @@ const BUSOLA_GITHUB_LINKS = { REPOSITORY: 'https://github.com/kyma-project/busola', PULLS: 'https://github.com/kyma-project/busola/pull', COMMITS: 'https://github.com/kyma-project/busola/commit', + RELEASE: 'https://github.com/kyma-project/busola/releases/tag/', + RELEASES: 'https://github.com/kyma-project/busola/releases/', }; function createGithubLink(version: string): string { @@ -15,11 +17,17 @@ function createGithubLink(version: string): string { if (version !== devVersion && version !== unknownVersion) { if (version.toString().startsWith('PR-')) { return `${BUSOLA_GITHUB_LINKS.PULLS}/${version.slice(3)}`; - } else if (version.toString().startsWith('v20')) { + } else if ( + version.toString().startsWith('v20') && + version.toString().includes('-') + ) { return `${BUSOLA_GITHUB_LINKS.COMMITS}/${version.substring( version.length - 8, )}`; - } + } else if (version.toString().startsWith('v')) { + return `${BUSOLA_GITHUB_LINKS.RELEASE}/${version}`; + } else if (version.toString() === 'latest') + return `${BUSOLA_GITHUB_LINKS.RELEASES}`; return `${BUSOLA_GITHUB_LINKS.COMMITS}/${version}`; } }