katello 3.8.1 → 3.9.0.rc1

data/webpack/scenes/Settings/Tables/TableHelpers.js

@@ -0,0 +1,8 @@
+export const mapTables = (tables) => {
+  const tableObject = {};
+  tables.forEach((element) => {
+    tableObject[element.name] = element;
+  });
+  return tableObject;
+};
+export default mapTables;

data/webpack/scenes/Settings/Tables/TableReducer.js

@@ -0,0 +1,46 @@
+import Immutable from 'seamless-immutable';
+import { mapTables } from './TableHelpers';
+import {
+  TABLES_REQUEST,
+  TABLES_SUCCESS,
+  TABLES_FAILURE,
+  CREATE_TABLE,
+  CREATE_TABLE_SUCCESS,
+  CREATE_TABLE_FAILURE,
+  UPDATE_TABLE,
+  UPDATE_TABLE_SUCCESS,
+  UPDATE_TABLE_FAILURE,
+} from './TableConstants';
+
+const initialState = Immutable({
+  loading: false,
+});
+
+export default (state = initialState, action) => {
+  switch (action.type) {
+    case TABLES_REQUEST:
+    case CREATE_TABLE:
+    case UPDATE_TABLE:
+      return state.set('loading', true);
+
+    case TABLES_SUCCESS:
+      return state.merge({
+        loading: false,
+        ...mapTables(action.payload.results),
+      });
+    case CREATE_TABLE_SUCCESS:
+    case UPDATE_TABLE_SUCCESS:
+      return state.merge({
+        loading: false,
+        ...state,
+        ...mapTables(action.payload),
+      });
+    case TABLES_FAILURE:
+    case UPDATE_TABLE_FAILURE:
+    case CREATE_TABLE_FAILURE: {
+      return state.set('loading', false);
+    }
+    default:
+      return state;
+  }
+};

data/webpack/scenes/Settings/Tables/__tests__/Table.fixtures.js

@@ -0,0 +1,125 @@
+import Immutable from 'seamless-immutable';
+import {
+  TABLES_REQUEST,
+  TABLES_SUCCESS,
+  TABLES_FAILURE,
+  CREATE_TABLE,
+  CREATE_TABLE_SUCCESS,
+  CREATE_TABLE_FAILURE,
+  UPDATE_TABLE,
+  UPDATE_TABLE_SUCCESS,
+  UPDATE_TABLE_FAILURE,
+} from '../TableConstants';
+
+export const initialState = Immutable({
+  loading: false,
+});
+
+export const loadingState = Immutable({
+  loading: true,
+});
+
+
+export const tableRecord = Immutable({
+  id: 36,
+  name: 'Katello::Subscriptions',
+  columns:
+    [
+      'id',
+      'product_id',
+      'contract_number',
+      'start_date',
+      'end_date',
+    ],
+  created_at: '2018-06-22 16:01:06 -0600',
+  updated_at: '2018-06-22 22:38:15 -0600',
+});
+
+export const requestSuccessResponse = Immutable({
+  total: 2,
+  subtotal: 2,
+  page: 1,
+  per_page: 20,
+  search: null,
+  sort: {
+    by: null,
+    order: null,
+  },
+  results: [
+    tableRecord,
+  ],
+});
+
+export const successState = Immutable({ 'Katello::Subscriptions': tableRecord, loading: false });
+export const errorState = Immutable({
+  loading: false,
+});
+
+export const getSuccessActions = [
+  { params: {}, type: TABLES_REQUEST },
+  { payload: requestSuccessResponse, type: TABLES_SUCCESS },
+];
+
+export const getFailureActions = [
+  {
+    params: {},
+    type: TABLES_REQUEST,
+  },
+  {
+    error: {
+      message: 'Access denied',
+      details: 'You are trying access the preferences of a different user',
+    },
+    type: TABLES_FAILURE,
+  },
+];
+
+export const createSuccessActions = [
+  {
+    type: CREATE_TABLE,
+    params: {},
+  },
+  {
+    payload: [tableRecord],
+    type: CREATE_TABLE_SUCCESS,
+  },
+];
+
+export const createFailureActions = [
+  {
+    type: CREATE_TABLE,
+    params: { name: 'Test', columns: [] },
+  },
+  {
+    error: {
+      message: 'Access denied',
+      details: 'You are trying access the preferences of a different user',
+    },
+    type: CREATE_TABLE_FAILURE,
+  },
+];
+
+export const updateSuccessActions = [
+  {
+    type: UPDATE_TABLE,
+    params: tableRecord,
+  },
+  {
+    payload: [tableRecord],
+    type: UPDATE_TABLE_SUCCESS,
+  },
+];
+
+export const updateFailureActions = [
+  {
+    type: UPDATE_TABLE,
+    params: tableRecord,
+  },
+  {
+    error: {
+      message: 'Access denied',
+      details: 'You are trying access the preferences of a different user',
+    },
+    type: UPDATE_TABLE_FAILURE,
+  },
+];

