katello 4.3.0.rc4 → 4.4.0.rc2

data/webpack/scenes/Organizations/OrganizationActions.js

@@ -39,7 +39,7 @@ const updateCdnConfigurationErrorToast = (error) => {
   return messages;
 };
 
-export const updateCdnConfiguration = (params) => {
+export const updateCdnConfiguration = (params, updateResults, onError) => {
   const nonNullParams = Object.keys(params)
     .filter(key => params[key] !== null)
     .reduce((a, k) => ({ ...a, [k]: params[k] }), {});
@@ -51,6 +51,10 @@ export const updateCdnConfiguration = (params) => {
     params: nonNullParams,
     errorToast: error => updateCdnConfigurationErrorToast(error),
     successToast: response => updateCdnConfigurationSuccessToast(response),
+    updateData: (_, resp) => {
+      updateResults(resp);
+    },
+    handleError: onError,
   });
 };
 

data/webpack/scenes/Organizations/OrganizationReducer.js

@@ -10,16 +10,16 @@ const initialState = Immutable({ loading: false });
 
 export default (state = initialState, action) => {
   switch (action.type) {
-    case GET_ORGANIZATION_REQUEST:
-      return state.set('loading', true);
+  case GET_ORGANIZATION_REQUEST:
+    return state.set('loading', true);
 
-    case GET_ORGANIZATION_SUCCESS:
-      return Immutable({ loading: false, ...action.response });
+  case GET_ORGANIZATION_SUCCESS:
+    return Immutable({ loading: false, ...action.response });
 
-    case GET_ORGANIZATION_FAILURE:
-      return Immutable({ error: action.error });
+  case GET_ORGANIZATION_FAILURE:
+    return Immutable({ error: action.error });
 
-    default:
-      return state;
+  default:
+    return state;
   }
 };

data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js

@@ -6,6 +6,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { isEmpty } from 'lodash';
 import { Grid, Row, Col } from 'react-bootstrap';
+import { Skeleton, Alert } from '@patternfly/react-core';
 import { Button } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PermissionDenied from 'foremanReact/components/PermissionDenied';
@@ -15,6 +16,7 @@ import SearchBar from './components/SearchBar';
 import RecommendedRepositorySetsToggler from './components/RecommendedRepositorySetsToggler';
 import { getSetsComponent, getEnabledComponent } from './helpers';
 import api from '../../services/api';
