Skip to content

Commit e8f18c1

Browse files
Checking index after refresh
1 parent 24d8325 commit e8f18c1

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

src/components/KymaModules/support.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,3 +224,20 @@ export const setChannel = (
224224
}
225225
setSelectedModules(modulesToUpdate);
226226
};
227+
228+
export const findIndexOfSelectedModule = (
229+
module: { name: string },
230+
layoutState: { midColumn: { resourceType: string } },
231+
) => {
232+
// Checking index for modules like btp-operator on refresh.
233+
if (window.location.href.includes('kymamodules') && layoutState?.midColumn) {
234+
const resourceType = layoutState.midColumn.resourceType;
235+
const resourceTypeDotIndex = resourceType.indexOf('.');
236+
const resourceTypeBase =
237+
resourceTypeDotIndex !== -1
238+
? resourceType.substring(0, resourceTypeDotIndex)
239+
: resourceType;
240+
return pluralize(module?.name?.replace('-', '') || '') === resourceTypeBase;
241+
}
242+
return false;
243+
};

src/resources/other/kymaModules.routes.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
} from 'components/KymaModules/kymaModulesQueries';
2121
import { ModulesDeleteBox } from 'components/KymaModules/components/ModulesDeleteBox';
2222
import { usePrepareLayoutColumns } from 'shared/hooks/usePrepareLayout';
23+
import { findIndexOfSelectedModule } from 'components/KymaModules/support';
2324

2425
const KymaModulesList = React.lazy(() =>
2526
import('../../components/KymaModules/KymaModulesList'),
@@ -195,7 +196,12 @@ const ColumnWraper = ({
195196
<ModulesDeleteBox
196197
DeleteMessageBox={DeleteMessageBox}
197198
selectedModules={activeKymaModules}
198-
chosenModuleIndex={openedModuleIndex}
199+
chosenModuleIndex={
200+
openedModuleIndex ??
201+
activeKymaModules.findIndex(module =>
202+
findIndexOfSelectedModule(module, layoutState),
203+
)
204+
}
199205
kymaResource={kymaResource}
200206
kymaResourceState={kymaResourceState}
201207
moduleTemplates={moduleTemplates}

0 commit comments

Comments
 (0)