Skip to content

Commit 864834c

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #15609 from vikram-raj/ocpbugs-61660
OCPBUGS-61660: Fix Bare Metal Hosts nav item
2 parents 694efdb + 4869959 commit 864834c

File tree

5 files changed

+150
-89
lines changed

5 files changed

+150
-89
lines changed

‎frontend/packages/metal3-plugin/console-extensions.json‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,110 @@
11
[
2+
{
3+
"type": "console.flag/model",
4+
"properties": {
5+
"model": {
6+
"group": "metal3.io",
7+
"version": "v1alpha1",
8+
"kind": "BareMetalHost"
9+
},
10+
"flag": "METAL3"
11+
}
12+
},
13+
{
14+
"type": "console.flag/model",
15+
"properties": {
16+
"model": {
17+
"group": "nodemaintenance.medik8s.io",
18+
"version": "v1beta1",
19+
"kind": "NodeMaintenance"
20+
},
21+
"flag": "NODE_MAINTENANCE"
22+
}
23+
},
24+
{
25+
"type": "console.flag/model",
26+
"properties": {
27+
"model": {
28+
"group": "nodemaintenance.kubevirt.io",
29+
"version": "v1beta1",
30+
"kind": "NodeMaintenance"
31+
},
32+
"flag": "NODE_MAINTENANCE_KV_BETA"
33+
}
34+
},
35+
{
36+
"type": "console.flag/model",
37+
"properties": {
38+
"model": {
39+
"group": "kubevirt.io",
40+
"version": "v1alpha1",
41+
"kind": "NodeMaintenance"
42+
},
43+
"flag": "NODE_MAINTENANCE_KV_ALPHA"
44+
}
45+
},
246
{
347
"type": "console.flag/hookProvider",
448
"properties": {
549
"handler": { "$codeRef": "features.useDetectNodeMaintenance" }
650
}
751
},
52+
{
53+
"type": "console.model-metadata",
54+
"properties": {
55+
"model": {
56+
"group": "metal3.io",
57+
"version": "v1alpha1",
58+
"kind": "BareMetalHost"
59+
},
60+
"label": "%metal3-plugin~Bare Metal Host%",
61+
"labelPlural": "%metal3-plugin~Bare Metal Hosts%",
62+
"abbr": "BMH",
63+
"color": "#2b9af3"
64+
}
65+
},
66+
{
67+
"type": "console.model-metadata",
68+
"properties": {
69+
"model": {
70+
"group": "nodemaintenance.medik8s.io",
71+
"version": "v1beta1",
72+
"kind": "NodeMaintenance"
73+
},
74+
"label": "%metal3-plugin~Node Maintenance%",
75+
"labelPlural": "%metal3-plugin~Node Maintenances%",
76+
"abbr": "NM",
77+
"color": "#2b9af3"
78+
}
79+
},
80+
{
81+
"type": "console.model-metadata",
82+
"properties": {
83+
"model": {
84+
"group": "kubevirt.io",
85+
"version": "v1alpha1",
86+
"kind": "NodeMaintenance"
87+
},
88+
"label": "%metal3-plugin~Node Maintenance%",
89+
"labelPlural": "%metal3-plugin~Node Maintenances%",
90+
"abbr": "NM",
91+
"color": "#2b9af3"
92+
}
93+
},
94+
{
95+
"type": "console.model-metadata",
96+
"properties": {
97+
"model": {
98+
"group": "nodemaintenance.kubevirt.io",
99+
"version": "v1beta1",
100+
"kind": "NodeMaintenance"
101+
},
102+
"label": "%metal3-plugin~Node Maintenance%",
103+
"labelPlural": "%metal3-plugin~Node Maintenances%",
104+
"abbr": "NM",
105+
"color": "#2b9af3"
106+
}
107+
},
8108
{
9109
"type": "console.navigation/resource-ns",
10110
"properties": {
@@ -36,5 +136,47 @@
36136
"flags": {
37137
"required": ["NODE_MAINTENANCE_ENABLED"]
38138
}
139+
},
140+
{
141+
"type": "console.page/resource/list",
142+
"properties": {
143+
"model": {
144+
"group": "metal3.io",
145+
"version": "v1alpha1",
146+
"kind": "BareMetalHost"
147+
},
148+
"component": { "$codeRef": "baremetalHostsPage" }
149+
},
150+
"flags": {
151+
"required": ["BAREMETAL"]
152+
}
153+
},
154+
{
155+
"type": "console.page/resource/details",
156+
"properties": {
157+
"model": {
158+
"group": "metal3.io",
159+
"version": "v1alpha1",
160+
"kind": "BareMetalHost"
161+
},
162+
"component": { "$codeRef": "baremetalHostsDetailsPage" }
163+
},
164+
"flags": {
165+
"required": ["BAREMETAL"]
166+
}
167+
},
168+
{
169+
"type": "console.page/route",
170+
"properties": {
171+
"exact": true,
172+
"path": [
173+
"/k8s/ns/:ns/metal3.io~v1alpha1~BareMetalHost/~new/form",
174+
"/k8s/ns/:ns/metal3.io~v1alpha1~BareMetalHost/:name/edit"
175+
],
176+
"component": { "$codeRef": "addBareMetalHostPage" }
177+
},
178+
"flags": {
179+
"required": ["BAREMETAL", "METAL3"]
180+
}
39181
}
40182
]

‎frontend/packages/metal3-plugin/locales/en/metal3-plugin.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
2+
"Bare Metal Host": "Bare Metal Host",
23
"Bare Metal Hosts": "Bare Metal Hosts",
4+
"Node Maintenance": "Node Maintenance",
5+
"Node Maintenances": "Node Maintenances",
36
"resources": "resources",
47
"Name \"${value}\" is already taken.": "Name \"${value}\" is already taken.",
58
"Value provided is not a valid BMC address": "Value provided is not a valid BMC address",

‎frontend/packages/metal3-plugin/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
"entry": "src/plugin.tsx",
1414
"exposedModules": {
1515
"nodeActions": "src/components/maintenance/actions.tsx",
16-
"features": "src/features.ts"
16+
"features": "src/features.ts",
17+
"baremetalHostsDetailsPage": "src/components/baremetal-hosts/BareMetalHostDetailsPage.tsx",
18+
"baremetalHostsPage": "src/components/baremetal-hosts/BareMetalHostsPage.tsx",
19+
"addBareMetalHostPage": "src/components/baremetal-hosts/add-baremetal-host/AddBareMetalHostPage.tsx"
1720
}
1821
}
1922
}

