katello 3.8.1 → 3.9.0.rc1

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js

@@ -4,6 +4,7 @@ import { Icon } from 'patternfly-react';
 import { Link } from 'react-router-dom';
 import helpers from '../../../../move_to_foreman/common/helpers';
 import { entitlementsInlineEditFormatter } from './EntitlementsInlineEditFormatter';
+import { subscriptionTypeFormatter } from './SubscriptionTypeFormatter';
 import {
   headerFormatter,
   cellFormatter,
@@ -24,12 +25,16 @@ export const createSubscriptionsTableSchema = (
     },
     cell: {
       formatters: [
-        (value, additionalData) =>
-          collapseableAndSelectionCellFormatter(
+        (value, additionalData) => {
+          // eslint-disable-next-line no-param-reassign
+          additionalData.disabled = additionalData.rowData.available === -1;
+
+          return collapseableAndSelectionCellFormatter(
             groupingController,
             selectionController,
             additionalData,
-          ),
+          );
+        },
       ],
     },
   },
@@ -49,6 +54,16 @@ export const createSubscriptionsTableSchema = (
       ],
     },
   },
+  {
+    property: 'type',
+    header: {
+      label: __('Type'),
+      formatters: [headerFormatter],
+    },
+    cell: {
+      formatters: [subscriptionTypeFormatter],
+    },
+  },
   {
     property: 'product_id',
     header: {

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionTypeFormatter.test.js

@@ -0,0 +1,33 @@
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import { subscriptionTypeFormatter } from '../SubscriptionTypeFormatter';
+
+describe('subscriptionTypeFormatter', () => {
+  const data = rowData => ({
+    rowData,
+  });
+
+  it('renders physical subscriptions', async () => {
+    const formatter = subscriptionTypeFormatter(null, data({ virt_only: false }));
+
+    expect(toJson(shallow(formatter))).toMatchSnapshot();
+  });
+
+  it('renders temporary subscriptions', async () => {
+    const formatter = subscriptionTypeFormatter(null, data({ unmapped_guest: true }));
+
+    expect(toJson(shallow(formatter))).toMatchSnapshot();
+  });
+
+  it('renders virtual subscriptions', async () => {
+    const formatter = subscriptionTypeFormatter(null, data({}));
+
+    expect(toJson(shallow(formatter))).toMatchSnapshot();
+  });
+
+  it('renders link to a host', async () => {
+    const formatter = subscriptionTypeFormatter(null, data({ hypervisor: { name: 'host.example.com', id: 83 } }));
+
+    expect(toJson(shallow(formatter))).toMatchSnapshot();
+  });
+});

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTable.test.js

@@ -8,15 +8,24 @@ import { loadSubscriptions, updateQuantity } from '../../../SubscriptionActions'
 
 jest.mock('../../../../../move_to_foreman/foreman_toast_notifications');
 jest.useFakeTimers();
+const tableColumns = [
+  'id',
+  'product_id',
+  'contract_number',
+  'start_date',
+  'end_date',
+];
 describe('subscriptions table', () => {
   it('should render a table', async () => {
     // Wrapping SubscriptionTable in MemoryRouter here since it contains
     // a Link componenent, which can't be used outside a Router
     /* eslint-disable react/jsx-indent */
+
     const page = render(<MemoryRouter>
           <SubscriptionsTable
             subscriptions={successState}
             loadSubscriptions={loadSubscriptions}
+            tableColumns={tableColumns}
             updateQuantity={updateQuantity}
             subscriptionDeleteModalOpen={false}
             onSubscriptionDeleteModalClose={() => { }}
@@ -28,6 +37,24 @@ describe('subscriptions table', () => {
     expect(toJson(page)).toMatchSnapshot();
   });
 
+  it('should disable checkboxes for custom subscriptions', async () => {
+    /* eslint-disable react/jsx-indent */
+    const page = render(<MemoryRouter>
+      <SubscriptionsTable
+        subscriptions={successState}
+        loadSubscriptions={loadSubscriptions}
+        tableColumns={tableColumns}
+        updateQuantity={updateQuantity}
+        subscriptionDeleteModalOpen={false}
+        onSubscriptionDeleteModalClose={() => { }}
+        onDeleteSubscriptions={() => {}}
+        toggleDeleteButton={() => {}}
+        emptyState={{}}
+      />
+                        </MemoryRouter>);
+    expect(page.find('#select1').is('[disabled]')).toBe(true);
+  });
+
   it('should render an empty state', async () => {
     const emptyStateData = {
       header: __('Yay empty state'),
@@ -45,6 +72,7 @@ describe('subscriptions table', () => {
         onSubscriptionDeleteModalClose={() => {}}
         onDeleteSubscriptions={() => {}}
         toggleDeleteButton={() => {}}
+        tableColumns={[]}
       />
                         </MemoryRouter>);
     expect(toJson(page)).toMatchSnapshot();
@@ -55,6 +83,7 @@ describe('subscriptions table', () => {
     const page = mount(<SubscriptionsTable
       subscriptions={loadingState}
       loadSubscriptions={loadSubscriptions}
+      tableColumns={tableColumns}
       updateQuantity={updateQuantity}
       subscriptionDeleteModalOpen={false}
       onSubscriptionDeleteModalClose={() => { }}

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionTypeFormatter.test.js.snap

@@ -0,0 +1,34 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`subscriptionTypeFormatter renders link to a host 1`] = `
+<td>
+  <span>
+    Guests of
+     
+    <Link
+      replace={false}
+      to="/content_hosts/83/"
+    >
+      host.example.com
+    </Link>
+  </span>
+</td>
+`;
+
+exports[`subscriptionTypeFormatter renders physical subscriptions 1`] = `
+<td>
+  Physical
+</td>
+`;
+
+exports[`subscriptionTypeFormatter renders temporary subscriptions 1`] = `
+<td>
+  Temporary
+</td>
+`;
+
+exports[`subscriptionTypeFormatter renders virtual subscriptions 1`] = `
+<td>
+  Virtual
+</td>
+`;

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap

@@ -18,9 +18,20 @@ exports[`subscriptions table should render a loading state 1`] = `
       },
       "quantitiesLoading": false,
       "results": Array [],
+      "selectedTableColumns": Array [],
+      "tableColumns": Array [],
       "tasks": Array [],
     }
   }
+  tableColumns={
+    Array [
+      "id",
+      "product_id",
+      "contract_number",
+      "start_date",
+      "end_date",
+    ]
+  }
   task={
     Object {
       "humanized": Object {},
@@ -105,21 +116,6 @@ exports[`subscriptions table should render a table 1`] = `
         >
           End Date
         </th>
-        <th
-          class=""
-        >
-          Requires Virt-Who
-        </th>
-        <th
-          class=""
-        >
-          Consumed
-        </th>
-        <th
-          class=""
-        >
-          Entitlements
-        </th>
       </tr>
     </thead>
     <tbody>
@@ -165,20 +161,6 @@ exports[`subscriptions table should render a table 1`] = `
         >
           2047-09-14 15:18:44 -0500
         </td>
-        <td>
-          <span
-            aria-hidden="true"
-            class="fa fa-minus"
-          />
-        </td>
-        <td
-          class=""
-        >
-          1
-        </td>
-        <td>
-          Unlimited
-        </td>
       </tr>
       <tr
         class=""
@@ -193,6 +175,7 @@ exports[`subscriptions table should render a table 1`] = `
             Select row
           </label>
           <input
+            disabled=""
             id="select1"
             type="checkbox"
           />
@@ -222,20 +205,6 @@ exports[`subscriptions table should render a table 1`] = `
         >
           2047-09-18 16:54:36 -0500
         </td>
-        <td>
-          <span
-            aria-hidden="true"
-            class="fa fa-minus"
-          />
-        </td>
-        <td
-          class=""
-        >
-          0
-        </td>
-        <td>
-          Unlimited
-        </td>
       </tr>
     </tbody>
   </table>
@@ -302,6 +271,18 @@ exports[`subscriptions table should render a table 1`] = `
               15
             </a>
           </li>
+          <li
+            class=""
+            role="presentation"
+          >
+            <a
+              href="#"
+              role="menuitem"
+              tabindex="-1"
+            >
+              20
+            </a>
+          </li>
           <li
             class=""
             role="presentation"

data/webpack/scenes/Subscriptions/index.js

@@ -2,22 +2,39 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 import * as subscriptionActions from './SubscriptionActions';
+
 import * as taskActions from '../Tasks/TaskActions';
 import * as settingActions from '../../move_to_foreman/Settings/SettingsActions';
+import * as tableActions from '../Settings/Tables/TableActions';
+import * as manifestActions from './Manifest/ManifestActions';
 
 import reducer from './SubscriptionReducer';
-
+import { SUBSCRIPTION_TABLE_NAME } from './SubscriptionConstants';
 import SubscriptionsPage from './SubscriptionsPage';
 
 // map state to props
-const mapStateToProps = state => ({
-  organization: state.katello.organization,
-  subscriptions: state.katello.subscriptions,
-  tasks: state.katello.subscriptions.tasks,
-});
+
+const mapStateToProps = (state) => {
+  const subscriptionTableSettings = state.katello.settings.tables[SUBSCRIPTION_TABLE_NAME] || {};
+
+  return {
+    organization: state.katello.organization,
+    subscriptions: state.katello.subscriptions,
+    tasks: state.katello.subscriptions.tasks,
+    subscriptionTableSettings,
+    taskDetails: state.katello.manifestHistory.taskDetails,
+  };
+};
 
 // map action dispatchers to props
-const actions = { ...subscriptionActions, ...taskActions, ...settingActions };
+const actions = {
+  ...subscriptionActions,
+  ...taskActions,
+  ...settingActions,
+  ...tableActions,
+  ...manifestActions,
+};
+
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
 // export reducers

data/webpack/scenes/Tasks/TaskActions.js

@@ -8,9 +8,22 @@ import {
   TASK_BULK_SEARCH_REQUEST,
   TASK_BULK_SEARCH_SUCCESS,
   TASK_BULK_SEARCH_FAILURE,
+  RESET_TASKS,
 } from './TaskConstants';
 
 export const bulkSearch = (extendedParams = {}) => (dispatch) => {
+  const params = {
+    search: Object.entries(propsToSnakeCase(extendedParams))
+      .map((item) => {
+        if (item[0] === 'action') {
+          return `${item[0]}~${item[1]}`;
+        }
+        return `${item[0]}=${item[1]}`;
+      })
+      .join(' and '),
+  };
+
+
   const onBulkSearchSuccess = ({ data }) => dispatch({
     type: TASK_BULK_SEARCH_SUCCESS,
     response: data,
@@ -22,17 +35,18 @@ export const bulkSearch = (extendedParams = {}) => (dispatch) => {
   });
 
   dispatch({ type: TASK_BULK_SEARCH_REQUEST });
-
-  const params = {
-    searches: [{ ...propsToSnakeCase(extendedParams) }],
-  };
-
   return api
-    .post('/tasks/bulk_search', params)
+    .get('/tasks', {}, params)
     .then(onBulkSearchSuccess)
     .catch(onBulkSearchFailure);
 };
 
+export const resetTasks = () => (dispatch) => {
+  dispatch({
+    type: RESET_TASKS,
+  });
+};
+
 export const loadTask = (taskId, extendedParams = {}) => (dispatch) => {
   dispatch({ type: GET_TASK_REQUEST });
 
@@ -55,22 +69,33 @@ export const loadTask = (taskId, extendedParams = {}) => (dispatch) => {
 const isUnauthorized = action =>
   (action.result && action.result.response && action.result.response.status === 401);
 
-export const pollBulkSearch = (extendedParams = {}, interval) => (dispatch) => {
-  const triggerPolling = (action) => {
-    if (!isUnauthorized(action)) {
-      setTimeout(() => dispatch(pollBulkSearch(extendedParams, interval)), interval);
+export const pollBulkSearch = (extendedParams = {}, interval, orgId) =>
+  (dispatch, getState) => {
+    const triggerPolling = (action) => {
+      const { id } = getState().katello.organization;
+      if (!isUnauthorized(action)) {
+        if (id === orgId) {
+          setTimeout(() => dispatch(pollBulkSearch(extendedParams, interval, orgId)), interval);
+        }
+      }
+    };
+    const { id, loading } = getState().katello.organization;
+
+    if (id === orgId && !loading) {
+      return dispatch(bulkSearch(extendedParams)).then(triggerPolling);
     }
-  };
 
-  return dispatch(bulkSearch(extendedParams)).then(triggerPolling);
-};
+    return dispatch({ type: 'POLLING_IS_SKIPPED' });
+  };
 
-export const pollTaskUntilDone = (taskId, extendedParams = {}, interval) => dispatch => (
-  new Promise((resolve, reject) => {
+export const pollTaskUntilDone = (taskId, extendedParams = {}, interval, orgId) =>
+  (dispatch, getState) => new Promise((resolve, reject) => {
     const pollUntilDone = (action) => {
-      if (isUnauthorized(action)) {
+      const { id, loading } = getState().katello.organization;
+
+      if (isUnauthorized(action) || id !== orgId || loading) {
         reject(action.result);
-      } else if (action.response.pending !== false) {
+      } else if (action.response.pending) {
         setTimeout(() => dispatch(loadTask(taskId, extendedParams)).then(pollUntilDone), interval);
       } else {
         resolve(action.response);
@@ -78,5 +103,4 @@ export const pollTaskUntilDone = (taskId, extendedParams = {}, interval) => disp
     };
 
     return dispatch(loadTask(taskId, extendedParams)).then(pollUntilDone);
-  })
-);
+  });

data/webpack/scenes/Tasks/TaskConstants.js

@@ -5,3 +5,4 @@ export const GET_TASK_FAILURE = 'GET_TASK_FAILURE';
 export const TASK_BULK_SEARCH_REQUEST = 'TASK_BULK_SEARCH_REQUEST';
 export const TASK_BULK_SEARCH_SUCCESS = 'TASK_BULK_SEARCH_SUCCESS';
 export const TASK_BULK_SEARCH_FAILURE = 'TASK_BULK_SEARCH_FAILURE';
+export const RESET_TASKS = 'RESET_TASKS';

data/webpack/scenes/Tasks/__tests__/TaskActions.test.js

@@ -17,7 +17,10 @@ import {
 import { bulkSearch, loadTask, pollTaskUntilDone, pollBulkSearch } from '../TaskActions';
 
 const mockStore = configureMockStore([thunk]);
-const store = mockStore({ tasks: Immutable({}) });
+const store = mockStore({
+  tasks: Immutable({}),
+  katello: { organization: { id: 1, loading: false } },
+});
 const mockApi = new MockAdapter(axios);
 
 beforeEach(() => {
@@ -44,17 +47,17 @@ afterEach(() => {
 
 describe('task actions', () => {
   describe('creates TASK_BULK_SEARCH_REQUEST', () => {
-    const url = '/foreman_tasks/api/tasks/bulk_search';
+    const url = '/foreman_tasks/api/tasks';
 
     it('and then fails with 422', () => {
-      mockApi.onPost(url).reply(422);
+      mockApi.onGet(url).reply(422);
 
       return store.dispatch(bulkSearch())
         .then(() => expect(store.getActions()).toEqual(buildBulkSearchFailureActions()));
     });
 
     it('and ends with success', () => {
-      mockApi.onPost(url).reply(200, bulkSearchSuccessResponse);
+      mockApi.onGet(url).reply(200, bulkSearchSuccessResponse);
 
       return store.dispatch(bulkSearch())
         .then(() => expect(store.getActions()).toEqual(bulkSearchSuccessActions));
@@ -88,7 +91,7 @@ describe('task actions', () => {
       mockApi.onGet(url).replyOnce(200, getTaskSuccessResponse);
 
       return store
-        .dispatch(pollTaskUntilDone(taskId, {}, 1))
+        .dispatch(pollTaskUntilDone(taskId, {}, 1, 1))
         .then(() => {
           expect(store.getActions()).toEqual(getTaskSuccessActions);
           expect(setTimeoutSpy).toHaveBeenCalledTimes(0);
@@ -109,7 +112,7 @@ describe('task actions', () => {
         .concat(getTaskSuccessActions);
 
       return store
-        .dispatch(pollTaskUntilDone(taskId, {}, 1))
+        .dispatch(pollTaskUntilDone(taskId, {}, 1, 1))
         .then(() => {
           expect(store.getActions()).toEqual(expectedActions);
           expect(setTimeoutSpy).toHaveBeenCalledTimes(2);
@@ -125,7 +128,7 @@ describe('task actions', () => {
         .concat(buildTaskFailureActions(401));
 
       return store
-        .dispatch(pollTaskUntilDone(taskId, {}, 1))
+        .dispatch(pollTaskUntilDone(taskId, {}, 1, 1))
         .catch(() => {
           expect(store.getActions()).toEqual(expectedActions);
           expect(setTimeoutSpy).toHaveBeenCalledTimes(1);
@@ -134,15 +137,15 @@ describe('task actions', () => {
   });
 
   describe('pollBulkSearch', () => {
-    const url = '/foreman_tasks/api/tasks/bulk_search';
+    const url = '/foreman_tasks/api/tasks';
 
     it('polls', () => {
       mockApi
-        .onPost(url)
+        .onGet(url)
         .replyOnce(200, bulkSearchSuccessResponse);
 
       return store
-        .dispatch(pollBulkSearch({}, 1))
+        .dispatch(pollBulkSearch({}, 1, 1))
         .then(() => {
           expect(store.getActions()).toEqual(bulkSearchSuccessActions);
           expect(setTimeoutSpy).toHaveBeenCalledTimes(1);
@@ -151,10 +154,10 @@ describe('task actions', () => {
 
     it('stops polling on unauthorized response', () => {
       mockApi
-        .onPost(url).replyOnce(401);
+        .onGet(url).replyOnce(401);
 
       return store
-        .dispatch(pollBulkSearch({}, 1))
+        .dispatch(pollBulkSearch({}, 1, 1))
         .then(() => {
           expect(store.getActions()).toEqual(buildBulkSearchFailureActions(401));
           expect(setTimeoutSpy).toHaveBeenCalledTimes(0);