katello 4.3.0.rc3 → 4.3.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa69b2700d8537140c39e127e5e94f121aeead00124eeddd6c2e7fa94e9fed32
-  data.tar.gz: 67ff63f7def7af9ed99bf7e73d14aa6e82cb41bd65ca73d4ec0fdd8867b2285d
+  metadata.gz: 83de032a01e5d20e480d164eb425db853b1eea9a4668eb1aa853bfaa5d6a703a
+  data.tar.gz: aad3b14f2608df9c71cb039222ced8baf98bc89537c28967fcc1d47ac3ce3c5c
 SHA512:
-  metadata.gz: 7b8d403df79ab4e58b40d3bb675c9908f5bae448d03e410c0fb256eaa974a043c80f8bcc371ceb9e2827311cd138f8bf209f255c3a3c295f6294af6b0799b69f
-  data.tar.gz: 469abe1ecd5ae6ce1117c9978fa3d9a1bf3dd2ad8e775de21bc6c61ba4d394e338ccec4b12e1d6226293189dfc2965f68c4377a6a5911130f1d723da14524516
+  metadata.gz: cb93e596697f4639b7b4ba3d512524f9880f63442bdba0b4963f73fe6aa18b61d4565f71f488a7cd99f54c0908cbe74cc59468b987450c5d02c9f8020a521761
+  data.tar.gz: 9ffa356f5005ab1e2119c119c24837530c23d4d004c1a9c99a3b120fc648f443bf126faae8adff3a5763714ba70d9aa412976f50b6d886e6dc3bd0fb4257dcce

data/app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb

@@ -28,7 +28,7 @@ module Katello
       end
 
       def context_urls
-        super.merge(rhsm_url: rhsm_url, pulp_content_url: pulp_content_url)
+        super.merge(rhsm_url: smart_proxy.rhsm_url, pulp_content_url: smart_proxy.pulp_content_url)
       end
 
       private
@@ -43,14 +43,6 @@ module Katello
           proxy
         end
       end
-
-      def rhsm_url
-        URI(smart_proxy.rhsm_url)
-      end
-
-      def pulp_content_url
-        smart_proxy.setting(SmartProxy::PULP3_FEATURE, 'content_app_url')
-      end
     end
   end
 end

data/app/lib/actions/katello/capsule_content/refresh_repos.rb

@@ -40,7 +40,7 @@ module Actions
             pulp_repo = repo.backend_service(smart_proxy)
             if !current_repos_on_capsule_ids.include?(repo.id)
               pulp_repo.create_mirror_entities
-            elsif pulp_repo.mirror_needs_updates?
+            else
               tasks += pulp_repo.refresh_mirror_entities
             end
           end

data/app/lib/actions/pulp3/capsule_content/generate_metadata.rb

@@ -17,13 +17,14 @@ module Actions
 
         def invoke_external_task
           repository = ::Katello::Repository.find(input[:repository_id])
+          backend = repository.backend_service(smart_proxy).with_mirror_adapter
           #yum repositories use metadata mirroring always, so we should never
-          # regenerate metadata on proxies
-          if repository.yum?
+          # regenerate metadata on proxies.  but if there is no publication,
+          # it means the repo was likely empty and syncing didn't generate one
+          if repository.yum? && backend.publication_href.present?
             []
           else
-            smart_proxy = ::SmartProxy.unscoped.find(input[:smart_proxy_id])
-            repository.backend_service(smart_proxy).with_mirror_adapter.create_publication
+            backend.create_publication
           end
         end
       end

data/app/lib/katello/resources/registry.rb

@@ -32,7 +32,7 @@ module Katello
             self.prefix = "/pulpcore_registry/"
             self.site = "#{uri.scheme}://#{uri.host}:#{uri.port}"
             self.ca_cert_file = Setting[:ssl_ca_file]
-            pulp_primary.pulp3_ssl_configuration(self)
+            pulp_primary.pulp3_ssl_configuration(self, :net_http)
 
             self
           end

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -185,17 +185,17 @@ module Katello
         end
       end
 
-      def pulp3_ssl_configuration(config)
+      def pulp3_ssl_configuration(config, connection_adapter = Faraday.default_adapter)
         legacy_pulp_cert = !self.setting(PULP3_FEATURE, 'client_authentication')&.include?('client_certificate')
 
-        if Faraday.default_adapter == :excon
+        if connection_adapter == :excon
           config.ssl_client_cert = ::Cert::Certs.ssl_client_cert_filename(use_admin_as_cn_cert: legacy_pulp_cert)
           config.ssl_client_key = ::Cert::Certs.ssl_client_key_filename(use_admin_as_cn_cert: legacy_pulp_cert)
-        elsif Faraday.default_adapter == :net_http
+        elsif connection_adapter == :net_http
           config.ssl_client_cert = ::Cert::Certs.ssl_client_cert(use_admin_as_cn_cert: legacy_pulp_cert)
           config.ssl_client_key = ::Cert::Certs.ssl_client_key(use_admin_as_cn_cert: legacy_pulp_cert)
         else
-          fail "Unexpected faraday default_adapter #{Faraday.default_adapter}!  Cannot continue, this is likely a bug."
+          fail "Unexpected connection_adapter #{Faraday.default_adapter}!  Cannot continue, this is likely a bug."
         end
       end
 
@@ -446,14 +446,22 @@ module Katello
       def rhsm_url
         # Since Foreman 3.1 this setting is set
         if (rhsm_url = setting(SmartProxy::PULP3_FEATURE, 'rhsm_url'))
-          rhsm_url
+          URI(rhsm_url)
         # Compatibility fall back
         elsif pulp_primary?
