Skip to content

Commit 4716f7a

Browse files
chriskarichriskari
committed
feat: improve initial layout
1 parent 6edb6f0 commit 4716f7a

File tree

5 files changed

+134
-81
lines changed

5 files changed

+134
-81
lines changed

‎src/components/App/ExtensibilityRoutes.js‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,36 @@ const ColumnWrapper = ({
3434
const { t } = useTranslation();
3535

3636
const { namespaceId, resourceName } = useParams();
37-
const initialLayoutState = {
38-
layout: layout ?? layoutState?.layout,
39-
startColumn: {
40-
resourceName: null,
41-
resourceType: urlPath ?? resourceType,
42-
namespaceId: namespaceId,
43-
apiGroup: extension?.general.resource.group,
44-
apiVersion: extension?.general.resource.version,
45-
},
46-
midColumn: {
47-
resourceName: resourceName,
48-
resourceType: urlPath ?? resourceType,
49-
namespaceId: namespaceId,
50-
apiGroup: extension?.general.resource.group,
51-
apiVersion: extension?.general.resource.version,
52-
},
53-
endColumn: null,
54-
};
37+
const initialLayoutState = layout
38+
? {
39+
layout: layout,
40+
startColumn: {
41+
resourceName: null,
42+
resourceType: urlPath ?? resourceType,
43+
namespaceId: namespaceId,
44+
apiGroup: extension?.general.resource.group,
45+
apiVersion: extension?.general.resource.version,
46+
},
47+
midColumn: {
48+
resourceName: resourceName,
49+
resourceType: urlPath ?? resourceType,
50+
namespaceId: namespaceId,
51+
apiGroup: extension?.general.resource.group,
52+
apiVersion: extension?.general.resource.version,
53+
},
54+
endColumn: null,
55+
}
56+
: {
57+
layout: layoutState?.layout,
58+
startColumn: {
59+
resourceType: urlPath ?? resourceType,
60+
namespaceId: namespaceId,
61+
apiGroup: extension?.general.resource.group,
62+
apiVersion: extension?.general.resource.version,
63+
},
64+
midColumn: null,
65+
endColumn: null,
66+
};
5567

5668
useEffect(() => {
5769
setLayoutColumn(initialLayoutState);

‎src/resources/createResourceRoutes.js‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,35 @@ const ColumnWrapper = ({
5757
[props.namespaceId, namespaceIdFromParams],
5858
);
5959

60-
const initialLayoutState = {
61-
layout: layout ?? layoutState?.layout,
62-
startColumn: {
63-
resourceType: props.resourceType,
64-
namespaceId: namespaceId,
65-
apiGroup: props.apiGroup,
66-
apiVersion: props.apiVersion,
67-
},
68-
midColumn: {
69-
resourceName: resourceName,
70-
resourceType: props.resourceType,
71-
namespaceId: namespaceId,
72-
apiGroup: props.apiGroup,
73-
apiVersion: props.apiVersion,
74-
},
75-
endColumn: null,
76-
};
60+
const initialLayoutState = layout
61+
? {
62+
layout: layout,
63+
startColumn: {
64+
resourceType: props.resourceType,
65+
namespaceId: namespaceId,
66+
apiGroup: props.apiGroup,
67+
apiVersion: props.apiVersion,
68+
},
69+
midColumn: {
70+
resourceName: resourceName,
71+
resourceType: props.resourceType,
72+
namespaceId: namespaceId,
73+
apiGroup: props.apiGroup,
74+
apiVersion: props.apiVersion,
75+
},
76+
endColumn: null,
77+
}
78+
: {
79+
layout: layoutState?.layout,
80+
startColumn: {
81+
resourceType: props.resourceType,
82+
namespaceId: namespaceId,
83+
apiGroup: props.apiGroup,
84+
apiVersion: props.apiVersion,
85+
},
86+
midColumn: null,
87+
endColumn: null,
88+
};
7789

7890
useEffect(() => {
7991
setLayoutColumn(initialLayoutState);

‎src/resources/other/BusolaExtensions.routes.js‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,29 @@ const ColumnWrapper = ({ defaultColumn = 'list' }) => {
3232

3333
const { namespace, name } = useParams();
3434

35-
const initialLayoutState = {
36-
layout: layout ?? layoutState?.layout,
37-
startColumn: {
38-
resourceType: 'Extensions',
39-
namespaceId: namespace,
40-
},
41-
midColumn: {
42-
resourceName: name,
43-
resourceType: 'Extensions',
44-
namespaceId: namespace,
45-
},
46-
endColumn: null,
47-
};
35+
const initialLayoutState = layout
36+
? {
37+
layout: layout,
38+
startColumn: {
39+
resourceType: 'Extensions',
40+
namespaceId: namespace,
41+
},
42+
midColumn: {
43+
resourceName: name,
44+
resourceType: 'Extensions',
45+
namespaceId: namespace,
46+
},
47+
endColumn: null,
48+
}
49+
: {
50+
layout: layoutState?.layout,
51+
startColumn: {
52+
resourceType: 'Extensions',
53+
namespaceId: namespace,
54+
},
55+
midColumn: null,
56+
endColumn: null,
57+
};
4858

4959
useEffect(() => {
5060
setLayoutColumn(initialLayoutState);

‎src/resources/other/CustomResourcesByGroup.routes.js‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,36 @@ export const ColumnWrapper = ({ defaultColumn = 'list' }) => {
3636
const { crdName, crName } = useParams();
3737
const { namespace, scopedUrl } = useUrl();
3838

39-
const initialLayoutState = {
40-
layout: layout ?? layoutState?.layout,
41-
startColumn: {
42-
resourceType: 'CustomResourceDefinition',
43-
},
44-
midColumn: crdName
45-
? {
46-
resourceName: crdName,
39+
const initialLayoutState = layout
40+
? {
41+
layout: layout,
42+
startColumn: {
43+
resourceType: 'CustomResourceDefinition',
44+
},
45+
midColumn: crdName
46+
? {
47+
resourceName: crdName,
48+
resourceType: 'CustomResourceDefinition',
49+
namespaceId: null,
50+
}
51+
: null,
52+
endColumn:
53+
crdName && crName
54+
? {
55+
resourceName: crName,
56+
resourceType: crdName,
57+
namespaceId: namespace,
58+
}
59+
: null,
60+
}
61+
: {
62+
layout: layoutState?.layout,
63+
startColumn: {
4764
resourceType: 'CustomResourceDefinition',
48-
namespaceId: null,
49-
}
50-
: null,
51-
endColumn:
52-
crdName && crName
53-
? {
54-
resourceName: crName,
55-
resourceType: crdName,
56-
namespaceId: namespace,
57-
}
58-
: null,
59-
};
65+
},
66+
midColumn: null,
67+
endColumn: null,
68+
};
6069

6170
useEffect(() => {
6271
setLayoutColumn(initialLayoutState);

‎src/resources/other/helmReleases.routes.js‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,29 @@ const ColumnWrapper = ({ defaultColumn = 'list' }) => {
1919
const layout = searchParams.get('layout');
2020
const { namespaceId, releaseName } = useParams();
2121

22-
const initialLayoutState = {
23-
layout: layout ? layout : layoutState?.layout,
24-
startColumn: {
25-
resourceType: 'HelmReleases',
26-
namespaceId,
27-
},
28-
midColumn: {
29-
resourceName: releaseName,
30-
resourceType: 'HelmReleases',
31-
namespaceId,
32-
},
33-
endColumn: null,
34-
};
22+
const initialLayoutState = layout
23+
? {
24+
layout: layout,
25+
startColumn: {
26+
resourceType: 'HelmReleases',
27+
namespaceId,
28+
},
29+
midColumn: {
30+
resourceName: releaseName,
31+
resourceType: 'HelmReleases',
32+
namespaceId,
33+
},
34+
endColumn: null,
35+
}
36+
: {
37+
layout: layoutState?.layout,
38+
startColumn: {
39+
resourceType: 'HelmReleases',
40+
namespaceId,
41+
},
42+
midColumn: null,
43+
endColumn: null,
44+
};
3545

3646
useEffect(() => {
3747
setLayoutColumn(initialLayoutState);

0 commit comments

Comments
 (0)