katello 3.8.0.rc1 → 3.8.0.rc2

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;
+};

data/webpack/services/api/testHelpers.js

@@ -0,0 +1,28 @@
+
+export const failureAction = (type, message = 'Request failed with status code 422') => (
+  {
+    type,
+    payload: {
+      messages: [message],
+      result: new Error(message),
+    },
+  }
+);
+
+export const toastErrorAction = (message = 'Request failed with status code 422') => (
+  {
+    payload: {
+      message: {
+        message,
+        sticky: true,
+        type: 'error',
+      },
+    },
+    type: 'TOASTS_ADD',
+  }
+);
+
+export default {
+  failureAction,
+  toastErrorAction,
+};

data/webpack/test_setup.js

@@ -3,8 +3,10 @@
 import 'babel-polyfill';
 import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
+import * as Services from './services/api';
 
 configure({ adapter: new Adapter() });
 
 // Mocking translation function
 global.__ = text => text; // eslint-disable-line
+Services.orgId = () => 1;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.8.0.rc1
+  version: 3.8.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1345,7 +1345,6 @@ files:
 - config/initializers/pagelets.rb
 - config/initializers/rabl_init.rb
 - config/initializers/runcible.rb
-- config/katello.yaml
 - config/katello.yaml.example
 - config/locales/README
 - config/locales/bn.yml
@@ -2265,7 +2264,10 @@ files:
 - vendor/assets/stylesheets/katello/jquery.treeTable.css.scss
 - vendor/assets/stylesheets/katello/ui.spinner.css.scss
 - webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/components/BreadcrumbBar.js
 - webpack/__mocks__/foremanReact/components/common/table.js
+- webpack/__mocks__/foremanReact/redux.js
+- webpack/__mocks__/foremanReact/redux/actions/toasts.js
 - webpack/__mocks__/react-bootstrap-tooltip-button.js
 - webpack/components/MultiSelect/index.js
 - webpack/components/PaginationRow/PaginationRow.test.js
@@ -2275,10 +2277,17 @@ files:
 - webpack/components/Search/__snapshots__/Search.test.js.snap
 - webpack/components/Search/helpers.js
 - webpack/components/Search/index.js
+- webpack/components/SelectOrg/SelectOrg.scss
+- webpack/components/SelectOrg/SelectOrgAction.js
+- webpack/components/SelectOrg/SelectOrgReducer.js
+- webpack/components/SelectOrg/SetOrganization.js
+- webpack/components/WithOrganization/withOrganization.js
 - webpack/containers/Application/Routes.js
 - webpack/containers/Application/config.js
 - webpack/containers/Application/index.js
 - webpack/containers/Application/overrides.scss
+- webpack/global_test_setup.js
+- webpack/helpers/caret.js
 - webpack/index.js
 - webpack/mockRequest.js
 - webpack/move_to_foreman/Settings/SettingsActions.js
@@ -2295,12 +2304,12 @@ files:
 - webpack/move_to_foreman/components/common/Dialog/__tests__/Dialog.test.js
 - webpack/move_to_foreman/components/common/Dialog/__tests__/__snapshots__/Dialog.test.js.snap
 - webpack/move_to_foreman/components/common/Dialog/index.js
+- webpack/move_to_foreman/components/common/EmptyState/index.js
 - webpack/move_to_foreman/components/common/ModalProgressBar/ModalProgressBar.js
 - webpack/move_to_foreman/components/common/ModalProgressBar/ModalProgressBar.scss
 - webpack/move_to_foreman/components/common/ModalProgressBar/__tests__/ModalProgressBar.test.js
 - webpack/move_to_foreman/components/common/ModalProgressBar/__tests__/__snapshots__/ModalProgressBar.test.js.snap
 - webpack/move_to_foreman/components/common/ModalProgressBar/index.js
-- webpack/move_to_foreman/components/common/emptyState/index.js
 - webpack/move_to_foreman/components/common/table/components/CollapseSubscriptionGroupButton.js
 - webpack/move_to_foreman/components/common/table/components/CollapseSubscriptionGroupButton.test.js
 - webpack/move_to_foreman/components/common/table/components/Table.js
@@ -2335,6 +2344,7 @@ files:
 - webpack/move_to_pf/LoadingState/LoadingState.test.js
 - webpack/move_to_pf/LoadingState/__snapshots__/LoadingState.test.js.snap
 - webpack/move_to_pf/LoadingState/index.js
+- webpack/move_to_pf/Select/Select.js
 - webpack/move_to_pf/TypeAhead/TypeAhead.js
 - webpack/move_to_pf/TypeAhead/TypeAhead.scss
 - webpack/move_to_pf/TypeAhead/TypeAheadInput.js
@@ -2368,6 +2378,7 @@ files:
 - webpack/scenes/Organizations/__tests__/organizations.fixtures.js
 - webpack/scenes/RedHatRepositories/components/EnabledRepository.js
 - webpack/scenes/RedHatRepositories/components/EnabledRepository.stories.js
+- webpack/scenes/RedHatRepositories/components/EnabledRepositoryContent.js
 - webpack/scenes/RedHatRepositories/components/RecommendedRepositorySetsToggler.js
 - webpack/scenes/RedHatRepositories/components/RecommendedRepositorySetsToggler.scss
 - webpack/scenes/RedHatRepositories/components/RepositorySet.js
@@ -2376,8 +2387,12 @@ files:
 - webpack/scenes/RedHatRepositories/components/RepositoryTypeIcon.js
 - webpack/scenes/RedHatRepositories/components/Search.js
 - webpack/scenes/RedHatRepositories/components/SearchBar.js