data/webpack/scenes/Settings/Tables/__tests__/TableActions.test.js

@@ -0,0 +1,84 @@
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+import thunk from 'redux-thunk';
+import Immutable from 'seamless-immutable';
+import configureMockStore from 'redux-mock-store';
+import { mockRequest, mockReset } from '../../../../mockRequest';
+import { loadTables, createColumns, updateColumns } from '../TableActions';
+import {
+  requestSuccessResponse,
+  getSuccessActions,
+  getFailureActions,
+  createSuccessActions,
+  createFailureActions,
+  updateSuccessActions,
+  updateFailureActions,
+  tableRecord,
+} from './Table.fixtures';
+
+const accessDenied = {
+  error: {
+    message: 'Access denied',
+    details: 'You are trying access the preferences of a different user',
+  },
+};
+const mockStore = configureMockStore([thunk]);
+const store = mockStore({ settings: Immutable({}) });
+const testTableName = 'Katello::Subscriptions';
+
+beforeEach(() => {
+  store.clearActions();
+  mockReset();
+});
+
+describe('table actions', () => {
+  it('creates TABLES_REQUEST with success', () => {
+    mockRequest({
+      url: '/api/v2/users/1/table_preferences',
+      status: 200,
+      response: requestSuccessResponse,
+    });
+    return store.dispatch(loadTables())
+      .then(() => expect(store.getActions()).toEqual(getSuccessActions));
+  });
+  it('creates TABLES_REQUEST with failure', () => {
+    mockRequest({
+      url: '/api/v2/users/1/table_preferences',
+      status: 403,
+      response: accessDenied,
+    });
+    return store.dispatch(loadTables())
+      .then(() => expect(store.getActions()).toEqual(getFailureActions));
+  });
+
+  it('creates SAVE_CREATE_TABLE and ends with success', () => {
+    const mock = new MockAdapter(axios);
+    mock.onPost('/api/v2/users/1/table_preferences').reply(200, tableRecord);
+
+    return store.dispatch(createColumns())
+      .then(() => expect(store.getActions()).toEqual(createSuccessActions));
+  });
+
+  it('creates CREATE_TABLE with failure', () => {
+    const mock = new MockAdapter(axios);
+    mock.onPost('/api/v2/users/1/table_preferences').reply(403, accessDenied);
+
+    return store.dispatch(createColumns({ name: 'Test', columns: [] }))
+      .then(() => expect(store.getActions()).toEqual(createFailureActions));
+  });
+
+  it('creates UPDATE_TABLE and ends with success', () => {
+    const mock = new MockAdapter(axios);
+    mock.onPut(`/api/v2/users/1/table_preferences/${testTableName}`).reply(200, tableRecord);
+
+    return store.dispatch(updateColumns(tableRecord))
+      .then(() => expect(store.getActions()).toEqual(updateSuccessActions));
+  });
+  it('creates UPDATE_TABLE with failure', () => {
+    const mock = new MockAdapter(axios);
+    mock.onPut(`/api/v2/users/1/table_preferences/${testTableName}`).reply(403, accessDenied);
+
+    return store.dispatch(updateColumns(tableRecord))
+      .then(() => expect(store.getActions()).toEqual(updateFailureActions));
+  });
+});

data/webpack/scenes/Settings/Tables/__tests__/TableReducer.test.js

@@ -0,0 +1,41 @@
+import * as types from '../TableConstants';
+
+import {
+  requestSuccessResponse,
+  tableRecord,
+} from './Table.fixtures';
+import reducer from '../TableReducer';
+import { testReducerSnapshotWithFixtures } from '../../../../move_to_pf/test-utils/testHelpers';
+
+const fixtures = {
+  'should return the initial state': {},
+  'should keep loading state on TABLES_REQUEST': {
+    action: {
+      type: types.TABLES_REQUEST,
+    },
+  },
+  'should pull table list from response TABLES_SUCCESS': {
+    action: {
+      type: types.TABLES_SUCCESS,
+      payload: (requestSuccessResponse),
+    },
+  },
+  'should have error on TABLE_REQUEST_FAILURE': {
+    action: {
+      type: types.TABLES_FAILURE,
+    },
+  },
+  'should create response for CREATE_TABLE_SUCCESS': {
+    action: {
+      type: types.CREATE_TABLE_SUCCESS,
+      payload: [tableRecord],
+    },
+  },
+  'should update response UPDATE_TABLE_SUCCESS': {
+    action: {
+      type: types.UPDATE_TABLE_SUCCESS,
+      payload: [tableRecord],
+    },
+  },
+};
+describe('Tables reducer', () => testReducerSnapshotWithFixtures(reducer, fixtures));

data/webpack/scenes/Settings/Tables/__tests__/__snapshots__/TableReducer.test.js.snap

