Merge branch 'main' into gh-actions-rebase

kyma-project · Jan 30, 2025 · 9856950 · 9856950
2 parents f79f1a4 + 83cc4ac
commit 9856950
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 5 deletions.
diff --git 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
@@ -1 +1,5 @@
-[]
+[
+  {
+    "source": "extensions/statics/modules-banner.yaml"
+  }
+]
diff --git 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
@@ -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
diff --git a/src/header/Header.tsx b/src/header/Header.tsx
@@ -265,6 +265,9 @@ export function Header() {
             />
           ))}
           <MenuItem
+            onClick={() => {
+              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
@@ -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}`;
     }
   }