-          "https://#{URI.parse(url).host}/rhsm"
+          URI("https://#{URI.parse(url).host}/rhsm")
         elsif pulp_mirror?
-          "https://#{URI.parse(url).host}:8443/rhsm"
+          URI("https://#{URI.parse(url).host}:8443/rhsm")
         end
       end
+
+      def pulp_content_url
+        URI(setting(SmartProxy::PULP3_FEATURE, 'content_app_url'))
+      end
+
+      class ::SmartProxy::Jail < ::Safemode::Jail
+        allow :rhsm_url, :pulp_content_url
+      end
     end
   end
 end

data/app/services/katello/pulp3/repository.rb

@@ -183,10 +183,6 @@ module Katello
         RepositoryMirror.new(self).refresh_entities
       end
 
-      def mirror_needs_updates?
-        RepositoryMirror.new(self).needs_updates?
-      end
-
       def refresh_if_needed
         tasks = []
         tasks << update_remote #always update remote

data/app/services/katello/pulp3/repository_mirror.rb

@@ -79,7 +79,7 @@ module Katello
       end
 
       def publication_href
-        api.publications_api.list(:repository_version => version_href).results.first.pulp_href
+        api.publications_api.list(:repository_version => version_href).results.first&.pulp_href
       end
 
       def create_version(options = {})

data/app/views/foreman/job_templates/change_content_source.erb

@@ -0,0 +1,42 @@
+<%#
+kind: job_template
+name: Change content source
+job_category: Katello
+model: JobTemplate
+provider_type: SSH
+description_format: Configure subscription manager to new content source
+feature: katello_change_content_source
+%>
+#!/bin/sh
+<%
+    content_source = @host.content_source
+-%>
+
+<% if content_source -%>
+SSL_CA_CERT=$(mktemp)
+cat << EOF > $SSL_CA_CERT
+<%= foreman_server_ca_cert %>
+EOF
+
+KATELLO_SERVER_CA_CERT=/etc/rhsm/ca/katello-server-ca.pem
+RHSM_CFG=/etc/rhsm/rhsm.conf
+
+# Prepare SSL certificate
+mkdir -p /etc/rhsm/ca
+cp -f $SSL_CA_CERT $KATELLO_SERVER_CA_CERT
+chmod 644 $KATELLO_SERVER_CA_CERT
+
+# Configure subscription-manager
+test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak
+
+subscription-manager config \
+  --server.hostname="<%= content_source.rhsm_url.host %>" \
+  --server.port="<%= content_source.rhsm_url.port %>" \
+  --server.prefix="<%= content_source.rhsm_url.path %>" \
+  --rhsm.repo_ca_cert="$KATELLO_SERVER_CA_CERT" \
+  --rhsm.baseurl="<%= content_source.pulp_content_url %>"
+
+<% else -%>
+echo "Host [<%= @host.name %>] doesn't have assigned content source!"
+exit 1
+<% end -%>

data/db/migrate/20210331180353_katello_pool_organization_id_not_nullable.rb

@@ -1,6 +1,8 @@
 class KatelloPoolOrganizationIdNotNullable < ActiveRecord::Migration[6.0]
   def up
     ::Katello::Pool.where(organization_id: nil).destroy_all
+    ::Katello::Pool.where(subscription_id: nil).destroy_all
+
     change_column :katello_pools, :organization_id, :integer, null: false
     change_column :katello_pools, :subscription_id, :integer, null: false
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.3.0.rc3".freeze
+  VERSION = "4.3.0.rc4".freeze
 end

data/webpack/scenes/ContentViews/Copy/CopyContentViewForm.js

@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
-import { Redirect } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { Form, FormGroup, TextInput, ActionGroup, Button } from '@patternfly/react-core';
 import {
@@ -15,21 +15,22 @@ import { copyContentView } from '../ContentViewsActions';
 const CopyContentViewForm = ({ cvId, setModalOpen }) => {
   const dispatch = useDispatch();
   const [name, setName] = useState('');
-  const [redirect, setRedirect] = useState(false);
   const [saving, setSaving] = useState(false);
   const response = useSelector(selectCopyContentViews);
   const status = useSelector(selectCopyContentViewStatus);
   const error = useSelector(selectCopyContentViewError);
+  const { push } = useHistory();
 
   useDeepCompareEffect(() => {
     const { id } = response;
-    if (id && status === STATUS.RESOLVED) {
+    if (saving && id && status === STATUS.RESOLVED) {
       setSaving(false);
-      setRedirect(true);
+      setModalOpen(false);
+      push(`/content_views/${id}`);
     } else if (status === STATUS.ERROR) {
       setSaving(false);
     }
-  }, [response, status, error]);
+  }, [response, status, error, saving, setSaving, setModalOpen, push]);
 
   const onSubmit = () => {
     setSaving(true);
@@ -39,11 +40,6 @@ const CopyContentViewForm = ({ cvId, setModalOpen }) => {
     }));
   };
 