+- webpack/scenes/RedHatRepositories/components/__tests__/EnabledRepository.test.js
+- webpack/scenes/RedHatRepositories/components/__tests__/EnabledRepositoryContent.test.js
 - webpack/scenes/RedHatRepositories/components/__tests__/RecommendedRepositorySetsToggler.test.js
 - webpack/scenes/RedHatRepositories/components/__tests__/RepositoryTypeIcon.test.js
+- webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/EnabledRepository.test.js.snap
+- webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/EnabledRepositoryContent.test.js.snap
 - webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/RecommendedRepositorySetsToggler.test.js.snap
 - webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/RepositoryTypeIcon.test.js.snap
 - webpack/scenes/RedHatRepositories/helpers.js
@@ -2391,6 +2406,7 @@ files:
 - webpack/scenes/Subscriptions/Details/SubscriptionDetailProducts.js
 - webpack/scenes/Subscriptions/Details/SubscriptionDetailReducer.js
 - webpack/scenes/Subscriptions/Details/SubscriptionDetails.js
+- webpack/scenes/Subscriptions/Details/SubscriptionDetails.scss
 - webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetailActions.test.js
 - webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetailAssociations.test.js
 - webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetailInfo.test.js
@@ -2444,7 +2460,9 @@ files:
 - webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js
 - webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js
 - webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js
+- webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/EntitlementsInlineEditFormatter.test.js
 - webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTable.test.js
+- webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/EntitlementsInlineEditFormatter.test.js.snap
 - webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap
 - webpack/scenes/Subscriptions/components/SubscriptionsTable/index.js
 - webpack/scenes/Subscriptions/index.js
@@ -2452,9 +2470,10 @@ files:
 - webpack/scenes/Tasks/TaskConstants.js
 - webpack/scenes/Tasks/__tests__/TaskActions.test.js
 - webpack/scenes/Tasks/__tests__/task.fixtures.js
-- webpack/services/api/fixtures.js
+- webpack/scenes/Tasks/helpers.js
 - webpack/services/api/index.js
 - webpack/services/api/setupMocks.js
+- webpack/services/api/testHelpers.js
 - webpack/services/index.js
 - webpack/stories/index.js
 - webpack/test_setup.js

data/config/katello.yaml

@@ -1,89 +0,0 @@
-:katello:
-  #if this block is not define, all types are enabled
-  #types are defined in lib/katello/repository_types/*.rb
-  :content_types:
-    :yum: true
-    :file: true
-    :deb: true
-    :puppet: true
-    :docker: true
-    :ostree: true
-
-  :use_cp: true # set to true/false if you want to override default
-  :use_pulp: true # set to true/false if you want to override default
-
-  :rest_client_timeout: 30
-  :gpg_strict_validation: false
-
-  :puppet_repo_root: '/etc/puppet/environments/'
-
-  :post_sync_url: "http://localhost:3000/katello/api/v2/repositories/sync_complete?token=katello"
-
-  :redhat_repository_url: https://cdn.redhat.com
-
-  :consumer_cert_rpm: 'katello-ca-consumer-latest.noarch.rpm'
-  :consumer_cert_sh:  'katello-rhsm-consumer'
-
-  # Setup your candlepin environment here
-  :candlepin:
-    # refers to the url of the candlepin
-    # example https://localhost:8443/candlepin
-    :url: https://192.168.42.116:31329/candlepin
-
-    # Specify your oauth key and secret used to authenticate between Katello and Candlepin
-    :oauth_key: katello
-    :oauth_secret: katello
-
-    # refers to the candlepin-ca.crt location that is needed
-    # to connect to candlepin over https.This is not necessary
-    # if the candlepin server is running on the same machine as katello
-    # but required if the server is on a different machine.
-    # In the different machine case the katello host needs to have a
-    # copy of /etc/candlepin/certs/candlepin-ca.crt copied from
-    # the candlepin host and the location of the copied file needs to be
-    # specified here..
-    :ca_cert_file:
-    # :bulk_load_size: 1000
-  # Setup your pulp environment here
-  :pulp:
-    # refers to the url of the pulp
-    # example https://localhost/pulp/api
-    :url: https://192.168.42.116:30133/pulp/api/v2/
-
-    :sync_threads: 4
-    :bulk_load_size: 100
-    # refers to the apache certificate
-    # (typically /etc/pki/tls/certs/localhost.crt) location that is needed
-    # to connect to pulp over https.
-    :ca_cert_file:
-    :default_login: admin
-    :sync_KBlimit:
-    :upload_chunk_size: 1048575 # upload size in bytes to pulp. see SSLRenegBufferSize in apache
-    :skip_checksum_validation: false
-
-  :qpid:
-    :url: amqp:ssl:katello-devel.example.com:5671
-    :subscriptions_queue_address: katello_event_queue
-
-  :cdn_proxy:
-  #    :host: localhost
-  #    :port: 3128
-  #    :user: login
-  #    :password: password
-
-# Logging configuration can be changed by uncommenting the loggers
-# section and the logger configuration desired.
-#
-#  :loggers:
-#    :glue:
-#      :enabled: true
-#    :pulp_rest:
-#      :enabled: true
-#    :cp_rest:
-#      :enabled: true
-#    :cp_proxy:
-#      :enabled: true
-#    :action:
-#      :enabled: true
-#    :manifest_import_logger:
-#      :enabled: true