foreman_scc_manager 5.3.1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4e316d044975143f5f3fe071e86440c55c2a034c17e6f3076fcb4554fc7b41
-  data.tar.gz: c38779211f22da8e1f2002bf41cec3fddf18c6362a6e986d1f68694a5e1c6f54
+  metadata.gz: b52bcdb6e07b2cdef965068534e58d4c8774aaa6324c07313e9f1b6826601cda
+  data.tar.gz: 1af1c59be010d873fa65aa70ba4d9d893abee2fcc8cc22ceb5c994cc310ec903
 SHA512:
-  metadata.gz: 8f680c7fb44188ed4fb63bdbdc6f4d43d523c846b86735c17195bc4c740137d075cf2446790fb35606dc7ad8fa8f47fdf80b4c630616dc82ab0304341c8f392a
-  data.tar.gz: 815a77552a823b38ab961a58e6f802a26676aa05bfc0d892cea83f75e5e48d8dc5d481dccc20af4194ee043fd97e7986d2f4645e1baa92658157940f2bfb9a31
+  metadata.gz: e2c0ea23ca1bc8fb2f63a9965c7d0f29e80e27c9a9b033354e5f2132e4e3ef07ed13b2034cedfcc86c8a7c4e994731f4a0d679829d972f9b9bb011179a2ae0c0
+  data.tar.gz: 51a87268a1fea3e5e6ac7b99330c835feb57ad551185bce8e7f79777fb7caf133011337f4c510dc5faff11bd9ab09bd30862670e28fc2c41cece01112f04120c

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '5.3.1'.freeze
+  VERSION = '5.4.0'.freeze
 end

data/webpack/components/SCCAccountForm/components/DateTimeField.js

