foreman_scc_manager 5.0.4 → 5.1.0

data/app/assets/javascripts/foreman_scc_manager/locale/zh_CN/foreman_scc_manager.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_scc_manager": {
       "": {
-        "Project-Id-Version": "foreman_scc_manager 4.0.0",
+        "Project-Id-Version": "foreman_scc_manager 5.0.4",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2019-10-17 13:28+0000",
         "Last-Translator": "Amit Upadhye <aupadhye@redhat.com>, 2022",
@@ -32,15 +32,6 @@
       "%s/%s": [
         ""
       ],
-      "Abstract": [
-        "摘要"
-      ],
-      "Abstract async task": [
-        "抽象 async 任务"
-      ],
-      "Action with sub plans": [
-        "有子计划的操作"
-      ],
       "Actions": [
         "操作"
       ],
@@ -59,63 +50,36 @@
       "Additive": [
         "Additive"
       ],
-      "Agent action": [
-        "代理操作"
-      ],
       "Associated GPG key of scc_account": [
         "scc_account 的关联 GPG 密钥"
       ],
-      "Attach subscriptions": [
-        "附加订阅"
-      ],
-      "Auto attach subscriptions": [
-        "自动附加订阅"
-      ],
       "Base URL": [
         "基本 URL"
       ],
-      "Bulk generate applicability for hosts": [
-        "批量生成主机的适用性"
-      ],
       "Bulk subscription of scc_products for scc_account": [
         "scc_account 的批量 scc_products 订阅"
       ],
       "Bulk subscription of scc_products with individual repository selection for scc_account.": [
         ""
       ],
+      "Cancel": [
+        ""
+      ],
       "Collapse products": [
         ""
       ],
       "Collapse/Expand": [
         ""
       ],
-      "Combined Profile Update": [
-        "组合的配置集更新"
+      "Connection OK": [
+        ""
+      ],
+      "Connection test failed.": [
+        ""
       ],
       "Content Only": [
         "只包括内容"
       ],
-      "Copy version units to library": [
-        "将版本单位复制到库"
-      ],
-      "Create": [
-        "创建"
-      ],
-      "Create Alternate Content Source": [
-        "创建备用内容源"
-      ],
-      "Create Export History": [
-        "创建导出历史记录"
-      ],
-      "Create Import History": [
-        "创建导入历史记录"
-      ],
-      "Create Package Group": [
-        "创建软件包组"
-      ],
-      "Create Syncable Export History": [
-        "创建可同步的导出历史记录"
-      ],
       "Create an scc_account": [
         "创建 scc_account"
       ],
@@ -125,86 +89,38 @@
       "Date and time relative to which the sync interval is run": [
         "运行同步间隔的日期和时间"
       ],
-      "Delete": [
-        "刪除"
-      ],
-      "Delete Activation Key": [
-        "删除激活码"
-      ],
-      "Delete Lifecycle Environment": [
-        "删除生命周期环境"
-      ],
-      "Delete Package Group": [
-        "删除软件包组"
-      ],
-      "Delete Product": [
-        "删除产品"
-      ],
       "Delete scc_account": [
         "删除 scc_account"
       ],
-      "Destroy": [
-        "销毁"
-      ],
-      "Destroy Alternate Content Source": [
-        "销毁备用内容源"
-      ],
-      "Destroy Content Host": [
-        "销毁内容主机"
-      ],
-      "Disable": [
-        "禁用"
-      ],
-      "Discover": [
-        "发现"
-      ],
       "Download Policy": [
         "下载政策"
       ],
       "Edit %s": [
         "编辑 %s"
       ],
-      "Enable": [
-        "启用"
-      ],
-      "Errata mail": [
-        "勘误邮件"
-      ],
       "Expand products": [
         ""
       ],
-      "Export": [
-        "导出"
-      ],
-      "Export Library": [
-        "导出库"
-      ],
-      "Export Repository": [
-        "导出仓库"
-      ],
       "Failed to add task to queue.": [
         ""
       ],
       "Failed to add task to queue: %s": [
         "向队列添加任务失败：%s"
       ],
-      "Fetch pxe files": [
-        "获取 pxe 文件"
+      "Failed to create SCC account.": [
+        ""
       ],
-      "Filter repositories": [
+      "Failed to update SCC account.": [
         ""
       ],
-      "Filtered index content": [
-        "已过滤的索引内容"
+      "Filter repositories": [
+        ""
       ],
       "Foreman plugin to sync SUSE Customer Center products and repositories into Katello.": [
         "Foreman 插件，将 SUSE 客户中心产品和存储库同步到 Katello。"
       ],
-      "Generate host applicability": [
-        "产生主机适用性"
-      ],
-      "Generate repository applicability": [
-        "生成仓库适用性"
+      "GPG key for SUSE products": [
+        ""
       ],
       "Go to Product page": [
         ""
@@ -212,11 +128,8 @@
       "Go to Repository page": [
         ""
       ],
-      "Hypervisors": [
-        "Hypervisor"
-      ],
-      "Hypervisors update": [
-        "Hypervisor 更新"
+      "HH:MM AM": [
+        ""
       ],
       "If this option is enabled, debug and source pool repositories are automatically selected if you select a product. This option is disabled by default. It applies for unselected products, only. Already selected products are not filtered.": [
         ""
@@ -224,51 +137,9 @@
       "Immediate": [
         "立即"
       ],
-      "Import": [
-        "导入"
-      ],
-      "Import Content View Version": [
-        "导入内容视图版本"
-      ],
-      "Import Default Content View": [
-        "导入默认内容视图"
-      ],
-      "Import Puppet classes": [
-        "导入 Puppet 类"
-      ],
-      "Import Repository": [
-        "导入仓库"
-      ],
-      "Import facts": [
-        "导入事实"
-      ],
       "Include Debug and Source Pool repositories": [
         ""
       ],
-      "Incremental Update": [
-        "增量更新"
-      ],
-      "Incremental Update of  Content View Version(s) ": [
-        "内容视图版本的增量更新"
-      ],
-      "Index content": [
-        "索引內容"
-      ],
-      "Index errata": [
-        "索引勘误"
-      ],
-      "Index module streams": [
-        "索引模块流"
-      ],
-      "Index package groups": [
-        "索引软件包组"
-      ],
-      "Install Applicable Errata": [
-        "安装适用的勘误"
-      ],
-      "Instance update": [
-        "实例更新"
-      ],
       "Interval cannot be nil": [
         "间隔不能为零"
       ],
@@ -290,26 +161,29 @@
       "Lock on SCC account already taken: %s": [
         "锁定 SCC 帐户已采用：%s"
       ],
+      "Login": [
+        ""
+      ],
       "Login id of scc_account": [
         "scc_account 的登录 ID"
       ],
       "Mirroring Policy": [
         "镜像策略"
       ],
+      "Name": [
+        ""
+      ],
       "Name of the scc_account": [
         "scc_account 的名称"
       ],
-      "No products selected.": [
-        "没有选择产品."
-      ],
       "None": [
         "没有"
       ],
       "On Demand": [
         "按需"
       ],
-      "Package Profile Update": [
-        "软件包配置集更新"
+      "Password": [
+        ""
       ],
       "Password of scc_account": [
         "scc_account 的密码"
@@ -320,69 +194,42 @@
       "Please synchronize your SUSE account before you can subscribe to SUSE products.": [
         ""
       ],
-      "Product Create": [
-        "产品创建"
-      ],
       "Product Selection for Account %s": [
         "为帐户 %s 选择产品"
       ],
       "Products": [
         "产品"
       ],
-      "Promote": [
-        "升级"
-      ],
-      "Promotion to Environment": [
-        "升级到环境"
-      ],
-      "Publish": [
-        "发布"
-      ],
-      "Publish Lifecycle Environment Repositories": [
-        "发布生命周期环境仓库"
-      ],
-      "Refresh Alternate Content Source": [
-        "刷新备用内容源"
-      ],
-      "Reindex subscriptions": [
-        "重新索引订阅"
-      ],
-      "Remove Content": [
-        "删除内容"
-      ],
-      "Remove Version": [
-        "移除版本"
-      ],
-      "Remove Versions and Associations": [
-        "删除版本和关联"
-      ],
-      "Remove from Environment": [
-        "从环境中移除"
+      "Refresh interval": [
+        ""
       ],
-      "Remove subscriptions": [
-        "删除订阅"
+      "Refresh time": [
+        ""
       ],
       "Repositories (%s/%s)": [
         ""
       ],
-      "Repository not imported": [
+      "Repository Sync Settings": [
         ""
       ],
-      "Republish Version Repositories": [
-        "发布版本库"
+      "Repository not imported": [
+        ""
       ],
       "Reset Selection": [
         ""
       ],
-      "Run Sync Plan:": [
-        "运行同步计划："
+      "SCC Account Credentials": [
+        ""
+      ],
+      "SCC account created successfully.": [
+        ""
+      ],
+      "SCC account updated successfully.": [
+        ""
       ],
       "SUSE Customer Center": [
         "SUSE 客户中心"
       ],
-      "SUSE Customer Center account": [
-        "SUSE 客户中心帐户"
-      ],
       "SUSE Subscription": [
         "SUSE 订阅"
       ],
@@ -434,9 +281,15 @@
       "Show/Hide unsubscribed": [
         ""
       ],
+      "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.": [
+        ""
+      ],
       "Starting the subscription task failed.": [
         ""
       ],
+      "Submit": [
+        ""
+      ],
       "Subscribe SCC Product": [
         "订阅 SCC 产品"
       ],
@@ -449,9 +302,6 @@
       "Sync": [
         "同步"
       ],
-      "Sync Date": [
-        "同步日期"
-      ],
       "Sync SUSE subscriptions": [
         "同步 SUSE 订阅"
       ],
@@ -461,33 +311,15 @@
       "Sync SUSE subscriptions (Repositories)": [
         "同步 SUSE 订阅（仓库）"
       ],
-      "Sync capsule": [
-        "同步 capsule"
-      ],
-      "Sync interval": [
-        "同步间隔"
-      ],
       "Sync scc_account": [
         "同步 scc_account"
       ],
       "Sync task started.": [
         "同步任务已启动。"
       ],
-      "Syncable export": [
-        "可同步导出"
-      ],
-      "Synchronize": [
-        "同步"
-      ],
       "Synchronize SUSE Account": [
         ""
       ],
-      "Synchronize smart proxy": [
-        "同步智能代理服务器"
-      ],
-      "Task to subscribe products started.": [
-        "订阅产品的任务已开始。"
-      ],
       "Test Connection": [
         "测试连接"
       ],
@@ -512,8 +344,11 @@
       "The subscription task with id ": [
         ""
       ],
-      "The sync interval is used to periodically update the SCC authentication tokens of any imported products.": [
-        "同步间隔用于定期更新任何导入产品的 SCC 身份验证令牌。"
+      "The token refresh interval is used to periodically update the SCC authentication tokens of any imported products.": [
+        ""
+      ],
+      "Token Refresh Settings": [
+        ""
       ],
       "URL of SUSE for scc_account": [
         "scc_account 的 SUSE URL"
@@ -521,71 +356,35 @@
       "Unknown": [
         "未知"
       ],
-      "Update": [
-        "更新"
-      ],
-      "Update Alternate Content Source": [
-        "更新备用内容源"
-      ],
-      "Update CDN Configuration": [
-        "更新 CDN 配置"
-      ],
-      "Update Content Overrides": [
-        "更新内容覆盖"
-      ],
       "Update SUSE repositories": [
         "创建 SUSE 仓库"
       ],
       "Update SUSE repositories %s": [
         "更新 SUSE 仓库 %s"
       ],
-      "Update content urls": [
-        "更新内容 url"
-      ],
-      "Update for host": [
-        "对主机的更新"
-      ],
-      "Update http proxy": [
-        "更新 HTTP 代理"
-      ],
-      "Update http proxy details": [
-        "更新 http 代理详情"
-      ],
-      "Update redhat repository": [
-        "更新 redhat 仓库"
-      ],
-      "Update release version for host": [
-        "为主机更新发行版本"
-      ],
       "Update scc_account": [
         "更新 scc_account"
       ],
-      "Updating System Purpose for host": [
-        "主机更新系统目的"
-      ],
-      "Upload into": [
-        "上传到"
-      ],
-      "Use GPG key for SUSE products": [
-        "将 GPG 密钥用于 SUSE 产品"
-      ],
       "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.": [
         "如果要在订阅时自动在 SUSE 产品中添加 GPG 密钥，请使用这个设置。稍后，您可以在 'Content' > 'Products' 菜单中更改此设置。"
       ],
       "Use your 'Organization credentials' obtained from the SUSE Customer Center.": [
         "使用从 SUSE 客户中心获取的\\\"组织凭据\\\"。"
       ],
-      "Verify checksum": [
-        "验证校验和"
-      ],
       "WARNING: If you want to switch SCC accounts and retain the synchronized content, DO NOT delete your old SCC account, even if it is expired. Please change the login and password of your SCC account, instead.\\n\\nIf you delete your old SCC account, you CANNOT reuse existing repositories, products, content views, and composite content views.\\n\\nReally delete SCC account %s?": [
         ""
       ],
+      "YYYY-MM-DD": [
+        ""
+      ],
       "You currently have no SUSE products selected. Search and add SUSE products in the section below.": [
         ""
       ],
       "never synced": [
         "从未同步"
+      ],
+      "no results": [
+        ""
       ]
     }
   }

data/app/controllers/api/v2/scc_accounts_controller.rb

@@ -61,10 +61,12 @@ module Api
       param_group :scc_account
       def update
         if params[:scc_account].present?
-          process_response @scc_account.update(scc_account_params)
+          process_response @scc_account.update_attributes_with_logic!(scc_account_params)
         else
-          render json: { error: 'No input data provided for changing the SCC account.', status: :expectation_failed }
+          render json: { error: 'No input data provided for changing the SCC account.' }, status: :expectation_failed
         end
+      rescue ActiveRecord::RecordInvalid => e
+        render json: { error: e.to_s }, status: :unprocessable_entity
       end
 
       api :DELETE, '/scc_accounts/:id', N_('Delete scc_account')

data/app/models/scc_account.rb

@@ -305,7 +305,7 @@ class SccAccount < ApplicationRecord
       ::Katello::RootRepository::MIRRORING_POLICY_CONTENT => _('Content Only'),
     }
 
-    ::Katello::RootRepository::MIRRORING_POLICIES.map do |p|
+    SCC_MIRRORING_POLICIES.map do |p|
       [names.fetch(p, p), p]
     end
   end

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

@@ -1,3 +1,25 @@
-<% title(_("Edit %s") % @scc_account) %>
+<% title (_("Edit %s") % @scc_account) %>
 
-<%= render partial: 'form' %>
+<%= webpacked_plugins_js_for :foreman_scc_manager %>
+<%= webpacked_plugins_css_for :foreman_scc_manager %>
+
+<%= react_component('SCCAccountForm', {       
+  organizationId: @scc_account.organization_id,
+  intervalOptions: SccAccount::TYPES,
+  downloadPolicyOptions: SccAccount::download_policy_selection_values,
+  mirroringPolicyOptions: SccAccount::mirroring_policy_selection_values,
+  gpgKeyOptions: @selectable_gpg_keys,                                     
+  selectedGpgKeyId: @scc_account.katello_gpg_key_id,
+  initial: {
+    id: @scc_account.id,
+    name: @scc_account.name,
+    login: @scc_account.login,
+    baseUrl: @scc_account.base_url,
+    interval: @scc_account.interval,
+    downloadPolicy: (SccAccount::download_policy_selection_values.detect{|l,v| v==@scc_account.download_policy}&.first),
+    mirroringPolicy: (SccAccount::mirroring_policy_selection_values.detect{|l,v| v==@scc_account.mirroring_policy}&.first),
+    gpgKey: (@selectable_gpg_keys.detect{|l,v| v==@scc_account.katello_gpg_key_id}&.first),
+    refreshDate: (@scc_account.sync_date&.to_date&.iso8601),   
+    refreshTime: (@scc_account.sync_date&.in_time_zone&.strftime("%I:%M %p")) 
+  }
+}) %>

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

@@ -1,3 +1,14 @@
 <% title _("Add SUSE Customer Center Account") %>
 
-<%= render partial: 'form' %>
+<%= webpacked_plugins_js_for :foreman_scc_manager %>
+<%= webpacked_plugins_css_for :foreman_scc_manager %>
+
+<%= react_component('SCCAccountForm', {
+  organizationId: @scc_account.organization_id,
+  intervalOptions: SccAccount::TYPES,
+  downloadPolicyOptions: SccAccount::download_policy_selection_values,
+  mirroringPolicyOptions: SccAccount::mirroring_policy_selection_values,
+  gpgKeyOptions: @selectable_gpg_keys,
+  selectedGpgKeyId: @scc_account.katello_gpg_key_id
+}) %>
+

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '5.0.4'.freeze
+  VERSION = '5.1.0'.freeze
 end