foreman_templates 10.0.2 → 10.0.4

data/locale/sv_SE/foreman_templates.po

@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_templates 10.0.1\n"
+"Project-Id-Version: foreman_templates 10.0.3\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-10-14 12:27+0000\n"
 "Last-Translator: johnny.westerlund <johnny.westerlund@gmail.com>, 2023\n"
@@ -50,6 +50,9 @@ msgstr ""
 msgid "Commit message"
 msgstr ""
 
+msgid "Custom HTTP proxy"
+msgstr ""
+
 msgid "Custom commit message for templates export"
 msgstr ""
 
@@ -59,6 +62,9 @@ msgstr ""
 msgid "Default metadata export mode, refresh re-renders metadata, keep will keep existing metadata, remove exports template without metadata"
 msgstr ""
 
+msgid "Directory within Git repo containing the templates."
+msgstr ""
+
 msgid "Dirname"
 msgstr ""
 
@@ -74,9 +80,26 @@ msgstr "Filter"
 msgid "Force import"
 msgstr ""
 
+msgid "Global default HTTP proxy"
+msgstr ""
+
+msgid "HTTP proxy"
+msgstr ""
+
+msgid "HTTP proxy policy"
+msgstr ""
+
+msgid ""
+"HTTP proxy policy for template sync. \\\n"
+"          Use only when synchronizing templates through the HTTP or the HTTPS protocol. If you choose 'selected', provide the `http_proxy_id` parameter."
+msgstr ""
+
 msgid "How to handle lock for imported templates?"
 msgstr ""
 
+msgid "ID of an HTTP proxy to use for template sync. Use this parameter together with `'http_proxy_policy':'selected'`"
+msgstr ""
+
 msgid "Import"
 msgstr "Importera"
 
@@ -92,6 +115,9 @@ msgstr ""
 msgid "Initiate Import"
 msgstr ""
 
+msgid "Invalid repo format, must start with one of: "
+msgstr ""
+
 msgid "Keep"
 msgstr ""
 
@@ -128,6 +154,9 @@ msgstr ""
 msgid "New"
 msgstr "Ny"
 
+msgid "No HTTP proxy"
+msgstr ""
+
 msgid "Override the default repo from settings."
 msgstr ""
 
@@ -155,6 +184,12 @@ msgstr ""
 msgid "Repo"
 msgstr ""
 
+msgid "Select an HTTP proxy to use for template sync. You can add HTTP proxies on the Infrastructure > HTTP proxies page."
+msgstr ""
+
+msgid "Should an HTTP proxy be used for template sync? If you select Custom HTTP proxy, you will be prompted to select one."
+msgstr ""
+
 msgid "Should importing overwrite locked templates?"
 msgstr ""
 
@@ -173,9 +208,6 @@ msgstr ""
 msgid "Template Sync"
 msgstr ""
 
-msgid "The directory within Git repo containing the templates"
-msgstr ""
-
 msgid "The directory within the Git repo containing the templates"
 msgstr ""
 

data/locale/zh_CN/foreman_templates.po

@@ -6,16 +6,15 @@
 # Translators:
 # Martin Liu <liuzh66@gmail.com>, 2019
 # Bryan Kearney <bryan.kearney@gmail.com>, 2023
-# Amit Upadhye <aupadhye@redhat.com>, 2023
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2024
+# Amit Upadhye <aupadhye@redhat.com>, 2024
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_templates 10.0.1\n"
+"Project-Id-Version: foreman_templates 10.0.3\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-10-14 12:27+0000\n"
-"Last-Translator: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarde"
-"n.nl>, 2024\n"
+"Last-Translator: Amit Upadhye <aupadhye@redhat.com>, 2024\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/foreman/teams/114/zh"
 "_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -54,6 +53,9 @@ msgstr "为 Rake 任务导入模板选择详细程度"
 msgid "Commit message"
 msgstr "提交消息"
 
+msgid "Custom HTTP proxy"
+msgstr ""
+
 msgid "Custom commit message for templates export"
 msgstr "模板导出的自定义提交消息"
 
