katello 4.4.0.rc1 → 4.4.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -160,19 +160,24 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                         }
                     });
                 }
-                if (!_.isEmpty(repository.include_tags)) {
-                    repository["include_tags"] = repository.include_tags.split(",").map(function(tag) {
-                        return tag.trim();
-                    });
-                } else {
-                    repository["include_tags"] = [];
+                if (!Array.isArray(repository.include_tags)) {
+                    if (!_.isEmpty(repository.include_tags)) {
+                        repository["include_tags"] = repository.include_tags.split(",").map(function(tag) {
+                            return tag.trim();
+                        });
+                    } else {
+                        repository["include_tags"] = [];
+                    }
                 }
-                if (!_.isEmpty(repository.exclude_tags)) {
-                    repository["exclude_tags"] = repository.exclude_tags.split(",").map(function(tag) {
-                        return tag.trim();
-                    });
-                } else {
-                    repository["exclude_tags"] = [];
+
+                if (!Array.isArray(repository.exclude_tags)) {
+                    if (!_.isEmpty(repository.exclude_tags)) {
+                        repository["exclude_tags"] = repository.exclude_tags.split(",").map(function(tag) {
+                            return tag.trim();
+                        });
+                    } else {
+                        repository["exclude_tags"] = [];
+                    }
                 }
                 repository.$save(success, error);
             };

data/lib/katello/plugin.rb

@@ -306,7 +306,9 @@ Foreman::Plugin.register :katello do
     RemoteExecutionFeature.register(:katello_package_install, N_("Katello: Install Package"), :description => N_("Install package via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_package_install_by_search, N_("Katello: Install packages by search query"), :description => N_("Install packages via Katello interface"), :provided_inputs => ['Package search query'])
     RemoteExecutionFeature.register(:katello_package_update, N_("Katello: Update Package"), :description => N_("Update package via Katello interface"), :provided_inputs => ['package'])
+    RemoteExecutionFeature.register(:katello_packages_update_by_search, N_("Katello: Update Packages by search query"), :description => N_("Update packages via Katello interface"), :provided_inputs => ['Package search query'])
     RemoteExecutionFeature.register(:katello_package_remove, N_("Katello: Remove Package"), :description => N_("Remove package via Katello interface"), :provided_inputs => ['package'])
+    RemoteExecutionFeature.register(:katello_packages_remove_by_search, N_("Katello: Remove Packages by search query"), :description => N_("Remove packages via Katello interface"), :provided_inputs => ['Package search query'])
     RemoteExecutionFeature.register(:katello_group_install, N_("Katello: Install Package Group"), :description => N_("Install package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_group_update, N_("Katello: Update Package Group"), :description => N_("Update package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_group_remove, N_("Katello: Remove Package Group"), :description => N_("Remove package group via Katello interface"), :provided_inputs => ['package'])

data/lib/katello/repository_types/ostree.rb

@@ -37,12 +37,6 @@ Katello::RepositoryTypeManager.register('ostree') do
                         :type => String,
                         :required => false
 
-  import_attribute :parent_commit, :content_type => 'ostree_ref',
-                        :api_param => :ostree_parent_commit,
-                        :description => "Checksum of a parent commit",
-                        :type => String,
-                        :required => false
-
   import_attribute :repository_name, :content_type => 'ostree_ref',
                         :api_param => :ostree_repository_name,
                         :description => "Name of the repository in the ostree archive",

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.4.0.rc1".freeze
+  VERSION = "4.4.0.rc2".freeze
 end

data/webpack/components/Errata/index.js

@@ -24,30 +24,30 @@ export const ErrataSummary = ({ type, count }) => {
   let url;
   let color;
   switch (type) {
-    case 'security':
-      label = __('Security');
-      ErrataIcon = SecurityIcon;
-      name = 'security advisories';
-      color = '#0066cc';
-      url = <a href="#/Content/errata?type=security"> {count} {name} </a>;
-      break;
-    case 'recommended':
-    case 'bugfix':
-      label = __('Bugfix');
-      ErrataIcon = BugIcon;
-      name = 'bug fixes';
-      color = '#8bc1f7';
-      url = <a href="#/Content/errata?type=bugfix"> {count} {name} </a>;
-      break;
-    case 'enhancement':
-    case 'optional':
-      label = __('Enhancement');
-      ErrataIcon = EnhancementIcon;
-      name = 'enhancements';
-      color = '#002f5d';
-      url = <a href="#/Content/errata?type=enhancement"> {count} {name} </a>;
-      break;
-    default:
+  case 'security':
+    label = __('Security');
+    ErrataIcon = SecurityIcon;
+    name = 'security advisories';
+    color = '#0066cc';
+    url = <a href="#/Content/errata?type=security"> {count} {name} </a>;
+    break;
+  case 'recommended':
+  case 'bugfix':
+    label = __('Bugfix');
+    ErrataIcon = BugIcon;
+    name = 'bug fixes';
+    color = '#8bc1f7';
+    url = <a href="#/Content/errata?type=bugfix"> {count} {name} </a>;
+    break;
+  case 'enhancement':
+  case 'optional':
+    label = __('Enhancement');
+    ErrataIcon = EnhancementIcon;
+    name = 'enhancements';
+    color = '#002f5d';
+    url = <a href="#/Content/errata?type=enhancement"> {count} {name} </a>;
+    break;
+  default:
   }
   if (!ErrataIcon) return null;
 
@@ -73,21 +73,21 @@ export const ErrataType = ({ type }) => {
   let ErrataIcon;
   let label;
   switch (type) {
-    case 'security':
-      label = __('Security');
-      ErrataIcon = SecurityIcon;
-      break;
-    case 'recommended':
-    case 'bugfix':
-      label = __('Bugfix');
-      ErrataIcon = BugIcon;
-      break;
-    case 'enhancement':
-    case 'optional':
-      label = __('Enhancement');
-      ErrataIcon = EnhancementIcon;
-      break;
-    default:
+  case 'security':
+    label = __('Security');
+    ErrataIcon = SecurityIcon;
+    break;
+  case 'recommended':
+  case 'bugfix':
+    label = __('Bugfix');
+    ErrataIcon = BugIcon;
+    break;
+  case 'enhancement':
+  case 'optional':
+    label = __('Enhancement');
+    ErrataIcon = EnhancementIcon;
+    break;
+  default:
   }
   if (!ErrataIcon) return null;
 
@@ -108,24 +108,24 @@ export const ErrataSeverity = ({ severity }) => {
   let label;
 
   switch (severity) {
-    case 'Low':
-      color = pfBlack.value;
-      label = __('Low');
-      break;
-    case 'Moderate':
-      color = pfGold.value;
-      label = __('Moderate');
-      break;
-    case 'Important':
-      color = pfOrange.value;
-      label = __('Important');
-      break;
-    case 'Critical':
-      color = pfRed.value;
-      label = __('Critical');
-      break;
-    default:
-      label = __('N/A');
+  case 'Low':
+    color = pfBlack.value;
+    label = __('Low');
+    break;
+  case 'Moderate':
+    color = pfGold.value;
+    label = __('Moderate');
+    break;
+  case 'Important':
+    color = pfOrange.value;
+    label = __('Important');
+    break;
+  case 'Critical':
+    color = pfRed.value;
+    label = __('Critical');
+    break;
+  default:
+    label = __('N/A');
   }
   return <TableText wrapModifier="nowrap">{color && <SecurityIcon color={color} title={label} />} {label} </TableText>;
 };

data/webpack/components/ErratumTypeLabel.js

@@ -5,22 +5,22 @@ import { translate as __ } from 'foremanReact/common/I18n';
 
 const ErratumTypeLabel = ({ type }) => {
   switch (type) {
-    case 'bugfix':
-      return (
-        <p><BugIcon />{' '}{__('Bugfix')}</p>
-      );
-    case 'enhancement':
-      return (
-        <p><EnhancementIcon />{' '}{__('Enhancement')}</p>
-      );
-    case 'security':
-      return (
-        <p><SecurityIcon />{' '}{__('Security')}</p>
-      );
-    default:
-      return (
-        <p><UnknownIcon /> {type}</p>
-      );
+  case 'bugfix':
+    return (
+      <p><BugIcon />{' '}{__('Bugfix')}</p>
+    );
+  case 'enhancement':
+    return (
+      <p><EnhancementIcon />{' '}{__('Enhancement')}</p>
+    );
+  case 'security':
+    return (
+      <p><SecurityIcon />{' '}{__('Security')}</p>
+    );
+  default:
+    return (
+      <p><UnknownIcon /> {type}</p>
+    );
   }
 };
 

data/webpack/components/MultiSelect/index.js

@@ -34,12 +34,12 @@ function MultiSelect(props) {
 }
 
 MultiSelect.defaultProps = {
-  onChange: () => {},
+  onChange: () => { },
   defaultValues: null,
 };
 
 MultiSelect.propTypes = {
-  options: PropTypes.arrayOf(PropTypes.object).isRequired,
+  options: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
   onChange: PropTypes.func,
   defaultValues: PropTypes.arrayOf(PropTypes.string),
 };

data/webpack/components/Select/Select.js

@@ -28,7 +28,7 @@ export default Select;
 
 Select.propTypes = {
   onChange: PropTypes.func.isRequired,
-  options: PropTypes.arrayOf(PropTypes.object).isRequired,
+  options: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
   disabled: PropTypes.bool,
   placeholder: PropTypes.string.isRequired,
   value: PropTypes.string,

data/webpack/components/SelectOrg/SelectOrgReducer.js

@@ -11,23 +11,23 @@ export default (state = initialState, action) => {
   const { payload } = action;
 
   switch (action.type) {
-    case GET_ORGANIZATIONS_LIST_REQUEST:
-      return state.set('loading', true);
+  case GET_ORGANIZATIONS_LIST_REQUEST:
+    return state.set('loading', true);
 
-    case GET_ORGANIZATIONS_LIST_SUCCESS:
-      return state
-        .set('list', payload.results)
-        .set('loading', false);
+  case GET_ORGANIZATIONS_LIST_SUCCESS:
+    return state
+      .set('list', payload.results)
+      .set('loading', false);
 
-    case CHANGE_CURRENT_ORGANIZATION_SUCCESS:
-      return state
-        .set('currentId', payload)
-        .set('loading', false);
+  case CHANGE_CURRENT_ORGANIZATION_SUCCESS:
+    return state
+      .set('currentId', payload)
+      .set('loading', false);
 
-    case GET_ORGANIZATIONS_LIST_FAILURE:
-      return state
-        .set('error', payload);
-    default:
-      return state;
+  case GET_ORGANIZATIONS_LIST_FAILURE:
+    return state
+      .set('error', payload);
+  default:
+    return state;
   }
 };

data/webpack/components/SelectOrg/SetOrganization.js

@@ -87,7 +87,7 @@ class SetOrganization extends Component {
 
 
 SetOrganization.propTypes = {
-  list: PropTypes.arrayOf(PropTypes.object),
+  list: PropTypes.arrayOf(PropTypes.shape({})),
   loading: PropTypes.bool.isRequired,
   history: PropTypes.shape({
     push: PropTypes.func,

data/webpack/components/Table/TableHooks.js

@@ -231,6 +231,7 @@ export const useBulkSelect = ({
     selectPage,
     selectNone,
     selectAll,
+    selectAllMode,
     isSelected,
     selectedCount,
     fetchBulkParams,

data/webpack/components/Table/TableWrapper.js

@@ -31,6 +31,7 @@ const TableWrapper = ({
   activeFilters,
   displaySelectAllCheckbox,
   selectAll,
+  selectAllMode,
   selectNone,
   selectPage,
   areAllRowsOnPageSelected,
@@ -285,9 +286,10 @@ TableWrapper.propTypes = {
   ])),
   displaySelectAllCheckbox: PropTypes.bool,
   selectedCount: PropTypes.number,
-  selectedResults: PropTypes.arrayOf(PropTypes.object),
+  selectedResults: PropTypes.arrayOf(PropTypes.shape({})),
   clearSelectedResults: PropTypes.func,
   selectAll: PropTypes.func,
+  selectAllMode: PropTypes.bool,
   selectNone: PropTypes.func,
   selectPage: PropTypes.func,
   areAllRowsOnPageSelected: PropTypes.func,
@@ -313,6 +315,7 @@ TableWrapper.defaultProps = {
   selectedResults: [],
   clearSelectedResults: noop,
   selectAll: undefined,
+  selectAllMode: false,
   selectNone: undefined,
   selectPage: undefined,
   areAllRowsOnPageSelected: noop,

data/webpack/components/TypeAhead/helpers/commonPropTypes.js

@@ -26,7 +26,7 @@ export const commonInputPropTypes = {
 };
 
 export const commonItemPropTypes = {
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  items: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
   activeItems: PropTypes.arrayOf(PropTypes.string).isRequired,
   highlightedIndex: PropTypes.number.isRequired,
   getItemProps: PropTypes.func.isRequired,

data/webpack/components/TypeAhead/helpers/helpers.js

@@ -5,22 +5,22 @@ const keyPressHandler = (
   selectItem, userInputValue, onSearch,
 ) => {
   switch (e.keyCode) {
-    case KEYCODES.TAB_KEY:
-      if (isOpen && activeItems[highlightedIndex]) {
-        selectItem(activeItems[highlightedIndex]);
-        e.preventDefault();
-      }
-      break;
+  case KEYCODES.TAB_KEY:
+    if (isOpen && activeItems[highlightedIndex]) {
+      selectItem(activeItems[highlightedIndex]);
+      e.preventDefault();
+    }
+    break;
 
-    case KEYCODES.ENTER:
-      if (!isOpen || !activeItems[highlightedIndex]) {
-        onSearch(userInputValue);
-        e.preventDefault();
-      }
-      break;
+  case KEYCODES.ENTER:
+    if (!isOpen || !activeItems[highlightedIndex]) {
+      onSearch(userInputValue);
+      e.preventDefault();
+    }
+    break;
 
-    default:
-      break;
+  default:
+    break;
   }
 };
 

data/webpack/components/TypeAhead/pf3Search/TypeAheadSearch.js

@@ -18,7 +18,7 @@ const TypeAheadSearch = ({
         onKeyPress={e => keyPressHandler(
           e, isOpen, activeItems, highlightedIndex,
           selectItem, userInputValue, onSearch,
-)}
+        )}
         onInputFocus={openMenu}
         passedProps={getInputProps()}
       />

data/webpack/components/WithOrganization/withOrganization.js

@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-indent */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
@@ -46,14 +47,13 @@ function withOrganization(WrappedComponent) {
 
       if (newOrgSelected) {
         if (!organization.label && !organization.loading) { this.props.loadOrganization(); }
-
         return <WrappedComponent {...this.props} />;
       } else if (this.state.orgId === '') {
         return (
-          <React.Fragment>
+          <>
             <Header title={__('Select Organization')} />
             <SetOrganization />
-          </React.Fragment>);
+          </>);
       }
       return <WrappedComponent {...this.props} />;
     }

data/webpack/components/extensions/HostDetails/HostPackages/HostPackagesActions.js

@@ -2,7 +2,12 @@ import { API_OPERATIONS, get, put } from 'foremanReact/redux/API';
 import { renderTaskStartedToast } from '../../../../scenes/Tasks/helpers';
 import { foremanApi } from '../../../../services/api';
 import { getResponseErrorMsgs } from '../../../../utils/helpers';
-import { HOST_PACKAGES_INSTALL_KEY, HOST_PACKAGES_KEY } from './HostPackagesConstants';
+import {
+  HOST_PACKAGES_INSTALL_KEY,
+  HOST_PACKAGES_KEY,
+  HOST_PACKAGES_REMOVE_KEY,
+  HOST_PACKAGES_UPGRADE_KEY,
+} from './HostPackagesConstants';
 
 const errorToast = (error) => {
   const message = getResponseErrorMsgs(error.response);
@@ -25,3 +30,29 @@ export const installPackageViaKatelloAgent = (hostId, params) => put({
   errorToast: error => errorToast(error),
   params,
 });
+
+export const removePackageViaKatelloAgent = (hostId, params) => put({
+  type: API_OPERATIONS.PUT,
+  key: HOST_PACKAGES_REMOVE_KEY,
+  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/remove`),
+  handleSuccess: ({ data }) => renderTaskStartedToast(data),
+  errorToast: error => errorToast(error),
+  params,
+});
+
+export const upgradePackageViaKatelloAgent = (hostId, params) => put({
+  type: API_OPERATIONS.PUT,
+  key: HOST_PACKAGES_UPGRADE_KEY,
+  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/upgrade`),
+  handleSuccess: ({ data }) => renderTaskStartedToast(data),
+  errorToast: error => errorToast(error),
+  params,
+});
+
+export const upgradeAllViaKatelloAgent = hostId => put({
+  type: API_OPERATIONS.PUT,
+  key: HOST_PACKAGES_UPGRADE_KEY,
+  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/upgrade_all`),
+  handleSuccess: ({ data }) => renderTaskStartedToast(data),
+  errorToast: error => errorToast(error),
+});

data/webpack/components/extensions/HostDetails/HostPackages/HostPackagesConstants.js

@@ -1,5 +1,8 @@
 export const HOST_PACKAGES_KEY = 'HOST_PACKAGES';
 export const HOST_PACKAGES_INSTALL_KEY = 'HOST_PACKAGES_KATELLO_AGENT_INSTALL';
+export const HOST_PACKAGES_REMOVE_KEY = 'HOST_PACKAGES_REMOVE';
+export const HOST_PACKAGES_UPGRADE_KEY = 'HOST_PACKAGES_UPGRADE';
+export const PACKAGES_SEARCH_QUERY = 'Packages search query';
 
 export const PACKAGES_VERSION_STATUSES = {
   UPGRADABLE: 'Upgradable',
@@ -10,5 +13,3 @@ export const VERSION_STATUSES_TO_PARAM = {
   [PACKAGES_VERSION_STATUSES.UPGRADABLE]: 'upgradable',
   [PACKAGES_VERSION_STATUSES.UP_TO_DATE]: 'up-to-date',
 };
-
-export default HOST_PACKAGES_KEY;

data/webpack/components/extensions/HostDetails/Tabs/ContentTab/SecondaryTabsRoutes.js

@@ -2,19 +2,21 @@ import React from 'react';
 import { Route, Switch, Redirect } from 'react-router-dom';
 import { PackagesTab } from '../PackagesTab';
 import { ErrataTab } from '../ErrataTab/ErrataTab.js';
+import { ModuleStreamsTab } from '../ModuleStreamsTab/ModuleStreamsTab';
 import { route } from './helpers';
 
 const SecondaryTabRoutes = () => (
   <Switch>
-    <Route exact path="/Content">
-      <Redirect to={route('errata')} />
-    </Route>
     <Route path={route('packages')}>
       <PackagesTab />
     </Route>
     <Route path={route('errata')}>
       <ErrataTab />
     </Route>
+    <Route path={route('module-streams')}>
+      <ModuleStreamsTab />
+    </Route>
+    <Redirect to={route('errata')} />
   </Switch>
 );
 

data/webpack/components/extensions/HostDetails/Tabs/ContentTab/constants.js

@@ -3,6 +3,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 const SECONDARY_TABS = [
   { key: 'packages', title: __('Packages') },
   { key: 'errata', title: __('Errata') },
+  { key: 'module-streams', title: __('Module streams') },
 ];
 
 export default SECONDARY_TABS;

data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/ErratumExpansionContents.js

@@ -50,10 +50,10 @@ ErratumExpansionContents.propTypes = {
     description: PropTypes.string,
     summary: PropTypes.string,
     solution: PropTypes.string,
-    bugs: PropTypes.arrayOf(PropTypes.object),
-    cves: PropTypes.arrayOf(PropTypes.object),
+    bugs: PropTypes.arrayOf(PropTypes.shape({})),
+    cves: PropTypes.arrayOf(PropTypes.shape({})),
     packages: PropTypes.arrayOf(PropTypes.string),
-    module_streams: PropTypes.arrayOf(PropTypes.object),
+    module_streams: PropTypes.arrayOf(PropTypes.shape({})),
   }).isRequired,
 };
 

data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsActions.js

@@ -0,0 +1,16 @@
+import { API_OPERATIONS, get } from 'foremanReact/redux/API';
+import { foremanApi } from '../../../../../services/api';
+import { getResponseErrorMsgs } from '../../../../../utils/helpers';
+import { MODULE_STREAMS_KEY } from './ModuleStreamsConstants';
+
+const errorToast = error => getResponseErrorMsgs(error.response);
+
+export const getHostModuleStreams = (hostId, params) => get({
+  type: API_OPERATIONS.GET,
+  key: MODULE_STREAMS_KEY,
+  url: foremanApi.getApiUrl(`/hosts/${hostId}/module_streams`),
+  errorToast: error => errorToast(error),
+  params,
+});
+
+export default getHostModuleStreams;

data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsConstants.js

@@ -0,0 +1,3 @@
+export const MODULE_STREAMS_KEY = 'MODULE_STREAMS';
+
+export default MODULE_STREAMS_KEY;

data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsSelectors.js

@@ -0,0 +1,19 @@
+import {
+  selectAPIStatus,
+  selectAPIError,
+  selectAPIResponse,
+} from 'foremanReact/redux/API/APISelectors';
+import { STATUS } from 'foremanReact/constants';
+import { MODULE_STREAMS_KEY } from './ModuleStreamsConstants';
+
+export const selectModuleStream = state =>
+  selectAPIResponse(state, MODULE_STREAMS_KEY) ?? {};
+
+export const selectHostId = state =>
+  selectAPIResponse(state, MODULE_STREAMS_KEY) ?? {};
+
+export const selectModuleStreamStatus = state =>
+  selectAPIStatus(state, MODULE_STREAMS_KEY) ?? STATUS.PENDING;
+
+export const selecModuleStreamError = state =>
+  selectAPIError(state, MODULE_STREAMS_KEY);