Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(inventoryList): issues/389 display cloud providers #467

Merged
merged 1 commit into from
Oct 20, 2020
Merged

fix(inventoryList): issues/389 display cloud providers #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions public/locales/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@
"tableEmptyInventoryTitle": "No results found",
"tableEmptyInventoryMessage": "No results match the filter criteria. Remove filters or clear all filters to show results.",
"tableSkeletonAriaLabel": "Loading",
"label_numberOfGuests": "<0>{{value}} VMs</0>",
"cloudProvider": "{{context}}",
"cloudProvider_aws": "AWS",
"cloudProvider_azure": "Azure",
"cloudProvider_google": "Google",
"cloudProvider_ibm": "IBM",
"hardwareType": "{{context}}",
"hardwareType_cloud": "Public cloud",
"hardwareType_hypervisor": "Hypervisor",
"hardwareType_physical": "Physical",
"hardwareType_virtualized": "Virtual",
Expand Down
36 changes: 34 additions & 2 deletions src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,22 @@ Array [
"key": "curiosity-inventory.cardHeading",
"match": "t('curiosity-inventory.cardHeading')",
},
Object {
"key": "curiosity-inventory.label",
"match": "translate('curiosity-inventory.label', { context: 'numberOfGuests', value: numberOfGuests.value }, [ <PfLabel color=\\"blue\\" /> ])",
},
Object {
"key": "curiosity-inventory.label",
"match": "translate('curiosity-inventory.label', { context: 'numberOfGuests', value: numberOfGuests.value }, [ <PfLabel color=\\"blue\\" /> ])",
},
Object {
"key": "curiosity-inventory.hardwareType",
"match": "translate('curiosity-inventory.hardwareType', { context: hardwareType.value })",
},
Object {
"key": "curiosity-inventory.cloudProvider",
"match": "translate('curiosity-inventory.cloudProvider', { context: cloudProvider.value })",
},
],
},
Object {
Expand Down Expand Up @@ -320,10 +332,22 @@ Array [
"key": "curiosity-inventory.cardHeading",
"match": "t('curiosity-inventory.cardHeading')",
},
Object {
"key": "curiosity-inventory.label",
"match": "translate('curiosity-inventory.label', { context: 'numberOfGuests', value: numberOfGuests.value }, [ <PfLabel color=\\"blue\\" /> ])",
},
Object {
"key": "curiosity-inventory.label",
"match": "translate('curiosity-inventory.label', { context: 'numberOfGuests', value: numberOfGuests.value }, [ <PfLabel color=\\"blue\\" /> ])",
},
Object {
"key": "curiosity-inventory.hardwareType",
"match": "translate('curiosity-inventory.hardwareType', { context: hardwareType.value })",
},
Object {
"key": "curiosity-inventory.cloudProvider",
"match": "translate('curiosity-inventory.cloudProvider', { context: cloudProvider.value })",
},
],
},
Object {
Expand Down Expand Up @@ -462,11 +486,19 @@ Array [
},
Object {
"file": "./src/components/openshiftView/openshiftView.js",
"key": "curiosity-inventory.hardwareType",
"key": "curiosity-inventory.label",
},
Object {
"file": "./src/components/openshiftView/openshiftView.js",
"key": "curiosity-inventory.label",
},
Object {
"file": "./src/components/rhelView/rhelView.js",
"key": "curiosity-inventory.label",
},
Object {
"file": "./src/components/rhelView/rhelView.js",
"key": "curiosity-inventory.hardwareType",
"key": "curiosity-inventory.label",
},
]
`;
Expand Down
20 changes: 9 additions & 11 deletions src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,15 +379,15 @@ Object {
exports[`OpenshiftView Component should have default props that set product configuration: filteredInventoryData results 1`] = `
Object {
"cells": Array [
"lorem",
<React.Fragment>
lorem

t(curiosity-inventory.label, [object Object], [object Object])
</React.Fragment>,
<React.Fragment>
t(curiosity-inventory.hardwareType, [object Object])

<Badge
isRead={true}
>
3
</Badge>

</React.Fragment>,
10,
12,
Expand Down Expand Up @@ -450,15 +450,13 @@ Object {
variant="link"
>
lorem

t(curiosity-inventory.label, [object Object], [object Object])
</Button>,
<React.Fragment>
t(curiosity-inventory.hardwareType, [object Object])

<Badge
isRead={true}
>
3
</Badge>

</React.Fragment>,
10,
12,
Expand Down
37 changes: 28 additions & 9 deletions src/components/openshiftView/openshiftView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
chart_color_blue_100 as chartColorBlueLight,
chart_color_blue_300 as chartColorBlueDark
} from '@patternfly/react-tokens';
import { Badge, Button } from '@patternfly/react-core';
import { Button, Label as PfLabel } from '@patternfly/react-core';
import { DateFormat } from '@redhat-cloud-services/frontend-components/components/cjs/DateFormat';
import { PageLayout, PageHeader, PageSection, PageToolbar } from '../pageLayout/pageLayout';
import {
Expand Down Expand Up @@ -286,22 +286,31 @@ OpenshiftView.defaultProps = {
},
{
id: 'lastSeen',
cell: obj => (obj?.lastSeen?.value && <DateFormat date={obj?.lastSeen?.value} />) || ''
cell: data => (data?.lastSeen?.value && <DateFormat date={data?.lastSeen?.value} />) || ''
}
],
initialInventoryFilters: [
{
id: 'displayName',
cell: (data, session) => {
const { displayName, inventoryId } = data;
const { displayName, inventoryId, numberOfGuests } = data;
const { inventory: authorized } = session?.authorized || {};

if (!inventoryId?.value) {
return displayName?.value;
}

if (!authorized) {
return displayName?.value || inventoryId?.value;
return (
<React.Fragment>
{displayName?.value || inventoryId?.value}{' '}
{(numberOfGuests.value &&
translate('curiosity-inventory.label', { context: 'numberOfGuests', value: numberOfGuests.value }, [
<PfLabel color="blue" />
])) ||
''}
</React.Fragment>
);
}

return (
Expand All @@ -312,20 +321,30 @@ OpenshiftView.defaultProps = {
target="_blank"
href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${inventoryId.value}/`}
>
{displayName.value || inventoryId.value}
{displayName.value || inventoryId.value}{' '}
{(numberOfGuests.value &&
translate('curiosity-inventory.label', { context: 'numberOfGuests', value: numberOfGuests.value }, [
<PfLabel color="blue" />
])) ||
''}
</Button>
);
},
isSortable: true
},
{
id: 'hardwareType',
cell: obj => {
const { hardwareType, numberOfGuests } = obj;
cell: data => {
const { cloudProvider, hardwareType } = data;
return (
<React.Fragment>
{translate('curiosity-inventory.hardwareType', { context: hardwareType.value })}{' '}
{(numberOfGuests.value && <Badge isRead>{numberOfGuests.value}</Badge>) || ''}
{(cloudProvider?.value && (
<PfLabel color="purple">
{translate('curiosity-inventory.cloudProvider', { context: cloudProvider.value })}
</PfLabel>
)) ||
''}
</React.Fragment>
);
},
Expand All @@ -343,7 +362,7 @@ OpenshiftView.defaultProps = {
},
{
id: 'lastSeen',
cell: obj => (obj?.lastSeen?.value && <DateFormat date={obj?.lastSeen?.value} />) || '',
cell: data => (data?.lastSeen?.value && <DateFormat date={data?.lastSeen?.value} />) || '',
isSortable: true
}
],
Expand Down
20 changes: 9 additions & 11 deletions src/components/rhelView/__tests__/__snapshots__/rhelView.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,15 +349,15 @@ Object {
exports[`RhelView Component should have default props that set product configuration: filteredInventoryData results 1`] = `
Object {
"cells": Array [
"lorem",
<React.Fragment>
lorem

t(curiosity-inventory.label, [object Object], [object Object])
</React.Fragment>,
<React.Fragment>
t(curiosity-inventory.hardwareType, [object Object])

<Badge
isRead={true}
>
3
</Badge>

</React.Fragment>,
10,
<DateFormat
Expand Down Expand Up @@ -418,15 +418,13 @@ Object {
variant="link"
>
lorem

t(curiosity-inventory.label, [object Object], [object Object])
</Button>,
<React.Fragment>
t(curiosity-inventory.hardwareType, [object Object])

<Badge
isRead={true}
>
3
</Badge>

</React.Fragment>,
10,
<DateFormat
Expand Down
37 changes: 28 additions & 9 deletions src/components/rhelView/rhelView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
chart_color_purple_100 as chartColorPurpleLight,
chart_color_purple_300 as chartColorPurpleDark
} from '@patternfly/react-tokens';
import { Badge, Button } from '@patternfly/react-core';
import { Button, Label as PfLabel } from '@patternfly/react-core';
import { DateFormat } from '@redhat-cloud-services/frontend-components/components/cjs/DateFormat';
import { PageLayout, PageHeader, PageSection, PageToolbar } from '../pageLayout/pageLayout';
import {
Expand Down Expand Up @@ -208,22 +208,31 @@ RhelView.defaultProps = {
},
{
id: 'lastSeen',
cell: obj => (obj?.lastSeen?.value && <DateFormat date={obj?.lastSeen?.value} />) || ''
cell: data => (data?.lastSeen?.value && <DateFormat date={data?.lastSeen?.value} />) || ''
}
],
initialInventoryFilters: [
{
id: 'displayName',
cell: (data, session) => {
const { displayName, inventoryId } = data;
const { displayName, inventoryId, numberOfGuests } = data;
const { inventory: authorized } = session?.authorized || {};

if (!inventoryId?.value) {
return displayName?.value;
}

if (!authorized) {
return displayName?.value || inventoryId?.value;
return (
<React.Fragment>
{displayName?.value || inventoryId?.value}{' '}
{(numberOfGuests.value &&
translate('curiosity-inventory.label', { context: 'numberOfGuests', value: numberOfGuests.value }, [
<PfLabel color="blue" />
])) ||
''}
</React.Fragment>
);
}

return (
Expand All @@ -234,20 +243,30 @@ RhelView.defaultProps = {
target="_blank"
href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${inventoryId.value}/`}
>
{displayName.value || inventoryId.value}
{displayName.value || inventoryId.value}{' '}
{(numberOfGuests.value &&
translate('curiosity-inventory.label', { context: 'numberOfGuests', value: numberOfGuests.value }, [
<PfLabel color="blue" />
])) ||
''}
</Button>
);
},
isSortable: true
},
{
id: 'hardwareType',
cell: obj => {
const { hardwareType, numberOfGuests } = obj;
cell: data => {
const { cloudProvider, hardwareType } = data;
return (
<React.Fragment>
{translate('curiosity-inventory.hardwareType', { context: hardwareType.value })}{' '}
{(numberOfGuests.value && <Badge isRead>{numberOfGuests.value}</Badge>) || ''}
{(cloudProvider?.value && (
<PfLabel color="purple">
{translate('curiosity-inventory.cloudProvider', { context: cloudProvider.value })}
</PfLabel>
)) ||
''}
</React.Fragment>
);
},
Expand All @@ -259,7 +278,7 @@ RhelView.defaultProps = {
},
{
id: 'lastSeen',
cell: obj => (obj?.lastSeen?.value && <DateFormat date={obj?.lastSeen?.value} />) || '',
cell: data => (data?.lastSeen?.value && <DateFormat date={data?.lastSeen?.value} />) || '',
isSortable: true
}
],
Expand Down
Loading