katello 3.13.4 → 3.14.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/registry/registry_proxies_controller.rb +25 -16
- data/app/controllers/katello/api/v2/activation_keys_controller.rb +26 -21
- data/app/controllers/katello/api/v2/ansible_collections_controller.rb +6 -0
- data/app/controllers/katello/api/v2/content_uploads_controller.rb +8 -2
- data/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb +8 -1
- data/app/controllers/katello/api/v2/content_view_filters_controller.rb +1 -1
- data/app/controllers/katello/api/v2/errata_controller.rb +1 -1
- data/app/controllers/katello/api/v2/host_subscriptions_controller.rb +3 -3
- data/app/controllers/katello/api/v2/katello_ping_controller.rb +24 -0
- data/app/controllers/katello/api/v2/module_streams_controller.rb +21 -0
- data/app/controllers/katello/api/v2/package_groups_controller.rb +5 -0
- data/app/controllers/katello/api/v2/packages_controller.rb +16 -0
- data/app/controllers/katello/api/v2/repositories_controller.rb +7 -4
- data/app/controllers/katello/api/v2/srpms_controller.rb +1 -1
- data/app/controllers/katello/api/v2/subscriptions_controller.rb +5 -1
- data/app/controllers/katello/api/v2/sync_plans_controller.rb +7 -5
- data/app/controllers/katello/concerns/api/v2/repository_content_controller.rb +36 -5
- data/app/helpers/katello/hosts_and_hostgroups_helper.rb +12 -0
- data/app/lib/actions/katello/capsule_content/refresh_repos.rb +55 -0
- data/app/lib/actions/katello/capsule_content/sync.rb +13 -64
- data/app/lib/actions/katello/capsule_content/sync_capsule.rb +40 -0
- data/app/lib/actions/katello/content_view/publish.rb +0 -3
- data/app/lib/actions/katello/content_view_puppet_environment/destroy.rb +1 -3
- data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb +21 -0
- data/app/lib/actions/katello/repository/create.rb +8 -0
- data/app/lib/actions/katello/repository/import_upload.rb +13 -12
- data/app/lib/actions/katello/repository/metadata_generate.rb +2 -2
- data/app/lib/actions/katello/repository/update.rb +9 -0
- data/app/lib/actions/katello/repository/upload_files.rb +4 -11
- data/app/lib/actions/pulp/consumer/sync_capsule.rb +4 -0
- data/app/lib/actions/pulp/orchestration/orphan_cleanup/remove_orphans.rb +16 -0
- data/app/lib/actions/pulp/orchestration/repository/refresh_repos.rb +25 -0
- data/app/lib/actions/pulp/orchestration/repository/smart_proxy_sync.rb +34 -0
- data/app/lib/actions/pulp/orchestration/repository/upload_content.rb +35 -0
- data/app/lib/actions/pulp/orphan_cleanup/remove_orphans.rb +15 -0
- data/app/lib/actions/{katello/capsule_content → pulp/orphan_cleanup}/remove_unneeded_repos.rb +2 -2
- data/app/lib/actions/pulp/repository/import_upload.rb +7 -11
- data/app/lib/actions/pulp3/abstract_async_task.rb +7 -7
- data/app/lib/actions/pulp3/capsule_content/generate_metadata.rb +32 -0
- data/app/lib/actions/pulp3/capsule_content/refresh_distribution.rb +31 -0
- data/app/lib/actions/pulp3/capsule_content/sync.rb +26 -0
- data/app/lib/actions/pulp3/orchestration/orphan_cleanup/remove_orphans.rb +20 -0
- data/app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb +15 -15
- data/app/lib/actions/pulp3/orchestration/repository/create.rb +3 -1
- data/app/lib/actions/pulp3/orchestration/repository/import_upload.rb +36 -0
- data/app/lib/actions/pulp3/orchestration/repository/refresh_repos.rb +24 -0
- data/app/lib/actions/pulp3/orchestration/repository/sync.rb +1 -1
- data/app/lib/actions/pulp3/orchestration/repository/upload_content.rb +25 -0
- data/app/lib/actions/pulp3/orphan_cleanup/delete_orphan_repository_versions.rb +20 -0
- data/app/lib/actions/pulp3/orphan_cleanup/remove_unneeded_repos.rb +16 -0
- data/app/lib/actions/pulp3/repository/create_publication.rb +1 -5
- data/app/lib/actions/pulp3/repository/import_upload.rb +21 -0
- data/app/lib/actions/pulp3/repository/save_artifact.rb +19 -0
- data/app/lib/actions/pulp3/repository/save_version.rb +3 -2
- data/app/lib/actions/pulp3/repository/sync.rb +1 -1
- data/app/lib/actions/pulp3/repository/upload_file.rb +76 -0
- data/app/lib/katello/api/v2/rendering.rb +1 -2
- data/app/lib/katello/concerns/base_template_scope_extensions.rb +34 -2
- data/app/lib/katello/errors.rb +21 -0
- data/app/lib/katello/resources/candlepin/consumer.rb +0 -9
- data/app/lib/katello/resources/candlepin/owner.rb +0 -5
- data/app/lib/katello/resources/candlepin/product.rb +2 -6
- data/app/lib/katello/resources/registry.rb +25 -10
- data/app/lib/katello/util/filter_clause_generator.rb +1 -1
- data/app/lib/katello/util/module_stream_clause_generator.rb +49 -0
- data/app/lib/katello/util/package_clause_generator.rb +1 -1
- data/app/models/katello/ansible_collection.rb +5 -8
- data/app/models/katello/ansible_collection_tag.rb +8 -0
- data/app/models/katello/ansible_tag.rb +8 -0
- data/app/models/katello/concerns/host_managed_extensions.rb +16 -14
- data/app/models/katello/concerns/pulp_database_unit.rb +27 -4
- data/app/models/katello/concerns/search_by_repository_name.rb +4 -1
- data/app/models/katello/concerns/smart_proxy_extensions.rb +44 -20
- data/app/models/katello/content_view_docker_filter.rb +15 -2
- data/app/models/katello/content_view_filter.rb +28 -8
- data/app/models/katello/content_view_module_stream_filter.rb +14 -0
- data/app/models/katello/content_view_module_stream_filter_rule.rb +11 -0
- data/app/models/katello/content_view_package_filter.rb +18 -8
- data/app/models/katello/content_view_version.rb +7 -2
- data/app/models/katello/deb.rb +0 -8
- data/app/models/katello/docker_manifest.rb +0 -8
- data/app/models/katello/docker_manifest_list.rb +0 -8
- data/app/models/katello/docker_meta_tag.rb +38 -20
- data/app/models/katello/docker_tag.rb +22 -33
- data/app/models/katello/erratum.rb +10 -8
- data/app/models/katello/file_unit.rb +1 -13
- data/app/models/katello/glue/candlepin/owner.rb +0 -5
- data/app/models/katello/glue/candlepin/product.rb +1 -5
- data/app/models/katello/glue/pulp/repo.rb +1 -1
- data/app/models/katello/host/content_facet.rb +6 -0
- data/app/models/katello/host_collection.rb +4 -0
- data/app/models/katello/installed_package.rb +4 -0
- data/app/models/katello/module_stream.rb +1 -12
- data/app/models/katello/ostree_branch.rb +0 -7
- data/app/models/katello/package_group.rb +0 -7
- data/app/models/katello/ping.rb +10 -3
- data/app/models/katello/pool.rb +11 -1
- data/app/models/katello/puppet_module.rb +0 -7
- data/app/models/katello/repository.rb +15 -6
- data/app/models/katello/repository_docker_meta_tag.rb +7 -0
- data/app/models/katello/repository_docker_tag.rb +7 -0
- data/app/models/katello/repository_file_unit.rb +7 -0
- data/app/models/katello/rhsm_fact_name.rb +5 -1
- data/app/models/katello/rhsm_fact_parser.rb +17 -1
- data/app/models/katello/root_repository.rb +11 -6
- data/app/models/katello/rpm.rb +0 -8
- data/app/models/katello/srpm.rb +0 -8
- data/app/models/katello/upstream_pool.rb +2 -0
- data/app/models/katello/yum_metadata_file.rb +0 -4
- data/app/models/setting/content.rb +124 -128
- data/app/services/katello/candlepin/consumer.rb +0 -1
- data/app/services/katello/pulp/content.rb +11 -4
- data/app/services/katello/pulp/docker_tag.rb +0 -1
- data/app/services/katello/pulp/pulp_content_unit.rb +4 -0
- data/app/services/katello/pulp/repository.rb +53 -0
- data/app/services/katello/pulp/repository/file.rb +1 -1
- data/app/services/katello/pulp/repository/puppet.rb +8 -1
- data/app/services/katello/pulp/repository/yum.rb +42 -9
- data/app/services/katello/pulp/smart_proxy_repository.rb +13 -96
- data/app/services/katello/pulp3/ansible_collection.rb +7 -3
- data/app/services/katello/pulp3/content.rb +60 -0
- data/app/services/katello/pulp3/docker_blob.rb +1 -1
- data/app/services/katello/pulp3/docker_manifest.rb +1 -1
- data/app/services/katello/pulp3/docker_manifest_list.rb +1 -1
- data/app/services/katello/pulp3/docker_tag.rb +2 -2
- data/app/services/katello/pulp3/file_unit.rb +7 -1
- data/app/services/katello/pulp3/pulp_content_unit.rb +15 -5
- data/app/services/katello/pulp3/repository.rb +301 -24
- data/app/services/katello/pulp3/repository/ansible_collection.rb +5 -1
- data/app/services/katello/pulp3/repository/docker.rb +54 -9
- data/app/services/katello/pulp3/repository/file.rb +8 -0
- data/app/services/katello/pulp3/repository/yum.rb +61 -0
- data/app/services/katello/pulp3/smart_proxy_repository.rb +38 -0
- data/app/services/katello/repository_type_manager.rb +7 -0
- data/app/services/katello/smart_proxy_helper.rb +50 -0
- data/app/views/foreman/smart_proxies/_content_tab.html.erb +1 -1
- data/app/views/katello/api/v2/ansible_collections/base.json.rabl +5 -0
- data/app/views/katello/api/v2/ansible_collections/show.json.rabl +7 -0
- data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl +1 -0
- data/app/views/katello/api/v2/content_view_filter_rules/show.json.rabl +1 -1
- data/app/views/katello/api/v2/content_view_filters/base.json.rabl +5 -0
- data/app/views/katello/api/v2/content_view_filters/show.json.rabl +2 -1
- data/app/views/katello/api/v2/hosts_bulk_actions/erratum.json.rabl +2 -0
- data/app/views/katello/api/v2/{ping → katello_ping}/server_status.json.rabl +0 -0
- data/app/views/katello/api/v2/{ping → katello_ping}/show.json.rabl +0 -0
- data/app/views/katello/api/v2/{ping → katello_ping}/version.json.rabl +0 -0
- data/app/views/katello/api/v2/repositories/show.json.rabl +1 -1
- data/app/views/katello/api/v2/subscription_facet/base.json.rabl +1 -1
- data/app/views/katello/api/v2/subscriptions/index.json.rabl +1 -0
- data/app/views/katello/api/v2/subscriptions/permissions.rabl +11 -0
- data/config/katello.yaml.example +9 -0
- data/config/routes.rb +2 -1
- data/config/routes/api/v2.rb +2 -2
- data/db/migrate/20180920214134_create_repository_root.rb +1 -1
- data/db/migrate/20190730183518_add_docker_tag_join_table.rb +25 -0
- data/db/migrate/20190730203334_add_docker_meta_tag_join_table.rb +25 -0
- data/db/migrate/20190814025338_create_content_view_module_stream_filter_rules.rb +13 -0
- data/db/migrate/20190816162733_rename_ansible_collection_whitelist_to_requirements.rb +5 -0
- data/db/migrate/20190822144300_add_ansible_fields.rb +18 -0
- data/db/migrate/20190912210927_rename_repository_file_unit.rb +12 -0
- data/engines/bastion/README.md +2 -2
- data/engines/bastion/app/assets/javascripts/bastion/components/bst-edit.directive.js +2 -1
- data/engines/bastion/app/assets/javascripts/bastion/components/nutupane.factory.js +20 -6
- data/engines/bastion/app/assets/javascripts/bastion/components/views/bst-modal.html +1 -1
- data/engines/bastion/app/assets/javascripts/bastion/layouts/partials/table.html +2 -1
- data/engines/bastion/app/assets/stylesheets/bastion/overrides.scss +1 -0
- data/engines/bastion/lib/bastion.rb +1 -0
- data/engines/bastion_katello/README.md +1 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js +1 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ansible-collections/ansible-collections.factory.js +28 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ansible-collections/ansible-collections.module.js +15 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion_katello.js +3 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js +4 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js +0 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-destroy-modal.html +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html +2 -34
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-repository-sets-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register-client.directive.js +6 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.routes.js +0 -11
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js +1 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages.controller.js +3 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html +1 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html +2 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html +1 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html +4 -16
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html +13 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register.html +1 -13
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js +47 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-available-content-views.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-content-views-list.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-module-stream-filter.controller.js +68 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-helper.service.js +2 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-rule-matching-package-modal.controller.js +37 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filters.controller.js +4 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/module-stream-list-filter.controller.js +73 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/new-filter.controller.js +4 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-filter.controller.js +14 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/errata-filter-details.html +3 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-details.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-repositories.html +5 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-rule-matching-package-modal.html +43 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filters.html +4 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/module-stream-filter-details.html +41 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/module-stream-filter.html +43 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-filter-details.html +4 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/content-view-history.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/views/content-view-history.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-deb-repositories.html +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html +1 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/new/views/content-view-new.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-errata.html +3 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/errata.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-add-hosts.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html +44 -35
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/packages.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +12 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js +5 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +21 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-ansible-collections.html +36 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/download-policy.service.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js +24 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +29 -15
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js +9 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html +1 -1
- data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss +8 -0
- data/engines/bastion_katello/lib/bastion_katello/engine.rb +8 -8
- data/lib/katello/engine.rb +0 -4
- data/lib/katello/plugin.rb +19 -1
- data/lib/katello/repository_types/yum.rb +2 -0
- data/lib/katello/tasks/delete_orphaned_content.rake +1 -1
- data/lib/katello/tasks/reimport.rake +1 -1
- data/lib/katello/version.rb +1 -1
- data/package.json +9 -5
- data/webpack/__mocks__/foremanReact/common/helpers.js +4 -1
- data/webpack/__mocks__/foremanReact/components/PermissionDenied/index.js +2 -0
- data/webpack/components/Content/ContentPage.js +55 -0
- data/webpack/{scenes/ModuleStreams/ModuleStreamsTable.js → components/Content/ContentTable.js} +9 -8
- data/webpack/components/Content/Details/ContentDetailInfo.js +33 -0
- data/webpack/{scenes/ModuleStreams/Details/Repositories/ModuleStreamDetailRepositories.js → components/Content/Details/ContentDetailRepositories.js} +4 -4
- data/webpack/{scenes/ModuleStreams/Details/Repositories/TableSchema.js → components/Content/Details/ContentDetailRepositoryTableSchema.js} +1 -1
- data/webpack/components/Content/Details/ContentDetails.js +70 -0
- data/webpack/components/Content/Details/__tests__/ContentDetailInfo.test.js +28 -0
- data/webpack/components/Content/Details/__tests__/ContentDetailRepositories.test.js +22 -0
- data/webpack/components/Content/Details/__tests__/ContentDetails.test.js +64 -0
- data/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetailInfo.test.js.snap +39 -0
- data/webpack/{scenes/ModuleStreams/Details/Repositories/__tests__/__snapshots__/ModuleStreamDetailRepositories.test.js.snap → components/Content/Details/__tests__/__snapshots__/ContentDetailRepositories.test.js.snap} +3 -9
- data/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap +137 -0
- data/webpack/components/Content/__tests__/ContentPage.test.js +36 -0
- data/webpack/components/Content/__tests__/ContentTable.test.js +40 -0
- data/webpack/components/Content/__tests__/__snapshots__/ContentPage.test.js.snap +70 -0
- data/webpack/components/Content/__tests__/__snapshots__/ContentTable.test.js.snap +33 -0
- data/webpack/components/Search/index.js +6 -7
- data/webpack/components/SelectOrg/SelectOrgAction.js +20 -22
- data/webpack/containers/Application/config.js +10 -0
- data/webpack/containers/Application/overrides.scss +5 -0
- data/webpack/move_to_foreman/common/helpers.js +1 -1
- data/webpack/move_to_foreman/components/common/table/components/TableSelectionCell.js +5 -2
- data/webpack/move_to_foreman/components/common/table/formatters/EntitlementsInlineEditFormatter.js +9 -2
- data/webpack/move_to_foreman/components/common/table/formatters/collapseableAndSelectionCellFormatter.js +2 -0
- data/webpack/move_to_foreman/components/common/table/formatters/selectionCellFormatter.js +3 -0
- data/webpack/move_to_pf/TypeAhead/TypeAhead.js +1 -0
- data/webpack/redux/OrganizationProducts/OrganizationProductsActions.js +10 -10
- data/webpack/redux/actions/RedHatRepositories/__tests__/enabled.test.js +39 -0
- data/webpack/redux/actions/RedHatRepositories/enabled.js +24 -24
- data/webpack/redux/actions/RedHatRepositories/helpers.js +5 -5
- data/webpack/redux/actions/RedHatRepositories/repositorySetRepositories.js +23 -22
- data/webpack/redux/actions/RedHatRepositories/sets.js +17 -21
- data/webpack/redux/reducers/RedHatRepositories/__tests__/enabled.test.js +1 -0
- data/webpack/redux/reducers/RedHatRepositories/__tests__/sets.test.js +1 -1
- data/webpack/redux/reducers/RedHatRepositories/enabled.fixtures.js +1 -0
- data/webpack/redux/reducers/RedHatRepositories/enabled.js +42 -33
- data/webpack/redux/reducers/RedHatRepositories/sets.fixtures.js +2 -1
- data/webpack/redux/reducers/RedHatRepositories/sets.js +2 -1
- data/webpack/redux/reducers/index.js +4 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsActions.js +30 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsConstants.js +3 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsPage.js +80 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsReducer.js +39 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsTableSchema.js +60 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsTables.scss +0 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetails.js +91 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsActions.js +23 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsConstants.js +3 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsReducer.js +30 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js +35 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetailInfo.test.js +16 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetails.fixtures.js +25 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetails.test.js +29 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetailsActions.test.js +41 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetailsReducer.test.js +33 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetailInfo.test.js.snap +83 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetails.test.js.snap +190 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetailsActions.test.js.snap +54 -0
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetailsReducer.test.js.snap +50 -0
- data/webpack/scenes/AnsibleCollections/Details/index.js +17 -0
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionPage.test.js +25 -0
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollections.fixtures.js +52 -0
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionsActions.test.js +48 -0
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionsReducer.test.js +46 -0
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionsTable.test.js +27 -0
- data/webpack/scenes/AnsibleCollections/__tests__/__snapshots__/AnsibleCollectionPage.test.js.snap +73 -0
- data/webpack/scenes/AnsibleCollections/__tests__/__snapshots__/AnsibleCollectionsTable.test.js.snap +81 -0
- data/webpack/scenes/AnsibleCollections/index.js +17 -0
- data/webpack/scenes/ModuleStreams/Details/ModuleDetailsSchema.js +56 -0
- data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetails.js +7 -71
- data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetailsActions.js +9 -11
- data/webpack/scenes/ModuleStreams/Details/__tests__/ModuleStreamDetailInfo.test.js +5 -3
- data/webpack/scenes/ModuleStreams/Details/__tests__/__snapshots__/ModuleStreamDetails.test.js.snap +453 -507
- data/webpack/scenes/ModuleStreams/ModuleStreamsActions.js +10 -11
- data/webpack/scenes/ModuleStreams/ModuleStreamsPage.js +12 -33
- data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamPage.test.js +2 -4
- data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamsActions.test.js +8 -9
- data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamsTable.test.js +5 -3
- data/webpack/scenes/ModuleStreams/__tests__/__snapshots__/ModuleStreamPage.test.js.snap +83 -65
- data/webpack/scenes/ModuleStreams/__tests__/__snapshots__/ModuleStreamsTable.test.js.snap +1 -1
- data/webpack/scenes/Organizations/OrganizationActions.js +27 -32
- data/webpack/scenes/Organizations/__tests__/OrganizationActions.test.js +12 -12
- data/webpack/scenes/Organizations/__tests__/organizations.fixtures.js +1 -1
- data/webpack/scenes/Products/ProductActions.js +10 -10
- data/webpack/scenes/Products/__tests__/ProductActions.test.js +6 -6
- data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js +118 -0
- data/webpack/scenes/RedHatRepositories/__tests__/RedHatRepositoriesPage.test.js +51 -0
- data/webpack/scenes/RedHatRepositories/__tests__/__snapshots__/RedHatRepositoriesPage.test.js.snap +117 -0
- data/webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepository.js +44 -45
- data/webpack/scenes/RedHatRepositories/components/EnabledRepository/__tests__/EnabledRepository.test.js +84 -5
- data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository/RepositorySetRepository.js +46 -47
- data/webpack/scenes/RedHatRepositories/helpers.js +1 -1
- data/webpack/scenes/RedHatRepositories/index.js +2 -101
- data/webpack/scenes/Settings/Tables/TableActions.js +42 -43
- data/webpack/scenes/Settings/Tables/__tests__/TableActions.test.js +18 -18
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetailActions.js +10 -10
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetails.js +7 -6
- data/webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetailActions.test.js +8 -8
- data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap +2 -2
- data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js +142 -113
- data/webpack/scenes/Subscriptions/Manifest/Manifest.scss +8 -0
- data/webpack/scenes/Subscriptions/Manifest/ManifestActions.js +40 -40
- data/webpack/scenes/Subscriptions/Manifest/__tests__/ManifestActions.test.js +24 -24
- data/webpack/scenes/Subscriptions/Manifest/__tests__/__snapshots__/ManageManifestModal.test.js.snap +0 -199
- data/webpack/scenes/Subscriptions/SubscriptionActions.js +52 -46
- data/webpack/scenes/Subscriptions/SubscriptionReducer.js +21 -2
- data/webpack/scenes/Subscriptions/SubscriptionsPage.js +64 -42
- data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js +3 -0
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsActions.js +21 -21
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js +20 -21
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js +1 -15
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/UpstreamSubscriptionsActions.test.js +12 -13
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/__snapshots__/UpstreamSubscriptionsPage.test.js.snap +11 -14
- data/webpack/scenes/Subscriptions/__tests__/SubscriptionsActions.test.js +21 -23
- data/webpack/scenes/Subscriptions/__tests__/SubscriptionsPage.test.js +35 -1
- data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap +13 -0
- data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsReducer.test.js.snap +7 -0
- data/webpack/scenes/Subscriptions/__tests__/subscriptions.fixtures.js +18 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js +5 -4
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js +26 -5
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableSchema.js +9 -1
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTable.fixtures.js +27 -2
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTableHelpers.test.js +5 -4
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap +1 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UpdateDialog.js +9 -9
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Table.js +8 -3
- data/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js +28 -23
- data/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/__snapshots__/SubscriptionsToolbar.test.js.snap +0 -135
- data/webpack/scenes/Subscriptions/index.js +2 -0
- data/webpack/scenes/Tasks/TaskActions.js +36 -31
- data/webpack/scenes/Tasks/__tests__/TaskActions.test.js +35 -47
- metadata +146 -67
- data/app/controllers/katello/api/v2/ping_controller.rb +0 -24
- data/app/lib/actions/katello/capsule_content/create_repos.rb +0 -30
- data/app/lib/actions/katello/capsule_content/remove_orphans.rb +0 -21
- data/app/lib/actions/pulp/repository/refresh_needed.rb +0 -37
- data/app/lib/katello/resources/candlepin/owner_info.rb +0 -18
- data/app/models/katello/glue/candlepin/owner_info.rb +0 -41
- data/app/models/katello/repository_file.rb +0 -7
- data/app/overrides/add_subscription_status.rb +0 -6
- data/app/views/overrides/hosts/_subscription_link.html.erb +0 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-events.controller.js +0 -17
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-events.html +0 -30
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/content-access-mode-banner.directive.js +0 -22
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-details.controller.js +0 -58
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-product-details.controller.js +0 -12
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-products.controller.js +0 -30
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-details.html +0 -25
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-info.html +0 -120
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-products.html +0 -54
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/grouped.filter.js +0 -21
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-details.controller.js +0 -34
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-history.controller.js +0 -18
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-import.controller.js +0 -261
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest.controller.js +0 -16
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-delete-modal.html +0 -19
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-details.html +0 -46
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import-history.html +0 -17
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import.html +0 -92
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest.html +0 -33
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscription-start-date.directive.js +0 -21
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscription-type.directive.js +0 -16
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptionAttachAmountFilter.filter.js +0 -16
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.controller.js +0 -73
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.routes.js +0 -110
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html +0 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscription-start-date.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscription-type.html +0 -18
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscriptions-delete-bulk.html +0 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscriptions.html +0 -63
- data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetailInfo.js +0 -52
- data/webpack/scenes/ModuleStreams/Details/Repositories/__tests__/ModuleStreamDetailRepositories.test.js +0 -16
@@ -1,17 +0,0 @@
|
|
1
|
-
<table class="table table-striped table-bordered manifest-history">
|
2
|
-
<thead>
|
3
|
-
<tr>
|
4
|
-
<th translate>Message</th>
|
5
|
-
<th translate>Time</th>
|
6
|
-
</tr>
|
7
|
-
</thead>
|
8
|
-
<tbody>
|
9
|
-
<tr ng-repeat="status in statuses track by $index">
|
10
|
-
<td>
|
11
|
-
<i ng-class="status.status == 'FAILURE' ? 'fa fa-warning' : 'fa fa-check'" />
|
12
|
-
{{ status.statusMessage }}
|
13
|
-
</td>
|
14
|
-
<td><short-date-time date="status.created" /></td>
|
15
|
-
</tr>
|
16
|
-
</tbody>
|
17
|
-
</table>
|
@@ -1,92 +0,0 @@
|
|
1
|
-
<section>
|
2
|
-
<div class="details">
|
3
|
-
<h4 translate>Red Hat Provider Details</h4>
|
4
|
-
|
5
|
-
<div class="detail">
|
6
|
-
<span class="info-label" translate>Red Hat CDN URL</span>
|
7
|
-
<span class="info-value"
|
8
|
-
bst-edit-text="organization.redhat_repository_url"
|
9
|
-
on-save="saveCdnUrl(organization)"
|
10
|
-
readonly="organization.readonly">
|
11
|
-
</span>
|
12
|
-
</div>
|
13
|
-
</div>
|
14
|
-
</section>
|
15
|
-
|
16
|
-
<section>
|
17
|
-
<div class="details">
|
18
|
-
<h4 translate>Subscription Manifest</h4>
|
19
|
-
|
20
|
-
<div ng-show="isTaskPending()">
|
21
|
-
<a ng-href="/foreman_tasks/tasks/{{ task.id }}">
|
22
|
-
|
23
|
-
<div ng-class="{ active: isTaskPending() }"
|
24
|
-
class="progress progress-striped">
|
25
|
-
<span uib-progressbar animate="false" value="task.progressbar.value" type="{{task.progressbar.type}}"></span>
|
26
|
-
</div>
|
27
|
-
</a>
|
28
|
-
{{ taskStatusText }}
|
29
|
-
</div>
|
30
|
-
|
31
|
-
<div class="detail">
|
32
|
-
<span class="info-label" translate>Upstream Subscription Management Application</span>
|
33
|
-
<span class="info-value" ng-show="upstream.uuid != undefined">
|
34
|
-
<a href="{{ manifestLink }}" target="_blank">{{ manifestName }}</a>
|
35
|
-
</span>
|
36
|
-
<span class="info-value" ng-show="upstream.uuid == undefined" translate>No subscription manifest imported</span>
|
37
|
-
</div>
|
38
|
-
|
39
|
-
<div class="detail pull-left" ng-show="upstream != null">
|
40
|
-
<button type="button" class="btn btn-default" ng-disabled="isTaskPending()"
|
41
|
-
ng-hide="denied('delete_manifest')"
|
42
|
-
ng-click="openModal()">
|
43
|
-
<span bst-modal="deleteManifest()" template-url="subscriptions/manifest/views/manifest-delete-modal.html"></span>
|
44
|
-
<span translate>Delete Manifest</span>
|
45
|
-
</button>
|
46
|
-
<button type="button" class="btn btn-default" ng-disabled="manifestRefreshDisabled()"
|
47
|
-
ng-click="refreshManifest()">
|
48
|
-
<span translate>Refresh Manifest</span>
|
49
|
-
</button>
|
50
|
-
<span ng-show="upstream.idCert == undefined || upstream.idCert.cert == undefined" translate>
|
51
|
-
Refreshing manifest not supported by this manifest.
|
52
|
-
</span>
|
53
|
-
</div>
|
54
|
-
</div>
|
55
|
-
</section>
|
56
|
-
|
57
|
-
<section>
|
58
|
-
<form role="form"
|
59
|
-
action="{{ uploadURL }}"
|
60
|
-
ng-upload="uploadManifest(content, completed)"
|
61
|
-
error-catcher="uploadError(error, content)"
|
62
|
-
ng-hide="denied('import_manifest')"
|
63
|
-
upload-options-enable-controls
|
64
|
-
upload-options-enable-rails-csrf>
|
65
|
-
|
66
|
-
<div class="form-group">
|
67
|
-
<label for="manifestUpload" translate>Upload New Manifest</label>
|
68
|
-
<input id="manifestUpload" type="file" name="content"/>
|
69
|
-
</div>
|
70
|
-
|
71
|
-
<div class="form-group">
|
72
|
-
<button type="button" class="btn btn-primary" ng-disabled="isTaskPending()" upload-submit>
|
73
|
-
<span translate>Upload</span>
|
74
|
-
</button>
|
75
|
-
</div>
|
76
|
-
|
77
|
-
</form>
|
78
|
-
|
79
|
-
<div bst-alert="info" ng-if="details.virt_who">
|
80
|
-
<span translate>
|
81
|
-
The uploaded manifest contains subscriptions that require the use of virt-who. Learn how to configure and use this tool at the <a href="https://access.redhat.com/articles/subscription-management-satellite-6" target="_blank">Subscription Management Home Page</a>.
|
82
|
-
</span>
|
83
|
-
</div>
|
84
|
-
</section>
|
85
|
-
|
86
|
-
<section>
|
87
|
-
<h4 translate>Manifest History</h4>
|
88
|
-
|
89
|
-
<div ng-include="'subscriptions/manifest/views/manifest-import-history.html'"></div>
|
90
|
-
|
91
|
-
<a ui-sref="subscriptions-manifest.history" ng-show="showHistoryMoreLink" translate>More...</a>
|
92
|
-
</section>
|
@@ -1,33 +0,0 @@
|
|
1
|
-
<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
|
2
|
-
<header data-block="header">
|
3
|
-
<h2 translate>Subscription Manifest</h2>
|
4
|
-
</header>
|
5
|
-
|
6
|
-
<nav data-block="navigation">
|
7
|
-
<div content-access-mode-banner></div>
|
8
|
-
|
9
|
-
<ul class="nav nav-tabs details-nav" role="menu">
|
10
|
-
<li role="menuitem" ui-sref-active="active">
|
11
|
-
<a ui-sref="subscriptions-manifest.details">
|
12
|
-
<span translate>Details</span>
|
13
|
-
</a>
|
14
|
-
</li>
|
15
|
-
|
16
|
-
<li role="menuitem" ui-sref-active="active">
|
17
|
-
<a ui-sref="subscriptions-manifest.import">
|
18
|
-
<span translate>Import/Remove Manifest</span>
|
19
|
-
</a>
|
20
|
-
</li>
|
21
|
-
|
22
|
-
<li role="menuitem" ui-sref-active="active">
|
23
|
-
<a ui-sref="subscriptions-manifest.history">
|
24
|
-
<span translate>Import History</span>
|
25
|
-
</a>
|
26
|
-
</li>
|
27
|
-
</ul>
|
28
|
-
</nav>
|
29
|
-
|
30
|
-
<div data-block="content">
|
31
|
-
<section ui-view></section>
|
32
|
-
</div>
|
33
|
-
</div>
|
@@ -1,21 +0,0 @@
|
|
1
|
-
/**
|
2
|
-
* @ngdoc directive
|
3
|
-
* @name Bastion.subscriptions:subscriptionStartDate
|
4
|
-
*
|
5
|
-
* @description
|
6
|
-
* Directive for the subscription start date
|
7
|
-
*/
|
8
|
-
angular.module('Bastion.subscriptions').directive('subscriptionStartDate', function () {
|
9
|
-
return {
|
10
|
-
restrict: 'AE',
|
11
|
-
scope: {
|
12
|
-
subscription: '=subscriptionStartDate'
|
13
|
-
},
|
14
|
-
templateUrl: 'subscriptions/views/subscription-start-date.html',
|
15
|
-
controller: ['$scope', 'translate', function ($scope, translate) {
|
16
|
-
$scope.checkFutureDate = function (date) {
|
17
|
-
return (Date.parse(date) > Date.parse(Date()) ? translate(' (future)') : '');
|
18
|
-
};
|
19
|
-
}]
|
20
|
-
};
|
21
|
-
});
|
@@ -1,16 +0,0 @@
|
|
1
|
-
/**
|
2
|
-
* @ngdoc directive
|
3
|
-
* @name Bastion.subscriptions:subscriptionType
|
4
|
-
*
|
5
|
-
* @description
|
6
|
-
* Directive for the subscription type
|
7
|
-
*/
|
8
|
-
angular.module('Bastion.subscriptions').directive('subscriptionType', function () {
|
9
|
-
return {
|
10
|
-
restrict: 'AE',
|
11
|
-
scope: {
|
12
|
-
subscription: '=subscriptionType'
|
13
|
-
},
|
14
|
-
templateUrl: 'subscriptions/views/subscription-type.html'
|
15
|
-
};
|
16
|
-
});
|
@@ -1,16 +0,0 @@
|
|
1
|
-
/**
|
2
|
-
* @ngdoc filter
|
3
|
-
* @name Bastion.subscriptions.filter:subscriptionAttachAmountFilter.filter.js
|
4
|
-
*
|
5
|
-
* @requires translate
|
6
|
-
*
|
7
|
-
*/
|
8
|
-
angular.module('Bastion.subscriptions').filter('subscriptionAttachAmountFilter',
|
9
|
-
['translate',
|
10
|
-
function (translate) {
|
11
|
-
return function (subscription) {
|
12
|
-
var amount = subscription["quantity_attached"];
|
13
|
-
return (!amount || amount < 1) ? translate("Automatic") : amount;
|
14
|
-
};
|
15
|
-
}]
|
16
|
-
);
|
@@ -1,73 +0,0 @@
|
|
1
|
-
/**
|
2
|
-
* @ngdoc object
|
3
|
-
* @name Bastion.subscriptions.controller:SubscriptionsController
|
4
|
-
*
|
5
|
-
* @requires $scope
|
6
|
-
* @requires $q
|
7
|
-
* @requires $location
|
8
|
-
* @requires translate
|
9
|
-
* @requires Nutupane
|
10
|
-
* @requires Subscription
|
11
|
-
* @requires Organization
|
12
|
-
* @requires CurrentOrganization
|
13
|
-
* @requires unlimitedFilterFilter
|
14
|
-
*
|
15
|
-
* @description
|
16
|
-
* Provides the functionality specific to Subscriptions for use with the Nutupane UI pattern.
|
17
|
-
* Defines the columns to display and the transform function for how to generate each row
|
18
|
-
* within the table.
|
19
|
-
*/
|
20
|
-
angular.module('Bastion.subscriptions').controller('SubscriptionsController',
|
21
|
-
['$scope', '$filter', '$location', 'translate', 'Nutupane', 'Subscription', 'Organization', 'CurrentOrganization', 'SubscriptionsHelper',
|
22
|
-
function ($scope, $filter, $location, translate, Nutupane, Subscription, Organization, CurrentOrganization, SubscriptionsHelper) {
|
23
|
-
var params, nutupane;
|
24
|
-
|
25
|
-
params = {
|
26
|
-
'organization_id': CurrentOrganization,
|
27
|
-
'search': $location.search().search || "",
|
28
|
-
'sort_order': 'ASC',
|
29
|
-
'enabled': true,
|
30
|
-
'paged': true
|
31
|
-
};
|
32
|
-
|
33
|
-
nutupane = new Nutupane(Subscription, params);
|
34
|
-
$scope.controllerName = 'katello_subscriptions';
|
35
|
-
nutupane.masterOnly = true;
|
36
|
-
$scope.table = nutupane.table;
|
37
|
-
$scope.refreshTable = nutupane.refresh;
|
38
|
-
|
39
|
-
$scope.groupedSubscriptions = {};
|
40
|
-
$scope.$watch('table.rows', function (rows) {
|
41
|
-
$scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);
|
42
|
-
});
|
43
|
-
|
44
|
-
$scope.hasManifest = false;
|
45
|
-
Organization.get({id: CurrentOrganization}, function (organization) {
|
46
|
-
$scope.hasManifest = organization['owner_details'] && organization['owner_details'].upstreamConsumer;
|
47
|
-
});
|
48
|
-
|
49
|
-
$scope.formatConsumed = function (subscription) {
|
50
|
-
var quantity = $filter('unlimitedFilter')(subscription.quantity);
|
51
|
-
|
52
|
-
return translate('%(consumed)s out of %(quantity)s').replace('%(consumed)s', subscription.consumed).replace('%(quantity)s', quantity);
|
53
|
-
};
|
54
|
-
|
55
|
-
$scope.formatInstanceBased = function (subscription) {
|
56
|
-
if (angular.isUndefined(subscription['instance_multiplier']) || subscription['instance_multiplier'] === "" || subscription['instance_multiplier'] === 0) {
|
57
|
-
return translate("No");
|
58
|
-
}
|
59
|
-
return translate("Yes");
|
60
|
-
};
|
61
|
-
|
62
|
-
$scope.redhatProvider = Organization.redhatProvider();
|
63
|
-
$scope.subscriptions = Subscription.queryPaged();
|
64
|
-
|
65
|
-
$scope.$on('$stateChangeSuccess', function () {
|
66
|
-
$scope.subscriptions.$promise.then(function () {
|
67
|
-
if ($scope.subscriptions.results.length < 1 && $scope.permitted('import_manifest')) {
|
68
|
-
$scope.transitionTo('subscriptions-manifest.import');
|
69
|
-
}
|
70
|
-
});
|
71
|
-
});
|
72
|
-
}]
|
73
|
-
);
|
@@ -1,110 +0,0 @@
|
|
1
|
-
/**
|
2
|
-
* @ngdoc object
|
3
|
-
* @name Bastion.subscriptions.config
|
4
|
-
*
|
5
|
-
* @requires $stateProvider
|
6
|
-
*
|
7
|
-
* @description
|
8
|
-
* Used for subscriptions level configuration such as setting up the ui state machine.
|
9
|
-
*/
|
10
|
-
angular.module('Bastion.subscriptions').config(['$stateProvider', function ($stateProvider) {
|
11
|
-
$stateProvider.state('subscriptions', {
|
12
|
-
url: '/legacy_subscriptions',
|
13
|
-
permission: 'view_subscriptions',
|
14
|
-
template: '<div ui-view></div>',
|
15
|
-
views: {
|
16
|
-
'@': {
|
17
|
-
controller: 'SubscriptionsController',
|
18
|
-
templateUrl: 'subscriptions/views/subscriptions.html'
|
19
|
-
}
|
20
|
-
},
|
21
|
-
ncyBreadcrumb: {
|
22
|
-
label: "{{ 'Subscriptions' | translate }}"
|
23
|
-
}
|
24
|
-
});
|
25
|
-
|
26
|
-
$stateProvider.state('subscription', {
|
27
|
-
abstract: true,
|
28
|
-
url: '/legacy_subscriptions/:subscriptionId',
|
29
|
-
permission: 'view_subscriptions',
|
30
|
-
controller: 'SubscriptionDetailsController',
|
31
|
-
templateUrl: 'subscriptions/details/views/subscription-details.html'
|
32
|
-
})
|
33
|
-
.state('subscription.info', {
|
34
|
-
url: '',
|
35
|
-
permission: 'view_subscriptions',
|
36
|
-
templateUrl: 'subscriptions/details/views/subscription-info.html',
|
37
|
-
ncyBreadcrumb: {
|
38
|
-
label: "{{ subscription.name }}",
|
39
|
-
parent: 'subscriptions'
|
40
|
-
}
|
41
|
-
})
|
42
|
-
.state('subscription.products', {
|
43
|
-
url: '/products',
|
44
|
-
permission: 'view_subscriptions',
|
45
|
-
controller: 'SubscriptionProductsController',
|
46
|
-
templateUrl: 'subscriptions/details/views/subscription-products.html',
|
47
|
-
ncyBreadcrumb: {
|
48
|
-
label: "{{ 'Product Content' | translate }}",
|
49
|
-
parent: 'subscription.info'
|
50
|
-
}
|
51
|
-
})
|
52
|
-
.state('subscription.activation-keys', {
|
53
|
-
url: '/activation-keys',
|
54
|
-
permission: 'view_subscriptions',
|
55
|
-
controller: 'SubscriptionActivationKeysController',
|
56
|
-
templateUrl: 'subscriptions/details/views/subscription-activation-keys.html',
|
57
|
-
ncyBreadcrumb: {
|
58
|
-
label: "{{ 'Activation Keys' | translate }}",
|
59
|
-
parent: 'subscription.info'
|
60
|
-
}
|
61
|
-
})
|
62
|
-
.state('subscription.content-hosts', {
|
63
|
-
url: '/content-hosts',
|
64
|
-
permission: 'view_subscriptions',
|
65
|
-
controller: 'SubscriptionContentHostsController',
|
66
|
-
templateUrl: 'subscriptions/details/views/subscription-content-hosts.html',
|
67
|
-
ncyBreadcrumb: {
|
68
|
-
label: "{{ 'Content Hosts' | translate }}",
|
69
|
-
parent: 'subscription.info'
|
70
|
-
}
|
71
|
-
});
|
72
|
-
|
73
|
-
$stateProvider.state('subscriptions-manifest', {
|
74
|
-
abstract: true,
|
75
|
-
url: '/legacy_subscriptions/manifest',
|
76
|
-
permission: 'import_manifest',
|
77
|
-
controller: 'ManifestController',
|
78
|
-
templateUrl: 'subscriptions/manifest/views/manifest.html'
|
79
|
-
})
|
80
|
-
.state('subscriptions-manifest.details', {
|
81
|
-
url: '/details',
|
82
|
-
permission: 'import_manifest',
|
83
|
-
controller: 'ManifestDetailsController',
|
84
|
-
templateUrl: 'subscriptions/manifest/views/manifest-details.html',
|
85
|
-
ncyBreadcrumb: {
|
86
|
-
label: "{{ 'Manifest Details' | translate }}",
|
87
|
-
parent: 'subscriptions'
|
88
|
-
}
|
89
|
-
})
|
90
|
-
.state('subscriptions-manifest.import', {
|
91
|
-
url: '/import',
|
92
|
-
permission: 'import_manifest',
|
93
|
-
controller: 'ManifestImportController',
|
94
|
-
templateUrl: 'subscriptions/manifest/views/manifest-import.html',
|
95
|
-
ncyBreadcrumb: {
|
96
|
-
label: "{{ 'Import Manifest' | translate }}",
|
97
|
-
parent: 'subscriptions'
|
98
|
-
}
|
99
|
-
})
|
100
|
-
.state('subscriptions-manifest.history', {
|
101
|
-
url: '/history',
|
102
|
-
permission: 'import_manifest',
|
103
|
-
controller: 'ManifestHistoryController',
|
104
|
-
templateUrl: 'subscriptions/manifest/views/manifest-import-history.html',
|
105
|
-
ncyBreadcrumb: {
|
106
|
-
label: "{{ 'Manifest History' | translate }}",
|
107
|
-
parent: 'subscriptions'
|
108
|
-
}
|
109
|
-
});
|
110
|
-
}]);
|
@@ -1,5 +0,0 @@
|
|
1
|
-
<div bst-alert="info" ng-show="contentAccessMode === 'org_environment'">
|
2
|
-
<span translate>
|
3
|
-
Access to repositories is unrestricted in this organization. Hosts can consume all repositories available in the Content View they are registered to, regardless of subscription status.
|
4
|
-
</span>
|
5
|
-
</div>
|
@@ -1,18 +0,0 @@
|
|
1
|
-
|
2
|
-
<div ng-if="subscription.virt_only === false">
|
3
|
-
{{ 'Physical' | translate }}
|
4
|
-
</div>
|
5
|
-
<div ng-if="subscription.virt_only === true && !subscription.hypervisor">
|
6
|
-
<div ng-if="subscription.unmapped_guest !== true">
|
7
|
-
{{ 'Virtual' | translate }}
|
8
|
-
</div>
|
9
|
-
<div ng-if="subscription.unmapped_guest === true">
|
10
|
-
{{ 'Temporary' | translate }}
|
11
|
-
</div>
|
12
|
-
</div>
|
13
|
-
<div ng-if="subscription.virt_only === true && subscription.hypervisor">
|
14
|
-
<span translate> Guests of </span>
|
15
|
-
<a ui-sref="content-host.info({hostId: subscription.hypervisor.id })">
|
16
|
-
{{ subscription.hypervisor.name }}
|
17
|
-
</a>
|
18
|
-
</div>
|
@@ -1,63 +0,0 @@
|
|
1
|
-
<span page-title>{{ 'Subscriptions' | translate }}</span>
|
2
|
-
|
3
|
-
<div data-extend-template="layouts/table-with-header.html">
|
4
|
-
|
5
|
-
<header data-block="header">
|
6
|
-
<h2 translate>Subscriptions</h2>
|
7
|
-
</header>
|
8
|
-
|
9
|
-
<div data-block="list-actions">
|
10
|
-
<button type="button" class="btn btn-primary" ui-sref="subscriptions-manifest.import"
|
11
|
-
ng-hide="denied('import_manifest') && denied('delete_manifest')">
|
12
|
-
<span ng-if="!hasManifest" translate>Import Manifest</span>
|
13
|
-
<span ng-if="hasManifest" translate>Manage Manifest</span>
|
14
|
-
</button>
|
15
|
-
</div>
|
16
|
-
|
17
|
-
<span data-block="no-rows-message" translate>
|
18
|
-
You currently don't have any Subscriptions.
|
19
|
-
</span>
|
20
|
-
|
21
|
-
<span data-block="no-search-results-message" translate>
|
22
|
-
Your search returned zero Subscriptions.
|
23
|
-
</span>
|
24
|
-
|
25
|
-
<div data-block="table">
|
26
|
-
<table class="table table-bordered" ng-class="{'table-mask': table.working}">
|
27
|
-
<thead>
|
28
|
-
<tr bst-table-head>
|
29
|
-
<th bst-table-column="consumed" class="align-center"><span translate>Consumed</span></th>
|
30
|
-
<th bst-table-column="type"><span translate>Type</span></th>
|
31
|
-
<th bst-table-column="startDate"><span translate>Starts</span></th>
|
32
|
-
<th bst-table-column="endDate"><span translate>Expires</span></th>
|
33
|
-
<th bst-table-column="supportLevel"><span translate>Support Level</span></th>
|
34
|
-
<th bst-table-column="contractNumber"><span translate>Contract</span></th>
|
35
|
-
<th bst-table-column="accountNumber"><span translate>Account</span></th>
|
36
|
-
<th bst-table-column="virtLimit"><span translate>Requires Virt-Who Usage</span></th>
|
37
|
-
</tr>
|
38
|
-
</thead>
|
39
|
-
|
40
|
-
<tbody>
|
41
|
-
<tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions">
|
42
|
-
<td bst-table-cell colspan="8">
|
43
|
-
<b>{{ name }}</b>
|
44
|
-
</td>
|
45
|
-
</tr>
|
46
|
-
<tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions">
|
47
|
-
<td bst-table-cell>
|
48
|
-
<a ui-sref="subscription.info({subscriptionId: subscription.id})">
|
49
|
-
{{ subscription | subscriptionConsumedFilter }}
|
50
|
-
</a>
|
51
|
-
</td>
|
52
|
-
<td bst-table-cell><div subscription-type="subscription"></div></td>
|
53
|
-
<td bst-table-cell><div subscription-start-date="subscription"></div></td>
|
54
|
-
<td bst-table-cell><short-date-time date="subscription.end_date" /></td>
|
55
|
-
<td bst-table-cell>{{ subscription.support_level }}</td>
|
56
|
-
<td bst-table-cell>{{ subscription.contract_number }}</td>
|
57
|
-
<td bst-table-cell>{{ subscription.account_number }}</td>
|
58
|
-
<td bst-table-cell><i class="fa fa-check" ng-if="subscription.virt_who"></i></td>
|
59
|
-
</tr>
|
60
|
-
</tbody>
|
61
|
-
</table>
|
62
|
-
</div>
|
63
|
-
</div>
|