foreman_scc_manager 5.0.4 → 5.1.0

data/webpack/components/SCCAccountForm/index.js

@@ -0,0 +1,306 @@
+import React, { useState } from 'react';
+import { useDispatch } from 'react-redux';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from 'foremanReact/common/helpers';
+import PropTypes from 'prop-types';
+import {
+  PageSection,
+  Title,
+  Form,
+  Button,
+  Stack,
+  StackItem,
+} from '@patternfly/react-core';
+
+import { formatDateTime } from './components/DateTimeField';
+import SCCCredentialsCard from './components/SCCCredentialsCard';
+import SCCTokenRefreshCard from './components/SCCTokenRefreshCard';
+import SCCSyncSettingsCard from './components/SCCSyncSettingsCard';
+import {
+  testSccConnectionAction,
+  submitSccAccountAction,
+} from './SCCAccountFormActions';
+import './SCCAccountForm.scss';
+
+const SCCAccountForm = ({
+  organizationId,
+  intervalOptions,
+  downloadPolicyOptions,
+  mirroringPolicyOptions,
+  gpgKeyOptions,
+  selectedGpgKeyId,
+  initial,
+}) => {
+  const isEdit = Boolean(initial?.id);
+  const dispatch = useDispatch();
+
+  const [openInterval, setOpenInterval] = useState(false);
+  const [openGpg, setOpenGpg] = useState(false);
+  const [openDownload, setOpenDownload] = useState(false);
+  const [openMirroring, setOpenMirroring] = useState(false);
+
+  const [name, setName] = useState(initial?.name ?? '');
+  const [login, setLogin] = useState(initial?.login ?? '');
+  const [password, setPassword] = useState(isEdit ? '********' : '');
+
+  const [baseUrl, setBaseUrl] = useState(
+    initial?.baseUrl ?? 'https://scc.suse.com'
+  );
+
+  const [refreshDate, setRefreshDate] = useState(initial?.refreshDate ?? '');
+  const [refreshTime, setRefreshTime] = useState(initial?.refreshTime ?? '');
+
+  const [testing, setTesting] = useState(false);
+  const [submitting, setSubmitting] = useState(false);
+
+  const [interval, setInterval] = useState(
+    initial?.interval ?? intervalOptions?.[0] ?? ''
+  );
+
+  const [gpgKey, setGpgKey] = useState(
+    initial?.gpgKey ?? selectedGpgKeyId ?? gpgKeyOptions?.[0]?.[0] ?? ''
+  );
+
+  const [downloadPolicy, setDownloadPolicy] = useState(
+    initial?.downloadPolicy ?? downloadPolicyOptions?.[0]?.[0] ?? ''
+  );
+
+  const [mirroringPolicy, setMirroringPolicy] = useState(
+    initial?.mirroringPolicy ?? mirroringPolicyOptions?.[0]?.[0] ?? ''
+  );
+
+  const handleUrl = (url) => {
+    if (!url) return;
+    try {
+      const parsed = new URL(url);
+      if (parsed.protocol === 'http:' || parsed.protocol === 'https:') {
+        setBaseUrl(url);
+        return;
+      }
+    } catch {
+      // ignore parse errors
+    }
+    setBaseUrl(url);
+  };
+
+  const buildPayload = () => {
+    const downloadPolicyValue =
+      downloadPolicyOptions.find(([label]) => label === downloadPolicy)?.[1] ??
+      downloadPolicy;
+
+    const mirroringPolicyValue =
+      mirroringPolicyOptions.find(
+        ([label]) => label === mirroringPolicy
+      )?.[1] ?? mirroringPolicy;
+
+    const katelloGpgKeyId = !gpgKey
+      ? null
+      : gpgKeyOptions.find(([label]) => label === gpgKey)?.[1] ?? null;
+
+    const payload = {
+      name,
+      login,
+      password: isEdit && password === '********' ? null : password,
+      base_url: baseUrl,
+      interval,
+      download_policy: downloadPolicyValue,
+      mirroring_policy: mirroringPolicyValue,
+      organization_id: organizationId,
+      katello_gpg_key_id: katelloGpgKeyId,
+    };
+    const sync = formatDateTime(refreshDate, refreshTime);
+    if (sync) payload.sync_date = sync;
+
+    return payload;
+  };
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    if (submitting) return;
+
+    setSubmitting(true);
+    const payload = buildPayload();
+
+    const action = submitSccAccountAction({
+      isEdit,
+      organizationId,
+      updateUrl: `/api/v2/scc_accounts/${initial?.id}`,
+      payload,
+      onSuccess: (redirect) => {
+        setSubmitting(false);
+        window.location.href = redirect;
+      },
+      onError: () => setSubmitting(false),
+    });
+
+    dispatch(action);
+  };
+  const handleTestConnection = () => {
+    setTesting(true);
+
+    const action = testSccConnectionAction({
+      login: isEdit && login === initial?.login ? '' : login,
+      password: isEdit && password === '********' ? '' : password,
+      baseUrl: isEdit && baseUrl === initial?.baseUrl ? '' : baseUrl,
+      isEdit,
+      id: initial?.id,
+      onFinally: () => setTesting(false),
+    });
+
+    const dispatchedAction = dispatch(action);
+    if (dispatchedAction?.finally)
+      dispatchedAction.finally(() => setTesting(false));
+  };
+
+  return (
+    <PageSection
+      isFilled
+      className="scc-account-form-section"
+      ouiaId="scc-account-form-page-section"
+    >
+      <Title
+        headingLevel="h1"
+        className="scc-account-form-title"
+        ouiaId="scc-account-form-title"
+      >
+        SUSE Customer Center Account
+      </Title>
+
+      <Form
+        isWidthLimited
+        className="scc-account-form"
+        onSubmit={handleSubmit}
+        ouiaId="scc-account-form"
+      >
+        <Stack hasGutter ouiaId="scc-account-form-stack">
+          <StackItem ouiaId="scc-credentials-stack-item">
+            <SCCCredentialsCard
+              name={name}
+              login={login}
+              password={password}
+              baseUrl={baseUrl}
+              testing={testing}
+              onNameChange={setName}
+              onLoginChange={setLogin}
+              onPasswordChange={setPassword}
+              onBaseUrlChange={handleUrl}
+              onTestConnection={handleTestConnection}
+            />
+          </StackItem>
+
+          <StackItem ouiaId="scc-token-refresh-stack-item">
+            <SCCTokenRefreshCard
+              interval={interval}
+              intervalOptions={intervalOptions}
+              openInterval={openInterval}
+              refreshDate={refreshDate}
+              refreshTime={refreshTime}
+              onIntervalChange={setInterval}
+              onIntervalOpenChange={setOpenInterval}
+              onRefreshDateChange={setRefreshDate}
+              onRefreshTimeChange={setRefreshTime}
+            />
+          </StackItem>
+
+          <StackItem ouiaId="scc-sync-settings-stack-item">
+            <SCCSyncSettingsCard
+              gpgKey={gpgKey}
+              gpgKeyOptions={gpgKeyOptions}
+              openGpg={openGpg}
+              downloadPolicy={downloadPolicy}
+              downloadPolicyOptions={downloadPolicyOptions}
+              openDownload={openDownload}
+              mirroringPolicy={mirroringPolicy}
+              mirroringPolicyOptions={mirroringPolicyOptions}
+              openMirroring={openMirroring}
+              onGpgKeyChange={setGpgKey}
+              onGpgOpenChange={setOpenGpg}
+              onDownloadPolicyChange={setDownloadPolicy}
+              onDownloadOpenChange={setOpenDownload}
+              onMirroringPolicyChange={setMirroringPolicy}
+              onMirroringOpenChange={setOpenMirroring}
+            />
+          </StackItem>
+
+          <StackItem ouiaId="scc-form-actions-stack-item">
+            <Button
+              variant="primary"
+              type="submit"
+              isDisabled={submitting}
+              ouiaId="scc-form-submit-button"
+            >
+              {__('Submit')}
+            </Button>{' '}
+            <Button
+              variant="link"
+              component="a"
+              href={foremanUrl('/scc_accounts')}
+              isDisabled={submitting}
+              ouiaId="scc-form-cancel-button"
+            >
+              {__('Cancel')}
+            </Button>
+          </StackItem>
+        </Stack>
+      </Form>
+    </PageSection>
+  );
+};
+
+SCCAccountForm.propTypes = {
+  organizationId: PropTypes.number.isRequired,
+  intervalOptions: PropTypes.arrayOf(PropTypes.string),
+  downloadPolicyOptions: PropTypes.arrayOf(
+    PropTypes.oneOfType([
+      PropTypes.exact({
+        label: PropTypes.string.isRequired,
+        value: PropTypes.string.isRequired,
+      }),
+      PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string])),
+    ])
+  ),
+  mirroringPolicyOptions: PropTypes.arrayOf(
+    PropTypes.oneOfType([
+      PropTypes.exact({
+        label: PropTypes.string.isRequired,
+        value: PropTypes.string.isRequired,
+      }),
+      PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string])),
+    ])
+  ),
+  gpgKeyOptions: PropTypes.arrayOf(
+    PropTypes.arrayOf(
+      PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.number,
+        PropTypes.oneOf([null]),
+      ])
+    )
+  ),
+  selectedGpgKeyId: PropTypes.oneOfType([
+    PropTypes.number,
+    PropTypes.oneOf(['', null]),
+  ]),
+  initial: PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+    login: PropTypes.string,
+    baseUrl: PropTypes.string,
+    interval: PropTypes.string,
+    downloadPolicy: PropTypes.string,
+    mirroringPolicy: PropTypes.string,
+    gpgKey: PropTypes.oneOfType([PropTypes.number, PropTypes.oneOf(['None'])]),
+    refreshDate: PropTypes.string,
+    refreshTime: PropTypes.string,
+  }),
+};
+
+SCCAccountForm.defaultProps = {
+  intervalOptions: [],
+  downloadPolicyOptions: [],
+  mirroringPolicyOptions: [],
+  gpgKeyOptions: [],
+  selectedGpgKeyId: '',
+  initial: {},
+};
+export default SCCAccountForm;

