katello 4.6.2.1 → 4.7.0.rc1

data/webpack/scenes/Hosts/ChangeContentSource/helpers.js

@@ -1,10 +1,7 @@
 import { STATUS } from 'foremanReact/constants';
 
-export const getHostIds = () => {
-  const url = new URL(window.location);
-  const hostId = url.searchParams.get('host_id');
-
-  if (hostId) return [hostId];
+export const getHostIds = (hostIdFromUrl) => {
+  if (hostIdFromUrl) return [hostIdFromUrl];
 
   const cookie = document.cookie.split('; ')
     .find(row => row.startsWith('_ForemanSelectedhosts'));

data/webpack/scenes/Hosts/ChangeContentSource/index.js

@@ -1,39 +1,47 @@
 import React, { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 
-import { Alert, Grid, GridItem, List, ListItem } from '@patternfly/react-core';
+import { Alert, Grid, GridItem } from '@patternfly/react-core';
 
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
-import { foremanUrl } from 'foremanReact/common/helpers';
 
 import { selectApiDataStatus,
   selectApiContentViewStatus,
   selectApiChangeContentStatus,
-  selectContentHostsIds,
-  selectHostsWithoutContent,
+  selectContentHosts,
+  selectContentHostsWithoutContent,
   selectEnvironments,
   selectContentSources,
   selectJobInvocationPath,
   selectContentViews,
   selectTemplate } from './selectors';
+
 import { getHostIds, formIsLoading } from './helpers';
-import { getFormData, changeContentSource, getContentViews } from './actions';
+import { useUrlParams } from '../../../components/Table/TableHooks';
+import {
+  getFormData,
+  getProxy,
+  changeContentSource,
+  getContentViews,
+} from './actions';
 import ContentSourceForm from './components/ContentSourceForm';
 import ContentSourceTemplate from './components/ContentSourceTemplate';
+import Hosts from './components/Hosts';
 import './styles.scss';
 
 const ChangeContentSourcePage = () => {
   const dispatch = useDispatch();
 
+  const urlParams = useUrlParams();
   const apiDataStatus = useSelector(selectApiDataStatus);
   const apiContentViewStatus = useSelector(selectApiContentViewStatus);
   const apiChangeStatus = useSelector(selectApiChangeContentStatus);
 
   const isLoading = formIsLoading(apiDataStatus, apiContentViewStatus, apiChangeStatus);
 
-  const contentHostsIds = useSelector(selectContentHostsIds);
-  const hostsWithoutContent = useSelector(selectHostsWithoutContent);
+  const contentHosts = useSelector(selectContentHosts);
+  const hostsWithoutContent = useSelector(selectContentHostsWithoutContent);
   const environments = useSelector(selectEnvironments);
   const contentSources = useSelector(selectContentSources);
   const jobInvocationPath = useSelector(selectJobInvocationPath);
@@ -41,48 +49,44 @@ const ChangeContentSourcePage = () => {
   const template = useSelector(selectTemplate);
   const contentViews = useSelector(selectContentViews);
 
-  const [environmentId, setEnvironmentId] = useState();
-  const [contentViewId, setContentViewId] = useState();
-  const [contentSourceId, setContentSourceId] = useState();
+  const [contentSourceId, setCapsuleId] = useState('');
+  const [environmentId, setEnvironmentId] = useState('');
+  const [contentViewId, setContentViewId] = useState('');
 
   const handleSubmit = (e) => {
     e.preventDefault();
 
-    dispatch(changeContentSource(environmentId, contentViewId, contentSourceId, contentHostsIds));
+    dispatch(changeContentSource(
+      environmentId,
+      contentViewId,
+      contentSourceId,
+      contentHosts.map(h => h.id),
+    ));
   };
 
-  const handleEnvironment = (envId) => {
-    if (envId) {
-      dispatch(getContentViews(envId));
+  const handleContentSource = (id) => {
+    setCapsuleId(id);
+    setEnvironmentId('');
+    setContentViewId('');
+
+    if (id) {
+      dispatch(getProxy(id));
     }
+  };
 
+  const handleEnvironment = (envId) => {
     setEnvironmentId(envId);
     setContentViewId('');
-  };
-
-  const IgnoredHostsAlert = () => (
-    <Alert
-      variant="warning"
-      title={__('Some hosts are ignored!')}
-      className="cs_alert"
-      isExpandable
-    >
-      <p>
-        { __('The following hosts are not registered as Content Hosts, so they will be ignored:') }
-      </p>
-      { hostsWithoutContent.map(name => (
-        <List>
-          <ListItem>
-            <a href={foremanUrl(`/hosts/${name}`)}>{name}</a>
-          </ListItem>
-        </List>))}
-    </Alert>);
 
+    if (envId) {
+      dispatch(getContentViews(envId));
+    }
+  };
   useEffect(() => {
-    dispatch(getFormData());
-  }, [dispatch]);
+    dispatch(getFormData(getHostIds(urlParams.host_id), urlParams.searchParam));
+  }, [dispatch, urlParams.host_id, urlParams.searchParam]);
 
-  if (getHostIds().length === 0) {
+  if (getHostIds(urlParams.host_id).length === 0 && urlParams.searchParam === '') {
     return (
       <Grid className="margin-40">
         <GridItem span={7}>
@@ -90,7 +94,6 @@ const ChangeContentSourcePage = () => {
             variant="danger"
             title={__('No hosts with content source found!')}
           />
-          { hostsWithoutContent.length > 0 && <IgnoredHostsAlert /> }
         </GridItem>
       </Grid>);
   }
@@ -99,9 +102,11 @@ const ChangeContentSourcePage = () => {
     <Grid className="margin-40">
       <GridItem span={7}>
         <h1>{__('Change host content source')}</h1>
-
-        { hostsWithoutContent.length > 0 && <IgnoredHostsAlert /> }
       </GridItem>
+      <Hosts
+        contentHosts={contentHosts}
+        hostsWithoutContent={hostsWithoutContent}
+      />
 
       <ContentSourceForm
         handleSubmit={handleSubmit}
@@ -113,8 +118,8 @@ const ChangeContentSourcePage = () => {
         contentViewId={contentViewId}
         contentSources={contentSources}
         contentSourceId={contentSourceId}
-        handleContentSource={setContentSourceId}
-        contentHostsIds={contentHostsIds}
+        handleContentSource={handleContentSource}
+        contentHosts={contentHosts}
         isLoading={isLoading}
       />
       { apiChangeStatus === STATUS.RESOLVED &&

data/webpack/scenes/Hosts/ChangeContentSource/selectors.js

@@ -4,7 +4,7 @@ import {
   selectAPIError,
 } from 'foremanReact/redux/API/APISelectors';
 
-import { CHANGE_CONTENT_SOURCE_DATA, CHANGE_CONTENT_SOURCE, CHANGE_CONTENT_SOURCE_VIEWS } from './constants';
+import { CHANGE_CONTENT_SOURCE_DATA, CHANGE_CONTENT_SOURCE_PROXY, CHANGE_CONTENT_SOURCE, CHANGE_CONTENT_SOURCE_VIEWS } from './constants';
 
 // API statuses
 export const selectApiDataStatus = state =>
@@ -19,14 +19,14 @@ export const selectApiChangeContentStatus = state =>
 export const selectError = state => selectAPIError(state, CHANGE_CONTENT_SOURCE);
 
 // Selectors
-export const selectContentHostsIds = state =>
-  selectAPIResponse(state, CHANGE_CONTENT_SOURCE_DATA).content_hosts_ids || [];
+export const selectContentHosts = state =>
+  selectAPIResponse(state, CHANGE_CONTENT_SOURCE_DATA).content_hosts || [];
 
-export const selectHostsWithoutContent = state =>
+export const selectContentHostsWithoutContent = state =>
   selectAPIResponse(state, CHANGE_CONTENT_SOURCE_DATA).hosts_without_content || [];
 
 export const selectEnvironments = state =>
-  selectAPIResponse(state, CHANGE_CONTENT_SOURCE_DATA).environments || [];
+  selectAPIResponse(state, CHANGE_CONTENT_SOURCE_PROXY).lifecycle_environments || [];
 
 export const selectContentSources = state =>
   selectAPIResponse(state, CHANGE_CONTENT_SOURCE_DATA).content_sources || [];

data/webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import ModuleStreamDetailArtifacts from './ModuleStreamDetailArtifacts';
+import ModuleStreamDetailProfiles from './Profiles/ModuleStreamDetailProfiles';
 import ContentDetailInfo from '../../../components/Content/Details/ContentDetailInfo';
 import ContentDetailRepositories from '../../../components/Content/Details/ContentDetailRepositories';
 
@@ -16,7 +17,7 @@ export const displayMap = new Map([
 ]);
 
 export default (detailInfo) => {
-  const { repositories, artifacts } = detailInfo;
+  const { repositories, profiles, artifacts } = detailInfo;
 
   return [
     {
@@ -36,6 +37,14 @@ export default (detailInfo) => {
     },
     {
       key: 3,
+      tabHeader: __('Profiles'),
+      tabContent: (profiles && profiles.length ?
+        <ModuleStreamDetailProfiles profiles={profiles} /> :
+        __('No profiles to show')
+      ),
+    },
+    {
+      key: 4,
       tabHeader: __('Artifacts'),
       tabContent: (artifacts && artifacts.length ?
         <ModuleStreamDetailArtifacts artifacts={artifacts} /> :

data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetails.js

@@ -42,7 +42,7 @@ class ModuleStreamDetails extends Component {
     };
 
     return (
-      <div>
+      <div style={{ margin: '24px' }}>
         {!loading && <BreadcrumbsBar
           isLoadingResources={loading}
           onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}

data/webpack/scenes/ModuleStreams/Details/__tests__/__snapshots__/ModuleStreamDetails.test.js.snap

@@ -1,7 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Module stream details page rendering renders with loading state 1`] = `
-<div>
+<div
+  style={
+    Object {
+      "margin": "24px",
+    }
+  }
+>
   <ContentDetails
     contentDetails={
       Object {
@@ -76,6 +82,11 @@ exports[`Module stream details page rendering renders with loading state 1`] = `
         },
         Object {
           "key": 3,
+          "tabContent": "No profiles to show",
+          "tabHeader": "Profiles",
+        },
+        Object {
+          "key": 4,
           "tabContent": "No artifacts to show",
           "tabHeader": "Artifacts",
         },
@@ -86,7 +97,13 @@ exports[`Module stream details page rendering renders with loading state 1`] = `
 `;
 
 exports[`Module stream details page rendering renders with module stream provided 1`] = `
-<div>
+<div
+  style={
+    Object {
+      "margin": "24px",
+    }
+  }
+>
   <BreadcrumbsBar
     breadcrumbItems={
       Array [
@@ -392,6 +409,84 @@ exports[`Module stream details page rendering renders with module stream provide
         },
         Object {
           "key": 3,
+          "tabContent": <ModuleStreamDetailProfiles
+            profiles={
+              Array [
+                Object {
+                  "id": 37,
+                  "name": "default",
+                  "rpms": Array [
+                    Object {
+                      "id": 108,
+                      "name": "perl",
+                    },
+                    Object {
+                      "id": 110,
+                      "name": "foo",
+                    },
+                    Object {
+                      "id": 111,
+                      "name": "rpm_0",
+                    },
+                    Object {
+                      "id": 112,
+                      "name": "rpm_1",
+                    },
+                    Object {
+                      "id": 113,
+                      "name": "rpm_2",
+                    },
+                    Object {
+                      "id": 114,
+                      "name": "rpm_3",
+                    },
+                    Object {
+                      "id": 115,
+                      "name": "rpm_4",
+                    },
+                    Object {
+                      "id": 116,
+                      "name": "rpm_5",
+                    },
+                    Object {
+                      "id": 117,
+                      "name": "rpm_6",
+                    },
+                    Object {
+                      "id": 118,
+                      "name": "rpm_7",
+                    },
+                    Object {
+                      "id": 119,
+                      "name": "rpm_8",
+                    },
+                    Object {
+                      "id": 120,
+                      "name": "rpm_9",
+                    },
+                    Object {
+                      "id": 121,
+                      "name": "rpm_10",
+                    },
+                  ],
+                },
+                Object {
+                  "id": 38,
+                  "name": "minimal",
+                  "rpms": Array [
+                    Object {
+                      "id": 84,
+                      "name": "python2-avocado",
+                    },
+                  ],
+                },
+              ]
+            }
+          />,
+          "tabHeader": "Profiles",
+        },
+        Object {
+          "key": 4,
           "tabContent": <ModuleStreamDetailArtifacts
             artifacts={
               Array [

data/webpack/scenes/Organizations/OrganizationSelectors.js

@@ -9,6 +9,7 @@ import {
 } from './OrganizationConstants';
 
 export const selectOrganizationState = state => state.katello.organization;
+export const selectOrgLoading = state => state.katello.organization.loading;
 
 export const selectManifestName = state =>
   selectOrganizationState(state).owner_details?.upstreamConsumer?.name;

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

@@ -2,9 +2,10 @@ import { translate as __ } from 'foremanReact/common/I18n';
 
 export const CDN_URL = 'https://cdn.redhat.com';
 
-export const [CDN, NETWORK_SYNC, EXPORT_SYNC] = ['redhat_cdn', 'network_sync', 'export_sync'];
+export const [CDN, NETWORK_SYNC, EXPORT_SYNC, CUSTOM_CDN] = ['redhat_cdn', 'network_sync', 'export_sync', 'custom_cdn'];
 export const CDN_CONFIGURATION_TYPES = {
   redhat_cdn: __('Red Hat CDN'),
+  custom_cdn: __('Custom CDN'),
   network_sync: __('Network Sync'),
   export_sync: __('Export Sync'),
 };

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
@@ -16,30 +16,18 @@ import { noop } from 'foremanReact/common/helpers';
 import { CDN_URL, CDN } from './CdnConfigurationConstants';
 import { updateCdnConfiguration } from '../../../Organizations/OrganizationActions';
 import {
+  selectOrgLoading,
   selectUpdatingCdnConfiguration,
 } from '../../../Organizations/OrganizationSelectors';
 import './CdnConfigurationForm.scss';
 
-const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
+const CdnTypeForm = ({ typeChangeInProgress, onUpdate }) => {
   const dispatch = useDispatch();
-  const [cdnUrl, setCdnUrl] = useState(url);
-  const [updateEnabled, setUpdateEnabled] = useState(showUpdate);
   const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
-  const firstUpdate = useRef(true);
-
-  useEffect(() => {
-    if (firstUpdate.current) {
-      firstUpdate.current = false;
-      return;
-    }
-    setUpdateEnabled(true);
-  }, [cdnUrl]);
-
+  const orgIsLoading = useSelector(state => selectOrgLoading(state));
   const performUpdate = () => {
-    setUpdateEnabled(false);
     dispatch(updateCdnConfiguration({
       type: CDN,
-      url: cdnUrl,
     }, onUpdate));
   };
 
@@ -55,7 +43,7 @@ const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
             }}
           />
           <br />
-          {showUpdate &&
+          {typeChangeInProgress &&
           <FormattedMessage
             id="cdn-configuration-type-cdn"
             defaultMessage={__('Click {update} below to save changes.')}
@@ -69,11 +57,10 @@ const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
       <FormGroup label={__('URL')} isRequired>
         <TextInput
           ouiaId="cdn-configuration-url-input"
-          aria-label="cdn-url"
+          aria-label="redhat-cdn-url"
           type="text"
-          value={cdnUrl}
-          onChange={setCdnUrl}
-          isDisabled={updatingCdnConfiguration}
+          value={CDN_URL}
+          isDisabled
         />
       </FormGroup>
 
@@ -83,7 +70,7 @@ const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
           aria-label="update-cdn-configuration"
           variant="secondary"
           onClick={performUpdate}
-          isDisabled={updatingCdnConfiguration || !updateEnabled || !cdnUrl}
+          isDisabled={updatingCdnConfiguration || orgIsLoading || !typeChangeInProgress}
           isLoading={updatingCdnConfiguration}
         >
           {__('Update')}
@@ -95,13 +82,11 @@ const CdnTypeForm = ({ showUpdate, onUpdate, url }) => {
 };
 
 CdnTypeForm.propTypes = {
-  showUpdate: PropTypes.bool.isRequired,
+  typeChangeInProgress: PropTypes.bool.isRequired,
   onUpdate: PropTypes.func,
-  url: PropTypes.string,
 };
 
 CdnTypeForm.defaultProps = {
-  url: CDN_URL,
   onUpdate: noop,
 };
 

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

@@ -0,0 +1,154 @@
+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,
+  FormGroup,
+  FormSelect,
+  FormSelectOption,
+  TextInput,
+  Text,
+} from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { noop } from 'foremanReact/common/helpers';
+
+import { CUSTOM_CDN } from './CdnConfigurationConstants';
+import { updateCdnConfiguration } from '../../../Organizations/OrganizationActions';
+import {
+  selectOrgLoading,
+  selectUpdatingCdnConfiguration,
+} from '../../../Organizations/OrganizationSelectors';
+import './CdnConfigurationForm.scss';
+
+const CustomCdnTypeForm = ({
+  typeChangeInProgress, onUpdate, contentCredentials, cdnConfiguration,
+}) => {
+  const dispatch = useDispatch();
+  const urlValue = cdnConfiguration.type === CUSTOM_CDN ? cdnConfiguration.url : '';
+  const [url, setUrl] = useState(urlValue);
+  const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
+  const orgIsLoading = useSelector(state => selectOrgLoading(state));
+  const [sslCaCredentialId, setSslCaCredentialId] = useState(cdnConfiguration.ssl_ca_credential_id);
+
+  const disableUpdate = () => {
+    if (updatingCdnConfiguration || orgIsLoading) {
+      return true;
+    }
+
+    const sslCaCredentialIdOrNull = sslCaCredentialId === '' ? null : sslCaCredentialId;
+    if (!url || (url === cdnConfiguration.url
+              && sslCaCredentialIdOrNull?.toString() ===
+                      cdnConfiguration.ssl_ca_credential_id?.toString())) {
+      return true;
+    }
+
+    return false;
+  };
+
+  const performUpdate = () => {
+    dispatch(updateCdnConfiguration({
+      url,
+      ssl_ca_credential_id: sslCaCredentialId,
+      type: CUSTOM_CDN,
+    }, onUpdate));
+  };
+
+  const sslCaCredentialValue =
+    cdnConfiguration.type === CUSTOM_CDN || typeChangeInProgress ? sslCaCredentialId : null;
+
+  return (
+    <Form isHorizontal>
+      <div id="update-hint-cdn" className="margin-top-16">
+        <Text>
+          <FormattedMessage
+            id="cdn-configuration-type"
+            defaultMessage={__('Red Hat content will be consumed from {type}.')}
+            values={{
+              type: <strong>{__('a custom CDN URL')}</strong>,
+            }}
+          />
+          <br />
+          {typeChangeInProgress &&
+          <FormattedMessage
+            id="cdn-configuration-type-cdn"
+            defaultMessage={__('Click {update} below to save changes.')}
+            values={{
+              update: <strong>{__('Update')}</strong>,
+            }}
+          />
+          }
+        </Text>
+      </div>
+
+      <FormGroup
+        label={__('URL')}
+        isRequired
+      >
+        <TextInput
+          ouiaId="custom-cdn-url-input"
+          aria-label="cdn-url"
+          type="text"
+          value={url || ''}
+          onChange={value => setUrl(value)}
+          isDisabled={updatingCdnConfiguration}
+        />
+      </FormGroup>
+
+      <FormGroup
+        label={__('SSL CA Content Credential')}
+      >
+        <FormSelect
+          ouiaId="custom-cdn-ca-content-credential-input"
+          aria-label="cdn-ssl-ca-content-credential"
+          value={sslCaCredentialValue || ''}
+          isDisabled={updatingCdnConfiguration}
+          onChange={value => setSslCaCredentialId(value)}
+        >
+          <FormSelectOption label={__('N/A')} />
+          {contentCredentials.map(cred =>
+            <FormSelectOption data-testid="ssl-ca-content-credential-option" key={cred.id} value={cred.id} label={cred.name} />)}
+        </FormSelect>
+      </FormGroup>
+
+      <ActionGroup>
+        <Button
+          ouiaId="custom-cdn-type-configuration-update-button"
+          aria-label="update-custom-cdn-configuration"
+          variant="secondary"
+          onClick={performUpdate}
+          isDisabled={disableUpdate()}
+          isLoading={updatingCdnConfiguration}
+        >
+          {__('Update')}
+        </Button>
+      </ActionGroup>
+    </Form>
+
+  );
+};
+
+CustomCdnTypeForm.propTypes = {
+  typeChangeInProgress: PropTypes.bool.isRequired,
+  onUpdate: PropTypes.func,
+  contentCredentials: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+  })),
+  cdnConfiguration: PropTypes.shape({
+    type: PropTypes.string.isRequired,
+    url: PropTypes.string,
+    ssl_ca_credential_id: PropTypes.number,
+  }),
+
+};
+
+CustomCdnTypeForm.defaultProps = {
+  onUpdate: noop,
+  contentCredentials: [],
+  cdnConfiguration: {},
+};
+
+export default CustomCdnTypeForm;

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

@@ -18,8 +18,8 @@ import {
 
 import './CdnConfigurationForm.scss';
 
-const ExportSyncForm = ({ showUpdate, onUpdate }) => {
-  const [updateEnabled, setUpdateEnabled] = useState(showUpdate);
+const ExportSyncForm = ({ typeChangeInProgress, onUpdate }) => {
+  const [updateEnabled, setUpdateEnabled] = useState(typeChangeInProgress);
   const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
   const dispatch = useDispatch();
   const performUpdate = () => {
@@ -41,7 +41,7 @@ const ExportSyncForm = ({ showUpdate, onUpdate }) => {
             }}
           />
           <br />
-          {showUpdate &&
+          {typeChangeInProgress &&
             <FormattedMessage
               id="cdn-configuration-type-cdn"
               defaultMessage={__('Click {update} below to save changes.')}
@@ -71,7 +71,7 @@ const ExportSyncForm = ({ showUpdate, onUpdate }) => {
 
 
 ExportSyncForm.propTypes = {
-  showUpdate: PropTypes.bool.isRequired,
+  typeChangeInProgress: PropTypes.bool.isRequired,
   onUpdate: PropTypes.func,
 };