Skip to content

Dev catalog- group by Operator #3758

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

Merged
openshift-merge-robot merged 1 commit into from
Jan 3, 2020
Merged

Dev catalog- group by Operator #3758

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
221 changes: 221 additions & 0 deletions frontend/__tests__/components/catalog-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
export const developerCatalogItems = [
{
createLabel: 'Create Application',
href:
'/catalog/source-to-image?imagestream=dotnet&imagestream-ns=openshift&preselected-ns=openshift-operators',
kind: 'ImageStream',
obj: {
metadata: {
name: 'dotnet',
namespace: 'openshift',
},
},
tileIconClass: null,
tileImgUrl: 'static/assets/dotnet.svg',
tileName: '.NET Core',
tileProvider: undefined,
},
{
createLabel: 'Instantiate Template',
documentationUrl: undefined,
href:
'/catalog/instantiate-template?template=dotnet-pgsql-persistent&template-ns=openshift&preselected-ns=openshift-operators',
kind: 'Template',
obj: {
metadata: {
name: 'dotnet-pgsql-persistent',
namespace: 'openshift',
},
},
tileIconClass: null,
tileImgUrl: 'static/assets/dotnet.svg',
tileName: '.NET Core + PostgreSQL (Persistent)',
tileProvider: undefined,
},
{
createLabel: 'Create',
documentationUrl: undefined,
href:
'/ns/openshift-operators/clusterserviceversions/elasticsearch-operator.4.2.9-201911261133/logging.openshift.io~v1~Elasticsearch/~new',
kind: 'InstalledOperator',
obj: {
csv: {
kind: 'ClusterServiceVersion',
metadata: {
name: 'elasticsearch-operator.4.2.9-201911261133',
namespace: 'openshift-operators',
},
spec: {
displayName: 'Elastic Search Operator',
},
},
},
tileDescription: 'An Elasticsearch cluster instance',
tileIconClass: null,
tileImgUrl: 'static/assets/operator.svg',
tileName: 'Elasticsearch',
tileProvider: 'Red Hat, Inc',
},
{
createLabel: 'Create',
documentationUrl: undefined,
href:
'/ns/openshift-operators/clusterserviceversions/servicemeshoperator.v1.0.2/maistra.io~v1~ServiceMeshControlPlane/~new',
kind: 'InstalledOperator',
obj: {
csv: {
kind: 'ClusterServiceVersion',
metadata: {
name: 'servicemeshoperator.v1.0.2',
namespace: 'openshift-operators',
},
spec: {
displayName: 'Service Mesh Operator',
},
},
},
tileDescription: 'An Istio control plane installation',
tileIconClass: null,
tileImgUrl: 'static/assets/operator.svg',
tileName: 'Istio Service Mesh Control Plane',
tileProvider: 'Red Hat, Inc',
},
{
createLabel: 'Create',
documentationUrl: undefined,
href:
'/ns/openshift-operators/clusterserviceversions/servicemeshoperator.v1.0.2/maistra.io~v1~ServiceMeshMemberRoll/~new',
kind: 'InstalledOperator',
obj: {
csv: {
kind: 'ClusterServiceVersion',
metadata: {
name: 'servicemeshoperator.v1.0.2',
namespace: 'openshift-operators',
},
spec: {
displayName: 'Service Mesh Operator',
},
},
},
tileDescription: 'A list of namespaces in Service Mesh',
tileIconClass: null,
tileImgUrl: 'static/assets/operator.svg',
tileName: 'Istio Service Mesh Member Roll',
tileProvider: 'Red Hat, Inc',
},
];

