katello 3.15.0.rc1.1 → 3.15.0.rc1.2

data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsSelectors.test.js.snap

@@ -4,8 +4,6 @@ exports[`Subscriptions selectors should select delete-button-disabled 1`] = `tru
 
 exports[`Subscriptions selectors should select delete-modal-opened 1`] = `false`;
 
-exports[`Subscriptions selectors should select manifest-modal-opened 1`] = `false`;
-
 exports[`Subscriptions selectors should select search-query 1`] = `"some-query"`;
 
 exports[`Subscriptions selectors should select subscriptions tasks 1`] = `
@@ -21,7 +19,6 @@ exports[`Subscriptions selectors should select the subscriptions state 1`] = `
 Object {
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "manifestModalOpened": false,
   "searchQuery": "some-query",
   "taskModalOpened": false,
   "tasks": Array [

data/webpack/scenes/Subscriptions/__tests__/subscriptions.fixtures.js

@@ -3,7 +3,6 @@ import { toastErrorAction, failureAction } from '../../../services/api/testHelpe
 
 export const initialState = Immutable({
   loading: true,
-  manifestModalOpened: false,
   results: [],
   pagination: {
     page: 0,
@@ -256,7 +255,6 @@ export const groupedSubscriptions = Immutable({
 
 export const successState = Immutable({
   loading: false,
-  manifestModalOpened: false,
   results: [
     {
       id: 3,
@@ -326,7 +324,6 @@ export const successState = Immutable({
 });
 export const permissionDeniedState = Immutable({
   loading: false,
-  manifestModalOpened: false,
   results: [],
   searchIsActive: false,
   search: undefined,
@@ -361,7 +358,6 @@ export const settingsSuccessState = Immutable({
 
 export const errorState = Immutable({
   loading: false,
-  manifestModalOpened: false,
   pagination: {
     page: 0,
     perPage: 20,

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

@@ -21,7 +21,6 @@ class SubscriptionsTable extends Component {
       showUpdateConfirmDialog: false,
       showCancelConfirmDialog: false,
       showErrorDialog: false,
-      selectedRows: [],
     };
   }
 
@@ -78,40 +77,30 @@ class SubscriptionsTable extends Component {
     const allSubscriptionResults = this.props.subscriptions.results;
 
     const checkAllRowsSelected = () =>
-      allSubscriptionResults.length === this.state.selectedRows.length;
+      allSubscriptionResults.length === this.props.selectedRows.length;
 
-    const updateDeleteButton = () => {
-      this.props.toggleDeleteButton(this.state.selectedRows.length > 0);
-    };
     return ({
       allRowsSelected: () => checkAllRowsSelected(),
       selectAllRows: () => {
         if (checkAllRowsSelected()) {
-          this.setState(
-            { selectedRows: [] },
-            updateDeleteButton,
-          );
+          this.props.onSelectedRowsChange([]);
+          this.props.toggleDeleteButton(false);
         } else {
-          this.setState(
-            { selectedRows: allSubscriptionResults.map(row => row.id) },
-            updateDeleteButton,
-          );
+          this.props.onSelectedRowsChange(allSubscriptionResults.map(row => row.id));
+          this.props.toggleDeleteButton(true);
         }
       },
       selectRow: ({ rowData }) => {
-        let { selectedRows } = this.state;
+        let { selectedRows } = this.props;
         if (selectedRows.includes(rowData.id)) {
           selectedRows = selectedRows.filter(e => e !== rowData.id);
         } else {
-          selectedRows.push(rowData.id);
+          selectedRows = selectedRows.concat(rowData.id);
         }
-
-        this.setState(
-          { selectedRows },
-          updateDeleteButton,
-        );
+        this.props.onSelectedRowsChange(selectedRows);
+        this.props.toggleDeleteButton(selectedRows.length > 0);
       },
-      isSelected: ({ rowData }) => this.state.selectedRows.includes(rowData.id),
+      isSelected: ({ rowData }) => this.props.selectedRows.includes(rowData.id),
     });
   };
 
@@ -177,7 +166,7 @@ class SubscriptionsTable extends Component {
       onDeleteSubscriptions,
       onSubscriptionDeleteModalClose,
     } = this.props;
-    const { selectedRows } = this.state;
+    const { selectedRows } = this.props;
     return {
       show,
       selectedRows,
@@ -305,6 +294,8 @@ SubscriptionsTable.propTypes = {
       displayName: PropTypes.string,
     }),
   }),
+  selectedRows: PropTypes.instanceOf(Array).isRequired,
+  onSelectedRowsChange: PropTypes.func.isRequired,
 };
 
 SubscriptionsTable.defaultProps = {

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

@@ -33,6 +33,8 @@ describe('subscriptions table', () => {
             onSubscriptionDeleteModalClose={() => { }}
             toggleDeleteButton={() => {}}
             emptyState={{}}
+            selectedRows={[]}
+            onSelectedRowsChange={() => {}}
           />
                         </MemoryRouter>);
     expect(toJson(page)).toMatchSnapshot();
@@ -54,6 +56,8 @@ describe('subscriptions table', () => {
             onDeleteSubscriptions={() => {}}
             toggleDeleteButton={() => {}}
             emptyState={{}}
+            selectedRows={[]}
+            onSelectedRowsChange={() => {}}
           />
                         </MemoryRouter>);
     expect(toJson(page)).toMatchSnapshot();
@@ -72,6 +76,8 @@ describe('subscriptions table', () => {
         onDeleteSubscriptions={() => {}}
         toggleDeleteButton={() => {}}
         emptyState={{}}
+        selectedRows={[]}
+        onSelectedRowsChange={() => {}}
       />
                         </MemoryRouter>);
     expect(page.find('#select1').is('[disabled]')).toBe(true);
@@ -95,6 +101,8 @@ describe('subscriptions table', () => {
         onDeleteSubscriptions={() => {}}
         toggleDeleteButton={() => {}}
         tableColumns={[]}
+        selectedRows={[]}
+        onSelectedRowsChange={() => {}}
       />
                         </MemoryRouter>);
     expect(toJson(page)).toMatchSnapshot();
@@ -112,6 +120,8 @@ describe('subscriptions table', () => {
       onDeleteSubscriptions={() => {}}
       toggleDeleteButton={() => {}}
       emptyState={{}}
+      selectedRows={[]}
+      onSelectedRowsChange={() => {}}
     />);
     jest.runAllTimers();
     page.update();

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

@@ -6,14 +6,15 @@ exports[`subscriptions table should render a loading state 1`] = `
   emptyState={Object {}}
   loadSubscriptions={[Function]}
   onDeleteSubscriptions={[Function]}
