katello 3.7.1.1 → 3.8.0.rc1

data/webpack/redux/actions/RedHatRepositories/enabled.js

@@ -34,6 +34,7 @@ export const createEnabledRepoParams = (extendedParams = {}) => {
 export const loadEnabledRepos = (extendedParams = {}) => (dispatch) => {
   dispatch({ type: ENABLED_REPOSITORIES_REQUEST, params: extendedParams });
   const { searchParams, repoParams } = createEnabledRepoParams(extendedParams);
+
   api
     .get('/repositories', {}, repoParams)
     .then(({ data }) => {

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -1,9 +1,9 @@
 const repoTypeSearchQueryMap = {
-  rpm: '(name !~ source rpm) and (name !~ debug rpm) and (content_type = yum)',
-  sourceRpm: '(name ~ source rpm) and (content_type = yum)',
-  debugRpm: '(name ~ debug rpm) and (content_type = yum)',
-  kickstart: 'content_type = kickstart',
-  ostree: 'content_type = ostree',
+  rpm: '(name ~ rpms) and (name !~ source rpm) and (name !~ debug rpm)',
+  sourceRpm: 'name ~ source rpm',
+  debugRpm: 'name ~ debug rpm',
+  kickstart: 'name ~ kickstart',
+  ostree: 'name ~ ostree',
   beta: 'name ~ beta',
 };
 

data/webpack/redux/actions/RedHatRepositories/sets.js

@@ -28,7 +28,7 @@ export const loadRepositorySets = (extendedParams = {}) => (dispatch, getState)
   ]);
 
   const params = {
-    ...{ organization_id: orgId(), with_active_subscription: true },
+    ...{ organization_id: orgId() },
     ...propsToSnakeCase(extendedParams),
     search,
   };

data/webpack/redux/consts.js

@@ -17,9 +17,3 @@ export const REPOSITORY_SETS_UPDATE_RECOMMENDED = 'REPOSITORY_SETS_UPDATE_RECOMM
 
 export const REPOSITORY_ENABLED = 'REPOSITORY_ENABLED';
 export const REPOSITORY_DISABLED = 'REPOSITORY_DISABLED';
-
-export const GET_ORGANIZATIONS_LIST_SUCCESS = 'GET_ORGANIZATIONS_LIST_SUCCESS';
-export const GET_ORGANIZATIONS_LIST_FAILURE = 'GET_ORGANIZATIONS_LIST_FAILURE';
-export const CHANGE_CURRENT_ORGANIZATION_SUCCESS = 'CHANGE_CURRENT_ORGANIZATION_SUCCESS';
-export const CHANGE_CURRENT_ORGANIZATION_FAILURE = 'CHANGE_CURRENT_ORGANIZATION_FAILURE';
-export const GET_ORGANIZATIONS_LIST_REQUEST = 'GET_ORGANIZATIONS_LIST_REQUEST';

data/webpack/redux/reducers/index.js

@@ -5,7 +5,6 @@ import { subscriptions } from '../../scenes/Subscriptions';
 import { upstreamSubscriptions } from '../../scenes/Subscriptions/UpstreamSubscriptions';
 import { manifestHistory } from '../../scenes/Subscriptions/Manifest';
 import { subscriptionDetails } from '../../scenes/Subscriptions/Details';
-import { setOrganization } from '../../components/SelectOrg/SetOrganization';
 
 export default combineReducers({
   organization,
@@ -14,5 +13,4 @@ export default combineReducers({
   upstreamSubscriptions,
   manifestHistory,
   subscriptionDetails,
-  setOrganization,
 });

data/webpack/scenes/RedHatRepositories/components/EnabledRepository.js

@@ -1,14 +1,12 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { ListView } from 'patternfly-react';
+import cx from 'classnames';
+import { ListView, Spinner, OverlayTrigger, Tooltip } from 'patternfly-react';
 import { connect } from 'react-redux';
 
 import RepositoryTypeIcon from './RepositoryTypeIcon';
 import { setRepositoryDisabled } from '../../../redux/actions/RedHatRepositories/enabled';
 import api from '../../../services/api';
-import { notify } from '../../../move_to_foreman/foreman_toast_notifications';
-import { getResponseErrorMsgs } from '../../../move_to_foreman/common/helpers';
-import EnabledRepositoryContent from './EnabledRepositoryContent';
 
 class EnabledRepository extends Component {
   constructor(props) {
@@ -51,12 +49,9 @@ class EnabledRepository extends Component {
       api
         .put(url, data)
         .then(this.setDisabled)
-        .catch(({ response }) => {
-          const errors = getResponseErrorMsgs(response);
-          errors.forEach((error) => {
-            notify({ message: error, type: 'error' });
-          });
+        .catch(() => {
           this.setState({ loading: false });
+          // TODO: Add error component
         });
     };
 
@@ -72,11 +67,25 @@ class EnabledRepository extends Component {
       <ListView.Item
         key={id}
         actions={
-          <EnabledRepositoryContent
-            loading={this.state.loading}
-            disableTooltipId={this.disableTooltipId}
-            disableRepository={this.disableRepository}
-          />
+          <Spinner loading={this.state.loading} inline>
+            <OverlayTrigger
+              overlay={<Tooltip id={this.disableTooltipId}>{__('Disable')}</Tooltip>}
+              placement="bottom"
+              trigger={['hover', 'focus']}
+              rootClose={false}
+            >
+              <button
+                onClick={this.disableRepository}
+                style={{
+                  backgroundColor: 'initial',
+                  border: 'none',
+                  color: '#0388ce',
+                }}
+              >
+                <i className={cx('fa-2x', 'fa fa-minus-circle')} />
+              </button>
+            </OverlayTrigger>
+          </Spinner>
         }
         leftContent={<RepositoryTypeIcon id={id} type={type} />}
         heading={name}

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository.js

@@ -50,7 +50,7 @@ class RepositorySetRepository extends Component {
       const data = {
         id: contentId,
         product_id: productId,
-        basearch: arch === UNSPECIFIED_ARCH ? undefined : arch,
+        basearch: arch == UNSPECIFIED_ARCH ? undefined : arch,
         releasever: releasever || undefined,
       };
 

data/webpack/scenes/RedHatRepositories/components/SearchBar.js

@@ -97,7 +97,6 @@ class SearchBar extends Component {
         <MultiSelect
           value={this.state.filters}
           options={filterOptions}
-          noneSelectedText={__('Filter by type')}
           onChange={(e) => {
             const values = [...e.target.options]
               .filter(({ selected }) => selected)

data/webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/RecommendedRepositorySetsToggler.test.js.snap

@@ -30,10 +30,8 @@ exports[`RecommendedRepositorySetsToggler rendering renders recommended-reposito
   />
   some-children
   <FieldLevelHelp
-    buttonClass=""
+    close="true"
     content="some-help"
-    placement="top"
-    rootClose={true}
   />
 </div>
 `;

data/webpack/scenes/RedHatRepositories/index.js

@@ -7,6 +7,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { Grid, Row, Col } from 'react-bootstrap';
 import { LoadingState } from '../../move_to_pf/LoadingState';
+
 import { createEnabledRepoParams, loadEnabledRepos } from '../../redux/actions/RedHatRepositories/enabled';
 import { loadRepositorySets, updateRecommendedRepositorySets } from '../../redux/actions/RedHatRepositories/sets';
 import SearchBar from './components/SearchBar';
@@ -30,6 +31,7 @@ class RedHatRepositoriesPage extends Component {
     return (
       <Grid id="redhatRepositoriesPage" bsClass="container-fluid">
         <h1>{__('Red Hat Repositories')}</h1>
+
         <Row className="toolbar-pf">
           <Col sm={12}>
             <SearchBar repoParams={repoParams} />
@@ -85,15 +87,9 @@ RedHatRepositoriesPage.propTypes = {
   updateRecommendedRepositorySets: PropTypes.func.isRequired,
   enabledRepositories: PropTypes.shape({}).isRequired,
   repositorySets: PropTypes.shape({}).isRequired,
-  history: PropTypes.shape({}).isRequired,
-  location: PropTypes.shape({}).isRequired,
 };
 
-const mapStateToProps = ({
-  katello: {
-    redHatRepositories: { enabled, sets },
-  },
-}) => ({
+const mapStateToProps = ({ katello: { redHatRepositories: { enabled, sets } } }) => ({
   enabledRepositories: enabled,
   repositorySets: sets,
 });

data/webpack/scenes/RedHatRepositories/index.scss

@@ -46,7 +46,6 @@
 
       h2 {
         margin: 0;
-        margin-right: 40px;
       }
     }
   }

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailActions.js

@@ -4,9 +4,9 @@ import {
   SUBSCRIPTION_DETAILS_SUCCESS,
   SUBSCRIPTION_DETAILS_FAILURE,
 } from './SubscriptionDetailConstants';
-import { apiError } from '../../../move_to_foreman/common/helpers.js';
+import { getResponseError } from '../../../move_to_foreman/common/helpers.js';
 
-export const loadSubscriptionDetails = subscriptionId => (dispatch, getState) => {
+export const loadSubscriptionDetails = subscriptionId => (dispatch) => {
   dispatch({ type: SUBSCRIPTION_DETAILS_REQUEST });
 
   return api
@@ -17,7 +17,12 @@ export const loadSubscriptionDetails = subscriptionId => (dispatch, getState) =>
         response: data,
       });
     })
-    .catch(result => dispatch(apiError(SUBSCRIPTION_DETAILS_FAILURE, result)));
+    .catch((result) => {
+      dispatch({
+        type: SUBSCRIPTION_DETAILS_FAILURE,
+        error: getResponseError(result.response),
+      });
+    });
 };
 
 export default loadSubscriptionDetails;

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailReducer.js

@@ -4,18 +4,9 @@ import {
   SUBSCRIPTION_DETAILS_SUCCESS,
   SUBSCRIPTION_DETAILS_FAILURE,
 } from './SubscriptionDetailConstants';
-import {
-  PRODUCTS_REQUEST,
-  PRODUCTS_SUCCESS,
-  PRODUCTS_FAILURE,
-} from '../../Products/ProductConstants';
 
 const initialState = Immutable({
   loading: false,
-  enabledProducts: {
-    results: [],
-    total: 0,
-  },
 });
 
 export default (state = initialState, action) => {
@@ -24,10 +15,6 @@ export default (state = initialState, action) => {
       return state.set('loading', true);
     }
 
-    case PRODUCTS_REQUEST: {
-      return state.set('loading', true);
-    }
-
     case SUBSCRIPTION_DETAILS_SUCCESS: {
       const subscriptionDetails = action.response;
 
@@ -37,25 +24,9 @@ export default (state = initialState, action) => {
       });
     }
 
-    case PRODUCTS_SUCCESS: {
-      const enabledProducts = { enabledProducts: action.response };
-
-      return state.merge({
-        ...enabledProducts,
-        loading: false,
-      });
-    }
-
     case SUBSCRIPTION_DETAILS_FAILURE: {
       return state.merge({
-        error: action.payload.message,
-        loading: false,
-      });
-    }
-
-    case PRODUCTS_FAILURE: {
-      return state.merge({
-        error: action.payload.message,
+        error: action.error,
         loading: false,
       });
     }

data/webpack/scenes/Subscriptions/Details/SubscriptionDetails.js

@@ -1,141 +1,58 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Nav, NavItem, TabPane, TabContent, TabContainer, Grid, Row, Col } from 'patternfly-react';
-import BreadcrumbsBar from 'foremanReact/components/BreadcrumbBar';
+import { Grid, Row, Col } from 'patternfly-react';
 import SubscriptionDetailInfo from './SubscriptionDetailInfo';
 import SubscriptionDetailAssociations from './SubscriptionDetailAssociations';
 import SubscriptionDetailProducts from './SubscriptionDetailProducts';
-import SubscriptionDetailEnabledProducts from './SubscriptionDetailEnabledProducts';
 import { LoadingState } from '../../../move_to_pf/LoadingState';
 import { notify } from '../../../move_to_foreman/foreman_toast_notifications';
-import api from '../../../services/api';
 
 class SubscriptionDetails extends Component {
-  constructor() {
-    super();
-    this.handleBreadcrumbSwitcherItem = this.handleBreadcrumbSwitcherItem.bind(this);
-  }
   componentDidMount() {
     // eslint-disable-next-line react/prop-types
     const routerParams = this.props.match.params;
     this.props.loadSubscriptionDetails(parseInt(routerParams.id, 10));
-    this.props.loadProducts({
-      subscription_id: parseInt(routerParams.id, 10),
-      include_available_content: true,
-      enabled: true,
-    });
-  }
-
-  componentDidUpdate(prevProps) {
-    const routerParams = this.props.match.params;
-    if (routerParams.id !== prevProps.match.params.id) {
-      this.props.loadSubscriptionDetails(parseInt(routerParams.id, 10));
-      this.props.loadProducts({
-        subscription_id: parseInt(routerParams.id, 10),
-        include_available_content: true,
-        enabled: true,
-      });
-    }
-  }
-
-  handleBreadcrumbSwitcherItem(e, url) {
-    this.props.history.push(url);
-    e.preventDefault();
   }
 
   render() {
     const { subscriptionDetails } = this.props;
 
-
-    const resource = {
-      nameField: 'name',
-      resourceUrl: api.getApiUrl('/subscriptions'),
-      switcherItemUrl: '/subscriptions/:id',
-    };
-
-    if (subscriptionDetails.error) {
-      notify({ message: subscriptionDetails.error });
-    }
+    if (subscriptionDetails.error) { notify({ message: subscriptionDetails.error }); }
 
     return (
-      <div>
-        {!subscriptionDetails.loading && <BreadcrumbsBar
-          onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}
-          data={{
-            isSwitchable: true,
-            breadcrumbItems: [
-              {
-                caption: __('Subscriptions'),
-                onClick: () =>
-                  this.props.history.push('/subscriptions'),
-              },
-              {
-                caption: String(subscriptionDetails.name),
-              },
-            ],
-            resource,
-          }}
-        />}
-
-        <TabContainer id="subscription-tabs-container" defaultActiveKey={1}>
-          <div>
-            <LoadingState loading={subscriptionDetails.loading} loadingText={__('Loading')}>
-              <Nav bsClass="nav nav-tabs">
-                <NavItem eventKey={1}>
-                  <div>{__('Details')}</div>
-                </NavItem>
-                <NavItem eventKey={2}>
-                  <div>{__('Enabled Products')}</div>
-                </NavItem>
-              </Nav>
-              <Grid bsClass="container-fluid">
-                <TabContent animation={false}>
-                  <TabPane eventKey={1}>
-                    <div>
-                      <Row>
-                        <Col sm={6}>
-                          <SubscriptionDetailInfo
-                            subscriptionDetails={subscriptionDetails}
-                          />
-                        </Col>
-                        <Col sm={6}>
-                          <SubscriptionDetailAssociations
-                            subscriptionDetails={subscriptionDetails}
-                          />
-                          <SubscriptionDetailProducts
-                            subscriptionDetails={subscriptionDetails}
-                          />
-                        </Col>
-                      </Row>
-                    </div>
-                  </TabPane>
-
-                  <TabPane eventKey={2}>
-                    <div>
-                      <Row>
-                        <Col sm={12}>
-                          <SubscriptionDetailEnabledProducts
-                            enabledProducts={subscriptionDetails.enabledProducts}
-                          />
-                        </Col>
-                      </Row>
-                    </div>
-                  </TabPane>
-                </TabContent>
-              </Grid>
-            </LoadingState>
-          </div>
-        </TabContainer>
-      </div>
+      <Grid bsClass="container-fluid">
+        <div>
+          <LoadingState loading={subscriptionDetails.loading} loadingText={__('Loading')}>
+            <Row>
+              <Col sm={12}>
+                <h1>{subscriptionDetails.name}</h1>
+              </Col>
+            </Row>
+            <Row>
+              <Col sm={6}>
+                <SubscriptionDetailInfo
+                  subscriptionDetails={subscriptionDetails}
+                />
+              </Col>
+              <Col sm={6}>
+                <SubscriptionDetailAssociations
+                  subscriptionDetails={subscriptionDetails}
+                />
+                <SubscriptionDetailProducts
+                  subscriptionDetails={subscriptionDetails}
+                />
+              </Col>
+            </Row>
+          </LoadingState>
+        </div>
+      </Grid>
     );
   }
 }
 
 SubscriptionDetails.propTypes = {
   loadSubscriptionDetails: PropTypes.func.isRequired,
-  loadProducts: PropTypes.func.isRequired,
   subscriptionDetails: PropTypes.shape({}).isRequired,
-  history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,
 };
 
 export default SubscriptionDetails;