katello 5.0.0 → 5.0.1

data/locale/zh_TW/katello.po

@@ -10,7 +10,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: katello 5.0.0.rc2\n"
+"Project-Id-Version: katello 5.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2017-12-19 20:14+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2026\n"
@@ -1374,6 +1374,9 @@ msgstr ""
 msgid "Clean Backend Objects"
 msgstr ""
 
+msgid "Clear"
+msgstr ""
+
 msgid "Clear any previous registration and run subscription-manager with --force."
 msgstr ""
 
@@ -1477,7 +1480,7 @@ msgid "Configuration updated on Foreman"
 msgstr ""
 
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 msgid "Confirm Deletion"
 msgstr ""
@@ -2586,6 +2589,9 @@ msgstr "下載除錯憑證"
 msgid "Download rate limit"
 msgstr ""
 
+msgid "Drag here"
+msgstr ""
+
 msgid "Due to a change in your organizations, this container name has become ambiguous (org name '%{org_label}'). If you wish to continue using this container name, destroy the organization in conflict with '%{o_name} (id %{o_id}). If you wish to keep both orgs, destroy '%{o_label}/%{prod_label}/%{root_repo_label}' and retry your push using the id format."
 msgstr ""
 
@@ -3216,7 +3222,7 @@ msgid "Generate RHUI certificates for the desired repositories as necessary."
 msgstr ""
 
 msgid "Generate and Download"
-msgstr "產生與下載"
+msgstr ""
 
 msgid "Generate containerfile install command (%s package selected)"
 msgid_plural "Generate containerfile install command (%s packages selected)"
@@ -4712,6 +4718,9 @@ msgstr ""
 msgid "Manifest expiring soon"
 msgstr ""
 
+msgid "Manifest history table"
+msgstr ""
+
 msgid "Manifest imported"
 msgstr ""
 
@@ -5479,6 +5488,9 @@ msgstr ""
 msgid "One or more processes require restarting"
 msgstr ""
 
+msgid "Only .zip manifest files are accepted"
+msgstr ""
+
 msgid "Only On Demand repositories may have space reclaimed."
 msgstr ""
 
@@ -5521,9 +5533,6 @@ msgstr "組織不能是空的。"
 msgid "Organization id"
 msgstr "組織 ID"
 
-msgid "Organization id not found: '%s'"
-msgstr ""
-
 msgid "Organization identifier"
 msgstr "組織識別子"
 
@@ -5539,9 +5548,6 @@ msgstr ""
 msgid "Organization not found"
 msgstr ""
 
-msgid "Organization not found: '%s'"
-msgstr ""
-
 msgid "Organization required"
 msgstr "需要的組織"
 
@@ -5835,9 +5841,6 @@ msgid ""
 "        this is not the same product id as the products api returns"
 msgstr ""
 
-msgid "Product id not found: '%s'"
-msgstr ""
-
 msgid "Product label"
 msgstr ""
 
@@ -5853,9 +5856,6 @@ msgstr "產品名稱"
 msgid "Product name as listed from a host's installed products"
 msgstr "來自主機已安裝產品的產品名稱"
 
-msgid "Product not found: '%s'"
-msgstr ""
-
 msgid "Product the repository belongs to"
 msgstr "產品的軟體庫屬於"
 
@@ -6564,6 +6564,9 @@ msgstr ""
 msgid "Requested access to '%s' is denied"
 msgstr ""
 
+msgid "Requested repository name is unknown to the registry."
+msgstr ""
+
 msgid "Requirements is not valid yaml."
 msgstr ""
 
@@ -6850,7 +6853,7 @@ msgid "Saving subscription quantities..."
 msgstr ""
 
 msgid "Saving..."
-msgstr ""
+msgstr "正在儲存…"
 
 msgid "Scan"
 msgstr ""
@@ -8786,6 +8789,9 @@ msgstr ""
 msgid "Upgrade via remote execution"
 msgstr ""
 
+msgid "Upload"
+msgstr "上傳"
+
 msgid "Upload Content Credential contents"
 msgstr ""
 
