Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/prod-beta' into prod-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
@dlabrecq
dlabrecq committed Nov 21, 2021
2 parents d9525fd + 94a225e commit 192941a
Show file tree
Hide file tree
Showing 16 changed files with 219 additions and 178 deletions.
22 changes: 11 additions & 11 deletions koku-ui-manifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,22 +116,22 @@ mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.scandir:2.1.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.stat:2.0.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.stat:2.0.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/@nodelib/fs.walk:1.2.8.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/patternfly:4.151.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-charts:6.21.9.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-core:4.168.9.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-icons:4.19.9.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-styles:4.18.9.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-table:4.37.9.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-tokens:4.20.9.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/patternfly:4.159.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-charts:6.28.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-core:4.175.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-icons:4.26.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-styles:4.25.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-table:4.44.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@patternfly/react-tokens:4.27.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@popperjs/core:2.10.2.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-config-utilities:1.5.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-notifications:3.2.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-config-utilities:1.5.6.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-notifications:3.2.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-translations:3.2.3.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:3.2.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:3.2.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components-utilities:3.2.5.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components:3.4.11.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/rbac-client:1.0.101.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/frontend-components:3.5.1.yarnlock
mgmt_services/cost-mgmt:koku-ui/@redhat-cloud-services/rbac-client:1.0.103.yarnlock
mgmt_services/cost-mgmt:koku-ui/@restart/context:2.1.4.yarnlock
mgmt_services/cost-mgmt:koku-ui/@restart/hooks:0.3.27.yarnlock
mgmt_services/cost-mgmt:koku-ui/@restart/hooks:0.3.27.yarnlock
Expand Down
22 changes: 11 additions & 11 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@
"dependencies": {
"@formatjs/cli": "4.2.12",
"@fortawesome/free-solid-svg-icons": "5.15.2",
"@patternfly/patternfly": "^4.151.4",
"@patternfly/react-charts": "^6.21.9",
"@patternfly/react-core": "^4.168.9",
"@patternfly/react-icons": "^4.19.9",
"@patternfly/react-styles": "^4.18.9",
"@patternfly/react-table": "^4.37.9",
"@patternfly/react-tokens": "^4.20.9",
"@redhat-cloud-services/frontend-components": "^3.4.11",
"@redhat-cloud-services/frontend-components-notifications": "^3.2.4",
"@patternfly/patternfly": "^4.159.1",
"@patternfly/react-charts": "^6.28.4",
"@patternfly/react-core": "^4.175.4",
"@patternfly/react-icons": "^4.26.4",
"@patternfly/react-styles": "^4.25.4",
"@patternfly/react-table": "^4.44.4",
"@patternfly/react-tokens": "^4.27.4",
"@redhat-cloud-services/frontend-components": "^3.5.1",
"@redhat-cloud-services/frontend-components-notifications": "^3.2.5",
"@redhat-cloud-services/frontend-components-translations": "^3.2.3",
"@redhat-cloud-services/frontend-components-utilities": "^3.2.5",
"@redhat-cloud-services/rbac-client": "^1.0.101",
"@redhat-cloud-services/rbac-client": "^1.0.103",
"@types/date-fns": "2.6.0",
"@types/qs": "6.9.5",
"@types/react": "17.0.2",
Expand Down Expand Up @@ -79,7 +79,7 @@
},
"devDependencies": {
"@formatjs/cli": "4.2.12",
"@redhat-cloud-services/frontend-components-config-utilities": "^1.5.1",
"@redhat-cloud-services/frontend-components-config-utilities": "^1.5.6",
"@testing-library/react": "11.2.5",
"@types/enzyme": "3.10.8",
"@types/jest": "26.0.20",
Expand Down
32 changes: 20 additions & 12 deletions src/pages/costModels/components/priceListToolbar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import {
ToolbarGroup,
ToolbarItem,
ToolbarItemVariant,
ToolbarToggleGroup,
} from '@patternfly/react-core';
import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon';
import React from 'react';

import { styles } from './priceListToolbar.styles';
Expand Down Expand Up @@ -35,18 +37,24 @@ export const PriceListToolbar: React.SFC<PriceListToolbarProps> = ({
return (
<Toolbar style={styles.toolbar} clearAllFilters={onClear} id="price-list-toolbar">
<ToolbarContent>
<ToolbarGroup variant="filter-group">
<ToolbarItem>{primary}</ToolbarItem>
{secondaries.map(secondary => {
return (
<ToolbarItem key={secondary.name}>
<ToolbarFilter deleteChip={secondary.onRemove} chips={secondary.filters} categoryName={secondary.name}>
{selected === secondary.name ? secondary.component : ''}
</ToolbarFilter>
</ToolbarItem>
);
})}
</ToolbarGroup>
<ToolbarToggleGroup breakpoint="xl" toggleIcon={<FilterIcon />}>
<ToolbarGroup variant="filter-group">
<ToolbarItem>{primary}</ToolbarItem>
{secondaries.map(secondary => {
return (
<ToolbarItem key={secondary.name}>
<ToolbarFilter
deleteChip={secondary.onRemove}
chips={secondary.filters}
categoryName={secondary.name}
>
{selected === secondary.name ? secondary.component : ''}
</ToolbarFilter>
</ToolbarItem>
);
})}
</ToolbarGroup>
</ToolbarToggleGroup>
<ToolbarItem>{button}</ToolbarItem>
<ToolbarItem variant={ToolbarItemVariant.pagination}>{pagination}</ToolbarItem>
</ToolbarContent>
Expand Down
17 changes: 12 additions & 5 deletions src/pages/costModels/costModel/assignSourcesModalToolbar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import {
ToolbarContent,
ToolbarFilter,
ToolbarItem,
ToolbarToggleGroup,
} from '@patternfly/react-core';
import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon';
import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon';
import messages from 'locales/messages';
import React from 'react';
Expand Down Expand Up @@ -64,11 +66,16 @@ export const AssignSourcesToolbarBase: React.SFC<AssignSourcesToolbarBaseProps>
return (
<Toolbar id="assign-sources-toolbar" clearAllFilters={filter.onClearAll}>
<ToolbarContent>
<ToolbarItem variant="search-filter">
<ToolbarFilter deleteChip={filter.onRemove} chips={filter.query.name} categoryName="name">
<FilterInput placeholder={intl.formatMessage(messages.CostModelsFilterPlaceholder)} {...filterInputProps} />
</ToolbarFilter>
</ToolbarItem>
<ToolbarToggleGroup breakpoint="xl" toggleIcon={<FilterIcon />}>
<ToolbarItem variant="search-filter">
<ToolbarFilter deleteChip={filter.onRemove} chips={filter.query.name} categoryName="name">
<FilterInput
placeholder={intl.formatMessage(messages.CostModelsFilterPlaceholder)}
{...filterInputProps}
/>
</ToolbarFilter>
</ToolbarItem>
</ToolbarToggleGroup>
<ToolbarItem variant="pagination">
<Pagination
isCompact={paginationProps.isCompact}
Expand Down
22 changes: 13 additions & 9 deletions src/pages/costModels/costModel/sourcesToolbar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import {
ToolbarContent,
ToolbarFilter,
ToolbarItem,
ToolbarToggleGroup,
} from '@patternfly/react-core';
import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon';
import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon';
import { ReadOnlyTooltip } from 'pages/costModels/components/readOnlyTooltip';
import React from 'react';
Expand Down Expand Up @@ -66,15 +68,17 @@ export const SourcesToolbar: React.SFC<SourcesToolbarProps> = ({
return (
<Toolbar id="assign-sources-toolbar" clearAllFilters={filter.onClearAll}>
<ToolbarContent>
<ToolbarItem variant="search-filter">
<ToolbarFilter
deleteChip={filter.onRemove}
chips={filter.query.name}
categoryName={filter.categoryNames.name}
>
<FilterInput {...filterInputProps} />
</ToolbarFilter>
</ToolbarItem>
<ToolbarToggleGroup breakpoint="xl" toggleIcon={<FilterIcon />}>
<ToolbarItem variant="search-filter">
<ToolbarFilter
deleteChip={filter.onRemove}
chips={filter.query.name}
categoryName={filter.categoryNames.name}
>
<FilterInput {...filterInputProps} />
</ToolbarFilter>
</ToolbarItem>
</ToolbarToggleGroup>
<ToolbarItem>
<ReadOnlyTooltip isDisabled={actionButtonProps.isDisabled}>
<Button {...actionButtonProps} />
Expand Down
27 changes: 18 additions & 9 deletions src/pages/costModels/costModelsDetails/toolbar.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import { ToolbarContent, ToolbarGroup, ToolbarItem, ToolbarItemVariant } from '@patternfly/react-core';
import {
ToolbarContent,
ToolbarGroup,
ToolbarItem,
ToolbarItemVariant,
ToolbarToggleGroup,
} from '@patternfly/react-core';
import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon';
import React from 'react';

import { CreateCostModelButton } from './createCostModelButton';
Expand All @@ -10,14 +17,16 @@ const CostModelsToolbar = () => {
<ClearableToolbar>
<ToolbarContent>
<ToolbarGroup variant="filter-group">
<ToolbarItem>
<CostModelsFilterSelector />
</ToolbarItem>
<ToolbarItem>
<NameFilter />
<DescriptionFilter />
<SourceTypeFilter />
</ToolbarItem>
<ToolbarToggleGroup breakpoint="xl" toggleIcon={<FilterIcon />}>
<ToolbarItem>
<CostModelsFilterSelector />
</ToolbarItem>
<ToolbarItem>
<NameFilter />
<DescriptionFilter />
<SourceTypeFilter />
</ToolbarItem>
</ToolbarToggleGroup>
<ToolbarItem>
<CreateCostModelButton />
</ToolbarItem>
Expand Down
17 changes: 12 additions & 5 deletions src/pages/costModels/createCostModelWizard/assignSourcesToolbar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import {
ToolbarContent,
ToolbarFilter,
ToolbarItem,
ToolbarToggleGroup,
} from '@patternfly/react-core';
import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon';
import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon';
import messages from 'locales/messages';
import React from 'react';
Expand Down Expand Up @@ -64,11 +66,16 @@ export const AssignSourcesToolbarBase: React.SFC<AssignSourcesToolbarBaseProps>
return (
<Toolbar id="assign-sources-toolbar" clearAllFilters={filter.onClearAll}>
<ToolbarContent>
<ToolbarItem variant="search-filter">
<ToolbarFilter deleteChip={filter.onRemove} chips={filter.query.name} categoryName="name">
<FilterInput placeholder={intl.formatMessage(messages.CostModelsFilterPlaceholder)} {...filterInputProps} />
</ToolbarFilter>
</ToolbarItem>
<ToolbarToggleGroup breakpoint="xl" toggleIcon={<FilterIcon />}>
<ToolbarItem variant="search-filter">
<ToolbarFilter deleteChip={filter.onRemove} chips={filter.query.name} categoryName="name">
<FilterInput
placeholder={intl.formatMessage(messages.CostModelsFilterPlaceholder)}
{...filterInputProps}
/>
</ToolbarFilter>
</ToolbarItem>
</ToolbarToggleGroup>
<ToolbarItem variant="pagination">
<Pagination
isCompact={paginationProps.isCompact}
Expand Down
Loading

0 comments on commit 192941a

Please sign in to comment.