katello 4.12.0 → 4.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd21e38a92cceb34e2ae67a8e9dd1f128eed67323230e83eeb671a63bad4f11f
-  data.tar.gz: 7cddfcb3d2aaae7a8d170b760986c4268b7bde531bff0f88d6b21896cda8e340
+  metadata.gz: c78bf13db890a8782d152850ca4e2b26425a3d181a1e02e9f4ecf779785e3585
+  data.tar.gz: 983b9a631aee789c6468d9dc3cdae527e1c5d42dd8b02281be7cfd41e751d5f1
 SHA512:
-  metadata.gz: 1762ccadc8e731d4662b243fd46effe9df5d67ce39a6cb5fa36f1593fb60d7e24237b497740feba93cf7e73f62497e8c8b1e637d584f85a864a0c367697f0303
-  data.tar.gz: b16c43097ea41164f44f68225deaa0a4e6cf256e06976f40519237e286575f87728b8af45e5861af6df241826fd31350eb20bbf90461566add5c4a4411e8c2cb
+  metadata.gz: 7ebb29c3055d54b87bdc077765fba457f7e790f6789267c69dd36709d308b74fe6979b32ace066aa9840d20ec94e06b203cade51fe59b68abc321c3c0f1a8d00
+  data.tar.gz: 85471a1295e226c3a03a4daab47c6f4ec7ff5707068ca67878c8fe67993c138c2a77f0ab8a751fa47fb057f9150b64764ce7847e3988d11d305101e6005584bc

data/README.md