@@ -8795,6 +8801,9 @@ msgstr "上傳一組檔案內容"
 msgid "Upload a subscription manifest"
 msgstr "上傳訂閱清單"
 
+msgid "Upload a zip file"
+msgstr ""
+
 msgid "Upload content"
 msgstr ""
 

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

@@ -14,7 +14,6 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
     docker_manifest_list_count: dockerManifestListCount = 0,
     docker_tag_count: dockerTagCount = 0,
     file_count: fileCount = 0,
-    module_stream_count: moduleStreamCount = 0,
     ansible_collection_count: ansibleCollectionCount = 0,
   } = cvVersion;
 
@@ -36,7 +35,7 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
 
   const noCounts =
     !Number(debCount) && !Number(dockerManifestCount) && !Number(dockerTagCount) &&
-    !Number(fileCount) && !Number(moduleStreamCount) && !Number(ansibleCollectionCount) &&
+    !Number(fileCount) && !Number(ansibleCollectionCount) &&
     !Number(dockerManifestListCount) && !contentConfigTypes?.length;
 
   if (noCounts) {
@@ -45,13 +44,6 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
 
   return (
     <>
-      {moduleStreamCount > 0 &&
-        <>
-          <Link to={`/versions/${versionId}/moduleStreams`}>
-            {`${moduleStreamCount} Module streams`}
-          </Link><br />
-        </>
-      }
       {debCount > 0 &&
         <>
           <Link to={`/versions/${versionId}/debPackages`}>
@@ -100,7 +92,6 @@ ContentViewVersionContent.propTypes = {
     docker_manifest_list_count: PropTypes.number,
     docker_tag_count: PropTypes.number,
     file_count: PropTypes.number,
-    module_stream_count: PropTypes.number,
     ansible_collection_count: PropTypes.number,
   }),
 };
@@ -113,7 +104,6 @@ ContentViewVersionContent.defaultProps = {
     docker_manifest_count: 0,
     docker_tag_count: 0,
     file_count: 0,
-    module_stream_count: 0,
     ansible_collection_count: 0,
   },
 };

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

@@ -16,7 +16,6 @@ import {
   getDockerTags,
   getErrata,
   getFiles,
-  getModuleStreams,
   getPackageGroups,
   getRepositories,
   getRPMPackages,
@@ -33,8 +32,6 @@ import {
   selectFilesStatus,
   selectErrata,
   selectErrataStatus,
-  selectModuleStreams,
-  selectModuleStreamsStatus,
   selectRepositories,
   selectRepositoriesStatus,
   selectRPMPackageGroups,
@@ -255,31 +252,6 @@ export default ({ cvId, versionId }) => [
       },
     ],
   },
