katello 4.1.4 → 4.2.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb +2 -2
- data/app/controllers/katello/api/v2/content_credentials_controller.rb +3 -3
- data/app/controllers/katello/api/v2/content_uploads_controller.rb +3 -1
- data/app/controllers/katello/api/v2/content_view_components_controller.rb +33 -1
- data/app/controllers/katello/api/v2/content_views_controller.rb +12 -0
- data/app/controllers/katello/api/v2/host_errata_controller.rb +1 -1
- data/app/controllers/katello/api/v2/products_bulk_actions_controller.rb +1 -2
- data/app/controllers/katello/api/v2/products_controller.rb +4 -4
- data/app/controllers/katello/api/v2/repositories_bulk_actions_controller.rb +3 -11
- data/app/controllers/katello/api/v2/repositories_controller.rb +68 -47
- data/app/controllers/katello/api/v2/upstream_subscriptions_controller.rb +0 -28
- data/app/controllers/katello/concerns/api/v2/registration_commands_controller_extensions.rb +26 -5
- data/app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb +26 -1
- data/app/lib/actions/candlepin/environment/destroy.rb +2 -0
- data/app/lib/actions/katello/agent_action.rb +2 -2
- data/app/lib/actions/katello/capsule_content/sync_capsule.rb +3 -2
- data/app/lib/actions/katello/{gpg_key → content_credential}/update.rb +1 -1
- data/app/lib/actions/katello/content_view/publish.rb +6 -1
- data/app/lib/actions/katello/content_view_version/create_repos.rb +1 -1
- data/app/lib/actions/katello/content_view_version/incremental_update.rb +0 -47
- data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb +1 -1
- data/app/lib/actions/katello/repository/clone_contents.rb +1 -7
- data/app/lib/actions/katello/repository/clone_to_environment.rb +1 -7
- data/app/lib/actions/katello/repository/create.rb +4 -8
- data/app/lib/actions/katello/repository/create_root.rb +1 -1
- data/app/lib/actions/katello/repository/destroy.rb +1 -3
- data/app/lib/actions/katello/repository/import_upload.rb +3 -2
- data/app/lib/actions/katello/repository/instance_update.rb +1 -1
- data/app/lib/actions/katello/repository/metadata_generate.rb +2 -8
- data/app/lib/actions/katello/repository/multi_clone_contents.rb +0 -1
- data/app/lib/actions/katello/repository/refresh_repository.rb +1 -4
- data/app/lib/actions/katello/repository/remove_content.rb +6 -4
- data/app/lib/actions/katello/repository/sync.rb +5 -25
- data/app/lib/actions/katello/repository/update.rb +1 -2
- data/app/lib/actions/katello/repository/update_http_proxy_details.rb +2 -5
- data/app/lib/actions/katello/repository/update_redhat_repository.rb +1 -1
- data/app/lib/actions/katello/repository/upload_files.rb +8 -3
- data/app/lib/actions/katello/repository/upload_package_group.rb +2 -11
- data/app/lib/actions/katello/repository/verify_checksum.rb +0 -1
- data/app/lib/actions/katello/repository_set/enable_repository.rb +1 -1
- data/app/lib/actions/pulp3/orchestration/repository/create.rb +2 -2
- data/app/lib/actions/pulp3/repository/create.rb +3 -4
- data/app/lib/actions/pulp3/repository/create_remote.rb +1 -6
- data/app/lib/actions/pulp3/repository/repair.rb +4 -0
- data/app/lib/katello/errors.rb +1 -0
- data/app/lib/katello/http_resource.rb +26 -73
- data/app/lib/katello/qpid/connection.rb +1 -3
- data/app/lib/katello/resources/candlepin/consumer.rb +1 -1
- data/app/lib/katello/resources/candlepin/environment.rb +2 -0
- data/app/lib/katello/resources/registry.rb +7 -20
- data/app/lib/katello/util/http_proxy.rb +0 -3
- data/app/lib/katello/validators/gpg_key_content_validator.rb +1 -1
- data/app/models/katello/authorization/{gpg_key.rb → content_credential.rb} +1 -1
- data/app/models/katello/authorization/product.rb +0 -4
- data/app/models/katello/concerns/host_managed_extensions.rb +2 -16
- data/app/models/katello/concerns/organization_extensions.rb +1 -1
- data/app/models/katello/concerns/pulp_database_unit.rb +13 -5
- data/app/models/katello/concerns/smart_proxy_extensions.rb +45 -41
- data/app/models/katello/{gpg_key.rb → content_credential.rb} +4 -4
- data/app/models/katello/content_view.rb +6 -1
- data/app/models/katello/generic_content_unit.rb +16 -0
- data/app/models/katello/glue/pulp/repos.rb +9 -25
- data/app/models/katello/kt_environment.rb +1 -1
- data/app/models/katello/product.rb +4 -4
- data/app/models/katello/repository.rb +13 -7
- data/app/models/katello/repository_generic_content_unit.rb +7 -0
- data/app/models/katello/root_repository.rb +38 -7
- data/app/models/setting/content.rb +5 -0
- data/app/services/cert/certs.rb +16 -8
- data/app/services/katello/applicability/applicable_content_helper.rb +1 -2
- data/app/services/katello/candlepin/consumer.rb +6 -0
- data/app/services/katello/component_view_presenter.rb +27 -0
- data/app/services/katello/pulp/repository.rb +1 -1
- data/app/services/katello/pulp/server.rb +2 -2
- data/app/services/katello/pulp3/api/core.rb +4 -0
- data/app/services/katello/pulp3/api/generic.rb +68 -0
- data/app/services/katello/pulp3/generic_content_unit.rb +29 -0
- data/app/services/katello/pulp3/pulp_content_unit.rb +5 -1
- data/app/services/katello/pulp3/repository/generic.rb +94 -0
- data/app/services/katello/pulp3/repository/yum.rb +4 -5
- data/app/services/katello/pulp3/repository.rb +27 -12
- data/app/services/katello/pulp3/repository_mirror.rb +2 -2
- data/app/services/katello/pulp3/smart_proxy_repository.rb +4 -4
- data/app/services/katello/registration_manager.rb +18 -7
- data/app/services/katello/repository_type.rb +59 -1
- data/app/services/katello/repository_type_manager.rb +116 -24
- data/app/views/katello/api/v2/content_views/base.json.rabl +4 -4
- data/app/views/katello/api/v2/repositories/show.json.rabl +1 -0
- data/app/views/smart_proxies/plugins/_pulpcore.html.erb +2 -5
- data/app/views/smart_proxies/pulp_status.html.erb +0 -7
- data/config/katello.yaml.example +0 -21
- data/config/routes/api/v2.rb +2 -1
- data/db/functions/deb_version_cmp_v01.sql +200 -0
- data/db/migrate/20171110082124_add_ssl_certs_to_products_and_repos.rb +5 -1
- data/db/migrate/20200402130013_add_repsoitory_docker_meta_tag_f_key.rb +3 -1
- data/db/migrate/20210624221630_katello_generic_content.rb +22 -0
- data/db/migrate/20210625095042_add_retain_package_versions_count.rb +9 -0
- data/db/migrate/20210628182553_add_generic_remote_options_to_root_repository.rb +5 -0
- data/db/migrate/20210714140440_remove_repo_export_permission.rb +5 -0
- data/db/migrate/20210721163730_change_gpg_keys_to_content_credentials.rb +8 -0
- data/db/migrate/20210728130748_create_function_deb_version_cmp.rb +12 -0
- data/db/seeds.d/111-upgrade_tasks.rb +1 -2
- data/engines/bastion/app/views/bastion/layouts/assets.html.erb +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js +7 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html +4 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html +2 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot +25 -33
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-advanced-sync-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-repositories.controller.js +1 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +10 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.filter.js +9 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html +1 -25
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +31 -13
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +11 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html +0 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/aggregate-task.factory.js +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/task.factory.js +1 -1
- data/lib/katello/engine.rb +2 -4
- data/lib/katello/permission_creator.rb +6 -12
- data/lib/katello/plugin.rb +76 -80
- data/lib/katello/repository_types/python.rb +37 -0
- data/lib/katello/tasks/reimport.rake +0 -9
- data/lib/katello/tasks/repository.rake +3 -4
- data/lib/katello/version.rb +1 -1
- data/locale/action_names.rb +28 -29
- data/locale/bn/katello.po +699 -221
- data/locale/cs/katello.po +167 -59
- data/locale/de/katello.po +585 -352
- data/locale/en/katello.po +167 -59
- data/locale/es/katello.po +1388 -1189
- data/locale/fr/katello.po +1740 -1494
- data/locale/gu/katello.po +896 -416
- data/locale/hi/katello.po +892 -415
- data/locale/it/katello.po +371 -170
- data/locale/ja/katello.po +1657 -1439
- data/locale/katello.pot +933 -736
- data/locale/kn/katello.po +894 -416
- data/locale/ko/katello.po +515 -317
- data/locale/mr/katello.po +857 -415
- data/locale/or/katello.po +894 -416
- data/locale/pa/katello.po +874 -411
- data/locale/pt/katello.po +347 -154
- data/locale/pt_BR/katello.po +1398 -1215
- data/locale/ru/katello.po +671 -463
- data/locale/ta/katello.po +697 -221
- data/locale/te/katello.po +891 -415
- data/locale/zh_CN/katello.po +2029 -1845
- data/locale/zh_TW/katello.po +735 -407
- data/package.json +3 -1
- data/webpack/components/EditableTextInput/EditableTextInput.js +3 -3
- data/webpack/components/RoutedTabs/RoutedTabs.js +7 -8
- data/webpack/components/Table/TableWrapper.js +19 -11
- data/webpack/components/Table/helpers.js +1 -1
- data/webpack/components/extensions/HostDetails/Tabs/ContentTab.js +42 -0
- data/webpack/components/extensions/HostDetails/Tabs/SubscriptionTab.js +12 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/ActivationKeys.test.js.snap +4 -0
- data/webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js +1 -1
- data/webpack/components/extensions/RegistrationCommands/index.js +1 -2
- data/webpack/components/pf3Table/formatters/selectionHeaderCellFormatter.js +2 -1
- data/webpack/fills_index.js +4 -1
- data/webpack/redux/actions/RedHatRepositories/helpers.js +2 -4
- data/webpack/redux/reducers/RedHatRepositories/enabled.js +4 -1
- data/webpack/scenes/ContentViews/ContentViewsActions.js +16 -1
- data/webpack/scenes/ContentViews/ContentViewsConstants.js +15 -0
- data/webpack/scenes/ContentViews/ContentViewsPage.js +12 -22
- data/webpack/scenes/ContentViews/Copy/CopyContentViewForm.js +4 -3
- data/webpack/scenes/ContentViews/Create/CreateContentViewForm.js +25 -14
- data/webpack/scenes/ContentViews/Create/CreateContentViewModal.js +4 -2
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js +153 -0
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentVersion.js +21 -10
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js +157 -19
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.fixtures.json +100 -108
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js +140 -16
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/publishedContentViewDetails.fixtures.json +367 -0
- data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js +59 -6
- data/webpack/scenes/ContentViews/Details/ContentViewDetailSelectors.js +43 -0
- data/webpack/scenes/ContentViews/Details/ContentViewDetails.js +44 -13
- data/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js +161 -0
- data/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js +54 -0
- data/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterCreateResult.fixtures.json +124 -0
- data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js +8 -6
- data/webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js +7 -6
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilterDetails.js +4 -3
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js +71 -12
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.test.js +77 -0
- data/webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js +13 -12
- data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js +2 -2
- data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js +17 -14
- data/webpack/scenes/ContentViews/Details/Repositories/LastSync.js +3 -3
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js +2 -2
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.test.js +6 -2
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js +61 -20
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewTaskInProgressResponse.fixtures.json +71 -0
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewTaskResponse.fixtures.json +75 -0
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js +86 -1
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersionsWithTask.fixtures.json +713 -0
- data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js +3 -0
- data/webpack/scenes/ContentViews/Publish/CVPublishFinish.js +184 -0
- data/webpack/scenes/ContentViews/Publish/CVPublishForm.js +104 -0
- data/webpack/scenes/ContentViews/Publish/CVPublishReview.js +71 -0
- data/webpack/scenes/ContentViews/Publish/ContentViewPublishSelectors.js +17 -0
- data/webpack/scenes/ContentViews/Publish/PublishContentViewWizard.js +145 -0
- data/webpack/scenes/ContentViews/Publish/__tests__/environmentPaths.fixtures.json +352 -0
- data/webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js +184 -0
- data/webpack/scenes/ContentViews/Publish/__tests__/publishResponse.fixture.json +69 -0
- data/webpack/scenes/ContentViews/Publish/cvPublishForm.scss +3 -0
- data/webpack/scenes/ContentViews/Table/ContentViewsTable.js +75 -48
- data/webpack/scenes/ContentViews/Table/tableDataGenerator.js +15 -2
- data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js +6 -10
- data/webpack/scenes/ContentViews/components/EnvironmentLabels.js +22 -10
- data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPathActions.js +12 -0
- data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPathConstants.js +2 -0
- data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPathSelectors.js +16 -0
- data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.js +72 -0
- data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.scss +8 -0
- data/webpack/scenes/ContentViews/components/TaskPresenter/TaskPresenter.js +85 -0
- data/webpack/scenes/SmartProxy/SmartProxyContentTable.js +9 -8
- data/webpack/scenes/Subscriptions/SubscriptionsPage.js +4 -25
- data/webpack/scenes/Subscriptions/__tests__/SubscriptionsPage.test.js +0 -3
- data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap +3 -3
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js +4 -2
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap +24 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Table.js +4 -1
- data/webpack/scenes/Subscriptions/index.js +1 -4
- metadata +74 -39
- data/app/lib/actions/candlepin/environment/create.rb +0 -21
- data/app/lib/actions/foreman/environment/destroy.rb +0 -23
- data/app/lib/actions/katello/content_view/environment_create.rb +0 -21
- data/app/lib/actions/katello/repository/export.rb +0 -85
- data/app/lib/actions/katello/repository/purge_empty_content.rb +0 -16
- data/app/lib/actions/katello/repository/upload_errata.rb +0 -38
- data/app/lib/katello/util/proxy_uri.rb +0 -64
- data/app/models/katello/rhsm_fact_importer.rb +0 -20
- data/app/models/katello/rhsm_fact_name.rb +0 -17
- data/app/models/katello/rhsm_fact_parser.rb +0 -120
@@ -13,7 +13,6 @@ import { SubscriptionsTable } from './components/SubscriptionsTable';
|
|
13
13
|
import SubscriptionsToolbar from './components/SubscriptionsToolbar';
|
14
14
|
import { filterRHSubscriptions } from './SubscriptionHelpers';
|
15
15
|
import api, { orgId } from '../../services/api';
|
16
|
-
import { CONTENT_DISCONNECTED } from '../Settings/SettingsConstants';
|
17
16
|
|
18
17
|
import { createSubscriptionParams } from './SubscriptionActions.js';
|
19
18
|
import { SUBSCRIPTION_TABLE_NAME, SUBSCRIPTION_WATCH_URL } from './SubscriptionConstants';
|
@@ -48,14 +47,11 @@ class SubscriptionsPage extends Component {
|
|
48
47
|
organization,
|
49
48
|
isManifestImported,
|
50
49
|
pingUpstreamSubscriptions,
|
51
|
-
settings,
|
52
50
|
subscriptions,
|
53
51
|
task,
|
54
52
|
checkSimpleContentAccessEligible,
|
55
53
|
} = this.props;
|
56
54
|
|
57
|
-
const { disconnected } = settings;
|
58
|
-
|
59
55
|
if (task) {
|
60
56
|
if (isPollingTask) {
|
61
57
|
if (prevProps.isTaskPending && !isTaskPending) {
|
@@ -69,9 +65,6 @@ class SubscriptionsPage extends Component {
|
|
69
65
|
if (organization) {
|
70
66
|
if (!prevProps.organization || prevProps.organization.id !== organization.id) {
|
71
67
|
this.loadData();
|
72
|
-
}
|
73
|
-
|
74
|
-
if (disconnected === false && disconnected !== prevProps.settings.disconnected) {
|
75
68
|
if (isManifestImported) {
|
76
69
|
pingUpstreamSubscriptions();
|
77
70
|
this.state.availableQuantitiesLoaded = false;
|
@@ -103,22 +96,18 @@ class SubscriptionsPage extends Component {
|
|
103
96
|
const {
|
104
97
|
hasUpstreamConnection,
|
105
98
|
task,
|
106
|
-
settings,
|
107
99
|
isManifestImported,
|
108
100
|
} = this.props;
|
109
|
-
const { disconnected } = settings;
|
110
101
|
let disabledReason = null;
|
111
102
|
|
112
|
-
if (
|
113
|
-
disabledReason = __('This is disabled because
|
103
|
+
if (!hasUpstreamConnection) {
|
104
|
+
disabledReason = __('This is disabled because no connection could be made to the upstream Subscription Allocation.');
|
114
105
|
} else if (task) {
|
115
106
|
disabledReason = __('This is disabled because a manifest related task is in progress.');
|
116
107
|
} else if (deleteButton && !disabledReason) {
|
117
108
|
disabledReason = __('This is disabled because no subscriptions are selected.');
|
118
109
|
} else if (!isManifestImported) {
|
119
110
|
disabledReason = __('This is disabled because no manifest has been uploaded.');
|
120
|
-
} else if (!hasUpstreamConnection) {
|
121
|
-
disabledReason = __('This is disabled because no connection could be made to the upstream Subscription Allocation.');
|
122
111
|
}
|
123
112
|
|
124
113
|
return disabledReason;
|
@@ -130,7 +119,6 @@ class SubscriptionsPage extends Component {
|
|
130
119
|
|
131
120
|
async loadData() {
|
132
121
|
const {
|
133
|
-
loadSetting,
|
134
122
|
loadSubscriptions,
|
135
123
|
loadTableColumns,
|
136
124
|
loadTables,
|
@@ -139,7 +127,6 @@ class SubscriptionsPage extends Component {
|
|
139
127
|
} = this.props;
|
140
128
|
|
141
129
|
pollTasks();
|
142
|
-
loadSetting(CONTENT_DISCONNECTED);
|
143
130
|
loadSubscriptions();
|
144
131
|
await loadTables();
|
145
132
|
loadTableColumns(subscriptionTableSettings);
|
@@ -150,7 +137,7 @@ class SubscriptionsPage extends Component {
|
|
150
137
|
const {
|
151
138
|
deleteModalOpened, openDeleteModal, closeDeleteModal,
|
152
139
|
deleteButtonDisabled, disableDeleteButton, enableDeleteButton,
|
153
|
-
searchQuery, updateSearchQuery, simpleContentAccess,
|
140
|
+
searchQuery, updateSearchQuery, simpleContentAccess, hasUpstreamConnection,
|
154
141
|
task, activePermissions, subscriptions, subscriptionTableSettings, isManifestImported,
|
155
142
|
} = this.props;
|
156
143
|
// Basic permissions - should we even show this page?
|
@@ -165,8 +152,7 @@ class SubscriptionsPage extends Component {
|
|
165
152
|
canImportManifest,
|
166
153
|
canEditOrganizations,
|
167
154
|
} = permissions;
|
168
|
-
const
|
169
|
-
const disableManifestActions = !!task || disconnected || !hasUpstreamConnection;
|
155
|
+
const disableManifestActions = !!task || !hasUpstreamConnection;
|
170
156
|
|
171
157
|
const openManageManifestModal = () => this.props.setModalOpen({ id: MANAGE_MANIFEST_MODAL_ID });
|
172
158
|
|
@@ -320,9 +306,6 @@ SubscriptionsPage.propTypes = {
|
|
320
306
|
loadTableColumns: PropTypes.func.isRequired,
|
321
307
|
simpleContentAccess: PropTypes.bool,
|
322
308
|
isManifestImported: PropTypes.bool,
|
323
|
-
settings: PropTypes.shape({
|
324
|
-
disconnected: PropTypes.bool,
|
325
|
-
}),
|
326
309
|
subscriptions: PropTypes.shape({
|
327
310
|
// Disabling rule as existing code failed due to an eslint-plugin-react update
|
328
311
|
/* eslint-disable react/forbid-prop-types */
|
@@ -361,7 +344,6 @@ SubscriptionsPage.propTypes = {
|
|
361
344
|
handleStartTask: PropTypes.func.isRequired,
|
362
345
|
handleFinishedTask: PropTypes.func.isRequired,
|
363
346
|
hasUpstreamConnection: PropTypes.bool,
|
364
|
-
loadSetting: PropTypes.func.isRequired,
|
365
347
|
loadTables: PropTypes.func.isRequired,
|
366
348
|
createColumns: PropTypes.func.isRequired,
|
367
349
|
updateColumns: PropTypes.func.isRequired,
|
@@ -395,9 +377,6 @@ SubscriptionsPage.defaultProps = {
|
|
395
377
|
can_import_manifest: false,
|
396
378
|
can_manage_subscription_allocations: false,
|
397
379
|
},
|
398
|
-
settings: {
|
399
|
-
disconnected: true,
|
400
|
-
},
|
401
380
|
};
|
402
381
|
|
403
382
|
export default SubscriptionsPage;
|
@@ -1,7 +1,6 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { shallow } from 'enzyme';
|
3
3
|
import toJson from 'enzyme-to-json';
|
4
|
-
import { loadSetting } from 'foremanReact/components/Settings/SettingsActions';
|
5
4
|
import SubscriptionsPage from '../SubscriptionsPage';
|
6
5
|
import { successState, settingsSuccessState, permissionDeniedState } from './subscriptions.fixtures';
|
7
6
|
import { loadAvailableQuantities, loadSubscriptions, updateQuantity, loadTableColumns } from '../SubscriptionActions';
|
@@ -36,7 +35,6 @@ describe('subscriptions page', () => {
|
|
36
35
|
organization={organization}
|
37
36
|
subscriptions={successState}
|
38
37
|
subscriptionTableSettings={settingsSuccessState}
|
39
|
-
loadSetting={loadSetting}
|
40
38
|
loadTables={loadTables}
|
41
39
|
loadTableColumns={loadTableColumns}
|
42
40
|
createColumns={createColumns}
|
@@ -72,7 +70,6 @@ describe('subscriptions page', () => {
|
|
72
70
|
organization={organization}
|
73
71
|
subscriptions={permissionDeniedState}
|
74
72
|
subscriptionTableSettings={settingsSuccessState}
|
75
|
-
loadSetting={loadSetting}
|
76
73
|
loadTables={loadTables}
|
77
74
|
loadTableColumns={loadTableColumns}
|
78
75
|
createColumns={createColumns}
|
@@ -40,9 +40,9 @@ exports[`subscriptions page should render 1`] = `
|
|
40
40
|
canManageSubscriptionAllocations={false}
|
41
41
|
disableAddButton={true}
|
42
42
|
disableDeleteButton={true}
|
43
|
-
disableDeleteReason="This is disabled because
|
43
|
+
disableDeleteReason="This is disabled because no connection could be made to the upstream Subscription Allocation."
|
44
44
|
disableManifestActions={true}
|
45
|
-
disableManifestReason="This is disabled because
|
45
|
+
disableManifestReason="This is disabled because no connection could be made to the upstream Subscription Allocation."
|
46
46
|
getAutoCompleteParams={[Function]}
|
47
47
|
isManifestImported={false}
|
48
48
|
onDeleteButtonClick={[Function]}
|
@@ -58,7 +58,7 @@ exports[`subscriptions page should render 1`] = `
|
|
58
58
|
canImportManifest={false}
|
59
59
|
delete={[Function]}
|
60
60
|
disableManifestActions={true}
|
61
|
-
disabledReason="This is disabled because
|
61
|
+
disabledReason="This is disabled because no connection could be made to the upstream Subscription Allocation."
|
62
62
|
refresh={[Function]}
|
63
63
|
taskInProgress={false}
|
64
64
|
upload={[Function]}
|
@@ -30,13 +30,15 @@ export const createSubscriptionsTableSchema = (
|
|
30
30
|
property: 'select',
|
31
31
|
header: {
|
32
32
|
label: __('Select all rows'),
|
33
|
-
formatters: [
|
33
|
+
formatters: [
|
34
|
+
label => selectionHeaderCellFormatter(selectionController, label, hasPermission),
|
35
|
+
],
|
34
36
|
},
|
35
37
|
cell: {
|
36
38
|
formatters: [
|
37
39
|
(value, additionalData) => {
|
38
40
|
// eslint-disable-next-line no-param-reassign
|
39
|
-
additionalData.disabled = additionalData.rowData.available === -1;
|
41
|
+
additionalData.disabled = !hasPermission || additionalData.rowData.available === -1;
|
40
42
|
|
41
43
|
return collapseableAndSelectionCellFormatter(
|
42
44
|
groupingController,
|
@@ -324,6 +324,22 @@ exports[`subscriptions table should render subscription name without hyperlink f
|
|
324
324
|
<tr
|
325
325
|
class=""
|
326
326
|
>
|
327
|
+
<th
|
328
|
+
aria-label="Select all rows"
|
329
|
+
class="table-view-pf-select"
|
330
|
+
>
|
331
|
+
<label
|
332
|
+
class="control-label sr-only"
|
333
|
+
for="selectAll"
|
334
|
+
>
|
335
|
+
Select all rows
|
336
|
+
</label>
|
337
|
+
<input
|
338
|
+
disabled=""
|
339
|
+
id="selectAll"
|
340
|
+
type="checkbox"
|
341
|
+
/>
|
342
|
+
</th>
|
327
343
|
<th
|
328
344
|
class=""
|
329
345
|
>
|
@@ -355,6 +371,14 @@ exports[`subscriptions table should render subscription name without hyperlink f
|
|
355
371
|
<tr
|
356
372
|
class=""
|
357
373
|
>
|
374
|
+
<td
|
375
|
+
class="table-view-pf-select"
|
376
|
+
>
|
377
|
+
<span
|
378
|
+
aria-hidden="true"
|
379
|
+
class="fa fa-angle-right collapse-subscription-group-button"
|
380
|
+
/>
|
381
|
+
</td>
|
358
382
|
<td>
|
359
383
|
hsdfhsdh
|
360
384
|
</td>
|
@@ -34,9 +34,12 @@ const Table = ({
|
|
34
34
|
toggle: ({ rowData }) => toggleSubscriptionGroup(rowData.product_id),
|
35
35
|
};
|
36
36
|
|
37
|
+
const collapsibleGroup =
|
38
|
+
Object.values(groupedSubscriptions).some(v => v.subscriptions.length > 1);
|
39
|
+
|
37
40
|
const alwaysDisplayColumns = [];
|
38
41
|
|
39
|
-
if (selectionEnabled) {
|
42
|
+
if (selectionEnabled || collapsibleGroup) {
|
40
43
|
alwaysDisplayColumns.push('select');
|
41
44
|
}
|
42
45
|
|
@@ -17,8 +17,7 @@ import {
|
|
17
17
|
selectIsTaskPending,
|
18
18
|
selectHasUpstreamConnection,
|
19
19
|
} from './SubscriptionsSelectors';
|
20
|
-
import {
|
21
|
-
selectTableSettings } from '../../scenes/Settings/SettingsSelectors';
|
20
|
+
import { selectTableSettings } from '../../scenes/Settings/SettingsSelectors';
|
22
21
|
import { selectIsPollingTask } from '../Tasks/TaskSelectors';
|
23
22
|
import { selectOrganizationState, selectSimpleContentAccessEnabled, selectIsManifestImported } from '../Organizations/OrganizationSelectors';
|
24
23
|
import { pingUpstreamSubscriptions } from './UpstreamSubscriptions/UpstreamSubscriptionsActions';
|
@@ -30,12 +29,10 @@ import SubscriptionsPage from './SubscriptionsPage';
|
|
30
29
|
const mapStateToProps = (state) => {
|
31
30
|
const subscriptions = selectSubscriptionsState(state);
|
32
31
|
const subscriptionTableSettings = selectTableSettings(state, SUBSCRIPTION_TABLE_NAME);
|
33
|
-
const settings = selectSettings(state);
|
34
32
|
|
35
33
|
return {
|
36
34
|
subscriptions,
|
37
35
|
subscriptionTableSettings,
|
38
|
-
settings,
|
39
36
|
activePermissions: selectActivePermissions(state),
|
40
37
|
simpleContentAccess: selectSimpleContentAccessEnabled(state),
|
41
38
|
isManifestImported: selectIsManifestImported(state),
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: katello
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.
|
4
|
+
version: 4.2.0.rc1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- N/A
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-08-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -84,30 +84,16 @@ dependencies:
|
|
84
84
|
name: foreman-tasks
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- - "
|
88
|
-
- !ruby/object:Gem::Version
|
89
|
-
version: '4.0'
|
90
|
-
type: :runtime
|
91
|
-
prerelease: false
|
92
|
-
version_requirements: !ruby/object:Gem::Requirement
|
93
|
-
requirements:
|
94
|
-
- - "~>"
|
95
|
-
- !ruby/object:Gem::Version
|
96
|
-
version: '4.0'
|
97
|
-
- !ruby/object:Gem::Dependency
|
98
|
-
name: foreman-tasks-core
|
99
|
-
requirement: !ruby/object:Gem::Requirement
|
100
|
-
requirements:
|
101
|
-
- - "<"
|
87
|
+
- - ">="
|
102
88
|
- !ruby/object:Gem::Version
|
103
|
-
version: '0
|
89
|
+
version: '5.0'
|
104
90
|
type: :runtime
|
105
91
|
prerelease: false
|
106
92
|
version_requirements: !ruby/object:Gem::Requirement
|
107
93
|
requirements:
|
108
|
-
- - "
|
94
|
+
- - ">="
|
109
95
|
- !ruby/object:Gem::Version
|
110
|
-
version: '0
|
96
|
+
version: '5.0'
|
111
97
|
- !ruby/object:Gem::Dependency
|
112
98
|
name: foreman_remote_execution
|
113
99
|
requirement: !ruby/object:Gem::Requirement
|
@@ -126,16 +112,16 @@ dependencies:
|
|
126
112
|
name: dynflow
|
127
113
|
requirement: !ruby/object:Gem::Requirement
|
128
114
|
requirements:
|
129
|
-
- - "
|
115
|
+
- - ">="
|
130
116
|
- !ruby/object:Gem::Version
|
131
|
-
version: 1.
|
117
|
+
version: 1.5.0
|
132
118
|
type: :runtime
|
133
119
|
prerelease: false
|
134
120
|
version_requirements: !ruby/object:Gem::Requirement
|
135
121
|
requirements:
|
136
|
-
- - "
|
122
|
+
- - ">="
|
137
123
|
- !ruby/object:Gem::Version
|
138
|
-
version: 1.
|
124
|
+
version: 1.5.0
|
139
125
|
- !ruby/object:Gem::Dependency
|
140
126
|
name: activerecord-import
|
141
127
|
requirement: !ruby/object:Gem::Requirement
|
@@ -416,6 +402,26 @@ dependencies:
|
|
416
402
|
- - "<"
|
417
403
|
- !ruby/object:Gem::Version
|
418
404
|
version: '2.0'
|
405
|
+
- !ruby/object:Gem::Dependency
|
406
|
+
name: pulp_python_client
|
407
|
+
requirement: !ruby/object:Gem::Requirement
|
408
|
+
requirements:
|
409
|
+
- - ">="
|
410
|
+
- !ruby/object:Gem::Version
|
411
|
+
version: 3.4.0
|
412
|
+
- - "<"
|
413
|
+
- !ruby/object:Gem::Version
|
414
|
+
version: 3.5.0
|
415
|
+
type: :runtime
|
416
|
+
prerelease: false
|
417
|
+
version_requirements: !ruby/object:Gem::Requirement
|
418
|
+
requirements:
|
419
|
+
- - ">="
|
420
|
+
- !ruby/object:Gem::Version
|
421
|
+
version: 3.4.0
|
422
|
+
- - "<"
|
423
|
+
- !ruby/object:Gem::Version
|
424
|
+
version: 3.5.0
|
419
425
|
- !ruby/object:Gem::Dependency
|
420
426
|
name: deface
|
421
427
|
requirement: !ruby/object:Gem::Requirement
|
@@ -822,7 +828,6 @@ files:
|
|
822
828
|
- app/lib/actions/candlepin/consumer/remove_subscription.rb
|
823
829
|
- app/lib/actions/candlepin/consumer/update.rb
|
824
830
|
- app/lib/actions/candlepin/environment/add_content_to_environment.rb
|
825
|
-
- app/lib/actions/candlepin/environment/create.rb
|
826
831
|
- app/lib/actions/candlepin/environment/destroy.rb
|
827
832
|
- app/lib/actions/candlepin/environment/set_content.rb
|
828
833
|
- app/lib/actions/candlepin/owner/destroy.rb
|
@@ -842,7 +847,6 @@ files:
|
|
842
847
|
- app/lib/actions/candlepin/product/delete_subscriptions.rb
|
843
848
|
- app/lib/actions/candlepin/product/destroy.rb
|
844
849
|
- app/lib/actions/candlepin/product/update.rb
|
845
|
-
- app/lib/actions/foreman/environment/destroy.rb
|
846
850
|
- app/lib/actions/helpers/notifications.rb
|
847
851
|
- app/lib/actions/helpers/output_propagator.rb
|
848
852
|
- app/lib/actions/helpers/presenter.rb
|
@@ -861,11 +865,11 @@ files:
|
|
861
865
|
- app/lib/actions/katello/capsule_content/sync.rb
|
862
866
|
- app/lib/actions/katello/capsule_content/sync_capsule.rb
|
863
867
|
- app/lib/actions/katello/check_matching_content.rb
|
868
|
+
- app/lib/actions/katello/content_credential/update.rb
|
864
869
|
- app/lib/actions/katello/content_view/add_to_environment.rb
|
865
870
|
- app/lib/actions/katello/content_view/capsule_sync.rb
|
866
871
|
- app/lib/actions/katello/content_view/create.rb
|
867
872
|
- app/lib/actions/katello/content_view/destroy.rb
|
868
|
-
- app/lib/actions/katello/content_view/environment_create.rb
|
869
873
|
- app/lib/actions/katello/content_view/errata_mail.rb
|
870
874
|
- app/lib/actions/katello/content_view/incremental_updates.rb
|
871
875
|
- app/lib/actions/katello/content_view/presenters/incremental_updates_presenter.rb
|
@@ -895,7 +899,6 @@ files:
|
|
895
899
|
- app/lib/actions/katello/environment/publish_repositories.rb
|
896
900
|
- app/lib/actions/katello/foreman/abstract.rb
|
897
901
|
- app/lib/actions/katello/foreman/content_update.rb
|
898
|
-
- app/lib/actions/katello/gpg_key/update.rb
|
899
902
|
- app/lib/actions/katello/host/attach_subscriptions.rb
|
900
903
|
- app/lib/actions/katello/host/auto_attach_subscriptions.rb
|
901
904
|
- app/lib/actions/katello/host/destroy.rb
|
@@ -952,7 +955,6 @@ files:
|
|
952
955
|
- app/lib/actions/katello/repository/destroy_package_group.rb
|
953
956
|
- app/lib/actions/katello/repository/discover.rb
|
954
957
|
- app/lib/actions/katello/repository/errata_mail.rb
|
955
|
-
- app/lib/actions/katello/repository/export.rb
|
956
958
|
- app/lib/actions/katello/repository/fetch_pxe_files.rb
|
957
959
|
- app/lib/actions/katello/repository/filtered_index_content.rb
|
958
960
|
- app/lib/actions/katello/repository/finish_upload.rb
|
@@ -965,7 +967,6 @@ files:
|
|
965
967
|
- app/lib/actions/katello/repository/metadata_generate.rb
|
966
968
|
- app/lib/actions/katello/repository/multi_clone_contents.rb
|
967
969
|
- app/lib/actions/katello/repository/multi_clone_to_version.rb
|
968
|
-
- app/lib/actions/katello/repository/purge_empty_content.rb
|
969
970
|
- app/lib/actions/katello/repository/refresh_repository.rb
|
970
971
|
- app/lib/actions/katello/repository/remove_content.rb
|
971
972
|
- app/lib/actions/katello/repository/sync.rb
|
@@ -975,7 +976,6 @@ files:
|
|
975
976
|
- app/lib/actions/katello/repository/update_http_proxy_details.rb
|
976
977
|
- app/lib/actions/katello/repository/update_metadata_sync.rb
|
977
978
|
- app/lib/actions/katello/repository/update_redhat_repository.rb
|
978
|
-
- app/lib/actions/katello/repository/upload_errata.rb
|
979
979
|
- app/lib/actions/katello/repository/upload_files.rb
|
980
980
|
- app/lib/actions/katello/repository/upload_package_group.rb
|
981
981
|
- app/lib/actions/katello/repository/verify_checksum.rb
|
@@ -1187,7 +1187,6 @@ files:
|
|
1187
1187
|
- app/lib/katello/util/package_clause_generator.rb
|
1188
1188
|
- app/lib/katello/util/package_filter.rb
|
1189
1189
|
- app/lib/katello/util/path_with_substitutions.rb
|
1190
|
-
- app/lib/katello/util/proxy_uri.rb
|
1191
1190
|
- app/lib/katello/util/pulpcore_content_filters.rb
|
1192
1191
|
- app/lib/katello/util/report_table.rb
|
1193
1192
|
- app/lib/katello/util/search.rb
|
@@ -1227,6 +1226,7 @@ files:
|
|
1227
1226
|
- app/models/katello/ansible_collection_tag.rb
|
1228
1227
|
- app/models/katello/ansible_tag.rb
|
1229
1228
|
- app/models/katello/authorization/activation_key.rb
|
1229
|
+
- app/models/katello/authorization/content_credential.rb
|
1230
1230
|
- app/models/katello/authorization/content_view.rb
|
1231
1231
|
- app/models/katello/authorization/content_view_component.rb
|
1232
1232
|
- app/models/katello/authorization/content_view_environment.rb
|
@@ -1235,7 +1235,6 @@ files:
|
|
1235
1235
|
- app/models/katello/authorization/content_view_version.rb
|
1236
1236
|
- app/models/katello/authorization/content_view_version_export_history.rb
|
1237
1237
|
- app/models/katello/authorization/content_view_version_import_history.rb
|
1238
|
-
- app/models/katello/authorization/gpg_key.rb
|
1239
1238
|
- app/models/katello/authorization/host_collection.rb
|
1240
1239
|
- app/models/katello/authorization/host_tracer.rb
|
1241
1240
|
- app/models/katello/authorization/lifecycle_environment.rb
|
@@ -1268,6 +1267,7 @@ files:
|
|
1268
1267
|
- app/models/katello/concerns/user_extensions.rb
|
1269
1268
|
- app/models/katello/concerns/widget_extensions.rb
|
1270
1269
|
- app/models/katello/content.rb
|
1270
|
+
- app/models/katello/content_credential.rb
|
1271
1271
|
- app/models/katello/content_facet_applicable_module_stream.rb
|
1272
1272
|
- app/models/katello/content_facet_applicable_rpm.rb
|
1273
1273
|
- app/models/katello/content_facet_erratum.rb
|
@@ -1317,6 +1317,7 @@ files:
|
|
1317
1317
|
- app/models/katello/events/import_pool.rb
|
1318
1318
|
- app/models/katello/ext/label_from_name.rb
|
1319
1319
|
- app/models/katello/file_unit.rb
|
1320
|
+
- app/models/katello/generic_content_unit.rb
|
1320
1321
|
- app/models/katello/glue.rb
|
1321
1322
|
- app/models/katello/glue/candlepin/activation_key.rb
|
1322
1323
|
- app/models/katello/glue/candlepin/candlepin_object.rb
|
@@ -1331,7 +1332,6 @@ files:
|
|
1331
1332
|
- app/models/katello/glue/pulp/pulp_errors.rb
|
1332
1333
|
- app/models/katello/glue/pulp/repo.rb
|
1333
1334
|
- app/models/katello/glue/pulp/repos.rb
|
1334
|
-
- app/models/katello/gpg_key.rb
|
1335
1335
|
- app/models/katello/hash_util.rb
|
1336
1336
|
- app/models/katello/host/content_facet.rb
|
1337
1337
|
- app/models/katello/host/info_provider.rb
|
@@ -1389,14 +1389,12 @@ files:
|
|
1389
1389
|
- app/models/katello/repository_docker_tag.rb
|
1390
1390
|
- app/models/katello/repository_erratum.rb
|
1391
1391
|
- app/models/katello/repository_file_unit.rb
|
1392
|
+
- app/models/katello/repository_generic_content_unit.rb
|
1392
1393
|
- app/models/katello/repository_module_stream.rb
|
1393
1394
|
- app/models/katello/repository_ostree_branch.rb
|
1394
1395
|
- app/models/katello/repository_package_group.rb
|
1395
1396
|
- app/models/katello/repository_rpm.rb
|
1396
1397
|
- app/models/katello/repository_srpm.rb
|
1397
|
-
- app/models/katello/rhsm_fact_importer.rb
|
1398
|
-
- app/models/katello/rhsm_fact_name.rb
|
1399
|
-
- app/models/katello/rhsm_fact_parser.rb
|
1400
1398
|
- app/models/katello/root_repository.rb
|
1401
1399
|
- app/models/katello/rpm.rb
|
1402
1400
|
- app/models/katello/smart_proxy_sync_history.rb
|
@@ -1441,6 +1439,7 @@ files:
|
|
1441
1439
|
- app/services/katello/candlepin/system_purpose.rb
|
1442
1440
|
- app/services/katello/candlepin/upstream_consumer.rb
|
1443
1441
|
- app/services/katello/candlepin_event_listener.rb
|
1442
|
+
- app/services/katello/component_view_presenter.rb
|
1444
1443
|
- app/services/katello/content_view_manager.rb
|
1445
1444
|
- app/services/katello/event_monitor/poller_thread.rb
|
1446
1445
|
- app/services/katello/event_queue.rb
|
@@ -1486,6 +1485,7 @@ files:
|
|
1486
1485
|
- app/services/katello/pulp3/api/core.rb
|
1487
1486
|
- app/services/katello/pulp3/api/docker.rb
|
1488
1487
|
- app/services/katello/pulp3/api/file.rb
|
1488
|
+
- app/services/katello/pulp3/api/generic.rb
|
1489
1489
|
- app/services/katello/pulp3/api/yum.rb
|
1490
1490
|
- app/services/katello/pulp3/content.rb
|
1491
1491
|
- app/services/katello/pulp3/content_view_version/export.rb
|
@@ -1504,6 +1504,7 @@ files:
|
|
1504
1504
|
- app/services/katello/pulp3/docker_tag.rb
|
1505
1505
|
- app/services/katello/pulp3/erratum.rb
|
1506
1506
|
- app/services/katello/pulp3/file_unit.rb
|
1507
|
+
- app/services/katello/pulp3/generic_content_unit.rb
|
1507
1508
|
- app/services/katello/pulp3/module_stream.rb
|
1508
1509
|
- app/services/katello/pulp3/package_group.rb
|
1509
1510
|
- app/services/katello/pulp3/pulp_content_unit.rb
|
@@ -1512,6 +1513,7 @@ files:
|
|
1512
1513
|
- app/services/katello/pulp3/repository/apt.rb
|
1513
1514
|
- app/services/katello/pulp3/repository/docker.rb
|
1514
1515
|
- app/services/katello/pulp3/repository/file.rb
|
1516
|
+
- app/services/katello/pulp3/repository/generic.rb
|
1515
1517
|
- app/services/katello/pulp3/repository/yum.rb
|
1516
1518
|
- app/services/katello/pulp3/repository_mirror.rb
|
1517
1519
|
- app/services/katello/pulp3/rpm.rb
|
@@ -1849,6 +1851,7 @@ files:
|
|
1849
1851
|
- config/routes/api/v2.rb
|
1850
1852
|
- config/routes/mount_engine.rb
|
1851
1853
|
- config/routes/overrides.rb
|
1854
|
+
- db/functions/deb_version_cmp_v01.sql
|
1852
1855
|
- db/migrate/20131014135042_katello_tables.rb
|
1853
1856
|
- db/migrate/20131014225132_add_users_fields.rb
|
1854
1857
|
- db/migrate/20131016124255_add_foreign_keys_engine.rb
|
@@ -2131,6 +2134,12 @@ files:
|
|
2131
2134
|
- db/migrate/20210409033915_add_created_in_katello_to_taxonomy.rb
|
2132
2135
|
- db/migrate/20210512170039_add_repo_timestamps.rb
|
2133
2136
|
- db/migrate/20210512192745_fix_red_hat_root_repository_arch.rb
|
2137
|
+
- db/migrate/20210624221630_katello_generic_content.rb
|
2138
|
+
- db/migrate/20210625095042_add_retain_package_versions_count.rb
|
2139
|
+
- db/migrate/20210628182553_add_generic_remote_options_to_root_repository.rb
|
2140
|
+
- db/migrate/20210714140440_remove_repo_export_permission.rb
|
2141
|
+
- db/migrate/20210721163730_change_gpg_keys_to_content_credentials.rb
|
2142
|
+
- db/migrate/20210728130748_create_function_deb_version_cmp.rb
|
2134
2143
|
- db/seeds.d/101-locations.rb
|
2135
2144
|
- db/seeds.d/102-organizations.rb
|
2136
2145
|
- db/seeds.d/104-proxy.rb
|
@@ -4439,6 +4448,7 @@ files:
|
|
4439
4448
|
- lib/katello/repository_types/docker.rb
|
4440
4449
|
- lib/katello/repository_types/file.rb
|
4441
4450
|
- lib/katello/repository_types/ostree.rb
|
4451
|
+
- lib/katello/repository_types/python.rb
|
4442
4452
|
- lib/katello/repository_types/yum.rb
|
4443
4453
|
- lib/katello/scheduled_jobs.rb
|
4444
4454
|
- lib/katello/tasks/clean_backend_objects.rake
|
@@ -4646,6 +4656,8 @@ files:
|
|
4646
4656
|
- webpack/components/WithOrganization/__snapshots__/withOrganization.test.js.snap
|
4647
4657
|
- webpack/components/WithOrganization/withOrganization.js
|
4648
4658
|
- webpack/components/WithOrganization/withOrganization.test.js
|
4659
|
+
- webpack/components/extensions/HostDetails/Tabs/ContentTab.js
|
4660
|
+
- webpack/components/extensions/HostDetails/Tabs/SubscriptionTab.js
|
4649
4661
|
- webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageConstants.js
|
4650
4662
|
- webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageHelpers.js
|
4651
4663
|
- webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageSelectors.js
|
@@ -4793,11 +4805,13 @@ files:
|
|
4793
4805
|
- webpack/scenes/ContentViews/Create/__tests__/contentViewCreateResult.fixtures.json
|
4794
4806
|
- webpack/scenes/ContentViews/Create/__tests__/createContentView.test.js
|
4795
4807
|
- webpack/scenes/ContentViews/Create/index.js
|
4808
|
+
- webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js
|
4796
4809
|
- webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentEnvironments.js
|
4797
4810
|
- webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentVersion.js
|
4798
4811
|
- webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js
|
4799
4812
|
- webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.fixtures.json
|
4800
4813
|
- webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js
|
4814
|
+
- webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/publishedContentViewDetails.fixtures.json
|
4801
4815
|
- webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/unpublishedCVComponents.fixtures.json
|
4802
4816
|
- webpack/scenes/ContentViews/Details/ContentViewDetailActions.js
|
4803
4817
|
- webpack/scenes/ContentViews/Details/ContentViewDetailReducer.js
|
@@ -4805,6 +4819,9 @@ files:
|
|
4805
4819
|
- webpack/scenes/ContentViews/Details/ContentViewDetails.js
|
4806
4820
|
- webpack/scenes/ContentViews/Details/ContentViewInfo.js
|
4807
4821
|
- webpack/scenes/ContentViews/Details/DetailsContainer.js
|
4822
|
+
- webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js
|
4823
|
+
- webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js
|
4824
|
+
- webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterCreateResult.fixtures.json
|
4808
4825
|
- webpack/scenes/ContentViews/Details/Filters/CVFilterDetailType.js
|
4809
4826
|
- webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js
|
4810
4827
|
- webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js
|
@@ -4837,13 +4854,25 @@ files:
|
|
4837
4854
|
- webpack/scenes/ContentViews/Details/Versions/ContentViewVersionErrata.scss
|
4838
4855
|
- webpack/scenes/ContentViews/Details/Versions/ContentViewVersionPackages.js
|
4839
4856
|
- webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js
|
4857
|
+
- webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewTaskInProgressResponse.fixtures.json
|
4858
|
+
- webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewTaskResponse.fixtures.json
|
4840
4859
|
- webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.fixtures.json
|
4841
4860
|
- webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js
|
4861
|
+
- webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersionsWithTask.fixtures.json
|
4842
4862
|
- webpack/scenes/ContentViews/Details/Versions/__tests__/emptyCVVersion.fixtures.json
|
4843
4863
|
- webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js
|
4844
4864
|
- webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json
|
4845
4865
|
- webpack/scenes/ContentViews/Details/contentViewInfo.scss
|
4846
4866
|
- webpack/scenes/ContentViews/Details/index.js
|
4867
|
+
- webpack/scenes/ContentViews/Publish/CVPublishFinish.js
|
4868
|
+
- webpack/scenes/ContentViews/Publish/CVPublishForm.js
|
4869
|
+
- webpack/scenes/ContentViews/Publish/CVPublishReview.js
|
4870
|
+
- webpack/scenes/ContentViews/Publish/ContentViewPublishSelectors.js
|
4871
|
+
- webpack/scenes/ContentViews/Publish/PublishContentViewWizard.js
|
4872
|
+
- webpack/scenes/ContentViews/Publish/__tests__/environmentPaths.fixtures.json
|
4873
|
+
- webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js
|
4874
|
+
- webpack/scenes/ContentViews/Publish/__tests__/publishResponse.fixture.json
|
4875
|
+
- webpack/scenes/ContentViews/Publish/cvPublishForm.scss
|
4847
4876
|
- webpack/scenes/ContentViews/Table/ContentViewVersionCell.js
|
4848
4877
|
- webpack/scenes/ContentViews/Table/ContentViewsTable.js
|
4849
4878
|
- webpack/scenes/ContentViews/Table/index.js
|
@@ -4853,9 +4882,15 @@ files:
|
|
4853
4882
|
- webpack/scenes/ContentViews/__tests__/contentViewPage.test.js
|
4854
4883
|
- webpack/scenes/ContentViews/components/ContentViewIcon.js
|
4855
4884
|
- webpack/scenes/ContentViews/components/EnvironmentLabels.js
|
4885
|
+
- webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPathActions.js
|
4886
|
+
- webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPathConstants.js
|
4887
|
+
- webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPathSelectors.js
|
4888
|
+
- webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.js
|
4889
|
+
- webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.scss
|
4856
4890
|
- webpack/scenes/ContentViews/components/IconWithCount.js
|
4857
4891
|
- webpack/scenes/ContentViews/components/IconWithCount.scss
|
4858
4892
|
- webpack/scenes/ContentViews/components/InactiveText.js
|
4893
|
+
- webpack/scenes/ContentViews/components/TaskPresenter/TaskPresenter.js
|
4859
4894
|
- webpack/scenes/ContentViews/components/contentViewIcon.scss
|
4860
4895
|
- webpack/scenes/ContentViews/expansions/DetailsExpansion.js
|
4861
4896
|
- webpack/scenes/ContentViews/helpers.js
|
@@ -5096,9 +5131,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
5096
5131
|
version: '2.5'
|
5097
5132
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
5098
5133
|
requirements:
|
5099
|
-
- - "
|
5134
|
+
- - ">"
|
5100
5135
|
- !ruby/object:Gem::Version
|
5101
|
-
version:
|
5136
|
+
version: 1.3.1
|
5102
5137
|
requirements: []
|
5103
5138
|
rubygems_version: 3.1.6
|
5104
5139
|
signing_key:
|
@@ -1,21 +0,0 @@
|
|
1
|
-
module Actions
|
2
|
-
module Candlepin
|
3
|
-
module Environment
|
4
|
-
class Create < Candlepin::Abstract
|
5
|
-
input_format do
|
6
|
-
param :organization_label
|
7
|
-
param :cp_id
|
8
|
-
param :name
|
9
|
-
param :description
|
10
|
-
end
|
11
|
-
|
12
|
-
def run
|
13
|
-
::Katello::Resources::Candlepin::Environment.create(input['organization_label'],
|
14
|
-
input['cp_id'],
|
15
|
-
input['name'],
|
16
|
-
input['description'].try(:truncate, 255))
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|