katello 3.7.0 → 3.7.1

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

@@ -1,11 +1,13 @@
 import React from 'react';
-import { render } from 'enzyme';
+import { render, mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { MemoryRouter } from 'react-router-dom';
 import SubscriptionsTable from '../SubscriptionsTable';
 import { successState, loadingState, emptyState } from '../../../__tests__/subscriptions.fixtures';
 import { loadSubscriptions, updateQuantity } from '../../../SubscriptionActions';
 
+jest.mock('../../../../../move_to_foreman/foreman_toast_notifications');
+jest.useFakeTimers();
 describe('subscriptions table', () => {
   it('should render a table', async () => {
     // Wrapping SubscriptionTable in MemoryRouter here since it contains
@@ -20,17 +22,23 @@ describe('subscriptions table', () => {
             onSubscriptionDeleteModalClose={() => { }}
             onDeleteSubscriptions={() => {}}
             toggleDeleteButton={() => {}}
+            emptyState={{}}
           />
                         </MemoryRouter>);
     expect(toJson(page)).toMatchSnapshot();
   });
-  /* eslint-enable react/jsx-indent */
 
   it('should render an empty state', async () => {
+    const emptyStateData = {
+      header: __('Yay empty state'),
+      description: __('There is nothing to see here'),
+    };
+
     /* eslint-disable react/jsx-indent */
     const page = render(<MemoryRouter>
       <SubscriptionsTable
         subscriptions={emptyState}
+        emptyState={emptyStateData}
         loadSubscriptions={loadSubscriptions}
         updateQuantity={updateQuantity}
         subscriptionDeleteModalOpen={false}
@@ -41,9 +49,10 @@ describe('subscriptions table', () => {
                         </MemoryRouter>);
     expect(toJson(page)).toMatchSnapshot();
   });
+  /* eslint-enable react/jsx-indent */
 
   it('should render a loading state', async () => {
-    const page = render(<SubscriptionsTable
+    const page = mount(<SubscriptionsTable
       subscriptions={loadingState}
       loadSubscriptions={loadSubscriptions}
       updateQuantity={updateQuantity}
@@ -51,7 +60,10 @@ describe('subscriptions table', () => {
       onSubscriptionDeleteModalClose={() => { }}
       onDeleteSubscriptions={() => {}}
       toggleDeleteButton={() => {}}
+      emptyState={{}}
     />);
+    jest.runAllTimers();
+    page.update();
     expect(toJson(page)).toMatchSnapshot();
   });
 });

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

@@ -0,0 +1,228 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EntitlementsInlineEditFormatter edit mode when available quantities are being loaded renders spinner 1`] = `
+<td
+  className="editable editing"
+>
+  <Spinner
+    className=""
+    inline={false}
+    inverse={false}
+    loading={true}
+    size="xs"
+  >
+    <FormGroup
+      bsClass="form-group"
+    >
+      <FormControl
+        bsClass="form-control"
+        componentClass="input"
+        defaultValue={100}
+        onBlur={[Function]}
+        type="text"
+      />
+      <HelpBlock
+        bsClass="help-block"
+      >
+        <div
+          className="validationMessages"
+        />
+      </HelpBlock>
+    </FormGroup>
+  </Spinner>
+</td>
+`;
+
+exports[`EntitlementsInlineEditFormatter edit mode when available quantities are loaded renders changed values 1`] = `
+<td
+  className="editable editing changed"
+>
+  <Spinner
+    className=""
+    inline={false}
+    inverse={false}
+    loading={false}
+    size="xs"
+  >
+    <FormGroup
+      bsClass="form-group"
+    >
+      <FormControl
+        bsClass="form-control"
+        componentClass="input"
+        defaultValue={100}
+        onBlur={[Function]}
+        type="text"
+      />
+      <HelpBlock
+        bsClass="help-block"
+      >
+        Max 200
+        <div
+          className="validationMessages"
+        />
+      </HelpBlock>
+    </FormGroup>
+  </Spinner>
+</td>
+`;
+
+exports[`EntitlementsInlineEditFormatter edit mode when available quantities are loaded renders edit field and max available 1`] = `
+<td
+  className="editable editing"
+>
+  <Spinner
+    className=""
+    inline={false}
+    inverse={false}
+    loading={false}
+    size="xs"
+  >
+    <FormGroup
+      bsClass="form-group"
+    >
+      <FormControl
+        bsClass="form-control"
+        componentClass="input"
+        defaultValue={100}
+        onBlur={[Function]}
+        type="text"
+      />
+      <HelpBlock
+        bsClass="help-block"
+      >
+        Max 500
+        <div
+          className="validationMessages"
+        />
+      </HelpBlock>
+    </FormGroup>
+  </Spinner>
+</td>
+`;
+
+exports[`EntitlementsInlineEditFormatter edit mode when available quantities are loaded renders edit field and unlimited message 1`] = `
+<td
+  className="editable editing"
+>
+  <Spinner
+    className=""
+    inline={false}
+    inverse={false}
+    loading={false}
+    size="xs"
+  >
+    <FormGroup
+      bsClass="form-group"
+    >
+      <FormControl
+        bsClass="form-control"
+        componentClass="input"
+        defaultValue={100}
+        onBlur={[Function]}
+        type="text"
+      />
+      <HelpBlock
+        bsClass="help-block"
+      >
+        Unlimited
+        <div
+          className="validationMessages"
+        />
+      </HelpBlock>
+    </FormGroup>
+  </Spinner>
+</td>
+`;
+
+exports[`EntitlementsInlineEditFormatter edit mode when available quantities are loaded renders validation message 1`] = `
+<td
+  className="editable editing"
+>
+  <Spinner
+    className=""
+    inline={false}
+    inverse={false}
+    loading={false}
+    size="xs"
+  >
+    <FormGroup
+      bsClass="form-group"
+      validationState="error"
+    >
+      <FormControl
+        bsClass="form-control"
+        componentClass="input"
+        defaultValue={200}
+        onBlur={[Function]}
+        type="text"
+      />
+      <HelpBlock
+        bsClass="help-block"
+      >
+        Max 100
+        <div
+          className="validationMessages"
+        >
+          Exceeds available quantity
+        </div>
+      </HelpBlock>
+    </FormGroup>
+  </Spinner>
+</td>
+`;
+
+exports[`EntitlementsInlineEditFormatter edit mode when available quantities failed to load renders just the edit field 1`] = `
+<td
+  className="editable editing"
+>
+  <Spinner
+    className=""
+    inline={false}
+    inverse={false}
+    loading={false}
+    size="xs"
+  >
+    <FormGroup
+      bsClass="form-group"
+    >
+      <FormControl
+        bsClass="form-control"
+        componentClass="input"
+        defaultValue={200}
+        onBlur={[Function]}
+        type="text"
+      />
+      <HelpBlock
+        bsClass="help-block"
+      >
+        <div
+          className="validationMessages"
+        />
+      </HelpBlock>
+    </FormGroup>
+  </Spinner>
+</td>
+`;
+
+exports[`EntitlementsInlineEditFormatter value mode renders the value 1`] = `
+<td
+  className="editable"
+>
+  <div
+    className="input"
+    onClick={[Function]}
+    onKeyPress={[Function]}
+    role="textbox"
+    tabIndex={0}
+  >
+    200
+  </div>
+</td>
+`;
+
+exports[`EntitlementsInlineEditFormatter value mode renders unlimited for -1 1`] = `
+<td>
+  Unlimited
+</td>
+`;

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

@@ -1,16 +1,59 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`subscriptions table should render a loading state 1`] = `
-<div
-  class="loading-state"
+<SubscriptionsTable
+  emptyState={Object {}}
+  loadSubscriptions={[Function]}
+  onDeleteSubscriptions={[Function]}
+  onSubscriptionDeleteModalClose={[Function]}
+  subscriptionDeleteModalOpen={false}
+  subscriptions={
+    Object {
+      "availableQuantities": null,
+      "itemCount": 0,
+      "loading": true,
+      "pagination": Object {
+        "page": 0,
+        "perPage": 20,
+      },
+      "quantitiesLoading": false,
+      "results": Array [],
+      "tasks": Array [],
+    }
+  }
+  task={
+    Object {
+      "humanized": Object {},
+    }
+  }
+  toggleDeleteButton={[Function]}
+  updateQuantity={[Function]}
 >
-  <div
-    class="spinner spinner-lg"
-  />
-  <p>
-    Loading
-  </p>
-</div>
+  <LoadingState
+    loading={true}
+    loadingText="Loading"
+    timeout={300}
+  >
+    <div
+      className="loading-state"
+    >
+      <Spinner
+        className=""
+        inline={false}
+        inverse={false}
+        loading={true}
+        size="lg"
+      >
+        <div
+          className="spinner spinner-lg"
+        />
+      </Spinner>
+      <p>
+        Loading
+      </p>
+    </div>
+  </LoadingState>
+</SubscriptionsTable>
 `;
 
 exports[`subscriptions table should render a table 1`] = `
@@ -403,22 +446,12 @@ exports[`subscriptions table should render an empty state 1`] = `
   <h4
     class="h1 blank-slate-pf-title"
   >
-    There are no Subscriptions to display
+    Yay empty state
   </h4>
   <p
     class="blank-slate-pf-info"
   >
-    Add Subscriptions to this Allocation to manage your Entitlements.
+    There is nothing to see here
   </p>
-  <div
-    class="blank-slate-pf-main-action"
-  >
-    <a
-      class="btn btn-lg btn-primary"
-      href="subscriptions/add"
-    >
-      Add Subscriptions
-    </a>
-  </div>
 </div>
 `;

data/webpack/scenes/Subscriptions/index.js

@@ -11,6 +11,7 @@ import SubscriptionsPage from './SubscriptionsPage';
 
 // map state to props
 const mapStateToProps = state => ({
+  organization: state.katello.organization,
   subscriptions: state.katello.subscriptions,
   tasks: state.katello.subscriptions.tasks,
 });

data/webpack/scenes/Tasks/helpers.js

@@ -0,0 +1,52 @@
+import React from 'react';
+import ReactDOMServer from 'react-dom/server';
+import { sprintf } from 'jed';
+import helpers from '../../move_to_foreman/common/helpers';
+import { notify } from '../../move_to_foreman/foreman_toast_notifications';
+
+const getErrors = task => (
+  <ul>
+    {task.humanized.errors.map(error => (
+      <li key={error}> {error} </li>
+        ))}
+  </ul>
+);
+
+export const renderTaskStartedToast = (task) => {
+  const message = (
+    <span>
+      <span>
+        {sprintf('Task %s has started.', task.humanized.action)}
+        {' '}
+      </span>
+      <a href={helpers.urlBuilder('foreman_tasks/tasks', '', task.id)}>
+        {__('Click here to go to the tasks page for the task.')}
+      </a>
+    </span>
+  );
+
+  notify({
+    message: ReactDOMServer.renderToStaticMarkup(message),
+    type: 'info',
+  });
+};
+
+export const renderTaskFinishedToast = (task) => {
+  const message = (
+    <span>
+      <span>
+        {`${__(`Task ${task.humanized.action} completed with a result of ${task.result}.`)}`}
+        {' '}
+      </span>
+      {task.errors ? getErrors(task) : ''}
+      <a href={helpers.urlBuilder('foreman_tasks/tasks', '', task.id)}>
+        {__('Click here to go to the tasks page for the task.')}
+      </a>
+    </span>
+  );
+
+  notify({
+    message: ReactDOMServer.renderToStaticMarkup(message),
+    type: task.result,
+  });
+};

data/webpack/services/api/index.js

@@ -1,5 +1,6 @@
 import axios from 'axios';
 import Immutable from 'seamless-immutable';
+import store from 'foremanReact/redux';
 
 const getcsrfToken = () => {
   const token = document.querySelector('meta[name="csrf-token"]');
@@ -99,7 +100,22 @@ class ForemanTasksApi extends Api {
 
 export const foremanTasksApi = new ForemanTasksApi();
 
+class ForemanEndpoint extends Api {
+  constructor() {
+    super();
+    this.baseApiPath = '/';
+  }
+}
+
+export const foremanEndpoint = new ForemanEndpoint();
+
 // eslint-disable-next-line import/prefer-default-export
 const orgNode = () => document.getElementById('organization-id');
 // This node does not exist while testing
-export const orgId = () => (orgNode() ? orgNode().dataset.id : '1');
+export const orgId = () => {
+  const node = orgNode();
+  const id = node && node.dataset.id;
+  const { katello: { setOrganization: { currentId } } } = store.getState();
+
+  return id === '' ? currentId : id;
+};