Skip to content

Commit cc25f12

Browse files
authored
fix: Fix suggestions on modules list (#3925)
* Fix suggestions on modules list * Try to fix tests * fix test
1 parent 2315e98 commit cc25f12

File tree

4 files changed

+46
-4
lines changed

4 files changed

+46
-4
lines changed

src/components/KymaModules/components/ModulesList.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,16 @@ export const ModulesList = ({
8080
const handleShowAddModule = () => {
8181
setLayoutColumn({
8282
startColumn: {
83-
resourceType: 'kymamodules',
83+
resourceType: 'kymas',
84+
namespaceId: 'kyma-system',
85+
apiGroup: 'operator.kyma-project.io',
86+
apiVersion: 'v1beta2',
8487
} as ColumnState,
8588
midColumn: null,
8689
endColumn: null,
8790
layout: 'TwoColumnsMidExpanded',
8891
showCreate: {
89-
resourceType: 'kymamodules',
92+
resourceType: 'kymas',
9093
resourceUrl: resourceUrl,
9194
} as ShowCreate,
9295
});

src/resources/other/kymaModules.routes.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const ColumnWraper = ({
4242
apiGroup: '',
4343
apiVersion: 'v1',
4444
resourceName: resourceName,
45+
isModule: true,
4546
resource:
4647
layoutState?.showCreate?.resource ||
4748
layoutState?.showEdit?.resource ||

src/shared/hooks/usePrepareLayout.js

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ export function usePrepareLayoutColumns({
9090
isCustomResource,
9191
crName,
9292
resource,
93+
isModule,
9394
}) {
9495
const setLayoutColumn = useSetRecoilState(columnLayoutState);
9596
const setIsFormOpen = useSetRecoilState(isFormOpenState);
@@ -102,6 +103,41 @@ export function usePrepareLayoutColumns({
102103

103104
const newLayoutState = useMemo(() => {
104105
const isAllNamespaces = namespaceId === '-all-';
106+
107+
if (isModule) {
108+
return {
109+
layout: layout || 'OneColumn',
110+
startColumn: {
111+
resourceType: 'kymas',
112+
namespaceId: 'kyma-system',
113+
apiGroup: 'operator.kyma-project.io',
114+
apiVersion: 'v1beta2',
115+
},
116+
midColumn: resourceName
117+
? {
118+
resourceName,
119+
resourceType,
120+
namespaceId,
121+
apiGroup,
122+
apiVersion,
123+
}
124+
: null,
125+
showCreate: showCreate ? { resourceType, namespaceId, resource } : null,
126+
showEdit: showEdit
127+
? editColumn === 'startColumn'
128+
? { resourceType, namespaceId, apiGroup, apiVersion }
129+
: {
130+
resourceName,
131+
resourceType,
132+
namespaceId,
133+
apiGroup,
134+
apiVersion,
135+
resource,
136+
}
137+
: null,
138+
};
139+
}
140+
105141
if (!layout || layout === 'OneColumn' || isAllNamespaces) {
106142
return {
107143
layout: 'OneColumn',
@@ -218,6 +254,7 @@ export function usePrepareLayoutColumns({
218254
isCustomResource,
219255
crName,
220256
resource,
257+
isModule,
221258
]);
222259

223260
useEffect(() => {

tests/integration/tests/kyma-namespace/test-hpa.spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { chooseComboboxOption } from '../../support/helpers';
55
const HPA_NAME = 'test-hpa';
66
const DOCKER_IMAGE = 'nginx';
77
const DEPLOYEMENT_NAME = 'no-pod';
8-
const MIN_REPLICAS = 2;
8+
const MIN_REPLICAS = 1;
99
const MAX_REPLICAS = 3;
1010
const SCALE_TARGET_REF_KIND = 'Deployment';
1111
const SCALE_TARGET_REF_NAME = 'no-pod';
@@ -103,10 +103,11 @@ context('Test HPA', () => {
103103

104104
cy.getMidColumn()
105105
.get('[data-testid="spec.minReplicas"]:visible')
106+
.eq(0)
106107
.find('input')
107108
.click()
108109
.clear()
109-
.type(MIN_REPLICAS, { force: true });
110+
.type(MIN_REPLICAS);
110111

111112
cy.saveChanges('Edit');
112113
cy.inspectTab('View');

0 commit comments

Comments
 (0)