foreman_scc_manager 4.0.0 → 5.0.0

data/webpack/components/SCCProductPage/components/SCCProductView/components/SCCRepoView/index.js

@@ -5,10 +5,11 @@ import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import {
+  Tooltip,
   Dropdown,
   DropdownItem,
-  BadgeToggle,
-  Tooltip,
+  DropdownList,
+  MenuToggle,
 } from '@patternfly/react-core';
 import { Icon } from 'patternfly-react';
 import { BrowserRouter, Link } from 'react-router-dom';
@@ -20,7 +21,10 @@ const createKatelloRepoLink = (repo, sccProductId) => {
     `/products/${sccProductId}/repositories/${repo.katello_repository_id}`
   );
   return (
-    <Tooltip content={__('Go to Repository page')}>
+    <Tooltip
+      key={'scc-manager-repo-view-tooltip-'.concat(repo.id)}
+      content={__('Go to Repository page')}
+    >
       <BrowserRouter>
         <Link to={url} target="_blank">
           {repo.name}
@@ -33,18 +37,25 @@ const createKatelloRepoLink = (repo, sccProductId) => {
 const createRepoDropDownItem = (repo, sccProductId) => (
   <DropdownItem
     key={repo.id}
+    ouiaId={repo.id}
     component="button"
     icon={
       repo.subscription_valid ? (
         repo.katello_repository_id !== null ? (
           <Icon name="check" type="fa" />
         ) : (
-          <Tooltip content={__('Repository not imported')}>
+          <Tooltip
+            key={'scc-manager-repo-link-tooltip-'.concat(repo.id)}
+            content={__('Repository not imported')}
+          >
             <Icon name="ban" type="fa" />
           </Tooltip>
         )
       ) : (
-        <Tooltip content={__('Please check your SUSE subscription')}>
+        <Tooltip
+          key={'scc-manager-repo-link-tooltip-'.concat(repo.id)}
+          content={__('Please check your SUSE subscription')}
+        >
           <Icon name="warning-triangle-o" type="pf" size="2x" />
         </Tooltip>
       )
@@ -58,8 +69,8 @@ const createRepoDropDownItem = (repo, sccProductId) => (
 
 const SCCRepoView = ({ sccRepos, sccProductId }) => {
   const [isOpen, setIsOpen] = useState(false);
-  const onToggle = (toggle) => {
-    setIsOpen(toggle);
+  const onToggleClick = () => {
+    setIsOpen(!isOpen);
   };
 
   const onFocus = () => {
@@ -70,7 +81,7 @@ const SCCRepoView = ({ sccRepos, sccProductId }) => {
   };
 
   const onSelect = (event) => {
-    setIsOpen(!isOpen);
+    setIsOpen(false);
     onFocus();
   };
 
@@ -78,25 +89,27 @@ const SCCRepoView = ({ sccRepos, sccProductId }) => {
     createRepoDropDownItem(repo, sccProductId)
   );
 
+  const toggle = (toggleRef) => (
+    <MenuToggle ref={toggleRef} onClick={onToggleClick} isExpanded={isOpen}>
+      {sprintf(
+        __('Repositories (%s/%s)'),
+        sccRepos.filter((r) => r.katello_repository_id !== null).length,
+        sccRepos.length
+      )}
+    </MenuToggle>
+  );
+
   return (
     <Dropdown
+      ouiaId={sccProductId?.toString().concat('scc-manager-repo-view')}
+      onClick={onToggleClick}
       onSelect={onSelect}
-      toggle={
-        <BadgeToggle
-          id={sprintf('scc-repo-show-toggle-id-%s', sccProductId)}
-          key={sprintf('scc-repo-show-toggle-id-%s', sccProductId)}
-          onToggle={onToggle}
-        >
-          {sprintf(
-            __('Repositories (%s/%s)'),
-            sccRepos.filter((r) => r.katello_repository_id !== null).length,
-            sccRepos.length
-          )}
-        </BadgeToggle>
-      }
+      toggle={toggle}
       isOpen={isOpen}
-      dropdownItems={dropdownItems}
-    />
+      onOpenChange={(isOpenMenu) => setIsOpen(isOpenMenu)}
+    >
+      <DropdownList>{dropdownItems}</DropdownList>
+    </Dropdown>
   );
 };
 

data/webpack/components/SCCProductPage/components/SCCProductView/components/SCCRepoView/styles.scss

@@ -1,14 +1,14 @@
-.pf-c-button.pf-m-plain {
-  --pf-c-button--PaddingTop: var(--pf-global--spacer--xs);
-  --pf-c-button--PaddingRight: var(--pf-global--spacer--sm);
-  --pf-c-button--PaddingBottom: var(--pf-global--spacer--xs);
-  --pf-c-button--PaddingLeft: var(--pf-global--spacer--sm);
+.pf-v5-c-button.pf-m-plain {
+  --pf-v5-c-button--PaddingTop: var(--pf-v5-global--spacer--xs);
+  --pf-v5-c-button--PaddingRight: var(--pf-v5-global--spacer--sm);
+  --pf-v5-c-button--PaddingBottom: var(--pf-v5-global--spacer--xs);
+  --pf-v5-c-button--PaddingLeft: var(--pf-v5-global--spacer--sm);
 }
 
-.pf-c-dropdown__toggle::before {
-  --pf-c-button--PaddingTop: var(--pf-global--spacer--xs);
-  --pf-c-button--PaddingRight: var(--pf-global--spacer--xs);
-  --pf-c-button--PaddingBottom: var(--pf-global--spacer--xs);
-  --pf-c-button--PaddingLeft: var(--pf-global--spacer--xs);
+.pf-v5-c-dropdown__toggle::before {
+  --pf-v5-c-button--PaddingTop: var(--pf-v5-global--spacer--xs);
+  --pf-v5-c-button--PaddingRight: var(--pf-v5-global--spacer--xs);
+  --pf-v5-c-button--PaddingBottom: var(--pf-v5-global--spacer--xs);
+  --pf-v5-c-button--PaddingLeft: var(--pf-v5-global--spacer--xs);
 }
 

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

@@ -33,7 +33,13 @@ const addKatelloLinkToTree = (tree) => {
     <BrowserRouter>
       <Link to={url} target="_blank">
         <Tooltip content={__('Go to Product page')}>
-          <Button variant="plain" id="tt-ref">
+          <Button
+            ouiaId={tree.product_id
+              .toString()
+              .concat('scc-manager-product-page-link')}
+            variant="plain"
+            id="tt-ref"
+          >
             <Icon name="external-link" type="fa" />
           </Button>
         </Tooltip>
@@ -45,8 +51,14 @@ const addKatelloLinkToTree = (tree) => {
 
 const addEditIcon = (tree, editProductTree) => {
   tree.customBadgeContent.push(
-    <Tooltip content={__('Add more sub products to Product tree')}>
+    <Tooltip
+      key={'scc-manager-add-sub-tooltip'.concat(tree.id.toString())}
+      content={__('Add more sub products to Product tree')}
+    >
       <Button
+        ouiaId={tree.id
+          .toString()
+          .concat('scc-manager-add-sub-products-button')}
         variant="plain"
         id={tree.id.toString()}
         onClick={(evt) => editProductTree(evt, tree.id)}
@@ -61,7 +73,10 @@ const addEditIcon = (tree, editProductTree) => {
 
 const addReposToTree = (tree) => {
   tree.customBadgeContent.push(
-    <Tooltip content={__('Show currently added repositories')}>
+    <Tooltip
+      key="scc-manager-repoview-show-repos-tooltip"
+      content={__('Show currently added repositories')}
+    >
       <SCCRepoView
         sccRepos={tree.scc_repositories}
         sccProductId={tree.product_id}
@@ -74,7 +89,10 @@ const addReposToTree = (tree) => {
 const addValidationStatusToTree = (tree) => {
   tree.customBadgeContent.push(
     <Tooltip content={__('Please check your SUSE subscription')}>
-      <Button variant="plain">
+      <Button
+        ouiaId="scc-manager-check-suse-subscription-button"
+        variant="plain"
+      >
         <Icon name="warning-triangle-o" type="pf" size="2x" />
       </Button>
     </Tooltip>
@@ -157,7 +175,7 @@ const SCCProductView = ({
   };
 
   return (
-    <Card>
+    <Card ouiaId="scc-manager-select-suse-products-card">
       <CardTitle>{__('Selected SUSE Products')}</CardTitle>
       {sccProducts.length > 0 && (
         <CardBody>
@@ -173,7 +191,7 @@ const SCCProductView = ({
             <TreeView
               data={showAll ? allProducts : subscribedProducts}
               allExpanded={expandAll}
-              hasChecks
+              hasCheckboxes
               hasBadges
               hasGuides
             />
@@ -190,7 +208,7 @@ const SCCProductView = ({
       <Flex>
         {sccProducts.length > 0 && (
           <FlexItem>
-            <Button variant="link">
+            <Button ouiaId="scc-manager-show-all-tasks-button" variant="link">
               <BrowserRouter>
                 <Link
                   to="/foreman_tasks/tasks/?search=Subscribe+SCC+Product"
@@ -204,7 +222,7 @@ const SCCProductView = ({
         )}
         {subscriptionTaskId !== '' && (
           <FlexItem>
-            <Button variant="link">
+            <Button ouiaId="scc-manager-show-last-task-button" variant="link">
               <BrowserRouter>
                 <Link
                   to={sprintf('/foreman_tasks/tasks/%s', subscriptionTaskId)}

data/webpack/components/SCCProductPage/components/common/SCCGenericExpander/SCCGenericExpander.test.js

@@ -34,8 +34,8 @@ describe('SCCGenericExpander', () => {
     // Select
     const select = wrapper.find('Select');
     expect(select.exists()).toBe(true);
-    expect(select.props()).toHaveProperty('selections');
-    expect(select.prop('selections')).toContain('open/close');
+    expect(select.props()).toHaveProperty('selected');
+    expect(select.prop('selected')).toContain('open/close');
 
     // SelectOptions
     const selectOptions = wrapper.find('SelectOption');

data/webpack/components/SCCProductPage/components/common/SCCGenericExpander/index.js

@@ -1,6 +1,13 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { Flex, FlexItem, Select, SelectOption } from '@patternfly/react-core';
+import {
+  Flex,
+  FlexItem,
+  Select,
+  SelectList,
+  MenuToggle,
+  SelectOption,
+} from '@patternfly/react-core';
 
 const SCCGenericExpander = ({
   setInParent,
@@ -11,12 +18,14 @@ const SCCGenericExpander = ({
   const [label, setLabel] = useState(initLabel);
   const [isOpen, setIsOpen] = useState(false);
 
-  const options = [
-    <SelectOption key={0} value={selectOptionOpen} />,
-    <SelectOption key={1} value={selectOptionClose} />,
-  ];
+  const options = (
+    <SelectList>
+      <SelectOption value={selectOptionOpen}>{selectOptionOpen}</SelectOption>
+      <SelectOption value={selectOptionClose}>{selectOptionClose}</SelectOption>
+    </SelectList>
+  );
 
-  const onSelect = (evt, selection) => {
+  const onSelect = (_evt, selection) => {
     if (selection === selectOptionOpen) {
       setInParent(true);
     } else {
@@ -26,18 +35,27 @@ const SCCGenericExpander = ({
     setIsOpen(false);
   };
 
-  const onToggle = (isOpenSelect) => {
-    setIsOpen(isOpenSelect);
+  const onToggleClick = () => {
+    setIsOpen(!isOpen);
   };
 
+  const toggle = (toggleRef) => (
+    <MenuToggle ref={toggleRef} onClick={onToggleClick} isExpanded={isOpen}>
+      {label}
+    </MenuToggle>
+  );
+
   return (
     <Flex>
       <FlexItem>
         <Select
-          onToggle={onToggle}
+          ouiaId={initLabel.concat('scc-manager-generic-expander-select')}
+          toggle={toggle}
           onSelect={onSelect}
-          selections={label}
+          selected={label}
           isOpen={isOpen}
+          onOpenChange={(nextOpen) => setIsOpen(isOpen)}
+          shouldFocusToggleOnSelect
         >
           {options}
         </Select>

data/webpack/components/SCCProductPage/sccProductPage.scss

@@ -1,8 +1,8 @@
 @import '~@theforeman/vendor/scss/variables';
 
-.pf-c-tile {
-  --pf-c-tile--PaddingTop: var(--pf-global--spacer--xs);
-  --pf-c-tile--PaddingRight: var(--pf-global--spacer--xs);
-  --pf-c-tile--PaddingBottom: var(--pf-global--spacer--xs);
-  --pf-c-tile--PaddingLeft: var(--pf-global--spacer--xs);
+.pf-v5-c-tile {
+  --pf-v5-c-tile--PaddingTop: var(--pf-v5-global--spacer--xs);
+  --pf-v5-c-tile--PaddingRight: var(--pf-v5-global--spacer--xs);
+  --pf-v5-c-tile--PaddingBottom: var(--pf-v5-global--spacer--xs);
+  --pf-v5-c-tile--PaddingLeft: var(--pf-v5-global--spacer--xs);
 }

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - ATIX AG
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2025-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -103,6 +102,7 @@ files:
 - app/assets/javascripts/foreman_scc_manager/locale/fr/foreman_scc_manager.js
 - app/assets/javascripts/foreman_scc_manager/locale/ja/foreman_scc_manager.js
 - app/assets/javascripts/foreman_scc_manager/locale/ka/foreman_scc_manager.js
+- app/assets/javascripts/foreman_scc_manager/locale/ko/foreman_scc_manager.js
 - app/assets/javascripts/foreman_scc_manager/locale/zh_CN/foreman_scc_manager.js
 - app/assets/javascripts/foreman_scc_manager/scc_accounts.js.coffee
 - app/controllers/api/v2/scc_accounts_controller.rb
@@ -187,6 +187,8 @@ files:
 - locale/ja/foreman_scc_manager.po
 - locale/ka/LC_MESSAGES/foreman_scc_manager.mo
 - locale/ka/foreman_scc_manager.po
+- locale/ko/LC_MESSAGES/foreman_scc_manager.mo
+- locale/ko/foreman_scc_manager.po
 - locale/zh_CN/LC_MESSAGES/foreman_scc_manager.mo
 - locale/zh_CN/foreman_scc_manager.po
 - package.json
@@ -204,6 +206,7 @@ files:
 - test/fixtures/models/scc_accounts.yml
 - test/fixtures/models/scc_products.yml
 - test/fixtures/models/scc_repositories.yml
+- test/lib/scc_manager_test.rb
 - test/models/scc_account_test.rb
 - test/models/scc_product_test.rb
 - test/support/fixtures_support.rb
@@ -235,9 +238,8 @@ files:
 - webpack/reducer.js
 homepage: https://www.orcharhino.com/
 licenses:
-- GPL-3.0
+- GPL-3.0-only
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -252,8 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Suse Customer Center plugin for Foreman
 test_files:
@@ -271,6 +272,7 @@ test_files:
 - test/fixtures/models/scc_accounts.yml
 - test/fixtures/models/scc_products.yml
 - test/fixtures/models/scc_repositories.yml
+- test/lib/scc_manager_test.rb
 - test/models/scc_account_test.rb
 - test/models/scc_product_test.rb
 - test/support/fixtures_support.rb