@@ -74,7 +74,6 @@ See the [annotation docs](./test/scenarios/annotations/README.md) for more infor
  * Archived mailing lists:
     * [Foreman User Mailing List](https://groups.google.com/forum/?fromgroups#!forum/foreman-users)
     * [Foreman Developer mailing list](https://groups.google.com/forum/?fromgroups#!forum/foreman-dev)
- * [IRC Freenode](https://theforeman.org/support.html#IRClivechat): #theforeman-dev, #theforeman
 
 ## Documentation
 

data/app/assets/javascripts/katello/sync_management/sync_management.js

@@ -333,6 +333,7 @@ KT.content_actions = (function () {
           updater.stop();
         }
       );
+      updater.restart();
     };
 
   return {

data/app/controllers/katello/api/v2/products_bulk_actions_controller.rb

@@ -55,7 +55,7 @@ module Katello
       repairable_products = @products.syncable
       repairable_roots = RootRepository.where(:product_id => repairable_products).has_url.select { |r| r.library_instance }.uniq
 
-      repairable_repositories = Katello::Repository.where(:root_id => repairable_roots)
+      repairable_repositories = Katello::Repository.library.where(:root_id => repairable_roots)
       task = async_task(::Actions::BulkAction,
                         ::Actions::Katello::Repository::VerifyChecksum,
                         repairable_repositories)

data/app/helpers/katello/katello_urls_helper.rb

@@ -37,11 +37,36 @@ module Katello
       "#{prefix}/pub/#{config}"
     end
 
-    apipie :method, 'Generates an absolute path to the file' do
+    apipie :method, 'Generates an absolute path to the file for liveimg kickstart templates' do
       required :content_path, String, desc: "Relative path to the file or it's name"
       optional :schema, String, desc: 'Optional URL schema for the content source', default: 'http'
       optional :content_type, String, desc: 'Content type', default: 'repos'
       returns String, desc: 'Absolute path to a file'
     end
+    def repository_url(content_path, _content_type = nil, schema = 'http')
+      return content_path if content_path =~ %r|^([\w\-\+]+)://|
+      url = if @host.content_source
+              "#{schema}://#{@host.content_source.hostname}"
+            else
+              foreman_settings_url(schema)
+            end
+      content_path = content_path.sub(%r|^/|, '')
+
+      lifecycle_environment = nil
+      if @host.default_environment?
+        # Don't update the content_path if the host is using the default org view / library
+        lifecycle_environment = ::Katello::KTEnvironment.library.find_by(organization_id: @host.organization_id)
+      elsif !@host.single_content_view_environment?
+        fail ::Katello::Errors::MultiEnvironmentNotSupportedError,
+          "Host #{@host.name} must be subscribed to only a single content view & environment or subscribe to the default organization content view for liveimg provisioning."
+      else
+        lifecycle_environment = @host.single_lifecycle_environment
+        content_path = [@host.single_content_view.label, content_path].join('/')
+      end
+
+      path = ::Katello::Repository.repo_path_from_content_path(
+        lifecycle_environment, content_path)
+      "#{url}/pulp/content/#{path}"
+    end
   end
 end

data/app/lib/katello/errors.rb

@@ -10,6 +10,10 @@ module Katello
 
     class RegistrationError < StandardError; end
 
+    class InvalidRepositoryTypeError < StandardError; end
+
+    class MultiEnvironmentNotSupportedError < StandardError; end
+
     # unauthorized access
     class SecurityViolation < StandardError; end
 

data/app/models/katello/candlepin/repository_mapper.rb

@@ -74,7 +74,7 @@ module Katello
       end
 
       def relative_path
-        ::Katello::Glue::Pulp::Repos.repo_path_from_content_path(product.organization.library, path)
+        ::Katello::Repository.repo_path_from_content_path(product.organization.library, path)
       end
 
       def prune_substitutions(subs, url)

data/app/models/katello/glue/pulp/repos.rb

@@ -6,12 +6,6 @@ module Katello
       base.send :include, InstanceMethods
     end
 
-    def self.repo_path_from_content_path(environment, content_path)
-      path = content_path.sub(%r|^/|, '')
-      path_prefix = [environment.organization.label, environment.label].join('/')
-      "#{path_prefix}/#{path}"
-    end
-
     module InstanceMethods
       def distributions(env)
         to_ret = []

data/app/models/katello/host_collection.rb

@@ -29,7 +29,10 @@ module Katello
     scoped_search :relation => :hosts, :on => :name, :rename => :host, :complete_value => true
 
     def max_hosts_check
-      if !unlimited_hosts && (hosts.length > 0 && (hosts.length.to_i > max_hosts.to_i)) && max_hosts_changed?
+      # NOTE: max_hosts_check and max_hosts_no_exceeded use size() instead of count() because
+      # the host list exists as an array rather than a DB query when run as a validation.
+      host_count = hosts.size
+      if !unlimited_hosts && (host_count > 0 && (host_count.to_i > max_hosts.to_i)) && max_hosts_changed?
         errors.add :max_host, N_("may not be less than the number of hosts associated with the host collection.")
       end
     end
@@ -60,8 +63,14 @@ module Katello
       type ? query.of_type(type) : query
     end
 
-    def total_hosts
-      hosts.length
+    def cache_key
+      "#{self.class.name}/#{self.id}"
+    end
+
+    def total_hosts(cached: false)
+      Rails.cache.fetch("#{cache_key}/total_hosts", expires_in: 1.minute, force: !cached) do
+        hosts.count
+      end
     end
 
     # Retrieve the list of accessible host collections in the organization specified, returning

data/app/models/katello/repository.rb

@@ -201,6 +201,12 @@ module Katello
       joins(:root).where("#{Katello::RootRepository.table_name}.product_id" => products)
     end
 
+    def self.repo_path_from_content_path(environment, content_path)
+      path = content_path.sub(%r|^/|, '')
+      path_prefix = [environment.organization.label, environment.label].join('/')
+      "#{path_prefix}/#{path}"
+    end
+
     def to_label
       name
     end

data/app/views/katello/api/v2/hosts/host_collections.json.rabl

@@ -1,3 +1,7 @@
 child :host_collections => :host_collections do
-  attributes :id, :name, :description, :max_hosts, :unlimited_hosts, :total_hosts
+  attributes :id, :name, :description, :max_hosts, :unlimited_hosts
+
+  node :total_hosts do |host_collection|
+    host_collection.total_hosts(cached: true)
+  end
 end

data/app/views/katello/hosts/_errata_counts.html.erb

@@ -43,7 +43,7 @@
 <% end %>
 <% if host.operatingsystem_name&.match(/Debian|Ubuntu/) %>
 <% if Setting["host_details_ui"] %>
-<a href="/new/hosts/<%= host.name %>#/Content/packages?status=Upgradable">
+<a href="/new/hosts/<%= host.name %>#/Content/debs?status=Upgradable">
 <% else %>
 <a href="/content_hosts/<%= host.id %>/debs/applicable">
 <% end %>

data/app/views/overrides/activation_keys/_host_tab_pane.html.erb

@@ -1,31 +1,3 @@
-
-<%= javascript "katello/hosts/activation_key_edit" %>
-
-
 <div class="tab-pane" id="activation_keys">
-  <div id="ak-load-error" class="alert alert-danger" style="display: none;">
-    <%= _("There was a problem retrieving Activation Key data from the server.") %>
-  </div>
-
-  <%= field(f, _("Activation Keys"),
-            :help_inline => _("The value will be available in templates as @host.params['#{kt_ak_label}']")) do
-    react_component('TypeAheadSelect', { id: 'kt_activation_keys', multiple: true, allowNew: true })
-  end %>
-
-  <div class="alert alert-info">
-    <p><b><%= _('Subscriptions information based on selected activation keys:') %></b></p>
-    <ul id="ak-subscriptions-info"></ul>
-
-    <div id="ak-subscriptions-spinner" style="display: none">
-      <%= image_tag "spinner.gif" %>
-    </div>
-
-    <p><%= _('Activation keys and subscriptions can be managed') %>
-      <b><a href="/activation_keys" target="_blank"> <%= _('here.') %></a></b>
-    </p>
-    <p translate>
-    Activation keys may be used during <a href="/hosts/register">system registration.</a>
-  </p>
-    <p><a href="" id="ak_refresh_subscriptions"><%= _('Reload data') %></a></p>
-  </div>
+  <%= react_component('ActivationKeysSearch')%> 
 </div>

data/lib/katello/plugin.rb

@@ -720,7 +720,7 @@ Foreman::Plugin.register :katello do
   ], 'Role granting permission to import content views in an organization'
 
   role 'Content Exporter', [
-    :export_content, :view_products, :view_content_views, :view_organizations
+    :export_content, :view_products, :view_content_views, :create_content_views, :view_organizations
   ], 'Role granting permission to export content views in an organization'
 
   def find_katello_assets(args = {})

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.12.0".freeze
+  VERSION = "4.12.1".freeze
 end

data/webpack/components/ActivationKeysSearch/ActivationKeysSearch.test.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { renderWithRedux } from 'react-testing-lib-wrapper';
+import ActivationKeysSearch from './index';
+
+describe('ActivationKeysSearch', () => {
+  const mockQuerySelector = jest.spyOn(document, 'querySelector');
+  mockQuerySelector.mockImplementation((selector) => {
+    if (selector === '#hostgroup_lifecycle_environment_id') {
+      return {
+        options: [{}],
+        selectedIndex: 0,
+        value: '1',
+      };
+    }
+    if (selector === '#hostgroup_content_view_id') {
+      return {
+        options: [{}],
+        selectedIndex: 0,
+        value: '2 ',
+      };
+    }
+    return null;
+  });
+  it('renders without crashing', () => {
+    const { getByText } = renderWithRedux(<ActivationKeysSearch />, {});
+    expect(getByText('Activation Key information')).toBeInTheDocument();
+  });
+});

data/webpack/components/ActivationKeysSearch/index.js

@@ -0,0 +1,222 @@
+import React, { useState, useEffect, useCallback, useMemo } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  Form,
+  FormGroup,
+  Spinner,
+  EmptyState,
+  Title,
+  Button,
+  Select,
+  SelectOption,
+  SelectVariant,
+  Alert,
+} from '@patternfly/react-core';
+import { FormattedMessage } from 'react-intl';
+import $ from 'jquery';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { get } from 'foremanReact/redux/API';
+import { foremanUrl } from 'foremanReact/common/helpers';
+import { STATUS } from 'foremanReact/constants';
+import { selectAPIStatus } from 'foremanReact/redux/API/APISelectors';
+
+const getSelectedEnvId = () => {
+  const selectElement = document.querySelector('#hostgroup_lifecycle_environment_id');
+  const selectedOption = selectElement.options[selectElement.selectedIndex];
+  let dataId = selectedOption?.getAttribute?.('data-id');
+  if (!dataId) {
+    dataId = selectElement.value;
+  }
+  return dataId;
+};
+const getSelectedContentViewId = () => {
+  const selectElement = document.querySelector('#hostgroup_content_view_id');
+  const selectedOption = selectElement.options[selectElement.selectedIndex];
+  let dataId = selectedOption?.getAttribute?.('data-id');
+  if (!dataId) {
+    dataId = selectElement.value;
+  }
+  return dataId;
+};
+const ActivationKeysSearch = () => {
+  const ACTIVATION_KEYS = 'ACTIVATION_KEYS';
+  const KT_AK_LABEL = 'kt_activation_keys';
+  const [selectedEnvId, setSelectedEnvId] = useState(getSelectedEnvId());
+  const [selectedContentViewId, setSelectedContentViewId] = useState(getSelectedContentViewId());
+  const isLoading =
+    useSelector(state => selectAPIStatus(state, ACTIVATION_KEYS)) === STATUS.PENDING;
+  const [activationKeys, setActivationKeys] = useState([]);
+  const [selectedKeys, setSelectedKeys] = useState([]);
+  const [isOpen, setIsOpen] = useState(false);
+  const dispatch = useDispatch();
+
+  const ktLoadActivationKeys = useCallback(() => {
+    if (selectedEnvId && selectedContentViewId) {
+      dispatch(get({
+        key: ACTIVATION_KEYS,
+        url: foremanUrl(`/katello/api/v2/environments/${selectedEnvId}/activation_keys`),
+        params: { content_view_id: selectedContentViewId },
+        handleSuccess: ({ data }) => {
+          setActivationKeys(data.results);
+        },
+        errorToast: () =>
+          __('There was a problem retrieving Activation Key data from the server.'),
+      }));
+    }
+  }, [dispatch, selectedEnvId, selectedContentViewId, setActivationKeys]);
+  const paramContainer = useMemo(() => {
+    let ret;
+    const inputs = document.querySelectorAll("div#parameters .fields input[type='text']");
+    inputs.forEach((input) => {
+      if (input.value === KT_AK_LABEL) {
+        ret = input.closest('.fields');
+      }
+    });
+    return ret;
+  }, []);
+
+  useEffect(() => {
+    $('#hostgroup_lifecycle_environment_id').on('change', () => setSelectedEnvId(getSelectedEnvId)); // cant use eventlistener on select2
+    $('#hostgroup_content_view_id').on('change', () =>
+      setSelectedContentViewId(getSelectedContentViewId())); // cant use eventlistener on select2
+    if (selectedEnvId && selectedContentViewId) {
+      ktLoadActivationKeys();
+    }
+
+    const ktHideParams = () => {
+      if (paramContainer) {
+        paramContainer.style.display = 'none';
+      }
+    };
+
+    const ktAkGetKeysFromParam = () => {
+      let keys = [];
+      if (paramContainer) {
+        const textarea = paramContainer.querySelector('textarea');
+        if (textarea) {
+          keys = textarea.value.split(',').map(key => key.trim());
+        }
+      }
+      return keys;
+    };
+    ktHideParams();
+    setSelectedKeys(ktAkGetKeysFromParam());
+  }, [ktLoadActivationKeys, paramContainer, selectedContentViewId, selectedEnvId]);
+
+  useEffect(() => {
+    function ktSetParam() {
+      let paramContainerCopy = paramContainer;
+      if (selectedKeys.length > 0) {
+        const value = selectedKeys.map(key => key.trim()).join(',');
+        if (!paramContainerCopy) {
+          // we create the param for kt_activation_keys
+          const addParameterButton = document.querySelector('#parameters .btn-primary');
+          addParameterButton.click();
+          const directionOfAddedItems = addParameterButton.getAttribute('direction');
+          const paramContainers = document.querySelectorAll('#parameters .fields');
+          if (directionOfAddedItems === 'append') {
+            paramContainerCopy = paramContainers[paramContainers.length - 1];
+          } else {
+            [paramContainerCopy] = paramContainers;
+          }
+          paramContainerCopy.querySelector("input[name*='name']").value = KT_AK_LABEL;
+        }
+        paramContainerCopy.querySelector('textarea').value = value;
+        paramContainerCopy.querySelector("input[type='hidden']").value = 0;
+      } else if (paramContainerCopy) {
+        // we remove the param by setting destroy to 1
+        paramContainerCopy.querySelector("input[type='hidden']").value = 1;
+      }
+    }
+    ktSetParam();
+  }, [paramContainer, selectedKeys]);
+
+  if (!(selectedEnvId && selectedContentViewId)) {
+    return (
+      <EmptyState>
+        <Title headingLevel="h4" size="lg" ouiaId="ak-empty-state-title">
+          {__('Please select a lifecycle environment and content view to view activation keys.')}
+        </Title>
+      </EmptyState>
+    );
+  }
+
+  const onSelect = (event, selection) => {
+    setIsOpen(false);
+    if (selectedKeys.includes(selection)) {
+      setSelectedKeys(prevState => prevState.filter(item => item !== selection));
+    } else {
+      setSelectedKeys(prevState => [...prevState, selection]);
+    }
+  };
+  const isEmptyResults = activationKeys.length === 0;
+  return (
+    <div>
+      <Form isHorizontal>
+        <FormGroup label={__('Activation Keys')}>
+          <Select
+            ouiaId="ak-select"
+            variant={SelectVariant.typeaheadMulti}
+            onToggle={setIsOpen}
+            onSelect={onSelect}
+            selections={selectedKeys}
+            isOpen={isOpen}
+            isCreatable
+            shouldResetOnSelect
+            isDisabled={isLoading || isEmptyResults}
+            placeholderText={
+              isEmptyResults
+                ? __('The selected lifecycle environment contains no activation keys')
+                : null
+            }
+          >
+            {activationKeys.map(({ id, name }) => (
+              <SelectOption key={id} value={name} />
+            ))}
+          </Select>
+        </FormGroup>
+        <Alert title={__('Activation Key information')} variant="info" ouiaId="ak-info">
+          <p>{__("The value will be available in templates as @host.params['kt_activation_keys']")}</p>
+          <p>
+            <FormattedMessage
+              id="ak-link-manage"
+              defaultMessage={__('Activation keys can be managed {here}.')}
+              values={{
+                here: (
+                  <b>
+                    <a href="/activation_keys" target="_blank">
+                      {__('here')}
+                    </a>
+                  </b>
+                ),
+              }}
+            />
+          </p>
+          <p>
+            <FormattedMessage
+              id="ak-subscriptions-info"
+              defaultMessage={__('Activation keys may be used during {system_registration}.')}
+              values={{
+                system_registration: <a href="/hosts/register">{__('system registration')}</a>,
+              }}
+            />
+          </p>
+          <p>
+            <Button
+              id="ak_refresh_subscriptions"
+              variant="link"
+              onClick={ktLoadActivationKeys}
+              ouiaId="ak-refresh-button"
+              isInline
+            >
+              {__('Reload data')}
+            </Button>
+          </p>
+        </Alert>
+      </Form>
+      {isLoading && <Spinner id="ak-subscriptions-spinner" />}
+    </div>
+  );
+};
+
+export default ActivationKeysSearch;

data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackagesTab.js

@@ -617,7 +617,7 @@ export const PackagesTab = () => {
           closeModal={closeModal}
           hostId={hostId}
           key={hostId}
-          hostName={hostname}
+          hostName={hostDetails.display_name}
           triggerPackageInstall={triggerPackageInstall}
         />
       }

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packageInstallModal.test.js

@@ -31,6 +31,7 @@ const renderOptions = (facetAttributes = contentFacetAttributes) => ({
           id: 1,
           name: 'test-host',
           content_facet_attributes: { ...facetAttributes },
+          display_name: 'test-host',
         },
         status: 'RESOLVED',
       },

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js

@@ -33,6 +33,7 @@ const renderOptions = (facetAttributes = contentFacetAttributes) => ({
           id: 1,
           name: hostname,
           content_facet_attributes: { ...facetAttributes },
+          display_name: hostname,
         },
         status: 'RESOLVED',
       },

data/webpack/global_index.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 import { registerReducer } from 'foremanReact/common/MountingService';
 import { translate as __ } from 'foremanReact/common/I18n';
+import componentRegistry from 'foremanReact/components/componentRegistry';
 
 import SystemStatuses from './components/extensions/about';
 import {
@@ -30,6 +31,9 @@ import HostsIndexActionsBar from './components/extensions/Hosts/ActionsBar';
 import RecentCommunicationCardExtensions from './components/extensions/HostDetails/DetailsTabCards/RecentCommunicationCardExtensions';
 import SystemPurposeCard from './components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeCard';
 
+
+import ActivationKeysSearch from './components/ActivationKeysSearch';
+
 registerReducer('katelloExtends', extendReducer);
 registerReducer('katello', rootReducer);
 
@@ -80,3 +84,9 @@ addGlobalFill(
 );
 
 addGlobalFill('host-tab-details-cards', 'HW properties', <HwPropertiesCard key="hw-properties" />, 200);
+
+componentRegistry.register({
+  name: 'ActivationKeysSearch',
+  type: ActivationKeysSearch,
+});
+

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js

@@ -5,7 +5,6 @@ import {
   Bullseye, Split, SplitItem, Button, ActionList,
   ActionListItem, Dropdown, DropdownItem, KebabToggle,
 } from '@patternfly/react-core';
-import { Link } from 'react-router-dom';
 import { TableVariant, fitContent, TableText } from '@patternfly/react-table';
 import { PencilAltIcon } from '@patternfly/react-icons';
 import { STATUS } from 'foremanReact/constants';
@@ -136,7 +135,7 @@ const ContentViewComponents = ({ cvId, details }) => {
         id: componentCvId, content_view: cv, content_view_version: cvVersion,
         latest, component_content_view_versions: componentCvVersions,
       } = componentCV;
-      const { environments, repositories } = cvVersion || {};
+      const { environments, repositories, id: cvVersionId } = cvVersion || {};
       const {
         id,
         name,
@@ -171,7 +170,11 @@ const ContentViewComponents = ({ cvId, details }) => {
             </Split>),
         },
         { title: environments ? <ComponentEnvironments {...{ environments }} /> : <InactiveText text={__('Not yet published')} /> },
-        { title: <Link to={urlBuilder(`content_views/${id}#repositories`, '')}>{repositories ? repositories.length : 0}</Link> },
+        {
+          title: cvVersionId ?
+            <a href={urlBuilder(`content_views/${id}#/versions/${cvVersionId}/repositories`, '')}>{repositories ? repositories.length : 0}</a> :
+            0,
+        },
         {
           title: <AddedStatusLabel added={!!componentCvId} />,
         },

data/webpack/scenes/Hosts/ChangeContentSource/components/ContentSourceForm.js

@@ -114,7 +114,7 @@ const ContentSourceForm = ({
   const hostCount = contentHosts.length;
 
   const handleCSSelect = (_event, selection) => {
-    handleContentSource(selection);
+    handleContentSource(typeof selection === 'number' ? selection.toString() : selection);
     setCSSelectOpen(false);
   };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.12.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -535,7 +535,6 @@ files:
 - app/assets/javascripts/katello/common/spin.min.js
 - app/assets/javascripts/katello/common/vendor.js
 - app/assets/javascripts/katello/containers/container.js
-- app/assets/javascripts/katello/hosts/activation_key_edit.js
 - app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js
 - app/assets/javascripts/katello/html5/excanvas.js
 - app/assets/javascripts/katello/html5/html5.js
@@ -4515,6 +4514,8 @@ files:
 - webpack/__mocks__/react-intl/locale-data/en.js
 - webpack/common_index.js
 - webpack/components/ActionableDetail.js
+- webpack/components/ActivationKeysSearch/ActivationKeysSearch.test.js
+- webpack/components/ActivationKeysSearch/index.js
 - webpack/components/AddedStatusLabel.js
 - webpack/components/Bookmark/AddBookmarkModal.js
 - webpack/components/Bookmark/Bookmark.scss
@@ -5402,7 +5403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman

data/app/assets/javascripts/katello/hosts/activation_key_edit.js

@@ -1,167 +0,0 @@
-var KT = KT ? KT : {};
-KT.hosts = KT.hosts  || {};
-
-KT.KT_AK_LABEL = 'kt_activation_keys';
-KT.hosts.availableActivationKeys = {};
-
-function ktLoadActivationKeys() {
-    if(getSelectedEnvId() && getSelectedContentViewId()) {
-        ktAkTab().show();
-    } else {
-        ktAkTab().hide();
-        return; //no Katello-specific env selected
-    }
-
-    $("#ak-load-error").hide();
-    $("#ak-subscriptions-info").hide();
-    $("#ak-subscriptions-spinner").show();
-
-    // Retrieve the activation keys associated with the current
-    // environment & content view.
-    $.ajax({
-        type: 'get',
-        url:  tfm.tools.foremanUrl('/katello/api/v2/environments/' + getSelectedEnvId() + '/activation_keys'),
-        data: {'content_view_id': getSelectedContentViewId()},
-        success: function(response) {
-            KT.hosts.availableActivationKeys = {};
-            $.each(response['results'], function (i, key) {
-                KT.hosts.availableActivationKeys[key.name] = [];
-            });
-            tfm.typeAheadSelect.updateOptions(Object.keys(KT.hosts.availableActivationKeys), KT.KT_AK_LABEL);
-        },
-        error: function() {
-          $("#ak-load-error").show();
-        },
-    });
-}
-
-function ktFindParamContainer(name){
-    var ret;
-    $("div#parameters .fields input[ type = 'text']").each(function () {
-        var element = $(this);
-        if(element.val() == name) {
-            ret = element.closest('.fields');
-            return false;
-        }
-        return true;
-    });
-    return ret;
-}
-
-function ktHideParams() {
-    var param = ktFindParamContainer(KT.KT_AK_LABEL);
-    if(param) {
-        param.hide();
-    }
-}
-
-function getSelectedEnvId() {
-    var dataId = $("#hostgroup_lifecycle_environment_id > option:selected").data("id");
-    if (dataId === undefined) {
-        dataId = $("#hostgroup_lifecycle_environment_id").val();
-    }
-    return dataId;
-}
-
-function getSelectedContentViewId() {
-    var dataId = $("#hostgroup_content_view_id > option:selected").data("id");
-    if (dataId === undefined) {
-        dataId = $("#hostgroup_content_view_id").val();
-    }
-    return dataId;
-}
-
-function ktSetParam(name, value) {
-    var paramContainer = ktFindParamContainer(name);
-    if(value) {
-        if(! paramContainer) { // we create the param for kt_activation_keys
-            var addParameterButton = $('#parameters').find('.btn-primary');
-            addParameterButton.click();
-            var directionOfAddedItems = addParameterButton.attr('direction');
-            var paramContainer = $('#parameters').find('.fields');
-            if(directionOfAddedItems === 'append'){
-                paramContainer = paramContainer.last();
-            } else {
-                paramContainer = paramContainer.first();
-            }
-            paramContainer.find("input[name*='name']").val(name);
-        }
-        paramContainer.find("textarea").val(value);
-        paramContainer.find("input[ type = 'hidden' ]").val(0);
-    } else if(paramContainer) {
-        // we remove the param by setting destroy to 1
-        paramContainer.find("input[ type = 'hidden' ]").val(1);
-    }
-}
-
-function ktAkGetKeysFromParam() {
-    var paramContainer = ktFindParamContainer(KT.KT_AK_LABEL);
-    var keys = [];
-    if(paramContainer) {
-        keys = paramContainer.find("textarea").val().split(',').map(function(key) {
-          return key.trim();
-        });
-    }
-    return keys;
-}
-
-function ktAkUpdateSubscriptionsInfo(selectedKeys) {
-    var subsInfo = $("ul#ak-subscriptions-info");
-    subsInfo.empty();
-    $.each(selectedKeys, function(i, key) {
-      if(KT.hosts.availableActivationKeys[key]) {
-        // hack to make it working with deface
-        var ul = "<ul>", ul_end = "</ul>", li = "<li>", li_end = "</li>";
-        content = li + key + ul;
-        if(!KT.hosts.availableActivationKeys[key].length == 0) {
-            content += li;
-            content += KT.hosts.availableActivationKeys[key].join(li_end + li);
-            content += li_end;
-        }
-        content +=  ul_end + li_end;
-        subsInfo.append(content);
-      }
-    });
-    $("#ak-subscriptions-info").show();
-    $("#ak-subscriptions-spinner").hide();
-}
-
-function ktAkTab() {
-    return $('li#activation_keys_tab');
-}
-
-function ktOnLoad() {
-    tfm.store.observeStore('typeAheadSelect', function(items, unsubscribe) {
-        if (items.kt_activation_keys) { // Wait until after initialization to subscribe to store changes
-            unsubscribe();
-
-            tfm.typeAheadSelect.updateSelected(ktAkGetKeysFromParam(), KT.KT_AK_LABEL);
-
-            tfm.store.observeStore('typeAheadSelect', function(items) {
-                if (items.kt_activation_keys) {
-                    var selected = items.kt_activation_keys.selected || [];
-
-                    ktAkUpdateSubscriptionsInfo(selected);
-                    ktSetParam(KT.KT_AK_LABEL, selected.map(function(key) {
-                      return key.trim();
-                    }).join(','));
-                }
-            });
-        }
-    });
-
-    ktHideParams();
-    ktLoadActivationKeys();
-}
-
-$(document).on('ContentLoad', function(){
-    ktOnLoad();
-
-    $("#hostgroup_lifecycle_environment_id").change(ktLoadActivationKeys);
-    $("#hostgroup_content_view_id").change(ktLoadActivationKeys);
-
-    $("#ak_refresh_subscriptions").click(function () {
-        ktLoadActivationKeys();
-        return false;
-    });
-});