+import { AIRGAPPED } from '../Subscriptions/Manifest/CdnConfigurationTab/CdnConfigurationConstants';
 
 class RedHatRepositoriesPage extends Component {
   componentDidMount() {
@@ -22,12 +24,13 @@ class RedHatRepositoriesPage extends Component {
   }
 
   loadData() {
+    this.props.loadOrganization();
     this.props.loadEnabledRepos();
     this.props.loadRepositorySets({ search: { filters: ['rpm'] } });
   }
 
   render() {
-    const { enabledRepositories, repositorySets } = this.props;
+    const { enabledRepositories, repositorySets, organization } = this.props;
     const { repoParams } = createEnabledRepoParams(enabledRepositories);
 
     if (!isEmpty(repositorySets.missingPermissions)) {
@@ -36,6 +39,26 @@ class RedHatRepositoriesPage extends Component {
     if (!isEmpty(enabledRepositories.missingPermissions)) {
       return <PermissionDenied missingPermissions={enabledRepositories.missingPermissions} />;
     }
+    if (!(organization?.cdn_configuration)) {
+      return <Skeleton />;
+    }
+    if (organization.cdn_configuration.type === AIRGAPPED) {
+      return (
+        <Grid id="redhatRepositoriesPage" bsClass="container-fluid">
+          <h1>{__('Red Hat Repositories')}</h1>
+          <Row className="toolbar-pf">
+            <Col>
+              <Alert
+                variant="info"
+                className="repo-sets-alert"
+                isInline
+                title={__('CDN configuration is set to Air-gapped (disconnected). Repository enablement/disablement is not permitted on this page.')}
+              />
+            </Col>
+          </Row>
+        </Grid>
+      );
+    }
 
     return (
       <Grid id="redhatRepositoriesPage" bsClass="container-fluid">
@@ -99,6 +122,7 @@ class RedHatRepositoriesPage extends Component {
 }
 
 RedHatRepositoriesPage.propTypes = {
+  loadOrganization: PropTypes.func.isRequired,
   loadEnabledRepos: PropTypes.func.isRequired,
   loadRepositorySets: PropTypes.func.isRequired,
   updateRecommendedRepositorySets: PropTypes.func.isRequired,
@@ -115,6 +139,12 @@ RedHatRepositoriesPage.propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     missingPermissions: PropTypes.array,
   }).isRequired,
+  organization: PropTypes.shape({
+    cdn_configuration: PropTypes.shape({
+      type: PropTypes.string,
+    }),
+  }).isRequired,
+
 };
 
 export default RedHatRepositoriesPage;

data/webpack/scenes/RedHatRepositories/__tests__/RedHatRepositoriesPage.test.js

@@ -9,6 +9,7 @@ describe('RedHatRepositories page', () => {
   const page = shallow(<RedHatRepositoriesPage
     loadEnabledRepos={jest.fn()}
     loadRepositorySets={jest.fn()}
+    loadOrganization={jest.fn()}
     updateRecommendedRepositorySets={jest.fn()}
     enabledRepositories={{
       loading: false,
@@ -22,11 +23,19 @@ describe('RedHatRepositories page', () => {
       search: {},
       missingPermissions: [],
     }}
+    organization={{
+      id: 1000,
+      cdn_configuration: {
+        type: 'redhat_cdn',
+        url: 'http://cdn.example.com',
+      },
+    }}
   />);
 
   const permissionDeniedPage = shallow(<RedHatRepositoriesPage
     loadEnabledRepos={jest.fn()}
     loadRepositorySets={jest.fn()}
+    loadOrganization={jest.fn()}
     updateRecommendedRepositorySets={jest.fn()}
     enabledRepositories={{
       loading: false,
@@ -39,6 +48,13 @@ describe('RedHatRepositories page', () => {
       search: {},
       missingPermissions: ['view_organizations'],
     }}
+    organization={{
+      id: 1000,
+      cdn_configuration: {
+        type: 'redhat_cdn',
+        url: 'http://cdn.example.com',
+      },
+    }}
   />);
 
   it('should render', async () => {

data/webpack/scenes/RedHatRepositories/__tests__/__snapshots__/RedHatRepositoriesPage.test.js.snap

@@ -112,9 +112,18 @@ exports[`RedHatRepositories page should render 1`] = `
           <div
             className="sticky-pagination sticky-pagination-grey"
           >
-            <PaginationWrapper
+            <Pagination
+              className={null}
+              isCompact={true}
+              itemCount={0}
+              noSidePadding={false}
               onChange={[Function]}
-              viewType="list"
+              onPerPageSelect={null}
+              onSetPage={null}
+              page={1}
+              perPage={null}
+              updateParamsByUrl={true}
+              variant="bottom"
             />
           </div>
         </ListView>

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

@@ -15,10 +15,10 @@ const EnabledRepositoryContent = ({ loading, disableTooltipId, disableRepository
       <button
         onClick={disableRepository}
         style={{
-            backgroundColor: 'initial',
-            border: 'none',
-            color: '#0388ce',
-          }}
+          backgroundColor: 'initial',
+          border: 'none',
+          color: '#0388ce',
+        }}
       >
         <i className={cx('fa-2x', 'fa fa-minus-circle')} />
       </button>

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

@@ -81,7 +81,7 @@ RepositorySetRepositories.propTypes = {
   type: PropTypes.string,
   data: PropTypes.shape({
     loading: PropTypes.bool.isRequired,
-    repositories: PropTypes.arrayOf(PropTypes.object),
+    repositories: PropTypes.arrayOf(PropTypes.shape({})),
     error: PropTypes.shape({
       displayMessage: PropTypes.string,
     }),

data/webpack/scenes/RedHatRepositories/helpers.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ListView } from 'patternfly-react';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
-import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
+import Pagination from 'foremanReact/components/Pagination';
 
 import RepositorySet from './components/RepositorySet';
 import EnabledRepository from './components/EnabledRepository';
@@ -34,10 +34,10 @@ export const getSetsComponent = (repoSetsState, onPaginationChange) => {
     <ListView>
       <div className="sticky-pagination">
         <Pagination
-          viewType="list"
           itemCount={itemCount}
-          pagination={pagination}
           onChange={onPaginationChange}
+          isCompact
+          {...pagination}
         />
       </div>
       {results.map(set => <RepositorySet id={set.id} key={set.id} {...set} />)}
@@ -64,10 +64,10 @@ export const getEnabledComponent = (enabledReposState, onPaginationChange) => {
     <ListView>
       <div className="sticky-pagination sticky-pagination-grey">
         <Pagination
-          viewType="list"
+          isCompact
           itemCount={itemCount}
-          pagination={pagination}
           onChange={onPaginationChange}
+          {...pagination}
         />
       </div>
       {repositories.map(repo => <EnabledRepository key={repo.id} {...repo} />)}

data/webpack/scenes/RedHatRepositories/index.js

@@ -1,23 +1,31 @@
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint import/no-unresolved: [2, { ignore: [foremanReact/*] }] */
 /* eslint-disable import/no-unresolved */
-
+import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { loadEnabledRepos } from '../../redux/actions/RedHatRepositories/enabled';
 import { loadRepositorySets, updateRecommendedRepositorySets } from '../../redux/actions/RedHatRepositories/sets';
 import RedHatRepositoriesPage from './RedHatRepositoriesPage';
+import * as organizationActions from '../Organizations/OrganizationActions';
 
 const mapStateToProps = ({
   katello: {
     redHatRepositories: { enabled, sets },
+    organization,
   },
 }) => ({
   enabledRepositories: enabled,
   repositorySets: sets,
+  organization,
 });
 
-export default connect(mapStateToProps, {
+// map action dispatchers to props
+const actions = {
+  ...organizationActions,
   loadEnabledRepos,
   loadRepositorySets,
   updateRecommendedRepositorySets,
-})(RedHatRepositoriesPage);
+};
+const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
+
+export default connect(mapStateToProps, mapDispatchToProps)(RedHatRepositoriesPage);

data/webpack/scenes/Settings/SettingsReducer.js

@@ -13,21 +13,21 @@ export const initialSettingsState = Immutable({
 
 export default (state = initialSettingsState, action) => {
   switch (action.type) {
-    case GET_SETTING_SUCCESS: {
-      const { name, value } = action.response;
-      switch (name) {
-        case AUTOSEARCH_DELAY:
-          return state.set('autoSearchDelay', value);
-        case AUTOSEARCH_WHILE_TYPING:
-          return state.set('autoSearchEnabled', value);
-        case CONTENT_DISCONNECTED:
-          return state.set('disconnected', value);
-        default:
-          return state;
-      }
-    }
-
+  case GET_SETTING_SUCCESS: {
+    const { name, value } = action.response;
+    switch (name) {
+    case AUTOSEARCH_DELAY:
+      return state.set('autoSearchDelay', value);
+    case AUTOSEARCH_WHILE_TYPING:
+      return state.set('autoSearchEnabled', value);
+    case CONTENT_DISCONNECTED:
+      return state.set('disconnected', value);
     default:
       return state;
+    }
+  }
+
+  default:
+    return state;
   }
 };

data/webpack/scenes/Settings/Tables/TableReducer.js

@@ -18,29 +18,29 @@ const initialState = Immutable({
 
 export default (state = initialState, action) => {
   switch (action.type) {
-    case TABLES_REQUEST:
-    case CREATE_TABLE:
-    case UPDATE_TABLE:
-      return state.set('loading', true);
+  case TABLES_REQUEST:
+  case CREATE_TABLE:
+  case UPDATE_TABLE:
+    return state.set('loading', true);
 
-    case TABLES_SUCCESS:
-      return state.merge({
-        loading: false,
-        ...mapTables(action.payload.results),
-      });
-    case CREATE_TABLE_SUCCESS:
-    case UPDATE_TABLE_SUCCESS:
-      return state.merge({
-        loading: false,
-        ...state,
-        ...mapTables(action.payload),
-      });
-    case TABLES_FAILURE:
-    case UPDATE_TABLE_FAILURE:
-    case CREATE_TABLE_FAILURE: {
-      return state.set('loading', false);
-    }
-    default:
-      return state;
+  case TABLES_SUCCESS:
+    return state.merge({
+      loading: false,
+      ...mapTables(action.payload.results),
+    });
+  case CREATE_TABLE_SUCCESS:
+  case UPDATE_TABLE_SUCCESS:
+    return state.merge({
+      loading: false,
+      ...state,
+      ...mapTables(action.payload),
+    });
+  case TABLES_FAILURE:
+  case UPDATE_TABLE_FAILURE:
+  case CREATE_TABLE_FAILURE: {
+    return state.set('loading', false);
+  }
+  default:
+    return state;
   }
 };

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

@@ -44,7 +44,7 @@ const SubscriptionDetailInfo = ({ subscriptionDetails }) => {
               <td><b>{__(subscriptionAttributes[key])}</b></td>
               <td>{subscriptionDetailValue(subscriptionDetails, key)}</td>
             </tr>
-            ))}
+          ))}
           <tr>
             <td><b>{__('Limits')}</b></td>
             <td>{subscriptionLimits(subscriptionDetails)}</td>
@@ -63,7 +63,7 @@ const SubscriptionDetailInfo = ({ subscriptionDetails }) => {
               <td><b>{__(subscriptionPurposeAttributes[key])}</b></td>
               <td>{subscriptionDetailValue(subscriptionDetails, key)}</td>
             </tr>
-            ))}
+          ))}
         </tbody>
       </Table>
     </div>

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

@@ -22,22 +22,22 @@ const SubscriptionDetailProductContent = ({ productContent }) => {
     return (
       <ListView>
         {listItems.map(({
-              index,
-              title,
-              availableContent,
-            }) => (
-              <ListView.Item
-                key={index}
-                heading={title}
-                hideCloseIcon
-              >
+          index,
+          title,
+          availableContent,
+        }) => (
+          <ListView.Item
+            key={index}
+            heading={title}
+            hideCloseIcon
+          >
 
-                <Col sm={12}>
-                  {availableContent.map(content => (
-                    <SubscriptionDetailProduct key={content.id} content={content} />
-                  ))}
-                </Col>
-              </ListView.Item>
+            <Col sm={12}>
+              {availableContent.map(content => (
+                <SubscriptionDetailProduct key={content.id} content={content} />
+              ))}
+            </Col>
+          </ListView.Item>
         ))}
       </ListView>
     );

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

@@ -11,7 +11,7 @@ const SubscriptionDetailProducts = ({ subscriptionDetails }) => (
       {subscriptionDetails.provided_products &&
         subscriptionDetails.provided_products.map(prod => (
           <ListGroupItem key={prod.id}> {prod.name} </ListGroupItem>
-          ))}
+        ))}
     </ListGroup>
   </div>
 );

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

@@ -20,47 +20,47 @@ const initialState = Immutable({
 
 export default (state = initialState, action) => {
   switch (action.type) {
-    case SUBSCRIPTION_DETAILS_REQUEST: {
-      return state.set('loading', true);
-    }
+  case SUBSCRIPTION_DETAILS_REQUEST: {
+    return state.set('loading', true);
+  }
 
-    case PRODUCTS_REQUEST: {
-      return state.set('loading', true);
-    }
+  case PRODUCTS_REQUEST: {
+    return state.set('loading', true);
+  }
 
-    case SUBSCRIPTION_DETAILS_SUCCESS: {
-      const subscriptionDetails = action.response;
+  case SUBSCRIPTION_DETAILS_SUCCESS: {
+    const subscriptionDetails = action.response;
 
-      return state.merge({
-        ...subscriptionDetails,
-        loading: false,
-      });
-    }
+    return state.merge({
+      ...subscriptionDetails,
+      loading: false,
+    });
+  }
 
-    case PRODUCTS_SUCCESS: {
-      const productContent = { productContent: action.response };
+  case PRODUCTS_SUCCESS: {
+    const productContent = { productContent: action.response };
 
-      return state.merge({
-        ...productContent,
-        loading: false,
-      });
-    }
+    return state.merge({
+      ...productContent,
+      loading: false,
+    });
+  }
 
-    case SUBSCRIPTION_DETAILS_FAILURE: {
-      return state.merge({
-        error: action.payload.message,
-        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,
-        loading: false,
-      });
-    }
+  case PRODUCTS_FAILURE: {
+    return state.merge({
+      error: action.payload.message,
+      loading: false,
+    });
+  }
 
-    default:
-      return state;
+  default:
+    return state;
   }
 };

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

@@ -63,19 +63,19 @@ class SubscriptionDetails extends Component {
           <BreadcrumbsBar
             onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}
             data={{
-            isSwitchable: true,
-            breadcrumbItems: [
-              {
-                caption: __('Subscriptions'),
-                onClick: () =>
-                this.props.history.push('/subscriptions'),
-              },
-              {
-                caption: String(subscriptionDetails.name || __('Subscription Details')),
-              },
-            ],
-            resource,
-          }}
+              isSwitchable: true,
+              breadcrumbItems: [
+                {
+                  caption: __('Subscriptions'),
+                  onClick: () =>
+                    this.props.history.push('/subscriptions'),
+                },
+                {
+                  caption: String(subscriptionDetails.name || __('Subscription Details')),
+                },
+              ],
+              resource,
+            }}
           />}
 
         <TabContainer id="subscription-tabs-container" defaultActiveKey={1}>

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/AirGappedTypeForm.js

@@ -0,0 +1,81 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch, useSelector } from 'react-redux';
+import { FormattedMessage } from 'react-intl';
+import {
+  ActionGroup,
+  Button,
+  Form,
+} from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { noop } from 'foremanReact/common/helpers';
+
+import { AIRGAPPED } from './CdnConfigurationConstants';
+import { updateCdnConfiguration } from '../../../Organizations/OrganizationActions';
+import {
+  selectUpdatingCdnConfiguration,
+} from '../../../Organizations/OrganizationSelectors';
+
+import './CdnConfigurationForm.scss';
+
+const AirGappedTypeForm = ({ showUpdate, onUpdate }) => {
+  const [updateEnabled, setUpdateEnabled] = useState(showUpdate);
+  const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
+  const dispatch = useDispatch();
+  const performUpdate = () => {
+    setUpdateEnabled(false);
+    dispatch(updateCdnConfiguration({
+      type: AIRGAPPED,
+    }, onUpdate));
+  };
+
+  return (
+    <Form isHorizontal>
+      <div id="update-hint-cdn" className="margin-top-16">
+        <p>
+          <FormattedMessage
+            id="cdn-configuration-type"
+            defaultMessage={__('Red Hat content will be enabled and consumed via the {type} process.')}
+            values={{
+              type: <strong>{__('Import/Export')}</strong>,
+            }}
+          />
+          <br />
+          {showUpdate &&
+            <FormattedMessage
+              id="cdn-configuration-type-cdn"
+              defaultMessage={__('Click {update} below to save changes.')}
+              values={{
+                update: <strong>{__('Update')}</strong>,
+              }}
+            />
+          }
+        </p>
+      </div>
+
+      <ActionGroup>
+        <Button
+          aria-label="update-airgapped-configuration"
+          variant="secondary"
+          onClick={performUpdate}
+          isDisabled={updatingCdnConfiguration || !updateEnabled}
+          isLoading={updatingCdnConfiguration}
+        >
+          {__('Update')}
+        </Button>
+      </ActionGroup>
+    </Form>
+  );
+};
+
+
+AirGappedTypeForm.propTypes = {
+  showUpdate: PropTypes.bool.isRequired,
+  onUpdate: PropTypes.func,
+};
+
+AirGappedTypeForm.defaultProps = {
+  onUpdate: noop,
+};
+
+export default AirGappedTypeForm;

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnConfigurationConstants.js

@@ -0,0 +1,13 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const CDN_URL = 'https://cdn.redhat.com';
+
+export const [CDN, UPSTREAM_SERVER, AIRGAPPED] = ['redhat_cdn', 'upstream_server', 'airgapped'];
+export const CDN_CONFIGURATION_TYPES = {
+  redhat_cdn: __('Red Hat CDN'),
+  upstream_server: __('Upstream Foreman server'),
+  airgapped: __('Air-gapped'),
+};
+
+export const DEFAULT_CONTENT_VIEW_LABEL = 'Default_Organization_View';
+export const DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL = 'Library';