Skip to content

Commit 3022012

Browse files
Updates per UX review
1 parent 992b1ce commit 3022012

15 files changed

Lines changed: 930 additions & 439 deletions

File tree

frontend/packages/console-app/locales/en/console-app.json

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,41 @@
352352
"Unpin": "Unpin",
353353
"Remove from navigation?": "Remove from navigation?",
354354
"Remove": "Remove",
355+
"Host addresses": "Host addresses",
356+
"Management": "Management",
357+
"NICs": "NICs",
358+
"Boot interface MAC": "Boot interface MAC",
359+
"Detached": "Detached",
360+
"No power management": "No power management",
361+
"Restart pending": "Restart pending",
362+
"On": "On",
363+
"Powering off": "Powering off",
364+
"Powering on": "Powering on",
365+
"Off": "Off",
366+
"Details": "Details",
367+
"Address": "Address",
368+
"Firmware": "Firmware",
369+
"Power state": "Power state",
370+
"Credentials": "Credentials",
371+
"namespace {{namespace}}": "namespace {{namespace}}",
372+
"BMC Configuration": "BMC Configuration",
373+
"Unable to load BMC configuration": "Unable to load BMC configuration",
374+
"There is no BMC configuration associated with this node": "There is no BMC configuration associated with this node",
375+
"Machine details": "Machine details",
376+
"Machine is not available": "Machine is not available",
377+
"Unable to load Machine resources": "Unable to load Machine resources",
378+
"There is no machine associated with this node": "There is no machine associated with this node",
379+
"Phase": "Phase",
380+
"Provider state": "Provider state",
381+
"Machine role": "Machine role",
382+
"Instance type": "Instance type",
383+
"Region": "Region",
384+
"Machine addresses": "Machine addresses",
355385
"Rotational": "Rotational",
356386
"SSD": "SSD",
357387
"Local disks": "Local disks",
358388
"Unable to load local disks": "Unable to load local disks",
389+
"Unable to load BareMetalHost": "Unable to load BareMetalHost",
359390
"Model": "Model",
360391
"Serial number": "Serial number",
361392
"Vendor": "Vendor",
@@ -370,28 +401,20 @@
370401
"Capacity": "Capacity",
371402
"Pod": "Pod",
372403
"No persistent volumes found": "No persistent volumes found",
404+
"Operating system": "Operating system",
373405
"Machine": "Machine",
374406
"MachineConfigPool": "MachineConfigPool",
407+
"MachineConfigPools are not available": "MachineConfigPools are not available",
408+
"Unable to load MachineConfigPool resources": "Unable to load MachineConfigPool resources",
409+
"There is no MachineConfigPool associated with this node": "There is no MachineConfigPool associated with this node",
375410
"Max unavailable machines": "Max unavailable machines",
376411
"Paused": "Paused",
377412
"True": "True",
378413
"False": "False",
379414
"Node selector": "Node selector",
380-
"Node": "Node",
381415
"MachineConfig selector": "MachineConfig selector",
382416
"Current configuration": "Current configuration",
383417
"Current configuration source": "Current configuration source",
384-
"Machine details": "Machine details",
385-
"Phase": "Phase",
386-
"Provider state": "Provider state",
387-
"Machine role": "Machine role",
388-
"Instance type": "Instance type",
389-
"Region": "Region",
390-
"Machine addresses": "Machine addresses",
391-
"Error loading machine config pool": "Error loading machine config pool",
392-
"There is no MachineConfigPool associated with this node": "There is no MachineConfigPool associated with this node",
393-
"Error loading machine": "Error loading machine",
394-
"There is no machine associated with this node": "There is no machine associated with this node",
395418
"This action cannot be undone. Deleting a node will instruct Kubernetes that the node is down or unrecoverable and delete all pods scheduled to that node. If the node is still running but unresponsive and the node is deleted, stateful workloads and persistent volumes may suffer corruption or data loss. Only delete a node that you have confirmed is completely stopped and cannot be restored.": "This action cannot be undone. Deleting a node will instruct Kubernetes that the node is down or unrecoverable and delete all pods scheduled to that node. If the node is still running but unresponsive and the node is deleted, stateful workloads and persistent volumes may suffer corruption or data loss. Only delete a node that you have confirmed is completely stopped and cannot be restored.",
396419
"Mark as schedulable": "Mark as schedulable",
397420
"Mark as unschedulable": "Mark as unschedulable",
@@ -422,7 +445,6 @@
422445
"Disk": "Disk",
423446
"Network interface": "Network interface",
424447
"CPU": "CPU",
425-
"Details": "Details",
426448
"Node name": "Node name",
427449
"Not available": "Not available",
428450
"Node addresses": "Node addresses",
@@ -467,7 +489,6 @@
467489
"Provider ID": "Provider ID",
468490
"Unschedulable": "Unschedulable",
469491
"Created": "Created",
470-
"Operating system": "Operating system",
471492
"OS image": "OS image",
472493
"Architecture": "Architecture",
473494
"Kernel version": "Kernel version",
@@ -479,6 +500,7 @@
479500
"Machine set": "Machine set",
480501
"This count is based on your access permissions and might not include all virtual machines.": "This count is based on your access permissions and might not include all virtual machines.",
481502
"{{formattedCores}} cores / {{totalCores}} cores": "{{formattedCores}} cores / {{totalCores}} cores",
503+
"Node": "Node",
482504
"Ready": "Ready",
483505
"Not Ready": "Not Ready",
484506
"Discovered": "Discovered",
@@ -502,6 +524,7 @@
502524
"Certificate approval required": "Certificate approval required",
503525
"An error occurred. Please try again": "An error occurred. Please try again",
504526
"No new Pods or workloads will be placed on this Node until it's marked as schedulable.": "No new Pods or workloads will be placed on this Node until it's marked as schedulable.",
527+
"Unable to load VirtualMachines": "Unable to load VirtualMachines",
505528
"Identity providers": "Identity providers",
506529
"Mapping method": "Mapping method",
507530
"Remove identity provider": "Remove identity provider",