@@ -63,6 +65,9 @@ msgstr "Git 仓库中的默认分支"
 msgid "Default metadata export mode, refresh re-renders metadata, keep will keep existing metadata, remove exports template without metadata"
 msgstr "默认元数据导出模式，刷新后重新渲染元数据，保留将保留现有元数据，删除不包含元数据的导出模板"
 
+msgid "Directory within Git repo containing the templates."
+msgstr ""
+
 msgid "Dirname"
 msgstr "Dirname"
 
@@ -78,9 +83,26 @@ msgstr "过滤器"
 msgid "Force import"
 msgstr "强制导入"
 
+msgid "Global default HTTP proxy"
+msgstr ""
+
+msgid "HTTP proxy"
+msgstr "HTTP 代理"
+
+msgid "HTTP proxy policy"
+msgstr ""
+
+msgid ""
+"HTTP proxy policy for template sync. \\\n"
+"          Use only when synchronizing templates through the HTTP or the HTTPS protocol. If you choose 'selected', provide the `http_proxy_id` parameter."
+msgstr ""
+
 msgid "How to handle lock for imported templates?"
 msgstr "如何处理导入的模板锁定？"
 
+msgid "ID of an HTTP proxy to use for template sync. Use this parameter together with `'http_proxy_policy':'selected'`"
+msgstr ""
+
 msgid "Import"
 msgstr "导入"
 
@@ -96,6 +118,9 @@ msgstr "启动导出"
 msgid "Initiate Import"
 msgstr "启动导入"
 
+msgid "Invalid repo format, must start with one of: "
+msgstr ""
+
 msgid "Keep"
 msgstr "保持"
 
@@ -132,6 +157,9 @@ msgstr "决不"
 msgid "New"
 msgstr "新"
 
+msgid "No HTTP proxy"
+msgstr ""
+
 msgid "Override the default repo from settings."
 msgstr "覆盖设置中的默认仓库。"
 
@@ -159,6 +187,12 @@ msgstr "移除"
 msgid "Repo"
 msgstr "仓库"
 
+msgid "Select an HTTP proxy to use for template sync. You can add HTTP proxies on the Infrastructure > HTTP proxies page."
+msgstr ""
+
+msgid "Should an HTTP proxy be used for template sync? If you select Custom HTTP proxy, you will be prompted to select one."
+msgstr ""
+
 msgid "Should importing overwrite locked templates?"
 msgstr "是否应该导入覆盖锁定的模板？"
 
@@ -177,9 +211,6 @@ msgstr "要导入/导出的目标路径。可以使用不同的协议，如 /tmp
 msgid "Template Sync"
 msgstr "模板同步"
 
-msgid "The directory within Git repo containing the templates"
-msgstr "Git 仓库中包含模板的目录"
-
 msgid "The directory within the Git repo containing the templates"
 msgstr "Git 仓库中包含模板的目录"
 

data/locale/zh_TW/foreman_templates.po

@@ -5,14 +5,14 @@
 #
 # Translators:
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2019
-# Bryan Kearney <bryan.kearney@gmail.com>, 2023
+# Bryan Kearney <bryan.kearney@gmail.com>, 2024
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_templates 10.0.1\n"
+"Project-Id-Version: foreman_templates 10.0.3\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-10-14 12:27+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2023\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2024\n"
 "Language-Team: Chinese (Taiwan) (https://app.transifex.com/foreman/teams/114/z"
 "h_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -51,6 +51,9 @@ msgstr ""
 msgid "Commit message"
 msgstr ""
 
+msgid "Custom HTTP proxy"
+msgstr ""
+
 msgid "Custom commit message for templates export"
 msgstr ""
 
@@ -60,6 +63,9 @@ msgstr ""
 msgid "Default metadata export mode, refresh re-renders metadata, keep will keep existing metadata, remove exports template without metadata"
 msgstr ""
 
+msgid "Directory within Git repo containing the templates."
+msgstr ""
+
 msgid "Dirname"
 msgstr ""
 
@@ -75,9 +81,26 @@ msgstr "篩選器"
 msgid "Force import"
 msgstr ""
 
