Skip to content

Commit 1e21f71

Browse files
authored
fix: Show version only from ModuleReleaseMeta if available (kyma-project#3966)
* fix: Show version only from ModuleReleaseMetaif available * enter:
1 parent 82317f8 commit 1e21f71

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

src/components/KymaModules/KymaModulesAddModule.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@ export default function KymaModulesAddModule(props) {
105105
item => item.spec.moduleName === name,
106106
);
107107

108-
if (module.spec.channel) {
108+
const isModuleMetaRelease = acc.find(
109+
item => item.name === moduleMetaRelase?.spec?.moduleName,
110+
);
111+
112+
if (module.spec.channel && !isModuleMetaRelease) {
109113
if (!existingModule && !isAlreadyInstalled) {
110114
acc.push({
111115
name: name,

src/components/KymaModules/KymaModulesEdit.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,15 @@ const addChannelsToModules = moduleReleaseMetas => {
4040
const name =
4141
module.metadata?.labels['operator.kyma-project.io/module-name'];
4242
const existingModule = acc.find(item => item.name === name);
43-
if (module.spec.channel) {
43+
const moduleMetaRelase = moduleReleaseMetas?.items.find(
44+
item => item.spec.moduleName === name,
45+
);
46+
47+
const isModuleMetaRelease = acc.find(
48+
item => item.name === moduleMetaRelase?.spec?.moduleName,
49+
);
50+
51+
if (module.spec.channel && !isModuleMetaRelease) {
4452
if (!existingModule) {
4553
acc.push({
4654
name: name,
@@ -68,9 +76,6 @@ const addChannelsToModules = moduleReleaseMetas => {
6876
}
6977
} else {
7078
if (!existingModule) {
71-
const moduleMetaRelase = moduleReleaseMetas?.items.find(
72-
item => item.spec.moduleName === name,
73-
);
7479
moduleMetaRelase?.spec.channels.forEach(channel => {
7580
if (!acc.find(item => item.name === name)) {
7681
acc.push({

0 commit comments

Comments
 (0)