fix checking beta for add and edit view

kyma-project · Jan 3, 2025 · 8d66d42 · 8d66d42
1 parent e5052fa
commit 8d66d42
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/components/KymaModules/KymaModulesAddModule.js b/src/components/KymaModules/KymaModulesAddModule.js
@@ -127,7 +127,7 @@ export default function KymaModulesAddModule({
                 {
                   channel: channel.channel,
                   version: channel.version,
-                  isBeta: module.spec.beta ?? false,
+                  isBeta: moduleMetaRelase.spec.beta ?? false,
                   isMetaRelease: true,
                 },
               ],
@@ -143,7 +143,7 @@ export default function KymaModulesAddModule({
               .channels.push({
                 channel: channel.channel,
                 version: channel.version,
-                isBeta: module.spec.beta ?? false,
+                isBeta: moduleMetaRelase.spec.beta ?? false,
                 isMetaRelease: true,
               });
           }
@@ -222,9 +222,11 @@ export default function KymaModulesAddModule({
         return false;
       }
       const moduleData = modulesAddData?.find(module => module.name === name);
+
       return moduleData
         ? moduleData.channels.some(
-            ({ channel: ch, isBeta }) => ch === channel && isBeta,
+            ({ channel: ch, isBeta }) =>
+              ch === channel || (kymaResource.spec.channel && isBeta),
           )
         : false;
     });
@@ -235,7 +237,8 @@ export default function KymaModulesAddModule({
       ?.find(mod => mod.name === moduleName)
       ?.channels.some(
         ({ channel: ch, isBeta }) =>
-          ch === findStatus(moduleName)?.channel && isBeta,
+          ch === findStatus(moduleName)?.channel ||
+          (kymaResource.spec.channel && isBeta),
       );
   };
 

diff --git a/src/components/KymaModules/KymaModulesCreate.js b/src/components/KymaModules/KymaModulesCreate.js
@@ -182,7 +182,7 @@ export default function KymaModulesCreate({ resource, ...props }) {
                 {
                   channel: channel.channel,
                   version: channel.version,
-                  isBeta: module.spec.beta ?? false,
+                  isBeta: moduleMetaRelase.spec.beta ?? false,
                   isMetaRelease: true,
                 },
               ],
@@ -194,7 +194,7 @@ export default function KymaModulesCreate({ resource, ...props }) {
               .channels.push({
                 channel: channel.channel,
                 version: channel.version,
-                isBeta: module.spec.beta ?? false,
+                isBeta: moduleMetaRelase.spec.beta ?? false,
                 isMetaRelease: true,
               });
           }
@@ -222,9 +222,11 @@ export default function KymaModulesCreate({ resource, ...props }) {
         return false;
       }
       const moduleData = modulesEditData?.find(module => module.name === name);
+
       return moduleData
         ? moduleData.channels.some(
-            ({ channel: ch, isBeta }) => ch === channel && isBeta,
+            ({ channel: ch, isBeta }) =>
+              ch === channel || (kymaResource.spec.channel && isBeta),
           )
         : false;
     });