Merge pull request #5621 from christianvogt/default-ns

Bug 1840809: set default namespace to ALL_NAMESPACES_KEY
openshift · May 29, 2020 · b6abf0e · b6abf0e
2 parents e7d61de + 5c81c29
commit b6abf0e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/frontend/__tests__/components/graphs/prometheus-graph.spec.tsx b/frontend/__tests__/components/graphs/prometheus-graph.spec.tsx
@@ -59,6 +59,7 @@ describe('<PrometheusGraphLink />', () => {
     let wrapper;
 
     store.dispatch(setFlag(FLAGS.CAN_GET_NS, false));
+    store.dispatch(UIActions.setActiveNamespace('default'));
     store.dispatch(UIActions.setActivePerspective('dev'));
     wrapper = getWrapper('');
     expect(wrapper.find(Link).exists()).toBe(false);

diff --git a/frontend/packages/dev-console/src/components/EmptyState.tsx b/frontend/packages/dev-console/src/components/EmptyState.tsx
@@ -7,6 +7,7 @@ import { useExtensions } from '@console/plugin-sdk';
 import { RootState } from '@console/internal/redux';
 import { isAddAction, AddAction } from '../extensions/add-actions';
 import './EmptyState.scss';
+import { ALL_NAMESPACES_KEY } from '@console/shared';
 
 const navigateTo = (e: React.SyntheticEvent, url: string) => {
   history.push(url);
@@ -29,6 +30,10 @@ const Item: React.FC<ItemProps> = ({
     // Defined extensions are immutable. This check will be consistent.
     // eslint-disable-next-line react-hooks/rules-of-hooks
     accessReview.map((descriptor) => useAccessReview({ namespace, ...descriptor })).every((x) => x);
+  if (namespace === ALL_NAMESPACES_KEY && url.match(/:namespace\b/)) {
+    // URL expects namespace scope
+    return null;
+  }
   const resolvedUrl = url.replace(/:namespace\b/g, namespace);
   return access ? (
     <GalleryItem>

diff --git a/frontend/packages/dev-console/src/plugin.tsx b/frontend/packages/dev-console/src/plugin.tsx
@@ -896,7 +896,7 @@ const plugin: Plugin<ConsumedExtensions> = [
     type: 'AddAction',
     properties: {
       id: 'operator-backed',
-      url: '/catalog/ns/:namespace?kind=%5B"ClusterServiceVersion"%5D',
+      url: '/catalog?kind=%5B"ClusterServiceVersion"%5D',
       label: 'Operator Backed',
       description: 'Browse the catalog to discover and deploy operator managed services',
       icon: <BoltIcon />,
@@ -923,6 +923,13 @@ const plugin: Plugin<ConsumedExtensions> = [
       label: 'Pipeline',
       description: 'Create a Tekton Pipeline to automate delivery of your application',
       icon: pipelineIcon,
+      accessReview: [
+        {
+          group: PipelineModel.apiGroup,
+          resource: PipelineModel.plural,
+          verb: 'create',
+        },
+      ],
     },
   },
 ];

diff --git a/frontend/packages/operator-lifecycle-manager/src/components/package-manifest.spec.tsx b/frontend/packages/operator-lifecycle-manager/src/components/package-manifest.spec.tsx
@@ -3,6 +3,7 @@ import { Link } from 'react-router-dom';
 import { shallow, ShallowWrapper } from 'enzyme';
 import * as _ from 'lodash';
 import { Table, TableRow } from '@console/internal/components/factory';
+import * as UIActions from '@console/internal/actions/ui';
 import { testPackageManifest, testCatalogSource, testSubscription } from '../../mocks';
 import { PackageManifestKind } from '../types';
 import {
@@ -33,6 +34,7 @@ describe(PackageManifestTableRow.displayName, () => {
   let wrapper: ShallowWrapper<PackageManifestTableRowProps>;
 
   beforeEach(() => {
+    jest.spyOn(UIActions, 'getActiveNamespace').mockReturnValue('default');
     wrapper = shallow(
       <PackageManifestTableRow
         index={0}

diff --git a/frontend/public/reducers/ui.ts b/frontend/public/reducers/ui.ts
@@ -87,7 +87,7 @@ export default (state: UIState, action: UIAction): UIState => {
     return ImmutableMap({
       activeNavSectionId: 'workloads',
       location: pathname,
-      activeNamespace: activeNamespace || 'default',
+      activeNamespace: activeNamespace || ALL_NAMESPACES_KEY,
       activeApplication: ALL_APPLICATIONS_KEY,
       activePerspective: getDefaultPerspective(),
       createProjectMessage: '',