export const groupedByType = {
'Elastic Search Operator': [
{
createLabel: 'Create',
documentationUrl: undefined,
href:
'/ns/openshift-operators/clusterserviceversions/elasticsearch-operator.4.2.9-201911261133/logging.openshift.io~v1~Elasticsearch/~new',
kind: 'InstalledOperator',
obj: {
csv: {
kind: 'ClusterServiceVersion',
metadata: {
name: 'elasticsearch-operator.4.2.9-201911261133',
namespace: 'openshift-operators',
},
spec: {
displayName: 'Elastic Search Operator',
},
},
},
tileDescription: 'An Elasticsearch cluster instance',
tileIconClass: null,
tileImgUrl: 'static/assets/operator.svg',
tileName: 'Elasticsearch',
tileProvider: 'Red Hat, Inc',
},
],
'Service Mesh Operator': [
{
createLabel: 'Create',
documentationUrl: undefined,
href:
'/ns/openshift-operators/clusterserviceversions/servicemeshoperator.v1.0.2/maistra.io~v1~ServiceMeshControlPlane/~new',
kind: 'InstalledOperator',
obj: {
csv: {
kind: 'ClusterServiceVersion',
metadata: {
name: 'servicemeshoperator.v1.0.2',
namespace: 'openshift-operators',
},
spec: {
displayName: 'Service Mesh Operator',
},
},
},
tileDescription: 'An Istio control plane installation',
tileIconClass: null,
tileImgUrl: 'static/assets/operator.svg',
tileName: 'Istio Service Mesh Control Plane',
tileProvider: 'Red Hat, Inc',
},
{
createLabel: 'Create',
documentationUrl: undefined,
href:
'/ns/openshift-operators/clusterserviceversions/servicemeshoperator.v1.0.2/maistra.io~v1~ServiceMeshMemberRoll/~new',
kind: 'InstalledOperator',
obj: {
csv: {
kind: 'ClusterServiceVersion',
metadata: {
name: 'servicemeshoperator.v1.0.2',
namespace: 'openshift-operators',
},
spec: {
displayName: 'Service Mesh Operator',
},
},
},
tileDescription: 'A list of namespaces in Service Mesh',
tileIconClass: null,
tileImgUrl: 'static/assets/operator.svg',
tileName: 'Istio Service Mesh Member Roll',
tileProvider: 'Red Hat, Inc',
},
],
'Non Operators': [
{
createLabel: 'Create Application',
href:
'/catalog/source-to-image?imagestream=dotnet&imagestream-ns=openshift&preselected-ns=openshift-operators',
kind: 'ImageStream',
obj: {
metadata: {
name: 'dotnet',
namespace: 'openshift',
},
},
tileIconClass: null,
tileImgUrl: 'static/assets/dotnet.svg',
tileName: '.NET Core',
tileProvider: undefined,
},
{
createLabel: 'Instantiate Template',
documentationUrl: undefined,
href:
'/catalog/instantiate-template?template=dotnet-pgsql-persistent&template-ns=openshift&preselected-ns=openshift-operators',
kind: 'Template',
obj: {
metadata: {
name: 'dotnet-pgsql-persistent',
namespace: 'openshift',
},
},
tileIconClass: null,
tileImgUrl: 'static/assets/dotnet.svg',
tileName: '.NET Core + PostgreSQL (Persistent)',
tileProvider: undefined,
},
],
};
12 changes: 12 additions & 0 deletions frontend/__tests__/components/catalog.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ import {
import {
CatalogTileViewPage,
catalogCategories as initCatalogCategories,
groupItems,
} from '../../public/components/catalog/catalog-items';
import {
catalogListPageProps,
catalogItems,
catalogCategories,
} from '../../__mocks__/catalogItemsMocks';
import { developerCatalogItems, groupedByType } from './catalog-data';
import { categorizeItems } from '../../public/components/utils/tile-view-page';

describe(CatalogTileViewPage.displayName, () => {
Expand Down Expand Up @@ -107,4 +109,14 @@ describe(CatalogTileViewPage.displayName, () => {
});
});
});

it('should group catalog items by Operator', () => {
const groupedByTypeResult = groupItems(developerCatalogItems, 'Operator');
expect(groupedByTypeResult).toEqual(groupedByType);
});

it('should not group the items when None is selected in the Group By Dropdown', () => {
const groupedByTypeResult = groupItems(developerCatalogItems, 'None');
expect(groupedByTypeResult).toEqual(developerCatalogItems);
});
});
13 changes: 13 additions & 0 deletions frontend/public/components/catalog/_catalog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,24 @@ $co-modal-ignore-warning-icon-width: 30px;
width: auto !important;
}

&__btn-group__group-by {
display: inline;
margin-left: var(--pf-global--spacer--xl);
}

&__num-items {
font-weight: var(--pf-global--FontWeight--bold);
padding: 0 0 20px;
}

&__group-title {
margin-bottom: var(--pf-global--spacer--sm);
}

&__grouped-items {
margin-bottom: var(--pf-global--spacer--md);
}

// Enable scrolling on the modal
&__overlay {
.modal-body .co-hint-block {
Expand Down
18 changes: 18 additions & 0 deletions frontend/public/components/catalog/catalog-items.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ const filterValueMap = {
ImageStream: 'Source-to-Image',
};

const GroupByTypes = {
Operator: 'Operator',
None: 'None',
};

const keywordCompare = (filterString, item) => {
if (!filterString) {
return true;
Expand All @@ -159,6 +164,17 @@ const setURLParams = (params) => {
history.replace(`${url.pathname}${searchParams}`);
};

export const groupItems = (items, groupBy) => {
if (groupBy === GroupByTypes.Operator) {
const installedOperators = _.filter(items, (item) => item.kind === 'InstalledOperator');
const nonOperators = _.filter(items, (item) => item.kind !== 'InstalledOperator');
const groupedOperators = _.groupBy(installedOperators, (item) => item.obj.csv.spec.displayName);
const groupAllItems = { ...groupedOperators, 'Non Operators': nonOperators };
return groupAllItems;
}
return items;
};

export class CatalogTileViewPage extends React.Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -250,6 +266,8 @@ export class CatalogTileViewPage extends React.Component {
renderTile={this.renderTile}
pageDescription={pageDescription}
emptyStateInfo="No developer catalog items are being shown due to the filters being applied."
groupItems={groupItems}
groupByTypes={GroupByTypes}
/>
<Modal
show={!!detailsItem}
Expand Down
Loading