+msgid "Global default HTTP proxy"
+msgstr ""
+
+msgid "HTTP proxy"
+msgstr "HTTP 代理"
+
+msgid "HTTP proxy policy"
+msgstr ""
+
+msgid ""
+"HTTP proxy policy for template sync. \\\n"
+"          Use only when synchronizing templates through the HTTP or the HTTPS protocol. If you choose 'selected', provide the `http_proxy_id` parameter."
+msgstr ""
+
 msgid "How to handle lock for imported templates?"
 msgstr ""
 
+msgid "ID of an HTTP proxy to use for template sync. Use this parameter together with `'http_proxy_policy':'selected'`"
+msgstr ""
+
 msgid "Import"
 msgstr "匯入"
 
@@ -93,6 +116,9 @@ msgstr ""
 msgid "Initiate Import"
 msgstr ""
 
+msgid "Invalid repo format, must start with one of: "
+msgstr ""
+
 msgid "Keep"
 msgstr ""
 
@@ -129,6 +155,9 @@ msgstr "永不"
 msgid "New"
 msgstr "新增"
 
+msgid "No HTTP proxy"
+msgstr ""
+
 msgid "Override the default repo from settings."
 msgstr ""
 
@@ -156,6 +185,12 @@ msgstr "移除"
 msgid "Repo"
 msgstr "軟體庫"
 
+msgid "Select an HTTP proxy to use for template sync. You can add HTTP proxies on the Infrastructure > HTTP proxies page."
+msgstr ""
+
+msgid "Should an HTTP proxy be used for template sync? If you select Custom HTTP proxy, you will be prompted to select one."
+msgstr ""
+
 msgid "Should importing overwrite locked templates?"
 msgstr ""
 
@@ -174,9 +209,6 @@ msgstr ""
 msgid "Template Sync"
 msgstr ""
 
-msgid "The directory within Git repo containing the templates"
-msgstr ""
-
 msgid "The directory within the Git repo containing the templates"
 msgstr ""
 

data/webpack/components/NewTemplateSync/components/NewTemplateSyncForm/NewTemplateSyncFormHelpers.js

@@ -1,4 +1,6 @@
 import * as Yup from 'yup';
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 export const redirectToResult = history => () =>
   history.push({ pathname: '/template_syncs/result' });
@@ -24,9 +26,9 @@ export const syncFormSchema = (syncType, settingsObj, validationData) => {
           repo: Yup.string()
             .test(
               'repo-format',
-              `Invalid repo format, must start with one of: ${validationData.repo.join(
-                ', '
-              )}`,
+              `${__(
+                'Invalid repo format, must start with one of: '
+              )}${validationData.repo.join(', ')}`,
               repoFormat(validationData.repo)
             )
             .required("can't be blank"),
@@ -41,3 +43,13 @@ export const syncFormSchema = (syncType, settingsObj, validationData) => {
     [syncType]: Yup.object().shape(schema),
   });
 };
+
+export const tooltipContent = setting => (
+  <div
+    dangerouslySetInnerHTML={{
+      __html: __(setting.description),
+    }}
+  />
+);
+
+export const label = setting => `${__(setting.fullName)}`;

data/webpack/components/NewTemplateSync/components/ProxySettingField.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { get } from 'lodash';
+
+import { FieldLevelHelp } from 'patternfly-react';
+import RenderField from './TextButtonField/RenderField';
+import ButtonTooltip from './ButtonTooltip';
+
+import {
+  tooltipContent,
+  label,
+} from './NewTemplateSyncForm/NewTemplateSyncFormHelpers';
+
+const ProxySettingField = ({ setting, resetField, field, form, fieldName }) => (
+  <RenderField
+    label={label(setting)}
+    fieldSelector={_ => 'select'}
+    tooltipHelp={<FieldLevelHelp content={tooltipContent(setting)} />}
+    buttonAttrs={{
+      buttonText: <ButtonTooltip tooltipId={fieldName} />,
+      buttonAction: () =>
+        resetField(fieldName, setting.value)(form.setFieldValue),
+    }}
+    blank={{}}
+    item={setting}
+    disabled={false}
+    fieldRequired
+    meta={{
+      touched: get(form.touched, fieldName),
+      error: get(form.errors, fieldName),
+    }}
+    input={field}
+  />
+);
+
+ProxySettingField.propTypes = {
+  setting: PropTypes.object.isRequired,
+  resetField: PropTypes.func.isRequired,
+  field: PropTypes.object.isRequired,
+  form: PropTypes.object.isRequired,
+  fieldName: PropTypes.string.isRequired,
+};
+
+export default ProxySettingField;