@@ -0,0 +1,76 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Tables reducer should create response for CREATE_TABLE_SUCCESS 1`] = `
+Object {
+  "Katello::Subscriptions": Object {
+    "columns": Array [
+      "id",
+      "product_id",
+      "contract_number",
+      "start_date",
+      "end_date",
+    ],
+    "created_at": "2018-06-22 16:01:06 -0600",
+    "id": 36,
+    "name": "Katello::Subscriptions",
+    "updated_at": "2018-06-22 22:38:15 -0600",
+  },
+  "loading": false,
+}
+`;
+
+exports[`Tables reducer should have error on TABLE_REQUEST_FAILURE 1`] = `
+Object {
+  "loading": false,
+}
+`;
+
+exports[`Tables reducer should keep loading state on TABLES_REQUEST 1`] = `
+Object {
+  "loading": true,
+}
+`;
+
+exports[`Tables reducer should pull table list from response TABLES_SUCCESS 1`] = `
+Object {
+  "Katello::Subscriptions": Object {
+    "columns": Array [
+      "id",
+      "product_id",
+      "contract_number",
+      "start_date",
+      "end_date",
+    ],
+    "created_at": "2018-06-22 16:01:06 -0600",
+    "id": 36,
+    "name": "Katello::Subscriptions",
+    "updated_at": "2018-06-22 22:38:15 -0600",
+  },
+  "loading": false,
+}
+`;
+
+exports[`Tables reducer should return the initial state 1`] = `
+Object {
+  "loading": false,
+}
+`;
+
+exports[`Tables reducer should update response UPDATE_TABLE_SUCCESS 1`] = `
+Object {
+  "Katello::Subscriptions": Object {
+    "columns": Array [
+      "id",
+      "product_id",
+      "contract_number",
+      "start_date",
+      "end_date",
+    ],
+    "created_at": "2018-06-22 16:01:06 -0600",
+    "id": 36,
+    "name": "Katello::Subscriptions",
+    "updated_at": "2018-06-22 22:38:15 -0600",
+  },
+  "loading": false,
+}
+`;

data/webpack/scenes/Settings/index.js

@@ -0,0 +1,4 @@
+import { combineReducers } from 'redux';
+import tables from './Tables/TableReducer';
+
+export default combineReducers({ tables });

data/webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js

@@ -1,3 +1,5 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
 export default {
   name: __('Name'),
   description: __('Description'),

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailActions.js

@@ -6,7 +6,7 @@ import {
 } from './SubscriptionDetailConstants';
 import { apiError } from '../../../move_to_foreman/common/helpers.js';
 
-export const loadSubscriptionDetails = subscriptionId => (dispatch, getState) => {
+export const loadSubscriptionDetails = subscriptionId => (dispatch) => {
   dispatch({ type: SUBSCRIPTION_DETAILS_REQUEST });
 
   return api

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailAssociations.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Table } from 'react-bootstrap';
+import { translate as __ } from 'foremanReact/common/I18n';
 import helpers from '../../../move_to_foreman/common/helpers.js';
 
 const SubscriptionDetailAssociations = ({ subscriptionDetails }) => {

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailInfo.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Table } from 'react-bootstrap';
+import { translate as __ } from 'foremanReact/common/I18n';
 import subscriptionAttributes from './SubscriptionAttributes';
 
 const SubscriptionDetailInfo = ({ subscriptionDetails }) => {

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailProduct.js

@@ -1,24 +1,31 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Row, Col } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 const SubscriptionDetailProduct = ({ content }) => (
   <Row key={content.id}>
     <Col sm={12}>
-      <Row><u>{content.name}</u></Row>
-    </Col>
-    <Col sm={3}>
-      <Row>{ __('Content Download URL') }</Row>
-      <Row>{ __('GPG Key URL') }</Row>
-      <Row>{ __('Repo Type') }</Row>
-      <Row>{ __('Enabled?') }</Row>
-    </Col>
-    <Col sm={9}>
-      <Row>{content.content_url}</Row>
-      <Row>{content.gpg_url}</Row>
-      <Row>{content.type}</Row>
-      <Row>{content.enabled ? __('yes') : __('no')}</Row>
+      <Row>
+        <u>{content.name}</u>
+      </Row>
     </Col>
+    <Row>
+      <Col sm={3}>{__('Content Download URL')}</Col>
+      <Col sm={9}>{content.content_url} </Col>
+    </Row>
+    <Row>
+      <Col sm={3}>{__('GPG Key URL')}</Col>
+      <Col sm={9}>{content.gpg_url} </Col>
+    </Row>
+    <Row>
+      <Col sm={3}>{__('Repo Type')}</Col>
+      <Col sm={9}>{content.type} </Col>
+    </Row>
+    <Row>
+      <Col sm={3}>{__('Enabled')}</Col>
+      <Col sm={9}>{content.enabled ? __('yes') : __('no')} </Col>
+    </Row>
   </Row>
 );