Use install properties to check if triggers is installed

Author: charles-edouard.breteche

src/containers/App/App.test.js

@@ -24,6 +24,7 @@ import * as selectors from '../../reducers';
 beforeEach(() => {
   jest.spyOn(API, 'getPipelines').mockImplementation(() => {});
   jest.spyOn(selectors, 'isReadOnly').mockImplementation(() => true);
+  jest.spyOn(selectors, 'isTriggersInstalled').mockImplementation(() => false);
 });
 
 it('App renders successfully', () => {

src/containers/SideNav/SideNav.js

@@ -30,25 +30,19 @@ import { selectNamespace } from '../../actions/namespaces';
 import {
   getExtensions,
   getSelectedNamespace,
-  isReadOnly
+  isReadOnly,
+  isTriggersInstalled
 } from '../../reducers';
-import { getCustomResource } from '../../api';
 
 import './SideNav.scss';
 
 class SideNav extends Component {
-  state = {
-    isTriggersInstalled: false
-  };
-
   componentDidMount() {
     const { match } = this.props;
 
     if (match && match.params.namespace) {
       this.props.selectNamespace(match.params.namespace);
     }
-
-    this.checkTriggersInstalled();
   }
 
   componentDidUpdate(prevProps) {
@@ -150,22 +144,8 @@ class SideNav extends Component {
     history.push('/');
   };
 
-  checkTriggersInstalled() {
-    getCustomResource({
-      group: 'apiextensions.k8s.io',
-      version: 'v1beta1',
-      type: 'customresourcedefinitions',
-      name: 'eventlisteners.triggers.tekton.dev'
-    })
-      .then(() => {
-        this.setState({ isTriggersInstalled: true });
-      })
-      .catch(() => {});
-  }
-
   render() {
     const { extensions, intl, namespace } = this.props;
-    const { isTriggersInstalled } = this.state;
 
     return (
       <CarbonSideNav
@@ -224,7 +204,7 @@ class SideNav extends Component {
             >
               TaskRuns
             </SideNavMenuItem>
-            {isTriggersInstalled && (
+            {this.props.isTriggersInstalled && (
               <>
                 <SideNavMenuItem
                   element={NavLink}
@@ -358,10 +338,15 @@ class SideNav extends Component {
   }
 }
 
+SideNav.defaultProps = {
+  isTriggersInstalled: false
+};
+
 /* istanbul ignore next */
 const mapStateToProps = state => ({
   extensions: getExtensions(state),
   isReadOnly: isReadOnly(state),
+  isTriggersInstalled: isTriggersInstalled(state),
   namespace: getSelectedNamespace(state)
 });
 

src/containers/SideNav/SideNav.test.js

@@ -20,11 +20,11 @@ import { ALL_NAMESPACES, paths, urls } from '@tektoncd/dashboard-utils';
 
 import { renderWithRouter } from '../../utils/test';
 import SideNavContainer, { SideNavWithIntl as SideNav } from './SideNav';
-import * as API from '../../api';
 import * as selectors from '../../reducers';
 
 beforeEach(() => {
   jest.spyOn(selectors, 'isReadOnly').mockImplementation(() => true);
+  jest.spyOn(selectors, 'isTriggersInstalled').mockImplementation(() => false);
 });
 
 it('SideNav renders with extensions', () => {
@@ -62,17 +62,15 @@ it('SideNav renders with extensions', () => {
 });
 
 it('SideNav renders with triggers', async () => {
-  jest.spyOn(selectors, 'isReadOnly').mockImplementation(() => false);
+  selectors.isReadOnly.mockImplementation(() => false);
+  selectors.isTriggersInstalled.mockImplementation(() => true);
 
   const middleware = [thunk];
   const mockStore = configureStore(middleware);
   const store = mockStore({
     extensions: { byName: {} },
     namespaces: { byName: {} }
   });
-  jest
-    .spyOn(API, 'getCustomResource')
-    .mockImplementation(() => Promise.resolve());
   const { queryByText } = renderWithRouter(
     <Provider store={store}>
       <SideNavContainer />
@@ -589,17 +587,14 @@ it('SideNav updates namespace in URL', async () => {
 });
 
 it('SideNav renders import in not read-only mode', async () => {
-  jest.spyOn(selectors, 'isReadOnly').mockImplementation(() => false);
+  selectors.isReadOnly.mockImplementation(() => false);
 
   const middleware = [thunk];
   const mockStore = configureStore(middleware);
   const store = mockStore({
     extensions: { byName: {} },
     namespaces: { byName: {} }
   });
-  jest
-    .spyOn(API, 'getCustomResource')
-    .mockImplementation(() => Promise.resolve());
   const { queryByText } = renderWithRouter(
     <Provider store={store}>
       <SideNavContainer />
@@ -615,9 +610,6 @@ it('SideNav does not render import in read-only mode', async () => {
     extensions: { byName: {} },
     namespaces: { byName: {} }
   });
-  jest
-    .spyOn(API, 'getCustomResource')
-    .mockImplementation(() => Promise.resolve());
   const { queryByText } = renderWithRouter(
     <Provider store={store}>
       <SideNavContainer isReadOnly />

src/reducers/index.js

@@ -482,3 +482,7 @@ export function isFetchingEventListeners(state) {
 export function isReadOnly(state) {
   return propertiesSelectors.isReadOnly(state.properties);
 }
+
+export function isTriggersInstalled(state) {
+  return propertiesSelectors.isTriggersInstalled(state.properties);
+}

src/reducers/index.test.js

@@ -49,7 +49,8 @@ import {
   isFetchingSecrets,
   isFetchingTaskRuns,
   isFetchingTasks,
-  isReadOnly
+  isReadOnly,
+  isTriggersInstalled
 } from '.';
 import * as clusterTaskSelectors from './clusterTasks';
 import * as extensionSelectors from './extensions';
@@ -504,3 +505,13 @@ it('isReadOnly', () => {
   expect(isReadOnly(state)).toBe(true);
   expect(propertiesSelectors.isReadOnly).toHaveBeenCalledWith(state.properties);
 });
+
+it('isTriggersInstalled', () => {
+  jest
+    .spyOn(propertiesSelectors, 'isTriggersInstalled')
+    .mockImplementation(() => true);
+  expect(isTriggersInstalled(state)).toBe(true);
+  expect(propertiesSelectors.isTriggersInstalled).toHaveBeenCalledWith(
+    state.properties
+  );
+});

src/reducers/properties.js

@@ -25,4 +25,8 @@ export function isReadOnly(state) {
   return state.ReadOnly;
 }
 
+export function isTriggersInstalled(state) {
+  return (state.TriggersNamespace && state.TriggersVersion) || false;
+}
+
 export default properties;

src/reducers/properties.test.js

@@ -28,4 +28,5 @@ it('INSTALL_PROPERTIES_SUCCESS', () => {
 
   const state = propertiesReducer({}, action);
   expect(selectors.isReadOnly(state)).toBe(false);
+  expect(selectors.isTriggersInstalled(state)).toBe(false);
 });