data/webpack/index.js

@@ -2,6 +2,12 @@ import componentRegistry from 'foremanReact/components/componentRegistry';
 import injectReducer from 'foremanReact/redux/reducers/registerReducer';
 import SCCProductPage from './components/SCCProductPage';
 import reducer from './reducer';
+import SCCAccountForm from './components/SCCAccountForm';
+
+componentRegistry.register({
+  name: 'SCCAccountForm',
+  type: SCCAccountForm,
+});
 
 componentRegistry.register({
   name: 'SCCProductPage',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.1.0
 platform: ruby
 authors:
 - ATIX AG
 bindir: bin
 cert_chain: []
-date: 2025-09-16 00:00:00.000000000 Z
+date: 2025-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -57,20 +57,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: katello
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +90,6 @@ files:
 - 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
 - app/controllers/api/v2/scc_products_controller.rb
 - app/controllers/scc_accounts_controller.rb
@@ -133,7 +118,6 @@ files:
 - app/views/api/v2/scc_products/main.json.rabl
 - app/views/api/v2/scc_products/show.json.rabl
 - app/views/scc_account_sync_plan_task_groups/_scc_account_sync_plan_task_groups.html.erb
-- app/views/scc_accounts/_form.html.erb
 - app/views/scc_accounts/edit.html.erb
 - app/views/scc_accounts/index.html.erb
 - app/views/scc_accounts/new.html.erb
@@ -212,6 +196,13 @@ files:
 - test/support/fixtures_support.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_scc_manager_test.rb
+- webpack/components/SCCAccountForm/SCCAccountForm.scss
+- webpack/components/SCCAccountForm/SCCAccountFormActions.js
+- webpack/components/SCCAccountForm/components/DateTimeField.js
+- webpack/components/SCCAccountForm/components/SCCCredentialsCard.js
+- webpack/components/SCCAccountForm/components/SCCSyncSettingsCard.js
+- webpack/components/SCCAccountForm/components/SCCTokenRefreshCard.js
+- webpack/components/SCCAccountForm/index.js
 - webpack/components/SCCProductPage/EmptySccProducts.js
 - webpack/components/SCCProductPage/SCCProductPage.js
 - webpack/components/SCCProductPage/SCCProductPageActions.js

data/app/assets/javascripts/foreman_scc_manager/scc_accounts.js.coffee

@@ -1,46 +0,0 @@
-scc_products_after_checked = (target) ->
-  if target.parentNode.dataset.parent
-    parent = $("#" + target.parentNode.dataset.parent + " input")[0]
-    if !parent.checked && !parent.disabled
-      parent.checked = true
-      scc_products_after_checked(parent)
-
-scc_products_after_unchecked = (target) ->
-  $("span.scc_product_checkbox input", target.parentNode.parentNode).each (index, child) ->
-    if child.checked && !child.disabled
-      child.checked = false
-      scc_products_after_unchecked(child)
-
-$ ->
-  $("body").on "change", "span.scc_product_checkbox input", (event) ->
-    target = event.target
-    if target.checked
-      scc_products_after_checked target
-    else
-      scc_products_after_unchecked target
-  $("body").on "click", "a.edit_deferrer", (event) ->
-    event.preventDefault()
-    $("a.edit_deferree", $(event.target).closest("tr"))[0].click()
-  $("body").on "click", "#test_scc_connection_btn", (event) ->
-    $('.tab-error').removeClass('tab-error')
-    $('#connection_test_result')[0].innerHTML = ''
-    $('#test_scc_connection_indicator').show()
-    $.ajax event.target.parentNode.dataset['url'],
-      type: 'POST'
-      dataType: 'JSON'
-      data: $('form').serialize()
-      success: (result) ->
-        $('#test_scc_connection_btn').addClass('btn-success')
-        $('#test_scc_connection_btn').removeClass('btn-default')
-        $('#test_scc_connection_btn').removeClass('btn-danger')
-      error: (result) ->
-        $('#test_scc_connection_btn').addClass('btn-danger')
-        $('#test_scc_connection_btn').removeClass('btn-default')
-        $('#test_scc_connection_btn').removeClass('btn-success')
-        $('#scc_account_login').closest('.form-group').addClass('tab-error')
-        $('#scc_account_password').closest('.form-group').addClass('tab-error')
-        $('#scc_account_base_url').closest('.form-group').addClass('tab-error')
-        $('#connection_test_result')[0].innerHTML = 'Connection test failed!'
-        $('#scc_account_login').focus()
-      complete: (result) ->
-        $('#test_scc_connection_indicator').hide()

data/app/views/scc_accounts/_form.html.erb

@@ -1,51 +0,0 @@
-<!-- see foreman/app/helper/form_helper.rb -->
-<% javascript 'foreman_scc_manager/scc_accounts'  %>
-
-<%= form_for(@scc_account) do |f| %>
-  <%= base_errors_for @scc_account %>
-  <ul class="nav nav-tabs" data-tabs="tabs">
-    <li class="active"><a href="#primary" data-toggle="tab"><%= _("SUSE Customer Center account") %></a></li>
-  </ul>
-
-  <div class="tab-content">
-    <div class="tab-pane active" id="primary">
-      <div>
-        <%= text_f f, :name %>
-        <%= text_f f, :login, :help_block => _("Use your 'Organization credentials' obtained from the SUSE Customer Center.") %>
-        <%= password_f f, :password %>
-        <%= text_f f, :base_url, label: _('Base URL') %>
-        <%= selectable_f f, :interval, SccAccount::TYPES, {},
-            { :label => _('Token refresh interval'), :help_block => _("The token refresh interval is used to periodically update the SCC authentication tokens of any imported products.") } %>
-        <%= field f, :sync_date, label: _('Token refresh time'), :help_block => _("Specifies the daily time when the SCC authentication token refresh process starts. Set this to a time outside of business hours (e.g., during the night) to minimize disruption.") do
-          f.datetime_field :sync_date, placeholder: Time.now
-        end %>
-       <%= selectable_f f, :katello_gpg_key_id, @selectable_gpg_keys, {},
-                        { :include_blank => _("None"),
-                          :label => _('Use GPG key for SUSE products'),
-                          :selected => @scc_account.katello_gpg_key_id,
-                          :help_block => _("Use this setting if you want to automatically add a GPG key to your SUSE products upon subscription. You can change this setting in the 'Content' > 'Products' menu, later.") } %>
-        <%= selectable_f f, :download_policy, SccAccount::download_policy_selection_values,
-            { :label => _('Download Policy'), :help_block => _("The default download policy for repositories which were created using this SCC Account.") } %>
-        <%= selectable_f f, :mirroring_policy, SccAccount::mirroring_policy_selection_values,
-            { :label => _('Mirroring Policy'), :help_block => _("The default mirroring policy for repositories which were created using this SCC Account.") } %>
-        <div class='clearfix'>
-          <div class='form-group'>
-            <div class='col-md-2'></div>
-            <div class='col-md-4'>
-              <%= spinner_button_f(f, _('Test Connection'), '',
-                                   id: 'test_scc_connection_btn',
-                                   spinner_id: 'test_scc_connection_indicator',
-                                   class: 'btn-default',
-                                   'data-url': @scc_account.id ? test_connection_scc_account_path : test_connection_scc_accounts_path ) %>
-            </div>
-            <div class='col-md-2'>
-              <span id='connection_test_result'></span>
-            </div>
-          </div>
-        </div>
-        <%= f.hidden_field :organization_id %>
-        <%= submit_or_cancel f %>
-      </div>
-    </div>
-  </div>
-<% end %>