data/webpack/components/NewTemplateSync/components/ProxySettingFields.js

@@ -0,0 +1,86 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Field as FormikField } from 'formik';
+
+import ProxySettingField from './ProxySettingField';
+
+const ProxySettingsFields = ({
+  proxyPolicySetting,
+  proxyIdSetting,
+  syncType,
+  resetField,
+  formProps: { isSubmitting },
+}) => {
+  if (Object.keys(proxyPolicySetting).length === 0) {
+    return <></>;
+  }
+  const proxyPolicyFieldName = `${syncType}.http_proxy_policy`;
+  const proxyIdFieldName = `${syncType}.http_proxy_id`;
+
+  // removes the custom proxy option if no proxy is available
+  if (proxyIdSetting.value === '') {
+    proxyPolicySetting = proxyPolicySetting.set(
+      'selection',
+      proxyPolicySetting.selection.slice(0, 2)
+    );
+  }
+
+  return (
+    <React.Fragment>
+      <FormikField
+        name={proxyPolicyFieldName}
+        render={({ field, form }) => {
+          if (form.values[syncType]?.repo?.match(/^https?:\/\//))
+            return (
+              <ProxySettingField
+                setting={proxyPolicySetting}
+                resetField={resetField}
+                field={field}
+                form={form}
+                fieldName={proxyPolicyFieldName}
+              />
+            );
+          return <></>;
+        }}
+      />
+      <FormikField
+        name={proxyIdFieldName}
+        render={({ field, form }) => {
+          if (
+            proxyIdSetting.value !== '' &&
+            // Changing name to camel case here would unnecessarily complicate the code
+            // eslint-disable-next-line camelcase
+            form.values[syncType]?.http_proxy_policy === 'selected'
+          ) {
+            return (
+              <ProxySettingField
+                setting={proxyIdSetting}
+                resetField={resetField}
+                field={field}
+                form={form}
+                fieldName={proxyIdFieldName}
+              />
+            );
+          }
+          return <></>;
+        }}
+      />
+    </React.Fragment>
+  );
+};
+
+ProxySettingsFields.propTypes = {
+  proxyPolicySetting: PropTypes.object,
+  proxyIdSetting: PropTypes.object,
+  syncType: PropTypes.string.isRequired,
+  resetField: PropTypes.func.isRequired,
+  formProps: PropTypes.object,
+};
+
+ProxySettingsFields.defaultProps = {
+  formProps: {},
+  proxyPolicySetting: {},
+  proxyIdSetting: {},
+};
+
+export default ProxySettingsFields;

data/webpack/components/NewTemplateSync/components/SyncSettingField.js

@@ -1,14 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FieldLevelHelp } from 'patternfly-react';
-import { translate as __ } from 'foremanReact/common/I18n';
 
+import {
+  tooltipContent,
+  label,
+} from './NewTemplateSyncForm/NewTemplateSyncFormHelpers';
 import TextButtonField from './TextButtonField';
 import ButtonTooltip from './ButtonTooltip';
 
 const SyncSettingField = ({ setting, resetField, disabled, syncType }) => {
-  const label = settingObj => `${__(settingObj.fullName)} `;
-
   const fieldSelector = settingObj => {
     if (settingObj.settingsType === 'boolean') {
       return 'checkbox';
@@ -21,14 +22,6 @@ const SyncSettingField = ({ setting, resetField, disabled, syncType }) => {
     return 'text';
   };
 
-  const tooltipContent = (
-    <div
-      dangerouslySetInnerHTML={{
-        __html: __(setting.description),
-      }}
-    />
-  );
-
   return (
     <TextButtonField
       name={`${syncType}.${setting.name}`}
@@ -40,7 +33,7 @@ const SyncSettingField = ({ setting, resetField, disabled, syncType }) => {
       fieldSelector={fieldSelector}
       disabled={disabled}
       fieldRequired={setting.required}
-      tooltipHelp={<FieldLevelHelp content={tooltipContent} />}
+      tooltipHelp={<FieldLevelHelp content={tooltipContent(setting)} />}
     >
       {setting.value}
     </TextButtonField>

data/webpack/components/NewTemplateSync/components/SyncSettingFields.js

@@ -3,6 +3,7 @@ import { upperFirst } from 'lodash';
 import PropTypes from 'prop-types';
 
 import SyncSettingField from './SyncSettingField';
+import ProxySettingsFields from './ProxySettingFields';
 
 const SyncSettingsFields = ({
   importSettings,
@@ -38,10 +39,21 @@ const SyncSettingsFields = ({
     );
 
   const settingsAry = syncType === 'import' ? importSettings : exportSettings;
+  const proxyPolicySetting = settingsAry.find(
+    setting => setting.id === 'template_sync_http_proxy_policy'
+  );
+  const proxyIdSetting = settingsAry.find(
+    setting => setting.id === 'template_sync_http_proxy_id'
+  );
 
   return (
     <React.Fragment>
       {settingsAry
+        .filter(
+          setting =>
+            setting.id !== 'template_sync_http_proxy_policy' &&
+            setting.id !== 'template_sync_http_proxy_id'
+        )
         .map(addRequiredToSetting)
         .map(setting => modifyDescription(setting, syncType))
         .map(setting => specializeDescription(setting, syncType))
@@ -54,6 +66,12 @@ const SyncSettingsFields = ({
             resetField={resetField}
           />
         ))}
+      <ProxySettingsFields
+        proxyPolicySetting={proxyPolicySetting}
+        proxyIdSetting={proxyIdSetting}
+        syncType={syncType}
+        resetField={resetField}
+      />
     </React.Fragment>
   );
 };

data/webpack/components/NewTemplateSync/components/__tests__/__snapshots__/SyncSettingField.test.js.snap

@@ -23,7 +23,7 @@ exports[`SyncSettingField should render boolean setting as checkbox 1`] = `
       "value": false,
     }
   }
-  label="undefined "
+  label="undefined"
   name="import.force"
   tooltipHelp={
     <FieldLevelHelp
@@ -67,7 +67,7 @@ exports[`SyncSettingField should render setting with input field 1`] = `
       "value": "",
     }
   }
-  label="undefined "
+  label="undefined"
   name="import.filter"
   tooltipHelp={
     <FieldLevelHelp
@@ -125,7 +125,7 @@ exports[`SyncSettingField should render setting with select choices 1`] = `
       "value": "new",
     }
   }
-  label="undefined "
+  label="undefined"
   name="import.associate"
   tooltipHelp={
     <FieldLevelHelp

data/webpack/components/NewTemplateSync/components/__tests__/__snapshots__/SyncSettingFields.test.js.snap

@@ -48,6 +48,13 @@ exports[`SyncSettingFields should show export settings 1`] = `
     }
     syncType="export"
   />
+  <ProxySettingsFields
+    formProps={Object {}}
+    proxyIdSetting={Object {}}
+    proxyPolicySetting={Object {}}
+    resetField={[Function]}
+    syncType="export"
+  />
 </Fragment>
 `;
 
@@ -97,5 +104,12 @@ exports[`SyncSettingFields should show import settings 1`] = `
     }
     syncType="import"
   />
+  <ProxySettingsFields
+    formProps={Object {}}
+    proxyIdSetting={Object {}}
+    proxyPolicySetting={Object {}}
+    resetField={[Function]}
+    syncType="import"
+  />
 </Fragment>
 `;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 10.0.2
+  version: 10.0.4
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -200,6 +200,8 @@ files:
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/NewTemplateSyncFormSelectors.test.js
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/__snapshots__/NewTemplateSyncFormSelectors.test.js.snap
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/index.js
+- webpack/components/NewTemplateSync/components/ProxySettingField.js
+- webpack/components/NewTemplateSync/components/ProxySettingFields.js
 - webpack/components/NewTemplateSync/components/SyncSettingField.js
 - webpack/components/NewTemplateSync/components/SyncSettingFields.js
 - webpack/components/NewTemplateSync/components/SyncTypeRadios.js
@@ -274,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Template-syncing engine for Foreman