frontend/packages/console-app/src/components/nodes/NodeSubNavPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const NodeSubNavPage: FC<NodeSubNavPageProps> = ({ obj, pageId, standardP
7575
<FlexItem className="pf-v6-u-h-100">
7676
<Tabs
7777
className="pf-v6-u-pt-md"
78-
activeKey={activeTabKey || pages[0].tabId}
78+
activeKey={activeTabKey || pages[0]?.tabId}
7979
component="nav"
8080
isVertical
8181
usePageInsets

frontend/packages/console-app/src/components/nodes/configuration/NodeConfiguration.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import type { FC } from 'react';
22
import type { NodeKind } from '@console/dynamic-plugin-sdk/src';
33
import { NodeSubNavPage } from '../NodeSubNavPage';
4+
import Machine from './machine/Machine';
45
import NodeStorage from './node-storage/NodeStorage';
5-
import NodeMachine from './NodeMachine';
6+
import OperatingSystem from './OperatingSystem';
67

78
type NodeConfigurationProps = {
89
obj: NodeKind;
@@ -16,12 +17,19 @@ const standardPages = [
1617
component: NodeStorage,
1718
priority: 70,
1819
},
20+
{
21+
tabId: 'operating-system',
22+
// t('console-app~Operating system')
23+
nameKey: 'console-app~Operating system',
24+
component: OperatingSystem,
25+
priority: 50,
26+
},
1927
{
2028
tabId: 'machine',
2129
// t('console-app~Machine')
2230
nameKey: 'console-app~Machine',
23-
component: NodeMachine,
24-
priority: 50,
31+
component: Machine,
32+
priority: 40,
2533
},
2634
];
2735

0 commit comments

Comments
 (0)