katello 4.20.0 → 4.21.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6906fd0237d8f131b8dd191803695f7af15dc79908dd2d1e6d3385394bedc997
-  data.tar.gz: 20cd7a88f0eae1a31a6ba650e2d761626ebbdd70f3ebc9ae21d362c8144bdd1e
+  metadata.gz: bc44a74d358bd01c4bf0088fe85b06cb7c6c5e2e0626a0dab2d592aaac0f858c
+  data.tar.gz: 055e47f3046825b57804b84d92f2b6015e1ab8b780577676d4773d25297115a1
 SHA512:
-  metadata.gz: c973d2b28b03b6dbfe9a3373fd57edd647974e25dc56531630809c3b14c4f3528becbf28725dd7d1b00200149870a81e1a0d45db855b69d484b4c9d967e5afeb
-  data.tar.gz: ce0c166fef878d6a477e6f003dcda75364d95026237f695db2689bbdbbf06731d3df3ac5a0610e6ce04388cd845df2dfb44cd71c463536748be0f02896f95889
+  metadata.gz: d847bc7428714c264464e0eae1f6a5225c83f3cd5c5459ce5f6aeded81a572c6697b0ca943ae7a705b5aa51057ec3b205abe85288a128500de4d249af0af5c18
+  data.tar.gz: 2a6e87519ce952434f2808668ea96df1a05e7236debbc3d11d0e10cf3cea8e7c8a181f15b4defd8cab7923bbb8cb4c214a667ffaa8bc3750afc35a3362ae2e04

data/README.md