‎frontend/packages/metal3-plugin/src/components/baremetal-hosts/add-baremetal-host/AddBareMetalHostPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { PageHeading } from '@console/shared/src/components/heading/PageHeading'
66
import PaneBody from '@console/shared/src/components/layout/PaneBody';
77
import AddBareMetalHost from './AddBareMetalHost';
88

9-
const AddBareMetalHostPage: React.FunctionComponent = () => {
9+
const AddBareMetalHostPage: React.FC = () => {
1010
const { t } = useTranslation();
1111
const location = useLocation();
1212
const { name, ns: namespace } = useParams();

‎frontend/packages/metal3-plugin/src/plugin.tsx‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -51,45 +51,6 @@ type ConsumedExtensions =
5151
const METAL3_FLAG = 'METAL3';
5252

5353
const plugin: Plugin<ConsumedExtensions> = [
54-
{
55-
type: 'ModelDefinition',
56-
properties: {
57-
models: [
58-
BareMetalHostModel,
59-
NodeMaintenanceModel,
60-
NodeMaintenanceKubevirtAlphaModel,
61-
NodeMaintenanceKubevirtBetaModel,
62-
],
63-
},
64-
},
65-
{
66-
type: 'FeatureFlag/Model',
67-
properties: {
68-
model: BareMetalHostModel,
69-
flag: METAL3_FLAG,
70-
},
71-
},
72-
{
73-
type: 'FeatureFlag/Model',
74-
properties: {
75-
model: NodeMaintenanceModel,
76-
flag: NODE_MAINTENANCE_FLAG,
77-
},
78-
},
79-
{
80-
type: 'FeatureFlag/Model',
81-
properties: {
82-
model: NodeMaintenanceKubevirtBetaModel,
83-
flag: NODE_MAINTENANCE_KV_BETA_FLAG,
84-
},
85-
},
86-
{
87-
type: 'FeatureFlag/Model',
88-
properties: {
89-
model: NodeMaintenanceKubevirtAlphaModel,
90-
flag: NODE_MAINTENANCE_KV_ALPHA_FLAG,
91-
},
92-
},
9354
{
9455
type: 'FeatureFlag/Custom',
9556
properties: {
@@ -102,54 +63,6 @@ const plugin: Plugin<ConsumedExtensions> = [
10263
detect: detectBMOEnabled,
10364
},
10465
},
105-
{
106-
type: 'Page/Resource/List',
107-
properties: {
108-
model: BareMetalHostModel,
109-
loader: () =>
110-
import(
111-
'./components/baremetal-hosts/BareMetalHostsPage' /* webpackChunkName: "metal3-baremetalhost" */
112-
).then((m) => m.default),
113-
},
114-
},
115-
{
116-
type: 'Page/Resource/Details',
117-
properties: {
118-
model: BareMetalHostModel,
119-
loader: () =>
120-
import(
121-
'./components/baremetal-hosts/BareMetalHostDetailsPage' /* webpackChunkName: "metal3-baremetalhost" */
122-
).then((m) => m.default),
123-
},
124-
},
125-
{
126-
type: 'Page/Route',
127-
properties: {
128-
exact: true,
129-
path: `/k8s/ns/:ns/${referenceForModel(BareMetalHostModel)}/~new/form`,
130-
loader: () =>
131-
import(
132-
'./components/baremetal-hosts/add-baremetal-host/AddBareMetalHostPage' /* webpackChunkName: "metal3-baremetalhost" */
133-
).then((m) => m.default),
134-
},
135-
flags: {
136-
required: [BAREMETAL_FLAG, METAL3_FLAG],
137-
},
138-
},
139-
{
140-
type: 'Page/Route',
141-
properties: {
142-
exact: true,
143-
path: `/k8s/ns/:ns/${referenceForModel(BareMetalHostModel)}/:name/edit`,
144-
loader: () =>
145-
import(
146-
'./components/baremetal-hosts/add-baremetal-host/AddBareMetalHostPage' /* webpackChunkName: "metal3-baremetalhost" */
147-
).then((m) => m.default),
148-
},
149-
flags: {
150-
required: [BAREMETAL_FLAG, METAL3_FLAG],
151-
},
152-
},
15366
{
15467
type: 'Dashboards/Overview/Inventory/Item/Replacement',
15568
properties: {

0 commit comments

Comments
 (0)