katello 3.13.4 → 3.14.0.rc1

data/webpack/scenes/ModuleStreams/ModuleStreamsActions.js

@@ -8,23 +8,22 @@ import {
 } from './ModuleStreamsConstants';
 import { apiError } from '../../move_to_foreman/common/helpers.js';
 
-export const getModuleStreams = (extendedParams = {}) => (dispatch) => {
+export const getModuleStreams = (extendedParams = {}) => async (dispatch) => {
   dispatch({ type: MODULE_STREAMS_REQUEST });
 
   const params = {
     organization_id: orgId(),
     ...propsToSnakeCase(extendedParams),
   };
-
-  return api
-    .get('/module_streams', {}, params)
-    .then(({ data }) => {
-      dispatch({
-        type: MODULE_STREAMS_SUCCESS,
-        response: data,
-      });
-    })
-    .catch(result => dispatch(apiError(MODULE_STREAMS_FAILURE, result)));
+  try {
+    const { data } = await api.get('/module_streams', {}, params);
+    return dispatch({
+      type: MODULE_STREAMS_SUCCESS,
+      response: data,
+    });
+  } catch (error) {
+    return dispatch(apiError(MODULE_STREAMS_FAILURE, error));
+  }
 };
 
 export default getModuleStreams;

data/webpack/scenes/ModuleStreams/ModuleStreamsPage.js

@@ -1,12 +1,10 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Grid, Row, Col, Form, FormGroup } from 'react-bootstrap';
 import qs from 'query-string';
 import { translate as __ } from 'foremanReact/common/I18n';
-
-import Search from '../../components/Search/index';
-import ModuleStreamsTable from './ModuleStreamsTable';
 import { orgId } from '../../services/api';
+import TableSchema from '../ModuleStreams/ModuleStreamsTableSchema';
+import ContentPage from '../../components/Content/ContentPage';
 
 class ModuleStreamsPage extends Component {
   constructor(props) {
@@ -49,35 +47,16 @@ class ModuleStreamsPage extends Component {
   render() {
     const { moduleStreams } = this.props;
     return (
-      <Grid bsClass="container-fluid">
-        <Row>
-          <Col sm={12}>
-            <h1>{__('Module Streams')}</h1>
-          </Col>
-        </Row>
-        <Row>
-          <Col sm={6}>
-            <Form className="toolbar-pf-actions">
-              <FormGroup className="toolbar-pf toolbar-pf-filter">
-                <Search
-                  onSearch={this.onSearch}
-                  getAutoCompleteParams={this.getAutoCompleteParams}
-                  updateSearchQuery={this.updateSearchQuery}
-                  initialInputValue={this.state.searchQuery}
-                />
-              </FormGroup>
-            </Form>
-          </Col>
-        </Row>
-        <Row>
-          <Col sm={12}>
-            <ModuleStreamsTable
-              moduleStreams={moduleStreams}
-              onPaginationChange={this.onPaginationChange}
-            />
-          </Col>
-        </Row>
-      </Grid>
+      <ContentPage
+        header={__('Module Streams')}
+        content={moduleStreams}
+        tableSchema={TableSchema}
+        onSearch={this.onSearch}
+        getAutoCompleteParams={this.getAutoCompleteParams}
+        updateSearchQuery={this.updateSearchQuery}
+        initialInputValue={this.state.searchQuery}
+        onPaginationChange={this.onPaginationChange}
+      />
     );
   }
 }

data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamPage.test.js

@@ -2,8 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import ModuleStreamsPage from '../ModuleStreamsPage';
-import ModuleStreamsTable from '../ModuleStreamsTable';
-import Search from '../../../components/Search/index';
+import ContentPage from '../../../components/Content/ContentPage';
 
 jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
 
@@ -20,8 +19,7 @@ describe('Module streams page', () => {
     />);
 
     expect(toJson(wrapper)).toMatchSnapshot();
-    expect(wrapper.find(ModuleStreamsTable)).toHaveLength(1);
-    expect(wrapper.find(Search)).toHaveLength(1);
+    expect(wrapper.find(ContentPage)).toHaveLength(1);
   });
 });
 

data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamsActions.test.js