-  {
-    name: __('Module Streams'),
-    route: 'moduleStreams',
-    repoType: 'yum',
-    getCountKey: item => item?.module_stream_count,
-    responseSelector: state => selectModuleStreams(state),
-    statusSelector: state => selectModuleStreamsStatus(state),
-    autocompleteEndpoint: '/katello/api/v2/module_streams',
-    autocompleteQueryParams: { content_view_version_id: versionId },
-    bookmarkController: 'katello_content_view_components',
-    fetchItems: params => getModuleStreams({ content_view_version_id: versionId, ...params }),
-    columnHeaders: [
-      {
-        title: __('Name'),
-        getProperty: item => (
-          <a href={urlBuilder(`content/module_streams/${item?.id}`, '')}>
-            {item?.name}
-          </a>),
-      },
-      { title: __('Stream'), getProperty: item => item?.stream },
-      { title: __('Version'), getProperty: item => item?.version },
-      { title: __('Context'), getProperty: item => item?.context },
-      { title: __('Arch'), getProperty: item => item?.arch },
-    ],
-  },
   {
     name: __('Deb Packages'),
     route: 'debPackages',

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

@@ -165,7 +165,7 @@ const testConfig = [
   },
   {
     name: 'Module Streams',
-    countKey: 'module_stream_count',
+    countKey: 'modulemd_count',
     autoCompleteUrl: '/module_streams/auto_complete_search',
     dataUrl: api.getApiUrl('/module_streams'),
     data: ContentViewVersionModuleStreamsData,
@@ -260,6 +260,51 @@ testConfig.forEach(({
     done();
   }));
 
+test('Does not duplicate Module Streams tab when both count keys are present', async () => {
+  const { version } = ContentViewVersionDetailsData;
+  const autocompleteScope = mockAutocomplete(
+    nockInstance,
+    '/module_streams/auto_complete_search',
+    autocompleteQuery('Module Streams'),
+  );
+
+  const scope = nockInstance
+    .get(cvVersions)
+    .query(true)
+    .reply(200, {
+      ...getTabSpecificData('modulemd_count'),
+      module_stream_count: ContentViewVersionDetailsCounts.module_stream_count,
+    });
+
+  const tabScope = nockInstance
+    .get(api.getApiUrl('/module_streams'))
+    .query(queryParams('Module Streams'))
+    .reply(200, ContentViewVersionModuleStreamsData);
+
+  const { getByText, queryByText, getAllByRole } = renderWithRedux(
+    withCVRoute(<ContentViewVersionDetails cvId={3} details={cvDetailData} />),
+    renderOptions,
+  );
+
+  expect(queryByText(`Version ${version}`)).toBeNull();
+  await patientlyWaitFor(() => {
+    expect(getByText(`Version ${version}`)).toBeTruthy();
+  });
+
+  await patientlyWaitFor(() => {
+    const moduleStreamTabs = getAllByRole('tab', { name: /Module Streams/ });
+    expect(moduleStreamTabs).toHaveLength(1);
+  });
+
+  await new Promise((resolve) => {
+    assertNockRequest(autocompleteScope, () => {
+      assertNockRequest(scope, () => {
+        assertNockRequest(tabScope, resolve);
+      });
+    });
+  });
+});
+
 test('Can change repository selector', async (done) => {
   const {
     countKey,

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersionContent.test.js

@@ -0,0 +1,41 @@
+import React from 'react';
+import { renderWithRedux } from 'react-testing-lib-wrapper';
+import ContentViewVersionContent from '../ContentViewVersionContent';
+
+const renderContent = cvVersion =>
+  renderWithRedux(<ContentViewVersionContent
+    cvId={3}
+    versionId={73}
+    cvVersion={cvVersion}
+  />);
+
+test('Shows no content when version has no counts', () => {
+  const { getByText } = renderContent({});
+
+  expect(getByText('No content')).toBeInTheDocument();
+});
+
+test('Shows module streams once from the generic content config', () => {
+  const { getByText, getAllByText } = renderContent({ modulemd_count: 14 });
+
+  expect(getAllByText('14 Module streams')).toHaveLength(1);
+  expect(getByText('14 Module streams').closest('a'))
+    .toHaveAttribute('href', expect.stringContaining('moduleStreams'));
+});
+
+test('Does not duplicate module streams when both count keys are present', () => {
+  const { getAllByText, queryByText } = renderContent({
+    modulemd_count: 14,
+    module_stream_count: 14,
+  });
+
+  expect(getAllByText('14 Module streams')).toHaveLength(1);
+  expect(queryByText('No content')).not.toBeInTheDocument();
+});
+
+test('Does not show module streams from the legacy count key alone', () => {
+  const { getByText, queryByText } = renderContent({ module_stream_count: 14 });
+
+  expect(queryByText(/Module streams/i)).not.toBeInTheDocument();
+  expect(getByText('No content')).toBeInTheDocument();
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-08 00:00:00.000000000 Z
+date: 2026-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,6 +101,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 18.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,6 +111,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 18.0.0
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -5212,6 +5218,7 @@ files:
 - webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionRpmPackages.fixtures.json
 - webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewTaskInProgressResponse.fixtures.json
 - webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewTaskResponse.fixtures.json
+- webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersionContent.test.js
 - webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.fixtures.json
 - webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js
 - webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersionsLatestEnvironment.fixtures.json