katello 4.5.0.rc2 → 4.6.0.rc2

data/webpack/scenes/AlternateContentSources/ACSActions.js

@@ -1,7 +1,14 @@
 import { API_OPERATIONS, APIActions, get, post } from 'foremanReact/redux/API';
 import { translate as __ } from 'foremanReact/common/I18n';
 import api, { orgId } from '../../services/api';
-import ACS_KEY, { acsRefreshKey, CREATE_ACS_KEY, DELETE_ACS_KEY } from './ACSConstants';
+import ACS_KEY, {
+  acsDetailsKey,
+  acsRefreshKey,
+  CREATE_ACS_KEY,
+  DELETE_ACS_KEY,
+  EDIT_ACS_KEY,
+  PRODUCTS_KEY,
+} from './ACSConstants';
 import { getResponseErrorMsgs } from '../../utils/helpers';
 import { renderTaskStartedToast } from '../Tasks/helpers';
 
@@ -30,6 +37,13 @@ const getAlternateContentSources = (extraParams, id = '') => get({
   params: createACSParams(extraParams),
 });
 
+export const getACSDetails = (acsId, extraParams = {}) => get({
+  type: API_OPERATIONS.GET,
+  key: acsDetailsKey(acsId),
+  params: { organization_id: orgId(), include_permissions: true, ...extraParams },
+  url: api.getApiUrl(`/alternate_content_sources/${acsId}`),
+});
+
 export const createACS = params => post({
   type: API_OPERATIONS.POST,
   key: CREATE_ACS_KEY,
@@ -59,7 +73,26 @@ export const refreshACS = (acsId, handleSuccess) => post({
   },
   errorToast: error => __(`Something went wrong while refreshing this alternate content source! ${getResponseErrorMsgs(error.response)}`),
 });
+
+export const getProducts = () => get({
+  type: API_OPERATIONS.GET,
+  key: PRODUCTS_KEY,
+  url: api.getApiUrl('/products'),
+  params: {
+    organization_id: orgId(), full_result: true, enabled: true, non_empty: true,
+  },
+});
+
+export const editACS = (acsId, params, handleSuccess, handleError) => APIActions.put({
+  type: API_OPERATIONS.PUT,
+  key: EDIT_ACS_KEY,
+  url: api.getApiUrl(`/alternate_content_sources/${acsId}`),
+  params,
+  handleSuccess,
+  handleError,
+  successToast: () => __('Alternate content source edited'),
+  errorToast: error => __(`Something went wrong while editing the alternate content source! ${getResponseErrorMsgs(error.response)}`),
+});
+
 export default getAlternateContentSources;
 
-// acs = Katello::AlternateContentSource.new
-// (name:"acs", label:"acs", alternate_content_source_type:"custom", base_url:"abcdef")

data/webpack/scenes/AlternateContentSources/ACSConstants.js

@@ -2,10 +2,13 @@ import { translate as __ } from 'foremanReact/common/I18n';
 
 const ACS_KEY = 'ACS';
 export const CREATE_ACS_KEY = 'ACS_CREATE';
+export const EDIT_ACS_KEY = 'ACS_EDIT';
 export const DELETE_ACS_KEY = 'ACS_DELETE';
 export const SMART_PROXY_KEY = 'SMART_PROXY';
+export const PRODUCTS_KEY = 'PRODUCTS';
 export const SSL_CERTS = 'SSL_CERTS';
 export const acsRefreshKey = acsId => `${ACS_KEY}_REFRESH_${acsId}`;
+export const acsDetailsKey = acsId => `${ACS_KEY}_DETAILS_${acsId}`;
 
 export const YUM = __('Yum');
 export const FILE = __('File');

data/webpack/scenes/AlternateContentSources/ACSSelectors.js

@@ -1,10 +1,6 @@
-import {
-  selectAPIStatus,
-  selectAPIError,
-  selectAPIResponse,
-} from 'foremanReact/redux/API/APISelectors';
+import { selectAPIError, selectAPIResponse, selectAPIStatus } from 'foremanReact/redux/API/APISelectors';
 import { STATUS } from 'foremanReact/constants';
-import ACS_KEY, { CREATE_ACS_KEY } from './ACSConstants';
+import ACS_KEY, { acsDetailsKey, CREATE_ACS_KEY, PRODUCTS_KEY } from './ACSConstants';
 
 export const selectAlternateContentSources = (state, index = '') => selectAPIResponse(state, ACS_KEY + index) || {};
 
@@ -22,3 +18,16 @@ export const selectCreateACSStatus = state =>
 
 export const selectCreateACSError = state =>
   selectAPIError(state, CREATE_ACS_KEY);
+
+export const selectACSDetails = (state, acsId) =>
+  selectAPIResponse(state, acsDetailsKey(acsId)) || {};
+
+export const selectACSDetailsStatus =
+    (state, acsId) => selectAPIStatus(state, acsDetailsKey(acsId)) || STATUS.PENDING;
+
+export const selectACSDetailsError =
+    (state, acsId) => selectAPIError(state, acsDetailsKey(acsId));
+
+export const selectProducts = state => selectAPIResponse(state, PRODUCTS_KEY) || {};
+
+export const selectProductsStatus = state => selectAPIStatus(state, PRODUCTS_KEY) || STATUS.PENDING;

data/webpack/scenes/AlternateContentSources/Create/ACSCreateWizard.js

@@ -14,6 +14,8 @@ import ACSCreateFinish from './Steps/ACSCreateFinish';
 import { getContentCredentials } from '../../ContentCredentials/ContentCredentialActions';
 import { getSmartProxies } from '../../SmartProxy/SmartProxyContentActions';
 import { CONTENT_CREDENTIAL_CERT_TYPE } from '../../ContentCredentials/ContentCredentialConstants';
+import { getProducts } from '../ACSActions';
+import ACSProducts from './Steps/ACSProducts';
 
 const ACSCreateWizard = ({ show, setIsOpen }) => {
   const [acsType, setAcsType] = useState(null);
@@ -33,6 +35,8 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
   const [password, setPassword] = useState('');
   const [caCert, setCACert] = useState('');
   const [caCertName, setCACertName] = useState('');
+  const [productIds, setProductIds] = useState([]);
+  const [productNames, setProductNames] = useState([]);
   const [currentStep, setCurrentStep] = useState(1);
   const dispatch = useDispatch();
 
@@ -40,53 +44,76 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     () => {
       dispatch(getContentCredentials({ content_type: CONTENT_CREDENTIAL_CERT_TYPE }));
       dispatch(getSmartProxies());
+      dispatch(getProducts());
     },
     [dispatch],
   );
 
-  const steps = [
-    {
-      id: 1,
-      name: __('Select source type'),
-      component: <SelectSource />,
-      enableNext: acsType && contentType,
-    },
-    {
-      id: 2,
-      name: __('Name source'),
-      component: <NameACS />,
-      enableNext: name !== '',
-    },
-    {
-      id: 3,
-      name: __('Select smart proxy'),
-      component: <ACSSmartProxies />,
-      enableNext: smartProxies.length,
-    },
-    {
-      id: 4,
-      name: __('URL and paths'),
-      component: <AcsUrlPaths />,
-      enableNext: url !== '' && subpaths !== '',
-    },
-    {
-      id: 5,
-      name: __('Credentials'),
-      component: <ACSCredentials />,
-    },
-    {
-      id: 6,
-      name: __('Review details'),
-      component: <ACSReview />,
-      nextButtonText: __('Add'),
-    },
-    {
-      id: 7,
-      name: __('Create ACS'),
-      component: <ACSCreateFinish />,
-      isFinishedStep: true,
-    },
+  const sourceTypeStep = {
+    id: 1,
+    name: __('Select source type'),
+    component: <SelectSource />,
+    enableNext: acsType && contentType,
+  };
 
+  const nameStep = {
+    id: 2,
+    name: __('Name source'),
+    component: <NameACS />,
+    enableNext: name !== '',
+  };
+
+  const smartProxyStep = {
+    id: 3,
+    name: __('Select smart proxy'),
+    component: <ACSSmartProxies />,
+    enableNext: smartProxies.length,
+  };
+
+  const productStep = {
+    id: 4,
+    name: __('Select products'),
+    component: <ACSProducts />,
+    enableNext: productIds.length,
+  };
+
+  const urlPathStep = {
+    id: 5,
+    name: __('URL and paths'),
+    component: <AcsUrlPaths />,
+    enableNext: url !== '',
+  };
+
+  const credentialsStep = {
+    id: 6,
+    name: __('Credentials'),
+    component: <ACSCredentials />,
+    enableNext: (url !== '' || productIds.length) && smartProxies.length && name !== '' && acsType && contentType,
+  };
+
+  const reviewStep = {
+    id: 7,
+    name: __('Review details'),
+    component: <ACSReview />,
+    nextButtonText: __('Add'),
+    enableNext: (url !== '' || productIds.length) && smartProxies.length && name !== '' && acsType && contentType,
+  };
+
+  const finishStep = {
+    id: 8,
+    name: __('Create ACS'),
+    component: <ACSCreateFinish />,
+    isFinishedStep: true,
+  };
+
+  const steps = [
+    sourceTypeStep,
+    nameStep,
+    smartProxyStep,
+    ...(acsType === 'custom' ? [urlPathStep, credentialsStep] : []),
+    ...(acsType === 'simplified' ? [productStep] : []),
+    reviewStep,
+    finishStep,
   ];
 
   return (
@@ -105,6 +132,10 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
       setDescription,
       smartProxies,
       setSmartProxies,
+      productIds,
+      setProductIds,
+      productNames,
+      setProductNames,
       url,
       setUrl,
       subpaths,

data/webpack/scenes/AlternateContentSources/Create/Steps/ACSCreateFinish.js

@@ -1,14 +1,16 @@
-import React, { useContext, useState } from 'react';
+import React, { useCallback, useContext, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import ACSCreateContext from '../ACSCreateContext';
 import { selectCreateACS, selectCreateACSError, selectCreateACSStatus } from '../../ACSSelectors';
-import getAlternateContentSources, { createACS } from '../../ACSActions';
+import { createACS } from '../../ACSActions';
 import Loading from '../../../../components/Loading';
 
 const ACSCreateFinish = () => {
+  const { push } = useHistory();
   const {
     currentStep,
     setIsOpen,
@@ -26,6 +28,7 @@ const ACSCreateFinish = () => {
     username,
     password,
     caCert,
+    productIds,
   } = useContext(ACSCreateContext);
   const dispatch = useDispatch();
   const response = useSelector(state => selectCreateACS(state));
@@ -34,20 +37,33 @@ const ACSCreateFinish = () => {
   const [createACSDispatched, setCreateACSDispatched] = useState(false);
   const [saving, setSaving] = useState(true);
 
+  const acsTypeParams = useCallback((params, type) => {
+    let acsParams = params;
+    if (type === 'custom') {
+      acsParams = {
+        base_url: url, verify_ssl: verifySSL, ssl_ca_cert_id: caCert, ...acsParams,
+      };
+      if (subpaths !== '') {
+        acsParams = { subpaths: subpaths.split(','), ...acsParams };
+      }
+    }
+    if (type === 'simplified') {
+      acsParams = { product_ids: productIds, ...acsParams };
+    }
+    return acsParams;
+  }, [caCert, productIds, subpaths, url, verifySSL]);
+
   useDeepCompareEffect(() => {
-    if (currentStep === 7 && !createACSDispatched) {
+    if (currentStep === 8 && !createACSDispatched) {
       setCreateACSDispatched(true);
       let params = {
         name,
         description,
-        base_url: url,
-        subpaths: subpaths.split(','),
         smart_proxy_names: smartProxies,
         content_type: contentType,
         alternate_content_source_type: acsType,
-        verify_ssl: verifySSL,
-        ssl_ca_cert_id: caCert,
       };
+      params = acsTypeParams(params, acsType);
       if (authentication === 'content_credentials') {
         params = { ssl_client_cert_id: sslCert, ssl_client_key_id: sslKey, ...params };
       }
@@ -59,19 +75,19 @@ const ACSCreateFinish = () => {
   }, [dispatch, createACSDispatched, setCreateACSDispatched,
     acsType, authentication, name, description, url, subpaths,
     smartProxies, contentType, verifySSL, caCert, sslCert, sslKey,
-    username, password, currentStep]);
+    username, password, currentStep, acsTypeParams]);
 
   useDeepCompareEffect(() => {
     const { id } = response;
     if (id && status === STATUS.RESOLVED && saving) {
       setSaving(false);
-      dispatch(getAlternateContentSources());
+      push(`/labs/alternate_content_sources/${id}/details`);
       setIsOpen(false);
     } else if (status === STATUS.ERROR) {
       setSaving(false);
       setIsOpen(false);
     }
-  }, [response, status, error, saving, dispatch, setIsOpen]);
+  }, [response, status, error, push, saving, dispatch, setIsOpen]);
 
   return <Loading loadingText={__('Saving alternate content source...')} />;
 };

data/webpack/scenes/AlternateContentSources/Create/Steps/ACSProducts.js

@@ -0,0 +1,44 @@
+import React, { useContext, useState } from 'react';
+import { useSelector } from 'react-redux';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { DualListSelector } from '@patternfly/react-core';
+import ACSCreateContext from '../ACSCreateContext';
+import WizardHeader from '../../../ContentViews/components/WizardHeader';
+import { selectProducts } from '../../ACSSelectors';
+
+const ACSProducts = () => {
+  const {
+    setProductIds, productNames, setProductNames,
+  } = useContext(ACSCreateContext);
+  const availableProducts = useSelector(selectProducts);
+  const { results } = availableProducts;
+  const [availableOptions, setAvailableOptions] = useState(results?.map(product =>
+    product.name)?.filter(pName => !productNames.includes(pName)));
+  const onListChange = (newAvailableOptions, newChosenOptions) => {
+    setAvailableOptions(newAvailableOptions);
+    setProductNames(newChosenOptions);
+    setProductIds(results?.filter(product =>
+      newChosenOptions.includes(product.name))?.map(p => p?.id));
+  };
+
+  return (
+    <>
+      <WizardHeader
+        title={__('Select products')}
+        description={__('Select products to associate to this source.')}
+      />
+      <DualListSelector
+        isSearchable
+        availableOptions={availableOptions}
+        chosenOptions={productNames}
+        addAll={onListChange}
+        removeAll={onListChange}
+        addSelected={onListChange}
+        removeSelected={onListChange}
+        id="product_selector"
+      />
+    </>
+  );
+};
+
+export default ACSProducts;

data/webpack/scenes/AlternateContentSources/Create/Steps/ACSReview.js

@@ -1,12 +1,6 @@
 import React, { useContext } from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import {
-  TextContent,
-  TextList,
-  TextListVariants,
-  TextListItem,
-  TextListItemVariants,
-} from '@patternfly/react-core';
+import { TextContent, TextList, TextListItem, TextListItemVariants, TextListVariants } from '@patternfly/react-core';
 import ACSCreateContext from '../ACSCreateContext';
 import WizardHeader from '../../../ContentViews/components/WizardHeader';
 
@@ -15,7 +9,7 @@ const ACSReview = () => {
     name, description, acsType, contentType,
     smartProxies, url, subpaths, verifySSL,
     authentication, sslCertName, sslKeyName, username,
-    password, caCertName,
+    password, caCertName, productNames,
   } = useContext(ACSCreateContext);
 
   return (
@@ -23,7 +17,7 @@ const ACSReview = () => {
       <WizardHeader
         title={__('Review Details')}
         description={__('Review the information below and click Add to add your source. ' +
-          'To edit details in previous steps, click Back or any step on the left.')}
+                'To edit details in previous steps, click Back or any step on the left.')}
       />
       <TextContent>
         <TextList component={TextListVariants.dl}>
@@ -45,56 +39,76 @@ const ACSReview = () => {
           </TextListItem>
           <TextListItem component={TextListItemVariants.dt}>{__('Smart proxies')}</TextListItem>
           <TextListItem component={TextListItemVariants.dd}>
-            {smartProxies}
+            {smartProxies.join(', ')}
           </TextListItem>
-          <TextListItem component={TextListItemVariants.dt}>{__('Base URL')}</TextListItem>
-          <TextListItem component={TextListItemVariants.dd}>
-            {url}
-          </TextListItem>
-          <TextListItem component={TextListItemVariants.dt}>{__('Subpaths')}</TextListItem>
-          <TextListItem component={TextListItemVariants.dd}>
-            {subpaths}
-          </TextListItem>
-          <TextListItem component={TextListItemVariants.dt}>{__('Verify SSL')}</TextListItem>
-          <TextListItem component={TextListItemVariants.dd}>
-            {verifySSL ? __('Yes') : __('No')}
-          </TextListItem>
-          <TextListItem component={TextListItemVariants.dt}>{__('CA Cert')}</TextListItem>
-          <TextListItem component={TextListItemVariants.dd}>
-            {caCertName}
-          </TextListItem>
-          {authentication === 'manual' && (
+          {acsType === 'custom' &&
             <>
-              <TextListItem component={TextListItemVariants.dt}>{__('Authentication type')}</TextListItem>
-              <TextListItem component={TextListItemVariants.dd}>
-                {__('Manual')}
+              <TextListItem component={TextListItemVariants.dt}>
+                {__('Base URL')}
               </TextListItem>
-              <TextListItem component={TextListItemVariants.dt}>{__('Username')}</TextListItem>
               <TextListItem component={TextListItemVariants.dd}>
-                {username}
+                {url}
               </TextListItem>
-              <TextListItem component={TextListItemVariants.dt}>{__('Password')}</TextListItem>
+              <TextListItem component={TextListItemVariants.dt}>{__('Subpaths')}</TextListItem>
               <TextListItem component={TextListItemVariants.dd}>
-                {password}
+                {subpaths}
               </TextListItem>
-            </>
-          )}
-          {authentication === 'content_credentials' && (
-            <>
-              <TextListItem component={TextListItemVariants.dt}>{__('Authentication type')}</TextListItem>
+              <TextListItem component={TextListItemVariants.dt}>{__('Verify SSL')}</TextListItem>
               <TextListItem component={TextListItemVariants.dd}>
-                {__('Content credential')}
+                {verifySSL ? __('Yes') : __('No')}
               </TextListItem>
-              <TextListItem component={TextListItemVariants.dt}>{__('SSL Cert')}</TextListItem>
+              <TextListItem component={TextListItemVariants.dt}>{__('CA Cert')}</TextListItem>
               <TextListItem component={TextListItemVariants.dd}>
-                {sslCertName}
+                {caCertName}
               </TextListItem>
-              <TextListItem component={TextListItemVariants.dt}>{__('Client key')}</TextListItem>
+              {authentication === 'manual' && (
+                <>
+                  <TextListItem
+                    component={TextListItemVariants.dt}
+                  >{__('Authentication type')}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {__('Manual')}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dt}>{__('Username')}</TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {username}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dt}>{__('Password')}</TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {password}
+                  </TextListItem>
+                </>
+              )}
+              {authentication === 'content_credentials' && (
+                <>
+                  <TextListItem
+                    component={TextListItemVariants.dt}
+                  >{__('Authentication type')}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {__('Content credential')}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dt}>{__('SSL Cert')}</TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {sslCertName}
+                  </TextListItem>
+                  <TextListItem component={TextListItemVariants.dt}>{__('Client key')}</TextListItem>
+                  <TextListItem component={TextListItemVariants.dd}>
+                    {sslKeyName}
+                  </TextListItem>
+                </>
+              )}
+            </>
+            }
+          {acsType === 'simplified' &&
+            <>
+              <TextListItem component={TextListItemVariants.dt}>{__('Products')}</TextListItem>
               <TextListItem component={TextListItemVariants.dd}>
-                {sslKeyName}
+                {productNames.join(', ')}
               </TextListItem>
             </>
-          )}
+            }
         </TextList>
       </TextContent>
     </>

data/webpack/scenes/AlternateContentSources/Create/Steps/ACSSmartProxies.js

@@ -12,7 +12,8 @@ const ACSSmartProxies = () => {
   } = useContext(ACSCreateContext);
   const availableSmartProxies = useSelector(selectSmartProxy);
   const { results } = availableSmartProxies;
-  const [availableOptions, setAvailableOptions] = useState(results?.map(proxy => proxy.name));
+  const [availableOptions, setAvailableOptions] = useState(results?.map(proxy =>
+    proxy.name)?.filter(sp => !smartProxies.includes(sp)));
   const onListChange = (newAvailableOptions, newChosenOptions) => {
     setAvailableOptions(newAvailableOptions);
     setSmartProxies(newChosenOptions);
@@ -21,8 +22,8 @@ const ACSSmartProxies = () => {
   return (
     <>
       <WizardHeader
-        title={__('Name source')}
-        description={__('Enter a name for your source.')}
+        title={__('Select smart proxy')}
+        description={__('Select smart proxies to be used with this source.')}
       />
       <DualListSelector
         isSearchable

data/webpack/scenes/AlternateContentSources/Create/Steps/AcsUrlPaths.js

@@ -44,7 +44,6 @@ const AcsUrlPaths = () => {
           label={__('Subpaths')}
           type="string"
           fieldId="acs_subpaths"
-          isRequired
         >
           <TextArea
             placeholder="test/repo1/, test/repo2/,"

data/webpack/scenes/AlternateContentSources/Create/Steps/SelectSource.js

@@ -1,14 +1,6 @@
 import React, { useContext } from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import {
-  Tile,
-  Flex,
-  FlexItem,
-  Form,
-  FormGroup,
-  FormSelect,
-  FormSelectOption,
-} from '@patternfly/react-core';
+import { Flex, FlexItem, Form, FormGroup, FormSelect, FormSelectOption, Tile } from '@patternfly/react-core';
 import ACSCreateContext from '../ACSCreateContext';
 import WizardHeader from '../../../ContentViews/components/WizardHeader';
 
@@ -47,7 +39,24 @@ const SelectSource = () => {
         >
           <Flex>
             <FlexItem>
-              <Tile title={__('Custom')} isStacked id="custom" onClick={onSelect} onKeyDown={onKeyDown} isSelected={acsType === 'custom'} />{' '}
+              <Tile
+                title={__('Custom')}
+                isStacked
+                id="custom"
+                onClick={onSelect}
+                onKeyDown={onKeyDown}
+                isSelected={acsType === 'custom'}
+              />{' '}
+            </FlexItem>
+            <FlexItem>
+              <Tile
+                title={__('Simplified')}
+                isStacked
+                id="simplified"
+                onClick={onSelect}
+                onKeyDown={onKeyDown}
+                isSelected={acsType === 'simplified'}
+              />{' '}
             </FlexItem>
           </Flex>
         </FormGroup>
@@ -57,16 +66,23 @@ const SelectSource = () => {
           fieldId="content_type"
           isRequired
         >
-          <FormSelect isRequired value={contentType} onChange={(value) => { setContentType(value); }} aria-label="FormSelect Input">
+          <FormSelect
+            isRequired
+            value={contentType}
+            onChange={(value) => {
+              setContentType(value);
+            }}
+            aria-label="FormSelect Input"
+          >
             {
-          typeOptions.map(option => (
-            <FormSelectOption
-              key={option.value}
-              value={option.value}
-              label={option.label}
-            />
-          ))
-        }
+                            typeOptions.map(option => (
+                              <FormSelectOption
+                                key={option.value}
+                                value={option.value}
+                                label={option.label}
+                              />
+                            ))
+                        }
           </FormSelect>
         </FormGroup>
       </Form>