@@ -8,6 +8,8 @@ import {
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 
+const HOURS_DAY_MAX = 12;
+
 export const formatDateTime = (dateStr, timeStr) => {
   if (!dateStr || !timeStr) return undefined;
 
@@ -16,7 +18,8 @@ export const formatDateTime = (dateStr, timeStr) => {
 
   const [, hourStr, minuteStr, ampm] = match;
   const hour24 =
-    (parseInt(hourStr, 10) % 12) + (ampm.toUpperCase() === 'PM' ? 12 : 0);
+    (parseInt(hourStr, 10) % HOURS_DAY_MAX) +
+    (ampm.toUpperCase() === 'PM' ? HOURS_DAY_MAX : 0);
 
   const [year, month, day] = dateStr.split('-').map(Number);
   if (!year || !month || !day) return undefined;

data/webpack/components/SCCAccountIndex/SCCAccountIndexActions.js

@@ -3,6 +3,8 @@ import { translate as __ } from 'foremanReact/common/I18n';
 
 import { INITIAL_DELAY, MAX_DELAY, BACKOFF } from './SCCAccountIndexConstants';
 
+const TIMEOUT_API_MSEC = 15000;
+
 const isDone = (state, result) =>
   state === 'stopped' || result === 'success' || result === 'error';
 
@@ -157,7 +159,7 @@ export const syncSccAccountAction = (
             taskTimeoutRef,
             lastStateRef
           );
-        }, 15000);
+        }, TIMEOUT_API_MSEC);
       },
       handleError: () => {
         setAccounts((prev) =>

data/webpack/components/SCCProductPage/SCCProductPage.js

@@ -1,35 +1,22 @@
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import { Stack, StackItem } from '@patternfly/react-core';
-import { useDispatch } from 'react-redux';
-import { translate as __ } from 'foremanReact/common/I18n';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import SCCProductView from './components/SCCProductView';
 import { EmptySccProducts } from './EmptySccProducts';
 import SCCProductPicker from './components/SCCProductPicker';
 import SCCProductPickerModal from './components/SCCProductPickerModal';
-import { SCCPRODUCTPAGE_SUMMARY_MODAL_ID } from './SCCProductPageConstants';
 import './sccProductPage.scss';
 
-const SCCProductPage = ({
-  canCreate,
-  sccAccountId,
-  sccProductsInit,
-  ...props
-}) => {
-  const dispatch = useDispatch();
+const SCCProductPage = ({ canCreate, sccAccountId, sccProductsInit }) => {
   const [productToEdit, setProductToEdit] = useState(0);
   const [reposToSubscribe, setReposToSubscribe] = useState([]);
   const [subscriptionTaskId, setSubscriptionTaskId] = useState();
+  const [isSummaryModalOpen, setIsSummaryModalOpen] = useState(false);
 
   const editProductTree = (productId) => {
     setProductToEdit(productId);
   };
 
-  const { setModalOpen } = useForemanModal({
-    id: SCCPRODUCTPAGE_SUMMARY_MODAL_ID,
-  });
-
   const handleSubscribeCallback = (
     subscriptionTaskIdFromAction,
     reposToSubscribeFromAction
@@ -44,15 +31,15 @@ const SCCProductPage = ({
       newReposToSubscribe.push(repo);
     });
     setReposToSubscribe(newReposToSubscribe);
-    dispatch(setModalOpen({ id: SCCPRODUCTPAGE_SUMMARY_MODAL_ID }));
+    setIsSummaryModalOpen(true);
   };
 
   return sccProductsInit.length > 0 ? (
     <Stack>
       <StackItem>
         <SCCProductPickerModal
-          id={SCCPRODUCTPAGE_SUMMARY_MODAL_ID}
-          title={__('The subscription task has been started successfully')}
+          isOpen={isSummaryModalOpen}
+          onClose={() => setIsSummaryModalOpen(false)}
           taskId={subscriptionTaskId}
           reposToSubscribe={reposToSubscribe}
         />

data/webpack/components/SCCProductPage/SCCProductPageConstants.js

@@ -1,4 +1,3 @@
-export const SCCPRODUCTPAGE_SUMMARY_MODAL_ID = 'SCCTreePickerForemanModal';
 export const SCCPRODUCTPAGE_SUBSCRIBE = 'SCCPRODUCTPAGE_SUBSCRIBE';
 export const SCCPRODUCTPAGE_SCCPRODUCTS = {
   key: 'SCCPRODUCTPAGE_GET_PRODUCTS',

data/webpack/components/SCCProductPage/components/SCCProductPicker/components/SCCGenericPicker/index.js

@@ -16,6 +16,8 @@ import { TimesIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import '../../../SCCProductPicker/styles.scss';
 
+const NO_RESULTS = __('no results');
+
 const GenericSelector = ({
   initialSelectOptions,
   setSelected,
@@ -34,7 +36,6 @@ const GenericSelector = ({
   );
   const [focusedItemIndex, setFocusedItemIndex] = useState(null);
   const [activeItemId, setActiveItemId] = useState(null);
-  const NO_RESULTS = __('no results');
 
   useEffect(() => {
     let newSelectOptions = initialSelectOptions.map((option) => ({
@@ -61,7 +62,7 @@ const GenericSelector = ({
       }
     }
     setSelectOptions(newSelectOptions);
-  }, [filterValue, initialSelectOptions]);
+  }, [filterValue, initialSelectOptions, isOpen]);
   const createItemId = (value) =>
     `select-typeahead-${value?.replace(' ', '-')}`;
   const setActiveAndFocusedItem = (itemIndex) => {

data/webpack/components/SCCProductPage/components/SCCProductPicker/components/SCCTreePicker/components/SCCRepoPicker/index.js

@@ -111,6 +111,7 @@ const SCCRepoPicker = ({
     activateDebugFilter,
     productAlreadySynced,
     sccProductId,
+    sccProductName,
     setSelectedReposFromChild,
   ]);
 

data/webpack/components/SCCProductPage/components/SCCProductPickerModal/SCCProductPickerModal.test.js

@@ -0,0 +1,69 @@
+/* eslint-disable react/prop-types, import/no-unresolved */
+import React from 'react';
+import '@testing-library/jest-dom';
+import { fireEvent, render, screen, within } from '@testing-library/react';
+
+import SCCProductPickerModal from './index';
+
+describe('SCCProductPickerModal', () => {
+  const defaultProps = {
+    isOpen: true,
+    onClose: jest.fn(),
+    taskId: 'task-123',
+    reposToSubscribe: [
+      {
+        productName: 'SLES',
+        repoNames: ['Repo A', 'Repo B'],
+      },
+      {
+        productName: 'Tools',
+        repoNames: ['Repo C'],
+      },
+    ],
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('does not render when closed', () => {
+    render(<SCCProductPickerModal {...defaultProps} isOpen={false} />);
+
+    expect(
+      screen.queryByRole('dialog', {
+        name: 'Summary of SCC product subscription',
+      })
+    ).not.toBeInTheDocument();
+  });
+
+  it('renders the subscription summary, task link, and imported products', () => {
+    render(<SCCProductPickerModal {...defaultProps} />);
+
+    const dialog = screen.getByRole('dialog', {
+      name: 'Summary of SCC product subscription',
+    });
+
+    expect(
+      within(dialog).getByText(/The subscription task with id/i)
+    ).toBeInTheDocument();
+    expect(
+      within(dialog).getByRole('link', { name: 'task-123' })
+    ).toHaveAttribute('href', '/foreman_tasks/tasks/task-123');
+    expect(
+      within(dialog).getByText('The following products will be imported:')
+    ).toBeInTheDocument();
+    expect(within(dialog).getByText('SLES')).toBeInTheDocument();
+    expect(within(dialog).getByText('Repo A')).toBeInTheDocument();
+    expect(within(dialog).getByText('Repo B')).toBeInTheDocument();
+    expect(within(dialog).getByText('Tools')).toBeInTheDocument();
+    expect(within(dialog).getByText('Repo C')).toBeInTheDocument();
+  });
+
+  it('calls onClose when the modal is closed', () => {
+    render(<SCCProductPickerModal {...defaultProps} />);
+
+    fireEvent.click(screen.getByRole('button', { name: 'Close' }));
+
+    expect(defaultProps.onClose).toHaveBeenCalledTimes(1);
+  });
+});

data/webpack/components/SCCProductPage/components/SCCProductPickerModal/index.js

@@ -1,11 +1,11 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
-import ForemanModal from 'foremanReact/components/ForemanModal';
 
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import {
   Card,
   CardBody,
+  Modal,
   TextContent,
   Text,
   TextList,
@@ -34,55 +34,62 @@ const generateProductList = (reposToSubscribe) => (
   </TextList>
 );
 
-const SCCProductPickerModal = ({ id, taskId, reposToSubscribe }) => (
-  <>
-    <ForemanModal
-      id={id}
-      title={__('Summary of SCC product subscription')}
-      enforceFocus
-    >
-      <Card ouiaId="scc-product-picker-modal">
-        <CardBody>
-          <TextContent key={taskId}>
-            <Text
-              ouiaId={'modal1'.concat(taskId)}
-              key={'modal1'.concat(taskId)}
-            >
-              {__('The subscription task with id ')}
-              <Text
-                ouiaId={'modal2'.concat(taskId)}
-                key={'modal2'.concat(taskId)}
-                component={TextVariants.a}
-                target="_blank"
-                href={sprintf('/foreman_tasks/tasks/%s', taskId)}
-              >
-                {sprintf('%s', taskId)}
-              </Text>
-              {__(' has started successfully.')}
-            </Text>
+const SCCProductPickerModal = ({
+  isOpen,
+  onClose,
+  taskId,
+  reposToSubscribe,
+}) => (
+  <Modal
+    ouiaId="scc-product-picker-modal"
+    title={__('Summary of SCC product subscription')}
+    isOpen={isOpen}
+    onClose={onClose}
+    variant="medium"
+  >
+    <Card ouiaId="scc-product-picker-modal-card">
+      <CardBody>
+        <TextContent key={taskId}>
+          <Text
+            ouiaId={'scc-subscription-task-message-'.concat(taskId)}
+            key={'scc-subscription-task-message-'.concat(taskId)}
+          >
+            {__('The subscription task with id ')}
             <Text
-              ouiaId={'modal3'.concat(taskId)}
-              key={'modal3'.concat(taskId)}
+              ouiaId={'scc-subscription-task-link-'.concat(taskId)}
+              key={'scc-subscription-task-link-'.concat(taskId)}
+              component={TextVariants.a}
+              target="_blank"
+              href={sprintf('/foreman_tasks/tasks/%s', taskId)}
             >
-              {__('The following products will be imported:')}
+              {sprintf('%s', taskId)}
             </Text>
-            {generateProductList(reposToSubscribe)}
-          </TextContent>
-        </CardBody>
-      </Card>
-    </ForemanModal>
-  </>
+            {__(' has started successfully.')}
+          </Text>
+          <Text
+            ouiaId={'scc-subscription-import-summary-'.concat(taskId)}
+            key={'scc-subscription-import-summary-'.concat(taskId)}
+          >
+            {__('The following products will be imported:')}
+          </Text>
+          {generateProductList(reposToSubscribe)}
+        </TextContent>
+      </CardBody>
+    </Card>
+  </Modal>
 );
 SCCProductPickerModal.propTypes = {
-  id: PropTypes.string,
+  isOpen: PropTypes.bool,
+  onClose: PropTypes.func,
   taskId: PropTypes.string,
   reposToSubscribe: PropTypes.array,
 };
 
 SCCProductPickerModal.defaultProps = {
-  id: '',
+  isOpen: false,
+  onClose: () => {},
   taskId: '',
-  reposToSubscribe: {},
+  reposToSubscribe: [],
 };
 
 export default SCCProductPickerModal;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.0
 platform: ruby
 authors:
 - ATIX AG
 bindir: bin
 cert_chain: []
-date: 2026-07-17 00:00:00.000000000 Z
+date: 2026-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -220,6 +220,7 @@ files:
 - webpack/components/SCCProductPage/components/SCCProductPicker/components/SCCTreePicker/index.js
 - webpack/components/SCCProductPage/components/SCCProductPicker/index.js
 - webpack/components/SCCProductPage/components/SCCProductPicker/styles.scss
+- webpack/components/SCCProductPage/components/SCCProductPickerModal/SCCProductPickerModal.test.js
 - webpack/components/SCCProductPage/components/SCCProductPickerModal/index.js
 - webpack/components/SCCProductPage/components/SCCProductView/components/SCCRepoView/index.js
 - webpack/components/SCCProductPage/components/SCCProductView/components/SCCRepoView/styles.scss