katello 3.17.3 → 3.18.0.rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/controllers/katello/api/registry/registry_proxies_controller.rb +38 -21
- data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb +3 -1
- data/app/controllers/katello/api/v2/activation_keys_controller.rb +10 -15
- data/app/controllers/katello/api/v2/api_controller.rb +2 -1
- data/app/controllers/katello/api/v2/content_credentials_controller.rb +1 -8
- data/app/controllers/katello/api/v2/content_view_components_controller.rb +31 -14
- data/app/controllers/katello/api/v2/content_view_repositories_controller.rb +1 -0
- data/app/controllers/katello/api/v2/content_view_versions_controller.rb +65 -36
- data/app/controllers/katello/api/v2/content_views_controller.rb +27 -25
- data/app/controllers/katello/api/v2/environments_controller.rb +8 -8
- data/app/controllers/katello/api/v2/gpg_keys_controller.rb +5 -5
- data/app/controllers/katello/api/v2/host_collections_controller.rb +19 -16
- data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb +17 -0
- data/app/controllers/katello/api/v2/repositories_bulk_actions_controller.rb +1 -1
- data/app/controllers/katello/api/v2/repositories_controller.rb +8 -5
- data/app/controllers/katello/api/v2/subscriptions_controller.rb +1 -1
- data/app/controllers/katello/api/v2/sync_plans_controller.rb +8 -9
- data/app/controllers/katello/api/v2/upstream_subscriptions_controller.rb +9 -2
- data/app/controllers/katello/concerns/api/v2/authorization.rb +9 -5
- data/app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb +21 -0
- data/app/controllers/katello/concerns/api/v2/repository_content_controller.rb +1 -1
- data/app/controllers/katello/concerns/organizations_controller_extensions.rb +2 -1
- data/app/helpers/katello/katello_urls_helper.rb +5 -2
- data/app/lib/actions/candlepin/product/content_create.rb +2 -0
- data/app/lib/actions/candlepin/product/content_update.rb +2 -0
- data/app/lib/actions/katello/applicability/hosts/bulk_generate.rb +2 -6
- data/app/lib/actions/katello/capsule_content/sync_capsule.rb +2 -6
- data/app/lib/actions/katello/content_view/publish.rb +3 -4
- data/app/lib/actions/katello/content_view_version/import.rb +4 -3
- data/app/lib/actions/katello/content_view_version/incremental_update.rb +18 -3
- data/app/lib/actions/katello/host/update_system_purpose.rb +31 -0
- data/app/lib/actions/katello/organization/manifest_delete.rb +0 -1
- data/app/lib/actions/katello/organization/manifest_import.rb +0 -1
- data/app/lib/actions/katello/organization/manifest_refresh.rb +0 -1
- data/app/lib/actions/katello/product/content_create.rb +7 -6
- data/app/lib/actions/katello/repository/filtered_index_content.rb +10 -1
- data/app/lib/actions/katello/repository/import_upload.rb +2 -1
- data/app/lib/actions/katello/repository/update.rb +4 -1
- data/app/lib/actions/pulp3/abstract_async_task.rb +0 -1
- data/app/lib/actions/pulp3/content_view/delete_repository_references.rb +1 -1
- data/app/lib/actions/pulp3/content_view_version/create_importer.rb +7 -3
- data/app/lib/actions/pulp3/content_view_version/export.rb +2 -1
- data/app/lib/actions/pulp3/content_view_version/import.rb +7 -3
- data/app/lib/actions/pulp3/orchestration/content_view_version/export.rb +15 -10
- data/app/lib/actions/pulp3/orchestration/content_view_version/import.rb +16 -10
- data/app/lib/actions/pulp3/repository/commit_upload.rb +2 -1
- data/app/lib/actions/pulp3/repository/delete.rb +1 -1
- data/app/lib/actions/pulp3/repository/save_artifact.rb +1 -1
- data/app/lib/katello/resources/candlepin/consumer.rb +2 -2
- data/app/lib/katello/resources/candlepin/owner.rb +5 -0
- data/app/lib/katello/resources/candlepin/upstream_consumer.rb +6 -0
- data/app/lib/katello/resources/registry.rb +3 -3
- data/app/models/katello/authorization/activation_key.rb +4 -0
- data/app/models/katello/authorization/content_view.rb +13 -0
- data/app/models/katello/authorization/content_view_component.rb +15 -0
- data/app/models/katello/authorization/gpg_key.rb +12 -4
- data/app/models/katello/authorization/lifecycle_environment.rb +8 -0
- data/app/models/katello/authorization/sync_plan.rb +16 -0
- data/app/models/katello/concerns/organization_extensions.rb +4 -5
- data/app/models/katello/concerns/redhat_extensions.rb +2 -2
- data/app/models/katello/concerns/smart_proxy_extensions.rb +1 -3
- data/app/models/katello/content_view_component.rb +2 -0
- data/app/models/katello/content_view_version_export_history.rb +2 -0
- data/app/models/katello/glue/candlepin/pool.rb +9 -14
- data/app/models/katello/glue/pulp/repo.rb +8 -0
- data/app/models/katello/gpg_key.rb +1 -1
- data/app/models/katello/root_repository.rb +26 -1
- data/app/services/katello/applicability/applicable_content_helper.rb +1 -12
- data/app/services/katello/candlepin/event_handler.rb +2 -0
- data/app/services/katello/candlepin/message_handler.rb +34 -0
- data/app/services/katello/candlepin/upstream_consumer.rb +28 -0
- data/app/services/katello/host_status_manager.rb +9 -0
- data/app/services/katello/pulp3/api/apt.rb +57 -0
- data/app/services/katello/pulp3/api/core.rb +8 -0
- data/app/services/katello/pulp3/content_view_version/export.rb +4 -3
- data/app/services/katello/pulp3/content_view_version/import.rb +5 -15
- data/app/services/katello/pulp3/deb.rb +38 -0
- data/app/services/katello/pulp3/erratum.rb +1 -2
- data/app/services/katello/pulp3/pulp_content_unit.rb +5 -0
- data/app/services/katello/pulp3/repository/ansible_collection.rb +9 -0
- data/app/services/katello/pulp3/repository/apt.rb +63 -0
- data/app/services/katello/pulp3/repository/docker.rb +4 -0
- data/app/services/katello/pulp3/repository/yum.rb +2 -1
- data/app/services/katello/pulp3/repository.rb +11 -9
- data/app/services/katello/pulp3/repository_mirror.rb +9 -4
- data/app/services/katello/pulp3/task.rb +3 -3
- data/app/services/katello/pulp3/task_group.rb +0 -6
- data/app/views/dashboard/_subscription_widget.html.erb +0 -5
- data/app/views/katello/api/v2/content_view_version_export_histories/show.json.rabl +1 -1
- data/app/views/katello/api/v2/repositories/base.json.rabl +1 -1
- data/app/views/overrides/organizations/_index_row_override.html.erb +1 -1
- data/config/routes/api/v2.rb +2 -0
- data/config/routes/overrides.rb +1 -0
- data/db/migrate/20150930183738_migrate_content_hosts.rb +1 -1
- data/db/migrate/20200514092553_move_katello_fields_from_hostgroups.katello.rb +2 -5
- data/db/migrate/20201008204114_add_os_versions_to_katello_root_repositories.rb +5 -0
- data/db/migrate/20201012172713_remove_gpg_key_perms.rb +23 -0
- data/db/migrate/20201012192035_add_metadata_to_katello_content_view_version_export_history.rb +5 -0
- data/db/seeds.d/111-upgrade_tasks.rb +2 -1
- data/engines/bastion/app/assets/javascripts/bastion/components/notification.service.js +1 -1
- data/engines/bastion/app/assets/javascripts/bastion/components/nutupane.factory.js +8 -13
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-system-purpose-modal.controller.js +112 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html +78 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-debs-installed.controller.js +2 -42
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-modal-helper.service.js +11 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.controller.js +5 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html +4 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-details.controller.js +4 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html +6 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-bulk-action.factory.js +2 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot +16 -14
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-advanced-sync-modal.controller.js +6 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +168 -155
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +17 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js +125 -113
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +15 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/os-versions.service.js +46 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-details.html +1 -1
- data/lib/katello/engine.rb +1 -0
- data/lib/katello/permission_creator.rb +68 -59
- data/lib/katello/permissions/host_permissions.rb +1 -0
- data/lib/katello/plugin.rb +4 -1
- data/lib/katello/repository_types/deb.rb +9 -1
- data/lib/katello/tasks/pulp3_content_switchover.rake +1 -3
- data/lib/katello/tasks/pulp3_migration_stats.rake +21 -0
- data/lib/katello/tasks/reports.rake +1 -4
- data/lib/katello/tasks/reset.rake +2 -1
- data/lib/katello/tasks/upgrades/3.18/add_cvv_export_history_metadata.rb +18 -0
- data/lib/katello/version.rb +1 -1
- data/locale/action_names.rb +54 -47
- data/locale/bn/katello.po +165 -26
- data/locale/cs/katello.po +164 -24
- data/locale/de/katello.po +165 -26
- data/locale/en/katello.po +164 -23
- data/locale/es/katello.po +165 -25
- data/locale/fr/katello.po +165 -25
- data/locale/gu/katello.po +165 -26
- data/locale/hi/katello.po +165 -26
- data/locale/it/katello.po +165 -25
- data/locale/ja/katello.po +165 -26
- data/locale/katello.pot +1036 -802
- data/locale/kn/katello.po +165 -26
- data/locale/ko/katello.po +165 -25
- data/locale/mr/katello.po +165 -26
- data/locale/or/katello.po +165 -26
- data/locale/pa/katello.po +165 -26
- data/locale/pt/katello.po +164 -23
- data/locale/pt_BR/katello.po +165 -25
- data/locale/ru/katello.po +165 -25
- data/locale/ta/katello.po +165 -26
- data/locale/te/katello.po +165 -26
- data/locale/zh_CN/katello.po +165 -25
- data/locale/zh_TW/katello.po +165 -26
- data/webpack/components/ActionableDetail.js +2 -1
- data/webpack/components/Search/Search.js +1 -1
- data/webpack/components/Table/MainTable.js +6 -2
- data/webpack/components/Table/TableWrapper.js +46 -9
- data/webpack/scenes/ContentViews/ContentViewSelectors.js +7 -3
- data/webpack/scenes/ContentViews/ContentViewsConstants.js +8 -0
- data/webpack/scenes/ContentViews/ContentViewsPage.js +2 -9
- data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js +25 -3
- data/webpack/scenes/ContentViews/Details/ContentViewDetailSelectors.js +14 -4
- data/webpack/scenes/ContentViews/Details/ContentViewDetails.js +2 -1
- data/webpack/scenes/ContentViews/Details/Repositories/ContentCounts.js +56 -0
- data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js +169 -0
- data/webpack/scenes/ContentViews/Details/Repositories/LastSync.js +47 -0
- data/webpack/scenes/ContentViews/Details/Repositories/RepoAddedStatus.js +17 -0
- data/webpack/scenes/ContentViews/Details/Repositories/RepoIcon.js +23 -0
- data/webpack/scenes/ContentViews/Details/Repositories/SelectableDropdown.js +49 -0
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json +154 -0
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.test.js +131 -0
- data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js +3 -0
- data/webpack/scenes/ContentViews/Table/ContentViewsTable.js +4 -1
- data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js +2 -2
- data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js +16 -8
- data/webpack/scenes/Subscriptions/Manifest/ManifestActions.js +17 -0
- data/webpack/scenes/Subscriptions/Manifest/ManifestConstants.js +4 -0
- data/webpack/scenes/Subscriptions/Manifest/SimpleContentAccess.js +19 -2
- data/webpack/scenes/Subscriptions/Manifest/__tests__/SimpleContentAccess.test.js +9 -1
- data/webpack/scenes/Subscriptions/Manifest/index.js +2 -1
- data/webpack/scenes/Subscriptions/SubscriptionConstants.js +1 -1
- data/webpack/scenes/Subscriptions/SubscriptionReducer.js +3 -0
- data/webpack/scenes/Subscriptions/SubscriptionsPage.js +8 -2
- data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js +3 -0
- data/webpack/scenes/Subscriptions/__tests__/SubscriptionsPage.test.js +3 -0
- data/webpack/scenes/Subscriptions/__tests__/SubscriptionsSelectors.test.js +6 -0
- data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsSelectors.test.js.snap +6 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js +1 -13
- metadata +69 -26
data/locale/zh_TW/katello.po
CHANGED
|
@@ -417,6 +417,9 @@ msgstr "已新增內容:"
|
|
|
417
417
|
msgid "Adding content units"
|
|
418
418
|
msgstr ""
|
|
419
419
|
|
|
420
|
+
msgid "Adding multiple versions of the same Puppet Module is not supported by incremental update. The following Puppet Modules have duplicate versions in the incremental update content list: %{dup_list}"
|
|
421
|
+
msgstr ""
|
|
422
|
+
|
|
420
423
|
msgid "Addons"
|
|
421
424
|
msgstr ""
|
|
422
425
|
|
|
@@ -521,6 +524,9 @@ msgstr ""
|
|
|
521
524
|
msgid "Artifacts"
|
|
522
525
|
msgstr ""
|
|
523
526
|
|
|
527
|
+
msgid "Assign system purpose attributes on one or more hosts"
|
|
528
|
+
msgstr ""
|
|
529
|
+
|
|
524
530
|
msgid "Assign the %{count} host with no %{taxonomy_single} to %{taxonomy_name}"
|
|
525
531
|
msgid_plural "Assign all %{count} hosts with no %{taxonomy_single} to %{taxonomy_name}"
|
|
526
532
|
msgstr[0] "將沒有 %{taxonomy_single} 的 %{count} 部主機指定至 %{taxonomy_name}"
|
|
@@ -566,9 +572,6 @@ msgstr ""
|
|
|
566
572
|
msgid "Author"
|
|
567
573
|
msgstr ""
|
|
568
574
|
|
|
569
|
-
msgid "Auto Enablement may only be set on custom repositories."
|
|
570
|
-
msgstr ""
|
|
571
|
-
|
|
572
575
|
msgid "Auto Publish - Triggered by '%s'"
|
|
573
576
|
msgstr ""
|
|
574
577
|
|
|
@@ -782,6 +785,9 @@ msgstr ""
|
|
|
782
785
|
msgid "Cannot delete view while it exists in environments"
|
|
783
786
|
msgstr "無法刪除還存在環境中的視域"
|
|
784
787
|
|
|
788
|
+
msgid "Cannot import a composite content view"
|
|
789
|
+
msgstr ""
|
|
790
|
+
|
|
785
791
|
msgid "Cannot import a custom subscription from a redhat product."
|
|
786
792
|
msgstr ""
|
|
787
793
|
|
|
@@ -858,6 +864,9 @@ msgstr ""
|
|
|
858
864
|
msgid "Checksum type cannot be set for yum repositories with on demand download policy."
|
|
859
865
|
msgstr ""
|
|
860
866
|
|
|
867
|
+
msgid "Chunk export-tarfile into pieces of chunk_size mega bytes. Relevant only for Pulp 3 repositories"
|
|
868
|
+
msgstr ""
|
|
869
|
+
|
|
861
870
|
msgid "Click here to go to the tasks page for the task."
|
|
862
871
|
msgstr ""
|
|
863
872
|
|
|
@@ -988,9 +997,15 @@ msgstr ""
|
|
|
988
997
|
msgid "Content View Version not set"
|
|
989
998
|
msgstr ""
|
|
990
999
|
|
|
1000
|
+
msgid "Content View Version specified in the metadata - '%{name}' already exists. If you wish to replace the existing version, delete %{name} and try again. "
|
|
1001
|
+
msgstr ""
|
|
1002
|
+
|
|
991
1003
|
msgid "Content View and Environment not set for registration."
|
|
992
1004
|
msgstr ""
|
|
993
1005
|
|
|
1006
|
+
msgid "Content View id"
|
|
1007
|
+
msgstr ""
|
|
1008
|
+
|
|
994
1009
|
# translation auto-copied from project Satellite6 Katello, version Sam-1.3.0, document katello, author tchuang
|
|
995
1010
|
msgid "Content Views"
|
|
996
1011
|
msgstr "內容視域"
|
|
@@ -1050,12 +1065,12 @@ msgstr ""
|
|
|
1050
1065
|
msgid "Copy an activation key"
|
|
1051
1066
|
msgstr "複製啟動金鑰"
|
|
1052
1067
|
|
|
1068
|
+
msgid "Copy version units to library"
|
|
1069
|
+
msgstr ""
|
|
1070
|
+
|
|
1053
1071
|
msgid "Cores: %s"
|
|
1054
1072
|
msgstr "核心:%s"
|
|
1055
1073
|
|
|
1056
|
-
msgid "Could not calculate errata status, ensure host is registered and the katello-host-tools package is installed"
|
|
1057
|
-
msgstr ""
|
|
1058
|
-
|
|
1059
1074
|
# translation auto-copied from project CFSE, version sam-1.2, document app, author tchuang
|
|
1060
1075
|
msgid "Could not delete organization '%s'."
|
|
1061
1076
|
msgstr "無法刪除組織 '%s'。"
|
|
@@ -1066,6 +1081,9 @@ msgstr "軟體庫中找不到擁有 '%{id}' 的 %{content}。"
|
|
|
1066
1081
|
msgid "Could not find %{count} errata. Only found: %{found}"
|
|
1067
1082
|
msgstr ""
|
|
1068
1083
|
|
|
1084
|
+
msgid "Could not find %{name} resource with id %{id}"
|
|
1085
|
+
msgstr ""
|
|
1086
|
+
|
|
1069
1087
|
msgid "Could not find Environment with ids: %s"
|
|
1070
1088
|
msgstr "找不到擁有 ID 的環境:%s"
|
|
1071
1089
|
|
|
@@ -1099,9 +1117,6 @@ msgstr ""
|
|
|
1099
1117
|
msgid "Couldn't find %{type} Filter with id %{id}"
|
|
1100
1118
|
msgstr "找不到擁有 ID %{id} 的 %{type} 篩選器"
|
|
1101
1119
|
|
|
1102
|
-
msgid "Couldn't find Content Credential '%s'"
|
|
1103
|
-
msgstr ""
|
|
1104
|
-
|
|
1105
1120
|
msgid "Couldn't find ContentViewFilter with id=%s"
|
|
1106
1121
|
msgstr "找不到 id 為「%s」的 ContentViewFilter"
|
|
1107
1122
|
|
|
@@ -1200,10 +1215,6 @@ msgstr ""
|
|
|
1200
1215
|
msgid "Couldn't find subject of synchronization"
|
|
1201
1216
|
msgstr "找不到要同步的東西"
|
|
1202
1217
|
|
|
1203
|
-
# translation auto-copied from project CFSE, version sam-1.2, document app, author tchuang
|
|
1204
|
-
msgid "Couldn't find sync plan '%{plan}' in organization '%{org}'"
|
|
1205
|
-
msgstr "在「%{org}」組織中找不到同步計劃「%{plan}」"
|
|
1206
|
-
|
|
1207
1218
|
msgid "Count"
|
|
1208
1219
|
msgstr ""
|
|
1209
1220
|
|
|
@@ -1486,6 +1497,15 @@ msgstr ""
|
|
|
1486
1497
|
msgid "Desired quantity of the pool"
|
|
1487
1498
|
msgstr ""
|
|
1488
1499
|
|
|
1500
|
+
msgid "Destination Server Name required for Pulp3 repositories"
|
|
1501
|
+
msgstr ""
|
|
1502
|
+
|
|
1503
|
+
msgid "Destination Server name"
|
|
1504
|
+
msgstr ""
|
|
1505
|
+
|
|
1506
|
+
msgid "Destination Server name, required for Pulp3"
|
|
1507
|
+
msgstr ""
|
|
1508
|
+
|
|
1489
1509
|
# translation auto-copied from project Satellite6 Foreman, version 6.1, document foreman
|
|
1490
1510
|
msgid "Destroy"
|
|
1491
1511
|
msgstr "銷毀"
|
|
@@ -1539,6 +1559,9 @@ msgstr "詳細資料"
|
|
|
1539
1559
|
msgid "Directly setting package lists on composite content views is not allowed. Please update the components, then re-publish the composite."
|
|
1540
1560
|
msgstr ""
|
|
1541
1561
|
|
|
1562
|
+
msgid "Directory containing the exported Content View Version"
|
|
1563
|
+
msgstr ""
|
|
1564
|
+
|
|
1542
1565
|
# translation auto-copied from project Satellite6 Foreman Discovery, version 6.1, document foreman_discovery, author ccheng
|
|
1543
1566
|
msgid "Disable"
|
|
1544
1567
|
msgstr "停用"
|
|
@@ -1555,6 +1578,9 @@ msgstr ""
|
|
|
1555
1578
|
msgid "Disable simple content access for a manifest"
|
|
1556
1579
|
msgstr ""
|
|
1557
1580
|
|
|
1581
|
+
msgid "Disabling Simple Content Access failed for '%{subject}'."
|
|
1582
|
+
msgstr ""
|
|
1583
|
+
|
|
1558
1584
|
msgid "Disconnected mode"
|
|
1559
1585
|
msgstr ""
|
|
1560
1586
|
|
|
@@ -1640,6 +1666,9 @@ msgstr ""
|
|
|
1640
1666
|
msgid "Enabled Repositories"
|
|
1641
1667
|
msgstr ""
|
|
1642
1668
|
|
|
1669
|
+
msgid "Enabling Simple Content Access failed for '%{subject}'."
|
|
1670
|
+
msgstr ""
|
|
1671
|
+
|
|
1643
1672
|
msgid "End Date"
|
|
1644
1673
|
msgstr ""
|
|
1645
1674
|
|
|
@@ -1770,6 +1799,9 @@ msgstr ""
|
|
|
1770
1799
|
msgid "Export to ISO format"
|
|
1771
1800
|
msgstr ""
|
|
1772
1801
|
|
|
1802
|
+
msgid "Export to ISO format. Relevant only for Pulp 2 repositories"
|
|
1803
|
+
msgstr ""
|
|
1804
|
+
|
|
1773
1805
|
msgid "Exported version"
|
|
1774
1806
|
msgstr ""
|
|
1775
1807
|
|
|
@@ -1910,10 +1942,6 @@ msgstr ""
|
|
|
1910
1942
|
msgid "GPG Key URL"
|
|
1911
1943
|
msgstr ""
|
|
1912
1944
|
|
|
1913
|
-
# translation auto-copied from project CFSE, version sam-1.2, document app, author tchuang
|
|
1914
|
-
msgid "GPG Keys"
|
|
1915
|
-
msgstr "GPG 金鑰"
|
|
1916
|
-
|
|
1917
1945
|
# translation auto-copied from project Satellite6 Katello, version Sam-1.3.0, document katello, author Chester Cheng
|
|
1918
1946
|
msgid "Generate and Download"
|
|
1919
1947
|
msgstr "產生與下載"
|
|
@@ -2021,6 +2049,9 @@ msgstr "主機集是空的。"
|
|
|
2021
2049
|
msgid "Host content and subscription details"
|
|
2022
2050
|
msgstr "主機內容和訂閱詳細資料"
|
|
2023
2051
|
|
|
2052
|
+
msgid "Host creation was skipped for %s because it shares a BIOS UUID with %s. To report this hypervisor, override its dmi.system.uuid fact or set 'candlepin.use_system_uuid_for_matching' to 'true' in the Candlepin configuration."
|
|
2053
|
+
msgstr ""
|
|
2054
|
+
|
|
2024
2055
|
msgid "Host did not finish content action in %s seconds. The task has been cancelled."
|
|
2025
2056
|
msgstr ""
|
|
2026
2057
|
|
|
@@ -2241,6 +2272,12 @@ msgstr ""
|
|
|
2241
2272
|
msgid "Immediate"
|
|
2242
2273
|
msgstr ""
|
|
2243
2274
|
|
|
2275
|
+
msgid "Import"
|
|
2276
|
+
msgstr ""
|
|
2277
|
+
|
|
2278
|
+
msgid "Import Content View Version"
|
|
2279
|
+
msgstr ""
|
|
2280
|
+
|
|
2244
2281
|
msgid "Import Manifest"
|
|
2245
2282
|
msgstr "匯入清單"
|
|
2246
2283
|
|
|
@@ -2262,6 +2299,9 @@ msgstr ""
|
|
|
2262
2299
|
msgid "Import a Manifest using the manifest tab above."
|
|
2263
2300
|
msgstr ""
|
|
2264
2301
|
|
|
2302
|
+
msgid "Import a content view version"
|
|
2303
|
+
msgstr ""
|
|
2304
|
+
|
|
2265
2305
|
msgid "Import facts"
|
|
2266
2306
|
msgstr "匯入詳情"
|
|
2267
2307
|
|
|
@@ -2433,6 +2473,9 @@ msgstr ""
|
|
|
2433
2473
|
msgid "Invalid filter rule specified, 'version' cannot be specified in the same tuple as 'min_version' or 'max_version'"
|
|
2434
2474
|
msgstr "指定了無效的篩選器規則,'version' 不可指定為與 'min_version' 或 'max_version' 相同的變數值組"
|
|
2435
2475
|
|
|
2476
|
+
msgid "Invalid parameters provided - %{params}. These are only relevant for Pulp 2 repositories"
|
|
2477
|
+
msgstr ""
|
|
2478
|
+
|
|
2436
2479
|
# translation auto-copied from project CFSE, version sam-1.2, document app, author tchuang
|
|
2437
2480
|
msgid "Invalid parameters sent in the request for this operation. Please contact a system administrator."
|
|
2438
2481
|
msgstr "此作業的請求中傳送了無效的參數。請聯絡系統管理員。"
|
|
@@ -2447,6 +2490,9 @@ msgstr ""
|
|
|
2447
2490
|
msgid "Invalid params provided - date_type must be one of %s"
|
|
2448
2491
|
msgstr ""
|
|
2449
2492
|
|
|
2493
|
+
msgid "Invalid path specified."
|
|
2494
|
+
msgstr ""
|
|
2495
|
+
|
|
2450
2496
|
msgid ""
|
|
2451
2497
|
"Invalid puppet module parameters specified. \\\n"
|
|
2452
2498
|
" Either 'uuid' or 'name' and 'author' must be specified."
|
|
@@ -2524,9 +2570,6 @@ msgstr ""
|
|
|
2524
2570
|
msgid "Learn more about adding Subscription Manifests"
|
|
2525
2571
|
msgstr ""
|
|
2526
2572
|
|
|
2527
|
-
msgid "Learn more about your overall subscription usage (opens in a new tab)"
|
|
2528
|
-
msgstr ""
|
|
2529
|
-
|
|
2530
2573
|
msgid "Library lifecycle environments may not be deleted."
|
|
2531
2574
|
msgstr "不可刪除函式庫生命週期環境。"
|
|
2532
2575
|
|
|
@@ -2779,6 +2822,9 @@ msgstr ""
|
|
|
2779
2822
|
msgid "List srpms"
|
|
2780
2823
|
msgstr ""
|
|
2781
2824
|
|
|
2825
|
+
msgid "List subscriptions"
|
|
2826
|
+
msgstr ""
|
|
2827
|
+
|
|
2782
2828
|
msgid "List sync plans"
|
|
2783
2829
|
msgstr "列出同步計劃"
|
|
2784
2830
|
|
|
@@ -2867,6 +2913,9 @@ msgstr "訊息"
|
|
|
2867
2913
|
msgid "Messaging connection"
|
|
2868
2914
|
msgstr ""
|
|
2869
2915
|
|
|
2916
|
+
msgid "Metadata taken from the upstream export history for this Content View Version"
|
|
2917
|
+
msgstr ""
|
|
2918
|
+
|
|
2870
2919
|
msgid "Mismatched"
|
|
2871
2920
|
msgstr ""
|
|
2872
2921
|
|
|
@@ -3012,12 +3061,18 @@ msgstr ""
|
|
|
3012
3061
|
msgid "No hosts registered with subscription-manager found in selection."
|
|
3013
3062
|
msgstr ""
|
|
3014
3063
|
|
|
3064
|
+
msgid "No installed packages and/or enabled repositories have been reported by %s."
|
|
3065
|
+
msgstr ""
|
|
3066
|
+
|
|
3015
3067
|
msgid "No manifest file uploaded"
|
|
3016
3068
|
msgstr "未上傳清單檔案"
|
|
3017
3069
|
|
|
3018
3070
|
msgid "No matching content views found"
|
|
3019
3071
|
msgstr ""
|
|
3020
3072
|
|
|
3073
|
+
msgid "No matching repositories found"
|
|
3074
|
+
msgstr ""
|
|
3075
|
+
|
|
3021
3076
|
# translation auto-copied from project CFSE, version sam-1.2, document app, author tchuang
|
|
3022
3077
|
msgid "No new packages installed"
|
|
3023
3078
|
msgstr "未安裝新的套件"
|
|
@@ -3157,6 +3212,9 @@ msgstr ""
|
|
|
3157
3212
|
msgid "On-disk location for exported repositories"
|
|
3158
3213
|
msgstr ""
|
|
3159
3214
|
|
|
3215
|
+
msgid "On-disk location for pulp 3 exported repositories"
|
|
3216
|
+
msgstr ""
|
|
3217
|
+
|
|
3160
3218
|
msgid "One of parameters [ %s ] required but not specified."
|
|
3161
3219
|
msgstr "需要其中一項 [%s] 參數,不過尚未指定。"
|
|
3162
3220
|
|
|
@@ -3189,6 +3247,9 @@ msgstr "操作器"
|
|
|
3189
3247
|
msgid "Optional date of last export (ex: 2010-01-01T12:00:00Z)"
|
|
3190
3248
|
msgstr ""
|
|
3191
3249
|
|
|
3250
|
+
msgid "Optional date of last export (ex: 2010-01-01T12:00:00Z). Relevant only for Pulp 2 repositories"
|
|
3251
|
+
msgstr ""
|
|
3252
|
+
|
|
3192
3253
|
# translation auto-copied from project Satellite6 Hammer CLI Katello, version 6.1, document hammer-cli-katello
|
|
3193
3254
|
msgid "Organization"
|
|
3194
3255
|
msgstr "組織"
|
|
@@ -3473,6 +3534,9 @@ msgstr "實體的"
|
|
|
3473
3534
|
msgid "Plan numeric identifier"
|
|
3474
3535
|
msgstr "計畫的數字識別元"
|
|
3475
3536
|
|
|
3537
|
+
msgid "Please add some repositories."
|
|
3538
|
+
msgstr ""
|
|
3539
|
+
|
|
3476
3540
|
msgid "Please enter a positive number above zero"
|
|
3477
3541
|
msgstr ""
|
|
3478
3542
|
|
|
@@ -3607,6 +3671,9 @@ msgstr ""
|
|
|
3607
3671
|
msgid "Pulp"
|
|
3608
3672
|
msgstr ""
|
|
3609
3673
|
|
|
3674
|
+
msgid "Pulp 3 export destination filepath"
|
|
3675
|
+
msgstr ""
|
|
3676
|
+
|
|
3610
3677
|
msgid "Pulp 3 migration cannot run. Types %s have already been migrated."
|
|
3611
3678
|
msgstr ""
|
|
3612
3679
|
|
|
@@ -3661,6 +3728,12 @@ msgstr ""
|
|
|
3661
3728
|
msgid "Pulp task error"
|
|
3662
3729
|
msgstr "Pulp 任務錯誤"
|
|
3663
3730
|
|
|
3731
|
+
msgid "Pulp user or group unable to read '%s'."
|
|
3732
|
+
msgstr ""
|
|
3733
|
+
|
|
3734
|
+
msgid "Pulp user or group unable to read content in '%s'."
|
|
3735
|
+
msgstr ""
|
|
3736
|
+
|
|
3664
3737
|
msgid "Pulpcore"
|
|
3665
3738
|
msgstr ""
|
|
3666
3739
|
|
|
@@ -3799,6 +3872,9 @@ msgstr "要啟用的發行版本"
|
|
|
3799
3872
|
msgid "Reload data"
|
|
3800
3873
|
msgstr "重新載入資料"
|
|
3801
3874
|
|
|
3875
|
+
msgid "Remote action:"
|
|
3876
|
+
msgstr ""
|
|
3877
|
+
|
|
3802
3878
|
msgid "Removal of package group(s) requested: %{groups}"
|
|
3803
3879
|
msgstr ""
|
|
3804
3880
|
|
|
@@ -3885,6 +3961,9 @@ msgstr "正在移除套件..."
|
|
|
3885
3961
|
msgid "Repo Type"
|
|
3886
3962
|
msgstr ""
|
|
3887
3963
|
|
|
3964
|
+
msgid "Report"
|
|
3965
|
+
msgstr ""
|
|
3966
|
+
|
|
3888
3967
|
# translation auto-copied from project Satellite6 Katello CLI, version 6.0, document keys, author tchuang
|
|
3889
3968
|
msgid "Repositories"
|
|
3890
3969
|
msgstr "軟體庫"
|
|
@@ -3962,6 +4041,9 @@ msgstr ""
|
|
|
3962
4041
|
msgid "Resolve Traces"
|
|
3963
4042
|
msgstr ""
|
|
3964
4043
|
|
|
4044
|
+
msgid "Resolve traces for one or more hosts"
|
|
4045
|
+
msgstr ""
|
|
4046
|
+
|
|
3965
4047
|
msgid "Resource"
|
|
3966
4048
|
msgstr ""
|
|
3967
4049
|
|
|
@@ -4041,6 +4123,9 @@ msgstr "回傳軟體庫 GPG 金鑰的內容,直接由 yum 所使用"
|
|
|
4041
4123
|
msgid "Role"
|
|
4042
4124
|
msgstr ""
|
|
4043
4125
|
|
|
4126
|
+
msgid "Role of host"
|
|
4127
|
+
msgstr ""
|
|
4128
|
+
|
|
4044
4129
|
msgid "Run Sync Plan:"
|
|
4045
4130
|
msgstr ""
|
|
4046
4131
|
|
|
@@ -4142,6 +4227,9 @@ msgstr "服務等級 %s"
|
|
|
4142
4227
|
msgid "Service Level (SLA)"
|
|
4143
4228
|
msgstr ""
|
|
4144
4229
|
|
|
4230
|
+
msgid "Service level of host"
|
|
4231
|
+
msgstr ""
|
|
4232
|
+
|
|
4145
4233
|
msgid "Service level to be used for autoheal"
|
|
4146
4234
|
msgstr ""
|
|
4147
4235
|
|
|
@@ -4236,6 +4324,9 @@ msgstr "顯示內容主機的可用發行版本"
|
|
|
4236
4324
|
msgid "Show the available repository types"
|
|
4237
4325
|
msgstr ""
|
|
4238
4326
|
|
|
4327
|
+
msgid "Show the export history for a content view version"
|
|
4328
|
+
msgstr ""
|
|
4329
|
+
|
|
4239
4330
|
msgid "Shows status of Katello system and it's subcomponents"
|
|
4240
4331
|
msgstr ""
|
|
4241
4332
|
|
|
@@ -4245,6 +4336,12 @@ msgstr "顯示版本資訊"
|
|
|
4245
4336
|
msgid "Simple Content Access"
|
|
4246
4337
|
msgstr ""
|
|
4247
4338
|
|
|
4339
|
+
msgid "Simple Content Access has been disabled for '%{subject}'."
|
|
4340
|
+
msgstr ""
|
|
4341
|
+
|
|
4342
|
+
msgid "Simple Content Access has been enabled for '%{subject}'."
|
|
4343
|
+
msgstr ""
|
|
4344
|
+
|
|
4248
4345
|
msgid "Size of file to upload"
|
|
4249
4346
|
msgstr ""
|
|
4250
4347
|
|
|
@@ -4492,6 +4589,9 @@ msgstr "同步一或多項產品"
|
|
|
4492
4589
|
msgid "Sync plan identifier to attach"
|
|
4493
4590
|
msgstr "同步要連接的計畫識別子"
|
|
4494
4591
|
|
|
4592
|
+
msgid "Sync state"
|
|
4593
|
+
msgstr ""
|
|
4594
|
+
|
|
4495
4595
|
msgid "Synced Content"
|
|
4496
4596
|
msgstr ""
|
|
4497
4597
|
|
|
@@ -4603,6 +4703,9 @@ msgstr "下列主機含有套用至它們的勘誤:"
|
|
|
4603
4703
|
msgid "The id of the host to alter"
|
|
4604
4704
|
msgstr ""
|
|
4605
4705
|
|
|
4706
|
+
msgid "The import path must be in a subdirectory under '%s'."
|
|
4707
|
+
msgstr ""
|
|
4708
|
+
|
|
4606
4709
|
msgid "The list of environments to promote the specified Content View Version to (replacing the older version)"
|
|
4607
4710
|
msgstr ""
|
|
4608
4711
|
|
|
@@ -4651,6 +4754,9 @@ msgstr ""
|
|
|
4651
4754
|
msgid "The requested resource does not belong to the specified organization"
|
|
4652
4755
|
msgstr ""
|
|
4653
4756
|
|
|
4757
|
+
msgid "The requested traces were not found for this host"
|
|
4758
|
+
msgstr ""
|
|
4759
|
+
|
|
4654
4760
|
msgid "The selected content source and lifecycle environment do not match"
|
|
4655
4761
|
msgstr ""
|
|
4656
4762
|
|
|
@@ -4714,6 +4820,9 @@ msgstr ""
|
|
|
4714
4820
|
msgid "There's no running synchronization for this smart proxy."
|
|
4715
4821
|
msgstr ""
|
|
4716
4822
|
|
|
4823
|
+
msgid "This API endpoint is only valid for Pulp 3 repositories."
|
|
4824
|
+
msgstr ""
|
|
4825
|
+
|
|
4717
4826
|
msgid "This Host is not currently registered with subscription-manager."
|
|
4718
4827
|
msgstr ""
|
|
4719
4828
|
|
|
@@ -4853,10 +4962,13 @@ msgstr ""
|
|
|
4853
4962
|
msgid "Unable to detect puppet path"
|
|
4854
4963
|
msgstr ""
|
|
4855
4964
|
|
|
4856
|
-
msgid "Unable to export, 'pulp_export_destination' setting is not a
|
|
4965
|
+
msgid "Unable to export, 'pulp_export_destination' setting is not set to a valid directory."
|
|
4857
4966
|
msgstr ""
|
|
4858
4967
|
|
|
4859
|
-
msgid "Unable to export
|
|
4968
|
+
msgid "Unable to export. 'pulp_export_destination' setting is not a writable directory."
|
|
4969
|
+
msgstr ""
|
|
4970
|
+
|
|
4971
|
+
msgid "Unable to export. 'pulpcore_export_destination' setting is not set to a valid directory."
|
|
4860
4972
|
msgstr ""
|
|
4861
4973
|
|
|
4862
4974
|
msgid "Unable to reassign activation_keys. Please check activation_key_content_view_id and activation_key_environment_id."
|
|
@@ -5072,6 +5184,12 @@ msgstr ""
|
|
|
5072
5184
|
msgid "Updating Package..."
|
|
5073
5185
|
msgstr "正在更新套件……"
|
|
5074
5186
|
|
|
5187
|
+
msgid "Updating System Purpose for host"
|
|
5188
|
+
msgstr ""
|
|
5189
|
+
|
|
5190
|
+
msgid "Updating System Purpose for host %s"
|
|
5191
|
+
msgstr ""
|
|
5192
|
+
|
|
5075
5193
|
# translation auto-copied from project Satellite6 Katello, version Sam-1.3.0, document katello, author Chester Cheng
|
|
5076
5194
|
msgid "Updating package group..."
|
|
5077
5195
|
msgstr "更新套件群組......"
|
|
@@ -5127,9 +5245,15 @@ msgstr ""
|
|
|
5127
5245
|
msgid "Usage Type"
|
|
5128
5246
|
msgstr ""
|
|
5129
5247
|
|
|
5248
|
+
msgid "Usage of host"
|
|
5249
|
+
msgstr ""
|
|
5250
|
+
|
|
5130
5251
|
msgid "Use remote execution by default"
|
|
5131
5252
|
msgstr ""
|
|
5132
5253
|
|
|
5254
|
+
msgid "Used to determine download concurrency of the repository in pulp3. Use value less than 20. Defaults to 10"
|
|
5255
|
+
msgstr ""
|
|
5256
|
+
|
|
5133
5257
|
msgid "User '%s' did not specify an organization ID and does not have a default organization."
|
|
5134
5258
|
msgstr "使用者「%s」並未指定組織 ID,並且沒有預設的組織。"
|
|
5135
5259
|
|
|
@@ -5154,6 +5278,15 @@ msgstr ""
|
|
|
5154
5278
|
msgid "Value must either be a boolean or 'default' for 'enabled'"
|
|
5155
5279
|
msgstr ""
|
|
5156
5280
|
|
|
5281
|
+
msgid "Verify checksum"
|
|
5282
|
+
msgstr ""
|
|
5283
|
+
|
|
5284
|
+
msgid "Verify checksum for one or more products"
|
|
5285
|
+
msgstr ""
|
|
5286
|
+
|
|
5287
|
+
msgid "Verify checksum of repository contents"
|
|
5288
|
+
msgstr ""
|
|
5289
|
+
|
|
5157
5290
|
msgid "Version"
|
|
5158
5291
|
msgstr ""
|
|
5159
5292
|
|
|
@@ -5171,7 +5304,7 @@ msgstr ""
|
|
|
5171
5304
|
msgid "Virtual"
|
|
5172
5305
|
msgstr "虛擬"
|
|
5173
5306
|
|
|
5174
|
-
msgid "When Simple Content Access is enabled, hosts
|
|
5307
|
+
msgid "When Simple Content Access is enabled, hosts are not required to have subscriptions attached to access repositories."
|
|
5175
5308
|
msgstr ""
|
|
5176
5309
|
|
|
5177
5310
|
msgid "When registering a host via subscription-manager, force use the specified fact (in the form of 'fact.fact')"
|
|
@@ -5240,6 +5373,9 @@ msgstr "您不能設置組織的 parent_id。這項功能已停用。"
|
|
|
5240
5373
|
msgid "You currently don't have any Content Views."
|
|
5241
5374
|
msgstr ""
|
|
5242
5375
|
|
|
5376
|
+
msgid "You currently don't have any repositories to add to this content view."
|
|
5377
|
+
msgstr ""
|
|
5378
|
+
|
|
5243
5379
|
msgid "You do not have permissions to delete %s"
|
|
5244
5380
|
msgstr "您沒有刪除 %s 的權限"
|
|
5245
5381
|
|
|
@@ -5659,9 +5795,6 @@ msgstr ""
|
|
|
5659
5795
|
msgid "if true, Katello will verify the upstream url's SSL certifcates are signed by a trusted CA"
|
|
5660
5796
|
msgstr ""
|
|
5661
5797
|
|
|
5662
|
-
msgid "if true, the repositories will be automatically enabled on a registered host subscribed to this product. Default: true"
|
|
5663
|
-
msgstr ""
|
|
5664
|
-
|
|
5665
5798
|
msgid "if true, will ignore the globally configured proxy when syncing"
|
|
5666
5799
|
msgstr ""
|
|
5667
5800
|
|
|
@@ -5741,6 +5874,9 @@ msgstr "已註冊的內容主機之最大數量"
|
|
|
5741
5874
|
msgid "maximum size of each ISO in MB"
|
|
5742
5875
|
msgstr ""
|
|
5743
5876
|
|
|
5877
|
+
msgid "maximum size of each ISO in MB. Relevant only for Pulp 2 repositories"
|
|
5878
|
+
msgstr ""
|
|
5879
|
+
|
|
5744
5880
|
msgid "may not be less than the number of hosts associated with the host collection."
|
|
5745
5881
|
msgstr ""
|
|
5746
5882
|
|
|
@@ -6027,6 +6163,9 @@ msgstr ""
|
|
|
6027
6163
|
msgid "the uuid of the puppet module to associate"
|
|
6028
6164
|
msgstr "欲相聯的 puppet 模組之 UUID"
|
|
6029
6165
|
|
|
6166
|
+
msgid "true if the export api is pulp3 ready and usable. This API is intended for use by hammer-cli only."
|
|
6167
|
+
msgstr ""
|
|
6168
|
+
|
|
6030
6169
|
msgid "true if the latest version of the component's content view is desired"
|
|
6031
6170
|
msgstr ""
|
|
6032
6171
|
|
|
@@ -47,7 +47,7 @@ ActionableDetail.propTypes = {
|
|
|
47
47
|
value: PropTypes.oneOfType([ // displayed value
|
|
48
48
|
PropTypes.string,
|
|
49
49
|
PropTypes.bool,
|
|
50
|
-
])
|
|
50
|
+
]),
|
|
51
51
|
onEdit: PropTypes.func.isRequired,
|
|
52
52
|
textArea: PropTypes.bool,
|
|
53
53
|
boolean: PropTypes.bool,
|
|
@@ -58,6 +58,7 @@ ActionableDetail.defaultProps = {
|
|
|
58
58
|
textArea: false,
|
|
59
59
|
boolean: false,
|
|
60
60
|
tooltip: null,
|
|
61
|
+
value: null,
|
|
61
62
|
};
|
|
62
63
|
|
|
63
64
|
export default ActionableDetail;
|
|
@@ -64,7 +64,7 @@ class Search extends Component {
|
|
|
64
64
|
if (this.state.typingTimeout) clearTimeout(this.state.typingTimeout);
|
|
65
65
|
|
|
66
66
|
this.setState({
|
|
67
|
-
typingTimeout: setTimeout(() => this.
|
|
67
|
+
typingTimeout: setTimeout(() => this.onSearch(searchTerm), autoSearchDelay),
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
70
|
|
|
@@ -12,12 +12,14 @@ import Loading from '../../components/Loading';
|
|
|
12
12
|
|
|
13
13
|
const MainTable = ({
|
|
14
14
|
status, cells, rows, error, emptyContentTitle, emptyContentBody,
|
|
15
|
-
emptySearchTitle, emptySearchBody, searchIsActive,
|
|
15
|
+
emptySearchTitle, emptySearchBody, searchIsActive, activeFilters,
|
|
16
|
+
...extraTableProps
|
|
16
17
|
}) => {
|
|
18
|
+
const isFiltering = activeFilters || searchIsActive;
|
|
17
19
|
if (status === STATUS.PENDING) return (<Loading />);
|
|
18
20
|
// Can we display the error message?
|
|
19
21
|
if (status === STATUS.ERROR) return (<EmptyStateMessage error={error} />);
|
|
20
|
-
if (status === STATUS.RESOLVED &&
|
|
22
|
+
if (status === STATUS.RESOLVED && isFiltering && rows.length === 0) {
|
|
21
23
|
return (<EmptyStateMessage
|
|
22
24
|
title={emptySearchTitle}
|
|
23
25
|
body={emptySearchBody}
|
|
@@ -56,11 +58,13 @@ MainTable.propTypes = {
|
|
|
56
58
|
emptySearchTitle: PropTypes.string.isRequired,
|
|
57
59
|
emptySearchBody: PropTypes.string.isRequired,
|
|
58
60
|
searchIsActive: PropTypes.bool,
|
|
61
|
+
activeFilters: PropTypes.bool,
|
|
59
62
|
};
|
|
60
63
|
|
|
61
64
|
MainTable.defaultProps = {
|
|
62
65
|
error: null,
|
|
63
66
|
searchIsActive: false,
|
|
67
|
+
activeFilters: false,
|
|
64
68
|
};
|
|
65
69
|
|
|
66
70
|
export default MainTable;
|