+  onSelectedRowsChange={[Function]}
   onSubscriptionDeleteModalClose={[Function]}
+  selectedRows={Array []}
   subscriptionDeleteModalOpen={false}
   subscriptions={
     Object {
       "availableQuantities": null,
       "itemCount": 0,
       "loading": true,
-      "manifestModalOpened": false,
       "pagination": Object {
         "page": 0,
         "perPage": 20,

data/webpack/scenes/Subscriptions/index.js

@@ -1,7 +1,7 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import * as settingActions from 'foremanReact/components/Settings/SettingsActions';
-
+import * as foremanModalActions from 'foremanReact/components/ForemanModal/ForemanModalActions';
 import * as subscriptionActions from './SubscriptionActions';
 import * as taskActions from '../Tasks/TaskActions';
 import * as tableActions from '../Settings/Tables/TableActions';
@@ -10,7 +10,6 @@ import * as manifestActions from './Manifest/ManifestActions';
 import {
   selectSubscriptionsState,
   selectSearchQuery,
-  selectManifestModalOpened,
   selectDeleteModalOpened,
   selectTaskModalOpened,
   selectDeleteButtonDisabled,
@@ -18,6 +17,7 @@ import {
   selectActivePermissions,
   selectTableSettings,
 } from './SubscriptionsSelectors';
+import { selectSimpleContentAccessEnabled } from '../Organizations/OrganizationSelectors';
 
 import reducer from './SubscriptionReducer';
 import { SUBSCRIPTION_TABLE_NAME } from './SubscriptionConstants';
@@ -32,9 +32,9 @@ const mapStateToProps = (state) => {
     subscriptions,
     subscriptionTableSettings,
     activePermissions: selectActivePermissions(state),
+    simpleContentAccess: selectSimpleContentAccessEnabled(state),
     tasks: selectSubscriptionsTasks(state),
     searchQuery: selectSearchQuery(state),
-    manifestModalOpened: selectManifestModalOpened(state),
     deleteModalOpened: selectDeleteModalOpened(state),
     taskModalOpened: selectTaskModalOpened(state),
     deleteButtonDisabled: selectDeleteButtonDisabled(state),
@@ -50,6 +50,7 @@ const actions = {
   ...settingActions,
   ...tableActions,
   ...manifestActions,
+  ...foremanModalActions,
 };
 
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);

data/webpack/scenes/Tasks/TaskConstants.js

@@ -6,3 +6,4 @@ 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';
+export const POLL_TASK_INTERVAL = 5000;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.15.0.rc1.1
+  version: 3.15.0.rc1.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,30 +202,42 @@ dependencies:
   name: pulpcore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0.dev01574423031
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0.dev01574423031
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pulp_file_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.0.dev01574442231
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0.dev01574442231
+        version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: pulp_ansible_client
   requirement: !ruby/object:Gem::Requirement
@@ -244,16 +256,22 @@ dependencies:
   name: pulp_container_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0.dev01574357179
+        version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.0.dev01574357179
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: pulp_rpm_client
   requirement: !ruby/object:Gem::Requirement
@@ -557,7 +575,6 @@ files:
 - app/assets/javascripts/katello/organizations/download_certificate.js
 - app/assets/javascripts/katello/sync_management/index.js
 - app/assets/javascripts/katello/sync_management/sync_management.js
-- app/assets/javascripts/katello/widgets/auto_complete.js
 - app/assets/javascripts/katello/widgets/env_content_view_selector.js
 - app/assets/javascripts/katello/widgets/path_selector.js
 - app/assets/javascripts/katello/widgets/subpanel_new.js
@@ -1587,8 +1604,8 @@ files:
 - app/views/overrides/taxonomies/_action_buttons.html.erb
 - app/views/smart_proxies/_disk_usage.html.erb
 - app/views/smart_proxies/plugins/_pulp.html.erb
-- app/views/smart_proxies/plugins/_pulp3.html.erb
 - app/views/smart_proxies/plugins/_pulp_node.html.erb
+- app/views/smart_proxies/plugins/_pulpcore.html.erb
 - app/views/smart_proxies/pulp_status.html.erb
 - app/views/smart_proxies/pulp_storage.html.erb
 - app/views/smart_proxies/show/_storage.html.erb
@@ -1871,6 +1888,8 @@ files:
 - db/migrate/20191204214919_add_content_view_version_counts.rb
 - db/migrate/20191213161248_add_dmi_uuid_to_katello_subscription_facets.rb
 - db/migrate/20200109162354_drop_host_update_lock_setting.rb
+- db/migrate/20200121213430_katello_repository_rpms_id_big_int.rb
+- db/migrate/20200129172534_add_epoch_version_release_arch_to_katello_installed_packages.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -1881,7 +1900,6 @@ files:
 - db/seeds.d/110-content-view-autopublish.rb
 - db/seeds.d/111-container-image-bookmarks.rb
 - db/seeds.d/111-upgrade_tasks.rb
-- db/seeds.d/115-http_proxy.rb
 - db/seeds.d/150-module_job_templates.rb
 - db/seeds.d/75-job_templates.rb
 - engines/bastion/README.md
@@ -4107,6 +4125,7 @@ files:
 - lib/katello/tasks/job_templates.rake
 - lib/katello/tasks/pulp3_content_switchover.rake
 - lib/katello/tasks/pulp3_migration.rake
+- lib/katello/tasks/pulp3_post_migration_check.rake
 - lib/katello/tasks/regenerate_ueber_certs.rake
 - lib/katello/tasks/reimport.rake
 - lib/katello/tasks/repository.rake
@@ -4215,7 +4234,6 @@ files:
 - vendor/assets/javascripts/katello/jquery.trunk8.js
 - vendor/assets/stylesheets/katello/facebox.css
 - vendor/assets/stylesheets/katello/jquery-ui-1.8.11.custom.css.scss
-- vendor/assets/stylesheets/katello/jquery.jnotify.css
 - vendor/assets/stylesheets/katello/jquery.loadmask.css.scss
 - vendor/assets/stylesheets/katello/jquery.multiselect.css
 - vendor/assets/stylesheets/katello/jquery.multiselect.filter.css
@@ -4227,6 +4245,9 @@ files:
 - webpack/__mocks__/foremanReact/common/keyCodes.js
 - webpack/__mocks__/foremanReact/common/urlHelpers.js
 - webpack/__mocks__/foremanReact/components/BreadcrumbBar.js
+- webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalActions.js
+- webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalSelectors.js
+- webpack/__mocks__/foremanReact/components/ForemanModal/index.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/PermissionDenied/index.js
 - webpack/__mocks__/foremanReact/components/Settings/SettingsActions.js
@@ -4442,6 +4463,7 @@ files:
 - webpack/scenes/Organizations/OrganizationActions.js
 - webpack/scenes/Organizations/OrganizationConstants.js
 - webpack/scenes/Organizations/OrganizationReducer.js
+- webpack/scenes/Organizations/OrganizationSelectors.js
 - webpack/scenes/Organizations/__tests__/OrganizationActions.test.js
 - webpack/scenes/Organizations/__tests__/OrganizationReducer.test.js
 - webpack/scenes/Organizations/__tests__/organizations.fixtures.js
@@ -4520,6 +4542,7 @@ files:
 - webpack/scenes/Subscriptions/Details/index.js
 - webpack/scenes/Subscriptions/Manifest/DeleteManifestModalText.js
 - webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js
+- webpack/scenes/Subscriptions/Manifest/ManageManifestModal.scss
 - webpack/scenes/Subscriptions/Manifest/Manifest.scss
 - webpack/scenes/Subscriptions/Manifest/ManifestActions.js
 - webpack/scenes/Subscriptions/Manifest/ManifestConstants.js

data/app/assets/javascripts/katello/widgets/auto_complete.js

@@ -1,183 +0,0 @@
-KT.auto_complete_box = function(params) {
-
-    var settings = {
-        values: undefined, //either a url, an array, or a callback of items for auto_completion
-        default_text: undefined, //default text to go into the search box if desired
-        comma_separated_input: false,
-        input_id: undefined,
-        input: undefined,
-        selected_input_id: undefined,
-        selected_input: undefined,
-        form_id: undefined,
-        add_btn_id: undefined,
-        add_btn: undefined,
-        add_text: katelloI18n.add_plus,
-        require_select: false, //disable the add button if proper autocompleted item isn't selected
-        add_cb: function(item, item_id, cb){cb();}
-    };
-    $.extend( settings, params );
-
-    var add_item_from_input = function(e) {
-        var item = get_input().attr("value"),
-            item_id = get_selected_input().val();
-
-
-        e.preventDefault();
-        if (item.length === 0 || item === settings.default_text){
-                return;
-        }
-            get_add_btn().addClass("working");
-        add_item_base(item, item_id, true);
-    },
-    get_input = function(){
-        return settings.input || $("#" + settings.input_id);
-    },
-    get_selected_input = function(){
-        return settings.selected_input || $("#" + settings.selected_input_id);
-    },
-    get_add_btn = function(){
-        return settings.add_btn || $("#" + settings.add_btn_id);
-    },
-    add_item_base = function(item, item_id, focus) {
-        var input = get_input(),
-            add_btn = get_add_btn();
-
-        input.removeClass("input_error");
-        add_btn.addClass("working");
-        add_btn.html("<img src='" + KT.common.spinner_path() + "'>");
-        input.attr("disabled", "disabled");
-        input.autocomplete('disable');
-        input.autocomplete('close');
-
-        if (settings.comma_separated_input) {
-            // convert the item string to an array
-            item = split(item);
-        }
-        settings.add_cb(item, item_id, function(){
-            reset_input();
-            if (focus) {
-                get_input().focus();
-            }
-        });
-    },
-    reset_input = function() {
-        //re-lookup all items, since a redraw may have happened
-        var input = get_input(),
-            add_btn = get_add_btn();
-        add_btn.removeClass('working');
-        if (add_btn.text() === "") {
-            add_btn.html(settings.add_text);
-        }
-        input.removeAttr('disabled');
-        input.autocomplete('enable');
-        input.val('');
-    },
-    manually_add = function(item, item_id) {
-        add_item_base(item, item_id, false);
-    },
-    error = function() {
-        var input = get_input();
-        input.addClass("input_error");
-    },
-    split = function(val) {
-        return val.split(/,\s*/);
-    },
-    extractLast = function(term) {
-        return split(term).pop();
-    };
-
-    //initialization
-    var input = get_input(),
-        form = $("#" + settings.form_id),
-        add_btn = get_add_btn();
-
-    if (settings.default_text) {
-        input.val(settings.default_text);
-        input.focus(function() {
-            if (input.val() === settings.default_text) {
-                input.val("");
-            }
-        });
-        input.blur(function() {
-            if(input.val() === "") {
-                input.val(settings.default_text);
-            }
-        });
-    }
-
-    if (!settings.comma_separated_input) {
-        input.autocomplete({
-            source: function (request, response) {
-                $.ajax({
-                    url: settings.values,
-                    data: request,
-                    dataType: 'json',
-                    success: function (data) {
-                        response(data);
-                        KT.utils.each(data, function(item){
-                            if(request.term === item.value ||
-                               request.term === item.label)
-                            {
-                                get_selected_input().val(item.id);
-                                add_btn.removeAttr("disabled");
-                            }
-                        });
-                    },
-                    error: function () {
-                        response([]);
-                    }
-                });
-            },
-            search: function(){
-                get_selected_input().val('');
-                if(settings.require_select){
-                    add_btn.attr("disabled", "disabled");
-                }
-            },
-            select: function (event, ui) {
-                get_input().val(ui.item.value);
-                get_selected_input().val(ui.item.id);
-                add_btn.removeAttr("disabled");
-                return false;
-            }
-        });
-    } else {
-        input.autocomplete({
-            source: function(request, response) {
-                $.getJSON( settings.values, {
-                    term: extractLast(request.term)
-                }, response);
-            },
-            search: function () {
-                // custom minLength
-                var term = extractLast(this.value);
-                if (term.length < 1) {
-                    return false;
-                }
-            },
-            focus: function () {
-                // prevent value inserted on focus
-                return false;
-            },
-            select: function (event, ui) {
-                var terms = split(this.value);
-                // remove the current input
-                terms.pop();
-                // add the selected item
-                terms.push(ui.item.value);
-                // add placeholder to get the comma-and-space at the end
-                terms.push("");
-                this.value = terms.join(", ");
-                return false;
-            }
-        });
-    }
-    add_btn.bind('click', add_item_from_input);
-    form.submit(add_item_from_input);
-
-    return {
-        manually_add: manually_add,
-        error: error,
-        reset_input: reset_input
-    };
-};