-  if (redirect) {
-    const { id } = response;
-    return (<Redirect to={`/content_views/${id}`} />);
-  }
-
   return (
     <Form onSubmit={(e) => {
       e.preventDefault();
@@ -77,7 +73,7 @@ const CopyContentViewForm = ({ cvId, setModalOpen }) => {
 };
 
 CopyContentViewForm.propTypes = {
-  cvId: PropTypes.string,
+  cvId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   setModalOpen: PropTypes.func,
 };
 

data/webpack/scenes/ContentViews/Copy/CopyContentViewModal.js

@@ -30,7 +30,7 @@ const CopyContentViewModal = ({
 };
 
 CopyContentViewModal.propTypes = {
-  cvId: PropTypes.string,
+  cvId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   cvName: PropTypes.string,
   show: PropTypes.bool,
   setIsOpen: PropTypes.func,

data/webpack/scenes/ContentViews/Copy/__tests__/copyContentView.test.js

@@ -32,7 +32,7 @@ test('Can copy content view from form', async (done) => {
   getByLabelText('copy_content_view').click();
   // Form closes it self on success
   await patientlyWaitFor(() => {
-    expect(queryByText('Name')).not.toBeInTheDocument();
+    expect(setModalOpen).toBeCalled();
   });
 
   assertNockRequest(copyscope, done);

data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionFinish.js

@@ -1,9 +1,10 @@
 import React, { useContext, useState } from 'react';
 import { useSelector, useDispatch } 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 { getContentViewVersions, removeContentViewVersion } from '../../Details/ContentViewDetailActions';
+import { removeContentViewVersion } from '../../Details/ContentViewDetailActions';
 import { selectRemoveCVVersionResponse, selectRemoveCVVersionStatus } from '../../Details/ContentViewDetailSelectors';
 import getContentViews from '../../ContentViewsActions';
 import CVDeleteContext from '../CVDeleteContext';
@@ -23,14 +24,19 @@ const CVDeletionFinish = () => {
   const removeResolved = removeCVStatus === STATUS.RESOLVED;
   const dispatch = useDispatch();
   const [removeDispatched, setRemoveDispatched] = useState(false);
+  const { push } = useHistory();
 
   useDeepCompareEffect(() => {
     if (removeResolved && removeDispatched) {
+      dispatch(getContentViews());
+      push('/content_views');
       setIsOpen(false);
-      dispatch(getContentViewVersions(cvId));
-      dispatch(getContentViews);
     }
-  }, [removeCVResponse, removeResolved, setIsOpen, dispatch, cvId, removeDispatched]);
+    if (removeCVStatus === STATUS.ERROR) {
+      setIsOpen(false);
+    }
+  }, [removeCVResponse, removeCVStatus, removeResolved,
+    setIsOpen, dispatch, cvId, removeDispatched, push]);
 
   useDeepCompareEffect(() => {
     if (!removeDispatched) {

data/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js

@@ -119,7 +119,6 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
 
   const cvVersionsScope = nockInstance
     .get(cvVersionsPath)
-    .times(2)
     .query(true)
     .reply(200, cvVersionsData);
 
@@ -128,6 +127,10 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
     .query(true)
     .reply(200, cvDetailsData);
 
+  const cvRedirectScope = nockInstance
+    .get(api.getApiUrl('/content_views?organization_id=1&nondefault=true&include_permissions=true'))
+    .reply(200, cvIndexData);
+
   const cvDeleteParams = {
     destroy_content_view: true,
     system_content_view_id: 2,
@@ -239,5 +242,5 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
   assertNockRequest(activationKeysScope);
   assertNockRequest(cVDropDownOptionsScope);
   assertNockRequest(cvDeleteScope);
-  assertNockRequest(cvVersionsScope, done);
+  assertNockRequest(cvRedirectScope, done);
 });

data/webpack/scenes/ContentViews/Details/ContentViewDetails.js

@@ -1,7 +1,18 @@
 import React, { useState } from 'react';
 import { useSelector, shallowEqual } from 'react-redux';
 import { useParams } from 'react-router-dom';
-import { Grid, GridItem, TextContent, Text, TextVariants, Button, Flex, FlexItem } from '@patternfly/react-core';
+import { Grid,
+  GridItem,
+  TextContent,
+  Text,
+  TextVariants,
+  Button,
+  Flex,
+  FlexItem,
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+  DropdownPosition } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 
@@ -18,6 +29,8 @@ import ContentViewIcon from '../components/ContentViewIcon';
 import CVBreadCrumb from '../components/CVBreadCrumb';
 import PublishContentViewWizard from '../Publish/PublishContentViewWizard';
 import { hasPermission } from '../helpers';
+import CopyContentViewModal from '../Copy/CopyContentViewModal';
+import ContentViewDeleteWizard from '../Delete/ContentViewDeleteWizard';
 
 export default () => {
   const { id } = useParams();
@@ -25,8 +38,31 @@ export default () => {
   const details = useSelector(state => selectCVDetails(state, cvId), shallowEqual);
   const [isPublishModalOpen, setIsPublishModalOpen] = useState(false);
   const [currentStep, setCurrentStep] = useState(1);
+  const [dropDownOpen, setDropdownOpen] = useState(false);
+  const [copying, setCopying] = useState(false);
+  const [deleting, setDeleting] = useState(false);
+  const dropDownItems = [
+    <DropdownItem
+      key="copy"
+      onClick={() => {
+        setCopying(true);
+      }}
+    >
+      {__('Copy')}
+    </DropdownItem>,
+    <DropdownItem
+      key="delete"
+      onClick={() => {
+        setDeleting(true);
+      }}
+    >
+      {__('Delete')}
+    </DropdownItem>,
+  ];
 
-  const { name, composite, permissions } = details;
+  const {
+    name, composite, permissions, environments, versions,
+  } = details;
   const tabs = [
     {
       key: 'details',
@@ -60,27 +96,28 @@ export default () => {
   ];
 
   return (
-    <Grid className="grid-with-margin">
-      <DetailsContainer cvId={cvId}>
-        <>
-          <CVBreadCrumb />
-          <GridItem xl={8} lg={7} sm={12} style={{ margin: '10px 0' }}>
-            <Flex alignItems={{
+    <>
+      <Grid className="grid-with-margin">
+        <DetailsContainer cvId={cvId}>
+          <>
+            <CVBreadCrumb />
+            <GridItem xl={8} lg={7} sm={12} style={{ margin: '10px 0' }}>
+              <Flex alignItems={{
               default: 'alignItemsCenter',
             }}
-            >
-              <FlexItem>
-                <TextContent>
-                  <Text component={TextVariants.h1}>
-                    <ContentViewIcon count={name} composite={composite} />
-                  </Text>
-                </TextContent>
-              </FlexItem>
-            </Flex>
-          </GridItem>
-          <GridItem xl={4} lg={5} sm={12} >
-            <Flex justifyContent={{ lg: 'justifyContentFlexEnd', sm: 'justifyContentFlexStart' }}>
-              {hasPermission(permissions, 'publish_content_views') &&
+              >
+                <FlexItem>
+                  <TextContent>
+                    <Text component={TextVariants.h1}>
+                      <ContentViewIcon count={name} composite={composite} />
+                    </Text>
+                  </TextContent>
+                </FlexItem>
+              </Flex>
+            </GridItem>
+            <GridItem xl={4} lg={5} sm={12} >
+              <Flex justifyContent={{ lg: 'justifyContentFlexEnd', sm: 'justifyContentFlexStart' }}>
+                {hasPermission(permissions, 'publish_content_views') &&
                 <FlexItem>
                   <Button onClick={() => { setIsPublishModalOpen(true); }} variant="primary" aria-label="publish_content_view">
                     {__('Publish new version')}
@@ -95,25 +132,53 @@ export default () => {
                   />}
                 </FlexItem>
               }
-              <FlexItem>
-                <Button
-                  component="a"
-                  aria-label="view tasks button"
-                  href={`/foreman_tasks/tasks?search=resource_type%3D+Katello%3A%3AContentView+resource_id%3D${cvId}`}
-                  target="_blank"
-                  variant="secondary"
-                >
-                  {'View tasks '}
-                  <ExternalLinkAltIcon />
-                </Button>
-              </FlexItem>
-            </Flex>
-          </GridItem>
-          <GridItem span={12}>
-            <RoutedTabs tabs={tabs} defaultTabIndex={1} />
-          </GridItem>
-        </ >
-      </DetailsContainer >
-    </Grid >
+                <FlexItem>
+                  <Button
+                    component="a"
+                    aria-label="view tasks button"
+                    href={`/foreman_tasks/tasks?search=resource_type%3D+Katello%3A%3AContentView+resource_id%3D${cvId}`}
+                    target="_blank"
+                    variant="secondary"
+                  >
+                    {'View tasks '}
+                    <ExternalLinkAltIcon />
+                  </Button>
+                </FlexItem>
+                <FlexItem>
+                  <Dropdown
+                    position={DropdownPosition.right}
+                    style={{ marginLeft: 'auto' }}
+                    toggle={<KebabToggle onToggle={setDropdownOpen} id="toggle-dropdown" />}
+                    isOpen={dropDownOpen}
+                    isPlain
+                    dropdownItems={dropDownItems}
+                  />
+                </FlexItem>
+              </Flex>
+            </GridItem>
+            <GridItem span={12}>
+              <RoutedTabs tabs={tabs} defaultTabIndex={1} />
+            </GridItem>
+          </ >
+        </DetailsContainer >
+      </Grid >
+      {copying && <CopyContentViewModal
+        cvId={cvId}
+        cvName={name}
+        show={copying}
+        setIsOpen={setCopying}
+        aria-label="copy_content_view_modal"
+      />}
+      {deleting && <ContentViewDeleteWizard
+        cvId={cvId && Number(cvId)}
+        cvEnvironments={environments}
+        cvVersions={versions}
+        show={deleting}
+        setIsOpen={setDeleting}
+        currentStep={currentStep}
+        setCurrentStep={setCurrentStep}
+        aria-label="delete_content_view_modal"
+      />}
+    </>
   );
 };

data/webpack/scenes/ContentViews/Details/Promote/ContentViewVersionPromote.js

@@ -1,6 +1,7 @@
 import React, { useState, useMemo, useCallback } from 'react';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 import { useDispatch, useSelector } from 'react-redux';
+import { Redirect } from 'react-router-dom';
 import { STATUS } from 'foremanReact/constants';
 import PropTypes from 'prop-types';
 import {
@@ -8,7 +9,6 @@ import {
   Modal, ModalVariant, Alert, TextContent, AlertActionCloseButton,
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
-
 import {
   selectEnvironmentPaths,
   selectEnvironmentPathsStatus,
@@ -23,13 +23,15 @@ import ComponentEnvironments from '../ComponentContentViews/ComponentEnvironment
 import Loading from '../../../../components/Loading';
 
 const ContentViewVersionPromote = ({
-  cvId, versionIdToPromote, versionNameToPromote, versionEnvironments, setIsOpen,
+  cvId, versionIdToPromote, versionNameToPromote,
+  versionEnvironments, setIsOpen, detailsPage,
 }) => {
   const [description, setDescription] = useState('');
   const [userCheckedItems, setUserCheckedItems] = useState([]);
   const [alertDismissed, setAlertDismissed] = useState(false);
   const [loading, setLoading] = useState(false);
   const [forcePromote, setForcePromote] = useState([]);
+  const [redirect, setRedirect] = useState(false);
   const environmentPathResponse = useSelector(selectEnvironmentPaths);
   const environmentPathStatus = useSelector(selectEnvironmentPathsStatus);
   const environmentPathLoading = environmentPathStatus === STATUS.PENDING;
@@ -55,13 +57,18 @@ const ContentViewVersionPromote = ({
 
   useDeepCompareEffect(() => {
     if (promoteResolved && promoteResponse) {
-      setIsOpen(false);
       dispatch(getContentViewVersions(cvId));
+      if (detailsPage) {
+        setRedirect(true);
+      } else {
+        setIsOpen(false);
+      }
     }
     if (promoteError) {
       setLoading(false);
     }
-  }, [promoteResponse, promoteResolved, promoteError, setLoading, setIsOpen, dispatch, cvId]);
+  }, [promoteResponse, promoteResolved, promoteError, detailsPage,
+    setRedirect, setLoading, setIsOpen, dispatch, cvId]);
 
   const envPathFlat = useMemo(() => {
     if (!environmentPathLoading) {
@@ -94,6 +101,10 @@ const ContentViewVersionPromote = ({
 
   const submitDisabled = loading || userCheckedItems.length === 0;
 
+  if (redirect && detailsPage) {
+    return (<Redirect to="/versions" />);
+  }
+
   return (
     <Modal
       title={__(`Promote version ${versionNameToPromote}`)}
@@ -169,11 +180,13 @@ ContentViewVersionPromote.propTypes = {
   versionNameToPromote: PropTypes.string.isRequired,
   versionEnvironments: PropTypes.arrayOf(PropTypes.shape({})),
   setIsOpen: PropTypes.func,
+  detailsPage: PropTypes.bool,
 };
 
 ContentViewVersionPromote.defaultProps = {
   versionEnvironments: [],
   setIsOpen: null,
+  detailsPage: false,
 };
 
 export default ContentViewVersionPromote;

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js

@@ -9,6 +9,7 @@ import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import { selectIntervals } from 'foremanReact/redux/middlewares/IntervalMiddleware/IntervalSelectors.js';
 
+import { useSet } from '../../../../components/Table/TableHooks';
 import TableWrapper from '../../../../components/Table/TableWrapper';
 import InactiveText from '../../components/InactiveText';
 import ContentViewVersionEnvironments from './ContentViewVersionEnvironments';
@@ -23,7 +24,7 @@ import {
 import getEnvironmentPaths from '../../components/EnvironmentPaths/EnvironmentPathActions';
 import ContentViewVersionPromote from '../Promote/ContentViewVersionPromote';
 import TaskPresenter from '../../components/TaskPresenter/TaskPresenter';
-import { startPollingTask } from '../../../Tasks/TaskActions';
+import { startPollingTask, stopPollingTask } from '../../../Tasks/TaskActions';
 import RemoveCVVersionWizard from './Delete/RemoveCVVersionWizard';
 import { hasPermission } from '../../helpers';
 import { pollTaskKey } from '../../../Tasks/helpers';
@@ -48,6 +49,7 @@ const ContentViewVersions = ({ cvId, details }) => {
   const [deleteVersion, setDeleteVersion] = useState(false);
   const [currentStep, setCurrentStep] = useState(1);
   const { permissions } = details;
+  const pendingTaskSet = useSet([]);
   const intervals = useSelector(state => selectIntervals(state));
 
   const columnHeaders = [
@@ -66,6 +68,16 @@ const ContentViewVersions = ({ cvId, details }) => {
     [dispatch],
   );
 
+  useEffect(() => { // eslint-disable-line arrow-body-style
+    return () => {
+      if (pendingTaskSet.size) {
+        pendingTaskSet.forEach(id =>
+          dispatch(stopPollingTask(id)));
+        pendingTaskSet.clear();
+      }
+    };
+  }, [pendingTaskSet, dispatch]);
+
   const buildCells = useCallback((cvVersion) => {
     const {
       version,
@@ -98,8 +110,18 @@ const ContentViewVersions = ({ cvId, details }) => {
     } = cvVersion;
     const { task } = activeHistory[0];
     const { result } = task || {};
+
     if (result !== 'error' && !pollIntervals[pollTaskKey(task.id)]) {
-      dispatch(startPollingTask(task.id, task));
+      pendingTaskSet.add(task.id);
+      dispatch(startPollingTask(
+        task.id, task,
+        ({ data: { pending } = {} }) => {
+          if (!pending) {
+            dispatch(stopPollingTask(task.id));
+            pendingTaskSet.delete(task.id);
+          }
+        },
+      ));
     }
 
     return [
@@ -115,7 +137,7 @@ const ContentViewVersions = ({ cvId, details }) => {
       { title: '' },
       { title: description ? <TableText wrapModifier="truncate">{description}</TableText> : <InactiveText text={__('No description')} /> },
     ];
-  }, [dispatch]);
+  }, [dispatch, pendingTaskSet]);
 
   useDeepCompareEffect(() => {
     const buildRows = () => {

data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveCVVersionWizard.js

@@ -17,7 +17,7 @@ import { useSet } from '../../../../../components/Table/TableHooks';
 const RemoveCVVersionWizard = ({
   cvId, versionIdToRemove, versionNameToRemove,
   versionEnvironments, show, setIsOpen,
-  currentStep, setCurrentStep, deleteWizard,
+  currentStep, setCurrentStep, deleteWizard, detailsPage,
 }) => {
   const [selectedEnvForAK, setSelectedEnvForAK] = useState([]);
   const [selectedEnvForHost, setSelectedEnvForHost] = useState([]);
@@ -133,6 +133,7 @@ const RemoveCVVersionWizard = ({
       selectedEnvForHost,
       setSelectedEnvForHost,
       selectedEnvSet,
+      detailsPage,
     }}
     >
       <Wizard
@@ -165,12 +166,14 @@ RemoveCVVersionWizard.propTypes = {
   currentStep: PropTypes.number.isRequired,
   setCurrentStep: PropTypes.func.isRequired,
   deleteWizard: PropTypes.bool.isRequired,
+  detailsPage: PropTypes.bool,
 };
 
 RemoveCVVersionWizard.defaultProps = {
   versionEnvironments: [],
   show: false,
   setIsOpen: null,
+  detailsPage: false,
 };
 
 export default RemoveCVVersionWizard;

data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionDeleteFinish.js

@@ -1,5 +1,6 @@
 import React, { useState, useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { Redirect } from 'react-router-dom';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -13,7 +14,8 @@ const CVVersionDeleteFinish = () => {
     cvId, versionIdToRemove, versionEnvironments,
     setIsOpen, selectedEnvSet,
     selectedCVForAK, selectedEnvForAK, selectedCVForHosts,
-    selectedEnvForHost, affectedActivationKeys, affectedHosts, deleteFlow, removeDeletionFlow,
+    selectedEnvForHost, affectedActivationKeys, affectedHosts,
+    deleteFlow, removeDeletionFlow, detailsPage,
   } = useContext(DeleteContext);
   const removeCVVersionResponse = useSelector(state =>
     selectRemoveCVVersionResponse(state, versionIdToRemove, versionEnvironments));
@@ -22,14 +24,20 @@ const CVVersionDeleteFinish = () => {
   const removeResolved = removeCVVersionStatus === STATUS.RESOLVED;
   const dispatch = useDispatch();
   const [removeDispatched, setRemoveDispatched] = useState(false);
+  const [redirect, setRedirect] = useState(false);
   const selectedEnv = versionEnvironments.filter(env => selectedEnvSet.has(env.id));
 
   useDeepCompareEffect(() => {
     if (removeResolved && removeCVVersionResponse && removeDispatched) {
-      setIsOpen(false);
       dispatch(getContentViewVersions(cvId));
+      if (detailsPage) {
+        setRedirect(true);
+      } else {
+        setIsOpen(false);
+      }
     }
-  }, [removeCVVersionResponse, removeResolved, setIsOpen, dispatch, cvId, removeDispatched]);
+  }, [removeCVVersionResponse, removeResolved, setIsOpen,
+    dispatch, cvId, removeDispatched, detailsPage, setRedirect]);
 
   /*
     The remove version from environment API takes the following params :
@@ -88,6 +96,9 @@ const CVVersionDeleteFinish = () => {
     selectedEnvForAK, selectedEnvForHost, selectedEnv,
     removeCVVersionResponse, removeCVVersionStatus, removeDispatched]);
 
+  if (redirect) {
+    return (<Redirect to="/versions" />);
+  }
   return <Loading loadingText={__('Please wait while the task starts..')} />;
 };
 

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetails.js

@@ -21,6 +21,7 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
   const { push } = useHistory();
   const dispatch = useDispatch();
   const [versionDetails, setVersionDetails] = useState({});
+  const [mounted, setMounted] = useState(true);
   // Example urls expected:/versions/:id or /versions/:id/repositories.
   const tab = pathname.split('/')[3];
   const response = useSelector(state =>
@@ -31,10 +32,11 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
   const tableConfigs = getCVVersionTableConfigs({ cvId, versionId });
 
   useEffect(() => {
-    if (isEmpty(response) && status === STATUS.PENDING) {
+    if (mounted || (isEmpty(response) && status === STATUS.PENDING)) {
       dispatch(getContentViewVersionDetails(versionId, cvId));
     }
-  }, [dispatch, versionId, cvId, response, status]);
+    return () => { setMounted(false); };
+  }, [dispatch, mounted, setMounted, versionId, cvId, response, status]);
 
   useDeepCompareEffect(() => {
     if (loaded) {

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsHeader.js

@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
+import { useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import {
   GridItem,
@@ -10,52 +11,153 @@ import {
   Label,
   Flex,
   FlexItem,
+  Dropdown,
+  DropdownItem,
+  DropdownToggle,
+  DropdownPosition,
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import EditableTextInput from '../../../../../components/EditableTextInput';
 import { hasPermission } from '../../../helpers';
+import ContentViewVersionPromote from '../../Promote/ContentViewVersionPromote';
+import getEnvironmentPaths from '../../../components/EnvironmentPaths/EnvironmentPathActions';
+import RemoveCVVersionWizard from '../Delete/RemoveCVVersionWizard';
 
 const ContentViewVersionDetailsHeader = ({
   versionDetails: {
-    version, description, environments,
+    version, description, environments, content_view_id: cvId, id,
   },
   onEdit,
   details: { permissions },
-}) => (
-  <>
-    <GridItem span={12}>
-      <TextContent>
-        <Text component={TextVariants.h2}>{__('Version ')}{version}</Text>
-      </TextContent>
-    </GridItem>
-    <GridItem className="content-view-header-content" span={12}>
-      <TextContent>
-        <TextList component={TextListVariants.dl}>
-          <EditableTextInput
-            key={description} // This fixes a render issue with the initial value
-            textArea
-            label={__('Description')}
-            attribute="description"
-            placeholder={__('No description')}
-            onEdit={onEdit}
-            disabled={!hasPermission(permissions, 'edit_content_views')}
-            value={description}
-          />
-        </TextList>
-      </TextContent>
-      <Flex>
-        {environments?.map(({ name, id }) =>
-          <FlexItem key={name}><Label isTruncated color="purple" href={`/lifecycle_environments/${id}`}>{name}</Label></FlexItem>)}
-      </Flex>
-    </GridItem>
-  </>
-);
+}) => {
+  const dispatch = useDispatch();
+  useEffect(
+    () => {
+      dispatch(getEnvironmentPaths());
+    },
+    [dispatch],
+  );
+  const [dropdownOpen, setDropdownOpen] = useState(false);
+  const [promoting, setPromoting] = useState(false);
+  const [removingFromEnv, setRemovingFromEnv] = useState(false);
+  const [currentStep, setCurrentStep] = useState(1);
+  const [deleteVersion, setDeleteVersion] = useState(false);
+  const dropDownItems = [
+    <DropdownItem
+      key="promote"
+      onClick={() => {
+        setPromoting(true);
+      }}
+    >
+      {__('Promote')}
+    </DropdownItem>,
+    <DropdownItem
+      key="remove"
+      onClick={() => {
+        setRemovingFromEnv(true);
+      }}
+    >
+      {__('Remove from environment')}
+    </DropdownItem>,
+    <DropdownItem
+      key="delete"
+      onClick={() => {
+        setCurrentStep(1);
+        setDeleteVersion(true);
+        setRemovingFromEnv(true);
+      }}
+    >
+      {__('Delete')}
+    </DropdownItem>,
+  ];
+
+  return (
+    <>
+      <GridItem span={10}>
+        <TextContent>
+          <Text component={TextVariants.h2}>{__('Version ')}{version}</Text>
+        </TextContent>
+      </GridItem>
+      <GridItem span={2} style={{ display: 'flex' }}>
+        <Dropdown
+          aria-label="version-action-dropdown"
+          position={DropdownPosition.right}
+          style={{ marginLeft: 'auto' }}
+          toggle={
+            <DropdownToggle
+              onToggle={setDropdownOpen}
+              id="toggle-id"
+            >
+              {__('Actions')}
+            </DropdownToggle>
+        }
+          isOpen={dropdownOpen}
+          dropdownItems={dropDownItems}
+        />
+      </GridItem>
+      <GridItem className="content-view-header-content" span={12}>
+        <TextContent>
+          <TextList component={TextListVariants.dl}>
+            <EditableTextInput
+              key={description} // This fixes a render issue with the initial value
+              textArea
+              label={__('Description')}
+              attribute="description"
+              placeholder={__('No description')}
+              onEdit={onEdit}
+              disabled={!hasPermission(permissions, 'edit_content_views')}
+              value={description}
+            />
+          </TextList>
+        </TextContent>
+        <Flex>
+          {environments?.map(({ name, id: envId }) =>
+            <FlexItem key={name}><Label isTruncated color="purple" href={`/lifecycle_environments/${envId}`}>{name}</Label></FlexItem>)}
+        </Flex>
+      </GridItem>
+      {promoting &&
+      <ContentViewVersionPromote
+        cvId={cvId}
+        versionIdToPromote={id}
+        versionNameToPromote={version}
+        versionEnvironments={environments}
+        setIsOpen={setPromoting}
+        detailsPage
+        aria-label="promote_content_view_modal"
+      />
+      }
+      {removingFromEnv &&
+      <RemoveCVVersionWizard
+        cvId={cvId}
+        versionIdToRemove={id}
+        versionNameToRemove={version}
+        versionEnvironments={environments}
+        show={removingFromEnv}
+        setIsOpen={setRemovingFromEnv}
+        currentStep={currentStep}
+        setCurrentStep={setCurrentStep}
+        deleteWizard={deleteVersion}
+        detailsPage
+        aria-label="remove_content_view_version_modal"
+      />
+      }
+    </>
+  );
+};
 
 ContentViewVersionDetailsHeader.propTypes = {
   versionDetails: PropTypes.shape({
     version: PropTypes.string,
     environments: PropTypes.arrayOf(PropTypes.shape({})),
     description: PropTypes.string,
+    content_view_id: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ]),
+    id: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ]),
   }).isRequired,
   onEdit: PropTypes.func.isRequired,
   details: PropTypes.shape({

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 import { head, last } from 'lodash';
-import { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
+import nock, { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
 import api from '../../../../../../services/api';
 import { cvVersionDetailsKey } from '../../../../ContentViewsConstants';
 import ContentViewVersionDetails from '../ContentViewVersionDetails';
@@ -20,12 +20,15 @@ import ContentViewVersionModuleStreamsData from './ContentViewVersionModuleStrea
 import ContentViewVersionDebPackagesData from './ContentViewVersionDebPackages.fixtures.json';
 import ContentViewVersionAnsibleCollectionsData from './ContentViewVersionAnsibleCollections.fixtures.json';
 import ContentViewVersionDockerTagsData from './ContentViewVersionDockerTags.fixtures.json';
+import environmentPathsData from '../../Delete/__tests__/versionRemoveEnvPaths.fixtures';
 
 // This changes the api count value so that only the specified tab will show.
 const getTabSpecificData = key => ({
   ...ContentViewVersionDetailsData,
   [key]: ContentViewVersionDetailsCounts[key],
 });
+let envScope;
+const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths');
 
 const withCVRoute = component => <Route path="/versions/:versionId([0-9]+)">{component}</Route>;
 
@@ -39,11 +42,23 @@ const renderOptions = {
   },
 };
 
+beforeEach(() => {
+  envScope = nockInstance
+    .get(environmentPathsPath)
+    .query(true)
+    .reply(200, environmentPathsData);
+});
+
+afterEach(() => {
+  assertNockRequest(envScope);
+  nock.cleanAll();
+});
 // This is written separately, as the autocomplete/search scopes are not needed.
 test('Can show versions details - Components Tab', async (done) => {
   const { version } = ContentViewVersionDetailsData;
   const scope = nockInstance
     .get(cvVersions)
+    .times(2)
     .query(true)
     .reply(200, getTabSpecificData('component_view_count'));
 
@@ -72,6 +87,7 @@ test('Can show versions details - Components Tab', async (done) => {
       .content_view.name)).toBeTruthy();
   });
 
+  assertNockRequest(scope);
   assertNockRequest(scope);
   assertNockRequest(componentScope, done);
 });
@@ -188,6 +204,7 @@ testConfig.forEach(({
 
     const scope = nockInstance
       .get(cvVersions)
+      .times(2)
       .query(true)
       .reply(200, getTabSpecificData(countKey));
 
@@ -219,6 +236,7 @@ testConfig.forEach(({
     assertNockRequest(autocompleteScope);
     assertNockRequest(searchDelayScope);
     assertNockRequest(autoSearchScope);
+    assertNockRequest(scope);
     assertNockRequest(tabScope);
     assertNockRequest(scope, done);
   }));
@@ -239,6 +257,7 @@ test('Can change repository selector', async (done) => {
   const scope = nockInstance
     .get(cvVersions)
     .query(true)
+    .times(2)
     .reply(200, {
       ...getTabSpecificData(countKey),
       repositories: ContentViewVersionDetailsCounts.repositories,
@@ -284,6 +303,7 @@ test('Can change repository selector', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(searchDelayScope);
   assertNockRequest(autoSearchScope);
+  assertNockRequest(scope);
   assertNockRequest(tabScope);
   assertNockRequest(scope, done);
 });

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js

@@ -2,16 +2,20 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 
-import { nockInstance, assertNockRequest } from '../../../../../../test-utils/nockWrapper';
+import nock, { nockInstance, assertNockRequest } from '../../../../../../test-utils/nockWrapper';
 import api from '../../../../../../services/api';
 import { cvVersionDetailsKey } from '../../../../ContentViewsConstants';
 import ContentViewVersionDetails from '../ContentViewVersionDetails';
 import ContentViewVersionDetailsEmptyData from './ContentViewVersionDetails.fixtures.json';
 import cvDetailData from '../../../../__tests__/mockDetails.fixtures.json';
+import environmentPathsData from '../../Delete/__tests__/versionRemoveEnvPaths.fixtures';
 
 const withCVRoute = component =>
   <Route path="/versions/:versionId([0-9]+)">{component}</Route>;
 const cvVersions = api.getApiUrl('/content_view_versions/73');
+let envScope;
+let versionScope;
+const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths');
 
 const renderOptions = {
   apiNamespace: cvVersionDetailsKey(3, 73),
@@ -21,6 +25,23 @@ const renderOptions = {
   },
 };
 
+beforeEach(() => {
+  envScope = nockInstance
+    .get(environmentPathsPath)
+    .query(true)
+    .reply(200, environmentPathsData);
+  versionScope = nockInstance
+    .get(cvVersions)
+    .query(true)
+    .reply(200, ContentViewVersionDetailsEmptyData);
+});
+
+afterEach(() => {
+  assertNockRequest(envScope);
+  assertNockRequest(versionScope);
+  nock.cleanAll();
+});
+
 test('Can show versions detail header', async (done) => {
   const { version } = ContentViewVersionDetailsEmptyData;
   const scope = nockInstance

data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsActions.test.js.snap

@@ -84,6 +84,7 @@ Array [
   Object {
     "interval": 5000,
     "payload": Object {
+      "handleSuccess": undefined,
       "key": "SUBSCRIPTIONS_POLL_TASK",
       "url": "/foreman_tasks/api/tasks/eb1b6271-8a69-4d98-84fc-bea06ddcc166",
     },

data/webpack/scenes/Tasks/TaskActions.js

@@ -31,12 +31,13 @@ export const startPollingTasks = (key, taskSearchParams = {}) =>
 
 export const stopPollingTasks = key => stopInterval(bulkSearchKey(key));
 
-const getTask = (key, task) => get({
+const getTask = (key, task, handleSuccess) => get({
   key,
   url: `${foremanTasksApi.baseApiPath}/tasks/${task.id}`,
+  handleSuccess,
 });
 
-export const startPollingTask = (key, task) =>
-  withInterval(getTask(pollTaskKey(key), task));
+export const startPollingTask = (key, task, handleSuccess) =>
+  withInterval(getTask(pollTaskKey(key), task, handleSuccess));
 
 export const stopPollingTask = key => stopInterval(pollTaskKey(key));

data/webpack/scenes/Tasks/__tests__/__snapshots__/TaskActions.test.js.snap

@@ -4,6 +4,7 @@ exports[`task actions can poll a task 1`] = `
 Object {
   "interval": 5000,
   "payload": Object {
+    "handleSuccess": undefined,
     "key": "TEST_POLL_TASK",
     "url": "/foreman_tasks/api/tasks/12345",
   },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.3.0.rc3
+  version: 4.3.0.rc4
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1572,6 +1572,7 @@ files:
 - app/views/dashboard/_subscription_status_widget.html.erb
 - app/views/dashboard/_subscription_widget.html.erb
 - app/views/dashboard/_sync_widget.html.erb
+- app/views/foreman/job_templates/change_content_source.erb
 - app/views/foreman/job_templates/install_errata.erb
 - app/views/foreman/job_templates/install_errata_-_katello_ansible_default.erb
 - app/views/foreman/job_templates/install_group.erb