@@ -3,65 +3,28 @@
 [![Build Status](https://ci.theforeman.org/buildStatus/icon?job=katello-nightly-release)](https://ci.theforeman.org/job/katello-nightly-release/)
 [![Code Climate](https://codeclimate.com/github/Katello/katello/badges/gpa.svg)](https://codeclimate.com/github/Katello/katello)
 
-Full documentation is at https://www.theforeman.org/plugins/katello/
-
 ## About
 
-[Katello](https://www.theforeman.org/plugins/katello/) is a systems life cycle management
-plugin to [Foreman](https://www.theforeman.org). Katello allows you to manage
-thousands of machines with one click. Katello can pull content
-from remote repositories into isolated environments, and make subscriptions
-management a breeze.
-
-Currently, it is able to handle Fedora and Red Hat Enterprise
-Linux based systems.
-
-## Development
-
-The most common way to set up Katello for development is to use
-[forklift](https://github.com/theforeman/forklift).
-This will set up a virtual machine with the Katello codebase checked out.
-Please use the forklift documentation found in the repository for how
-to get started with forklift.
-
-If you have questions about or issues with deploying a development environment, feel free to ask
-for assistance in #theforeman-dev IRC channel on libera.chat or via the
-[community forum](https://community.theforeman.org/)
-
-### Test Run
-
-At this point, the development environment should be completely setup and the Katello engine functionality available. To verify this, go to your Foreman checkout:
+[Katello](https://www.theforeman.org/plugins/katello/) is a plugin for [Foreman](https://www.theforeman.org) that orchestrates content distribution and subscription management at scale across thousands of Enterprise Linux and Debian-based systems. Katello serves as an enterprise content gateway between external repositories and Foreman-managed hosts by synchronizing RPMs, container images, flatpaks, and more into versioned Content Views, promoting this content through isolated Lifecycle Environments. Katello provides Foreman hosts with first-class content, subscription, and entitlement management.
 
-1. Start the development server
+Full user documentation is available at https://docs.theforeman.org/release/nightly/index-katello.html. Use the selection in the upper right to select your Foreman/Katello version.
 
-    ```bash
-    cd $GITDIR/foreman
-
-    bundle exec foreman start
-    ```
-
-1. Access Foreman in your browser (e.g. `https://<hostname>/`). Note that while Rails will listen on port 3000, the dev installer will set up a reverse proxy so HTTPS on port 443 will work.
-1. The first time you do this, you will need to accept the self-signed certificate on port 3808 by first visiting `https://<hostname>:3808`
-1. Login to Foreman (default: `admin` and `changeme`)
-1. If you go to `https://<hostname>/about` and view the "Plugins" tab, you should see a "Katello" plugin listed.
+## Found a bug?
 
-### Reset Development Environment
+That's rather unfortunate. But don't worry; we can help! Just file a bug [in our project tracker](https://projects.theforeman.org/projects/katello).
 
-In order to reset the development environment, all backend data and the database needs to be reset. To reiterate, *the following will destroy all data in Pulp, Candlepin and your Foreman/Katello database*. From the Foreman checkout run:
+## Development and Contributing
 
-```bash
-rake katello:reset
-```
+Katello welcomes community contributions! We typically review community pull requests within a week. All pull requests are required to reference a valid Katello issue on Foreman's [project tracker](https://projects.theforeman.org/projects/katello/issues). Please view existing PRs to get a sense of our contribution standards.
 
-## Found a bug?
+To set up Katello for development, we recommend using [forklift](https://github.com/theforeman/forklift) to set up a virtual machine with the Katello codebase checked out and pre-configured. Please use the forklift documentation found in the repository above for further information. Once your environment is checked out, view our [developer quick reference guide](https://github.com/Katello/katello/blob/master/developer_docs/quick_reference.md) for information on running your Katello development server.
 
-That's rather unfortunate. But don't worry! We can help. Just file a bug
-[in our project tracker](https://projects.theforeman.org/projects/katello).
+Please see our [development guidelines](https://www.theforeman.org/plugins/katello/developers.html). Katello source follows the following style guidelines:
 
+* [Ruby guidelines](https://theforeman.org/handbook.html#Ruby)
+* [Javascript guidelines](https://theforeman.org/handbook.html#JavaScript)
 
-## Contributing
-
-See the [developer documentation](https://www.theforeman.org/plugins/katello/developers).
+If you have questions about or issues with deploying a development environment, feel free to ask for assistance in our [matrix channel](https://matrix.to/#/#theforeman:matrix.org) or our [community forum](https://community.theforeman.org/)
 
 ## Annotated Pulp and Candlepin Workflows and test Scenarios
 
@@ -71,11 +34,5 @@ See the [annotation docs](./test/scenarios/annotations/README.md) for more infor
 
  * [theforeman.org](https://theforeman.org/plugins/katello)
  * [Discourse Forum](https://theforeman.org/support.html#DiscourseForum)
- * Archived mailing lists:
-    * [Foreman User Mailing List](https://groups.google.com/forum/?fromgroups#!forum/foreman-users)
-    * [Foreman Developer mailing list](https://groups.google.com/forum/?fromgroups#!forum/foreman-dev)
-
-## Documentation
-
-Most of our documentation (both for users and developers) can be found at
-[theforeman.org](https://www.theforeman.org/plugins/katello).
+ * [Support Matrix channel](https://matrix.to/#/#theforeman:matrix.org)
+ * [Developer Matrix channel](https://matrix.to/#/#theforeman-dev:matrix.org)

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -16,8 +16,10 @@ $(document).on('ContentLoad', function(){
 KT.hosts.contentSourceChanged = function() {
   $("#hostgroup_lifecycle_environment_id").val("");
   $("#host_lifecycle_environment_id").val("");
+  $("#hostgroup_content_view_environment_id").val("");
   KT.hosts.fetchEnvironments();
   KT.hosts.environmentChanged();
+  KT.hosts.refreshContentViewEnvironments();
 };
 
 KT.hosts.environmentChanged = function() {
@@ -29,6 +31,60 @@ KT.hosts.environmentChanged = function() {
   KT.hosts.toggle_installation_medium(previous_content_view);
 };
 
+KT.hosts.refreshContentViewEnvironments = function() {
+  var select = $("#hostgroup_content_view_environment_id");
+  if (select.length === 0) return; // Only for hostgroups
+
+  var content_source_id = $('#content_source_id').val();
+  var orgIdsElem = $("#hostgroup_organization_ids");
+  var orgIds = orgIdsElem.val();
+
+  if (orgIds === undefined || orgIds === null || orgIds.length === 0) {
+    orgIds = orgIdsElem.data('useds');
+  }
+  if (orgIds === undefined || orgIds === null || orgIds.length === 0) {
+    return; // Can't fetch without organization
+  }
+  var orgId = Array.isArray(orgIds) ? orgIds[0] : orgIds;
+
+  var previousInheritText = select.find('option:first-child').text();
+  var previousValue = select.val();
+  select.find('option').remove();
+
+  var url = tfm.tools.foremanUrl('/katello/api/v2/content_view_environments');
+  var params = { organization_id: orgId, full_result: true };
+
+  if (content_source_id) {
+    params.content_source_id = content_source_id;
+  }
+
+  $.get(url, params, function(data) {
+    var foundPreviousValue = false;
+
+    // Add inherit option back if it was there
+    if (previousInheritText && (previousInheritText.includes('Inherit') || previousInheritText === '')) {
+      select.append($("<option />").text(previousInheritText).val(''));
+    }
+
+    $.each(data.results, function(index, cve) {
+      var label = cve.lifecycle_environment.name + ' / ' + cve.content_view.name;
+      var option = $("<option />").val(cve.id).text(label);
+      if (cve.id === parseInt(previousValue)) {
+        option.prop('selected', true);
+        foundPreviousValue = true;
+      }
+      select.append(option);
+    });
+
+    // If previous value not found in filtered list, select the blank/inherit option
+    if (!foundPreviousValue) {
+      select.val('');
+    }
+
+    select.trigger('change');
+  });
+};
+
 KT.hosts.fetchEnvironments = function () {
   var select = KT.hosts.getEnvironmentSelect();
   var content_source_id = $('#content_source_id').val();