Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/components/KymaModules/components/ModulesList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,16 @@ export const ModulesList = ({
const handleShowAddModule = () => {
setLayoutColumn({
startColumn: {
resourceType: 'kymamodules',
resourceType: 'kymas',
namespaceId: 'kyma-system',
apiGroup: 'operator.kyma-project.io',
apiVersion: 'v1beta2',
} as ColumnState,
midColumn: null,
endColumn: null,
layout: 'TwoColumnsMidExpanded',
showCreate: {
resourceType: 'kymamodules',
resourceType: 'kymas',
resourceUrl: resourceUrl,
} as ShowCreate,
});
Expand Down
1 change: 1 addition & 0 deletions src/resources/other/kymaModules.routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const ColumnWraper = ({
apiGroup: '',
apiVersion: 'v1',
resourceName: resourceName,
isModule: true,
resource:
layoutState?.showCreate?.resource ||
layoutState?.showEdit?.resource ||
Expand Down
37 changes: 37 additions & 0 deletions src/shared/hooks/usePrepareLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ export function usePrepareLayoutColumns({
isCustomResource,
crName,
resource,
isModule,
}) {
const setLayoutColumn = useSetRecoilState(columnLayoutState);
const setIsFormOpen = useSetRecoilState(isFormOpenState);
Expand All @@ -102,6 +103,41 @@ export function usePrepareLayoutColumns({

const newLayoutState = useMemo(() => {
const isAllNamespaces = namespaceId === '-all-';

if (isModule) {
return {
layout: layout || 'OneColumn',
startColumn: {
resourceType: 'kymas',
namespaceId: 'kyma-system',
apiGroup: 'operator.kyma-project.io',
apiVersion: 'v1beta2',
},
midColumn: resourceName
? {
resourceName,
resourceType,
namespaceId,
apiGroup,
apiVersion,
}
: null,
showCreate: showCreate ? { resourceType, namespaceId, resource } : null,
showEdit: showEdit
? editColumn === 'startColumn'
? { resourceType, namespaceId, apiGroup, apiVersion }
: {
resourceName,
resourceType,
namespaceId,
apiGroup,
apiVersion,
resource,
}
: null,
};
}

if (!layout || layout === 'OneColumn' || isAllNamespaces) {
return {
layout: 'OneColumn',
Expand Down Expand Up @@ -218,6 +254,7 @@ export function usePrepareLayoutColumns({
isCustomResource,
crName,
resource,
isModule,
]);

useEffect(() => {
Expand Down
5 changes: 3 additions & 2 deletions tests/integration/tests/kyma-namespace/test-hpa.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { chooseComboboxOption } from '../../support/helpers';
const HPA_NAME = 'test-hpa';
const DOCKER_IMAGE = 'nginx';
const DEPLOYEMENT_NAME = 'no-pod';
const MIN_REPLICAS = 2;
const MIN_REPLICAS = 1;
const MAX_REPLICAS = 3;
const SCALE_TARGET_REF_KIND = 'Deployment';
const SCALE_TARGET_REF_NAME = 'no-pod';
Expand Down Expand Up @@ -103,10 +103,11 @@ context('Test HPA', () => {

cy.getMidColumn()
.get('[data-testid="spec.minReplicas"]:visible')
.eq(0)
.find('input')
.click()
.clear()
.type(MIN_REPLICAS, { force: true });
.type(MIN_REPLICAS);

cy.saveChanges('Edit');
cy.inspectTab('View');
Expand Down
Loading