@@ -22,28 +22,27 @@ describe('module stream actions', () => {
   describe('getModuleStreams', () => {
     it(
       'creates MODULE_STREAMS_REQUEST and then fails with 500 on bad request',
-      () => {
+      async () => {
         mockErrorRequest({
           url: endpoint,
         });
-        return store.dispatch(getModuleStreams())
-          .then(() => expect(store.getActions())
-            .toEqual(moduleStreamsFailureActions));
+        await store.dispatch(getModuleStreams());
+        expect(store.getActions())
+          .toEqual(moduleStreamsFailureActions);
       },
     );
 
     it(
       'creates MODULE_STREAMS_REQUEST and then return successfully',
-      () => {
+      async () => {
         mockRequest({
           url: endpoint,
           response: results,
         });
-        return store.dispatch(getModuleStreams())
-          .then(() => expect(store.getActions())
-            .toEqual(moduleStreamsSuccessActions));
+        await store.dispatch(getModuleStreams());
+        expect(store.getActions())
+          .toEqual(moduleStreamsSuccessActions);
       },
     );
   });
 });
-

data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamsTable.test.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import ModuleStreamsTable from '../ModuleStreamsTable';
+import ContentTable from '../../../components/Content/ContentTable';
+import TableSchema from '../../ModuleStreams/ModuleStreamsTableSchema';
 import { Table } from '../../../move_to_foreman/components/common/table';
 
 jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
@@ -13,8 +14,9 @@ describe('Module streams table', () => {
     };
     const onPaginationChange = () => {};
 
-    const wrapper = shallow(<ModuleStreamsTable
-      moduleStreams={moduleStreams}
+    const wrapper = shallow(<ContentTable
+      content={moduleStreams}
+      tableSchema={TableSchema}
       onPaginationChange={onPaginationChange}
     />);
 

data/webpack/scenes/ModuleStreams/__tests__/__snapshots__/ModuleStreamPage.test.js.snap

@@ -1,69 +1,87 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Module streams page should render and contain appropiate components 1`] = `
-<Grid
-  bsClass="container-fluid"
-  componentClass="div"
-  fluid={false}
->
-  <Row
-    bsClass="row"
-    componentClass="div"
-  >
-    <Col
-      bsClass="col"
-      componentClass="div"
-      sm={12}
-    >
-      <h1>
-        Module Streams
-      </h1>
-    </Col>
-  </Row>
-  <Row
-    bsClass="row"
-    componentClass="div"
-  >
-    <Col
-      bsClass="col"
-      componentClass="div"
-      sm={6}
-    >
-      <Form
-        bsClass="form"
-        className="toolbar-pf-actions"
-        componentClass="form"
-        horizontal={false}
-        inline={false}
-      >
-        <FormGroup
-          bsClass="form-group"
-          className="toolbar-pf toolbar-pf-filter"
-        >
-          <Search
-            getAutoCompleteParams={[Function]}
-            initialInputValue=""
-            onSearch={[Function]}
-            updateSearchQuery={[Function]}
-          />
-        </FormGroup>
-      </Form>
-    </Col>
-  </Row>
-  <Row
-    bsClass="row"
-    componentClass="div"
-  >
-    <Col
-      bsClass="col"
-      componentClass="div"
-      sm={12}
-    >
-      <ModuleStreamsTable
-        moduleStreams={Object {}}
-        onPaginationChange={[Function]}
-      />
-    </Col>
-  </Row>
-</Grid>
+<ContentPage
+  content={Object {}}
+  getAutoCompleteParams={[Function]}
+  header="Module Streams"
+  initialInputValue=""
+  onPaginationChange={[Function]}
+  onSearch={[Function]}
+  tableSchema={
+    Array [
+      Object {
+        "cell": Object {
+          "formatters": Array [
+            [Function],
+          ],
+        },
+        "header": Object {
+          "formatters": Array [
+            [Function],
+          ],
+          "label": "Name",
+        },
+        "property": "name",
+      },
+      Object {
+        "cell": Object {
+          "formatters": Array [
+            [Function],
+          ],
+        },
+        "header": Object {
+          "formatters": Array [
+            [Function],
+          ],
+          "label": "Stream",
+        },
+        "property": "stream",
+      },
+      Object {
+        "cell": Object {
+          "formatters": Array [
+            [Function],
+          ],
+        },
+        "header": Object {
+          "formatters": Array [
+            [Function],
+          ],
+          "label": "Version",
+        },
+        "property": "version",
+      },
+      Object {
+        "cell": Object {
+          "formatters": Array [
+            [Function],
+          ],
+        },
+        "header": Object {
+          "formatters": Array [
+            [Function],
+          ],
+          "label": "Context",
+        },
+        "property": "context",
+      },
+      Object {
+        "cell": Object {
+          "formatters": Array [
+            [Function],
+          ],
+        },
+        "header": Object {
+          "formatters": Array [
+            [Function],
+          ],
+          "label": "Arch",
+        },
+        "property": "arch",
+      },
+    ]
+  }
+  updateSearchQuery={[Function]}
+/>
 `;

data/webpack/scenes/ModuleStreams/__tests__/__snapshots__/ModuleStreamsTable.test.js.snap

@@ -83,7 +83,7 @@ exports[`Module streams table should render and contain appropiate components 1`
     }
     emptyState={
       Object {
-        "header": "No Module Streams found",
+        "header": "No Content found",
       }
     }
     itemCount={0}

data/webpack/scenes/Organizations/OrganizationActions.js

@@ -11,54 +11,49 @@ import {
   SAVE_ORGANIZATION_FAILURE,
 } from './OrganizationConstants';
 
-export const loadOrganization = (extendedParams = {}) => (dispatch) => {
+export const loadOrganization = (extendedParams = {}) => async (dispatch) => {
   dispatch({ type: GET_ORGANIZATION_REQUEST });
 
   const params = {
     ...propsToSnakeCase(extendedParams),
   };
 
-  return api
-    .get(`/organizations/${orgId()}`, {}, params)
-    .then(({ data }) => {
-      dispatch({
-        type: GET_ORGANIZATION_SUCCESS,
-        response: data,
-      });
-    })
-    .catch((result) => {
-      dispatch({
-        type: GET_ORGANIZATION_FAILURE,
-        result,
-      });
+  try {
+    const { data } = await api.get(`/organizations/${orgId()}`, {}, params);
+    return dispatch({
+      type: GET_ORGANIZATION_SUCCESS,
+      response: data,
     });
+  } catch (error) {
+    return dispatch({
+      type: GET_ORGANIZATION_FAILURE,
+      error,
+    });
+  }
 };
 
-export const saveOrganization = (extendedParams = {}) => (dispatch) => {
+export const saveOrganization = (extendedParams = {}) => async (dispatch) => {
   dispatch({ type: SAVE_ORGANIZATION_REQUEST });
 
   const params = {
     ...{ id: orgId() },
     ...propsToSnakeCase(extendedParams),
   };
-
-  return api
-    .put(`/organizations/${orgId()}`, params)
-    .then(({ data }) => {
-      dispatch({
-        type: SAVE_ORGANIZATION_SUCCESS,
-        response: data,
-      });
-
-      // TODO: Necessary because of https://projects.theforeman.org/issues/26420
-      dispatch(loadOrganization());
-    })
-    .catch((result) => {
-      dispatch({
-        type: SAVE_ORGANIZATION_FAILURE,
-        result,
-      });
+  try {
+    const { data } = await api.put(`/organizations/${orgId()}`, params);
+    const result = dispatch({
+      type: SAVE_ORGANIZATION_SUCCESS,
+      response: data,
+    });
+    // TODO: Necessary because of https://projects.theforeman.org/issues/26420
+    dispatch(loadOrganization());
+    return result;
+  } catch (error) {
+    return dispatch({
+      type: SAVE_ORGANIZATION_FAILURE,
+      result: error,
     });
+  }
 };
 
 export default loadOrganization;

data/webpack/scenes/Organizations/__tests__/OrganizationActions.test.js

@@ -23,37 +23,37 @@ beforeEach(() => {
 });
 
 describe('organization actions', () => {
-  it('creates GET_ORGANIZATION_REQUEST and then fails with 422', () => {
+  it('creates GET_ORGANIZATION_REQUEST and then fails with 422', async () => {
     mockRequest({
       url: '/katello/api/v2/organizations/1',
       status: 422,
     });
-    return store.dispatch(loadOrganization())
-      .then(() => expect(store.getActions()).toEqual(getFailureActions));
+    await store.dispatch(loadOrganization());
+    expect(store.getActions()).toEqual(getFailureActions);
   });
 
-  it('creates GET_ORGANIZATION_REQUEST and ends with success', () => {
+  it('creates GET_ORGANIZATION_REQUEST and ends with success', async () => {
     mockRequest({
       url: '/katello/api/v2/organizations/1',
       response: requestSuccessResponse,
     });
-    return store.dispatch(loadOrganization())
-      .then(() => expect(store.getActions()).toEqual(getSuccessActions));
+    await store.dispatch(loadOrganization());
+    expect(store.getActions()).toEqual(getSuccessActions);
   });
 
-  it('creates SAVE_ORGANIZATION_REQUEST and then fails with 422', () => {
+  it('creates SAVE_ORGANIZATION_REQUEST and then fails with 422', async () => {
     const mock = new MockAdapter(axios);
     mock.onPut('/katello/api/v2/organizations/1').reply(422);
 
-    return store.dispatch(saveOrganization())
-      .then(() => expect(store.getActions()).toEqual(saveFailureActions));
+    await store.dispatch(saveOrganization());
+    expect(store.getActions()).toEqual(saveFailureActions);
   });
 
-  it('creates SAVE_ORGANIZATION_REQUEST and ends with success', () => {
+  it('creates SAVE_ORGANIZATION_REQUEST and ends with success', async () => {
     const mock = new MockAdapter(axios);
     mock.onPut('/katello/api/v2/organizations/1').reply(200, requestSuccessResponse);
 
-    return store.dispatch(saveOrganization())
-      .then(() => expect(store.getActions()).toEqual(saveSuccessActions));
+    await store.dispatch(saveOrganization());
+    expect(store.getActions()).toEqual(saveSuccessActions);
   });
 });