External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 18:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Account for node state of 'unavailable' in the UI.

Browse Source
This commit is contained in:
Kia Lam
2022-09-07 12:39:32 -07:00
committed by Jeff Bradberry
parent b1168ce77d
commit fd10d83893
5 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/src/components/StatusIcon/StatusIcon.js
View File

@@ -27,6 +27,7 @@ const colors = {
installed: blue, installed: blue,
provisioning: gray, provisioning: gray,
deprovisioning: gray, deprovisioning: gray,
unavailable: red,
'provision-fail': red, 'provision-fail': red,
'deprovision-fail': red, 'deprovision-fail': red,
}; };

1
awx/ui/src/components/StatusIcon/icons.js
View File

@@ -46,6 +46,7 @@ const icons = {
installed: ClockIcon, installed: ClockIcon,
provisioning: PlusCircleIcon, provisioning: PlusCircleIcon,
deprovisioning: MinusCircleIcon, deprovisioning: MinusCircleIcon,
unavailable: ExclamationCircleIcon,
'provision-fail': ExclamationCircleIcon, 'provision-fail': ExclamationCircleIcon,
'deprovision-fail': ExclamationCircleIcon, 'deprovision-fail': ExclamationCircleIcon,
}; };

3
awx/ui/src/components/StatusLabel/StatusLabel.js
View File

@@ -29,6 +29,7 @@ const colors = {
installed: 'blue', installed: 'blue',
provisioning: 'gray', provisioning: 'gray',
deprovisioning: 'gray', deprovisioning: 'gray',
unavailable: 'red',
'provision-fail': 'red', 'provision-fail': 'red',
'deprovision-fail': 'red', 'deprovision-fail': 'red',
}; };
@@ -57,6 +58,7 @@ export default function StatusLabel({ status, tooltipContent = '', children }) {
installed: t`Installed`, installed: t`Installed`,
provisioning: t`Provisioning`, provisioning: t`Provisioning`,
deprovisioning: t`Deprovisioning`, deprovisioning: t`Deprovisioning`,
unavailable: t`Unavailable`,
'provision-fail': t`Provisioning fail`, 'provision-fail': t`Provisioning fail`,
'deprovision-fail': t`Deprovisioning fail`, 'deprovision-fail': t`Deprovisioning fail`,
}; };
@@ -106,6 +108,7 @@ StatusLabel.propTypes = {
'installed', 'installed',
'provisioning', 'provisioning',
'deprovisioning', 'deprovisioning',
'unavailable',
'provision-fail', 'provision-fail',
'deprovision-fail', 'deprovision-fail',
]).isRequired, ]).isRequired,

1
awx/ui/src/screens/TopologyView/constants.js
View File

@@ -21,6 +21,7 @@ export const NODE_STATE_COLOR_KEY = {
ready: '#3E8635', ready: '#3E8635',
'provision-fail': '#C9190B', 'provision-fail': '#C9190B',
'deprovision-fail': '#C9190B', 'deprovision-fail': '#C9190B',
unavailable: '#C9190B',
installed: '#0066CC', installed: '#0066CC',
provisioning: '#666', provisioning: '#666',
deprovisioning: '#666', deprovisioning: '#666',

5
awx/ui/src/screens/TopologyView/utils/helpers.js
View File

@@ -44,6 +44,7 @@ export function renderLabelIcons(nodeState) {
const nodeLabelIconMapper = { const nodeLabelIconMapper = {
ready: 'checkmark', ready: 'checkmark',
installed: 'clock', installed: 'clock',
unavailable: 'exclaimation',
'provision-fail': 'exclaimation', 'provision-fail': 'exclaimation',
'deprovision-fail': 'exclaimation', 'deprovision-fail': 'exclaimation',
provisioning: 'plus', provisioning: 'plus',
@@ -60,6 +61,7 @@ export function renderIconPosition(nodeState, bbox) {
const iconPositionMapper = { const iconPositionMapper = {
ready: `translate(${bbox.x - 15}, ${bbox.y + 3}), scale(0.02)`, ready: `translate(${bbox.x - 15}, ${bbox.y + 3}), scale(0.02)`,
installed: `translate(${bbox.x - 18}, ${bbox.y + 1}), scale(0.03)`, installed: `translate(${bbox.x - 18}, ${bbox.y + 1}), scale(0.03)`,
unavailable: `translate(${bbox.x - 9}, ${bbox.y + 3}), scale(0.02)`,
'provision-fail': `translate(${bbox.x - 9}, ${bbox.y + 3}), scale(0.02)`, 'provision-fail': `translate(${bbox.x - 9}, ${bbox.y + 3}), scale(0.02)`,
'deprovision-fail': `translate(${bbox.x - 9}, ${ 'deprovision-fail': `translate(${bbox.x - 9}, ${
bbox.y + 3 bbox.y + 3
@@ -128,7 +130,8 @@ export const generateRandomNodes = (n) => {
'installed', 'installed',
'provision-fail', 'provision-fail',
'deprovision-fail', 'deprovision-fail',
][getRandomInt(0, 5)]; 'unavailable',
][getRandomInt(0, 6)];
} }
for (let i = 0; i < n; i++) { for (let i = 0; i < n; i++) {
const id = i + 1; const id = i + 1;