katello 4.13.1 → 4.14.0.rc1.1

data/app/assets/javascripts/katello/containers/container.js

@@ -1,304 +0,0 @@
-var KT = KT ? KT : {};
-
-KT.container = (function(){
-    var pre_selection = {};
-    var setup = function() {
-        var orgDropdown = $('#organization_id'),
-            envDropdown = $('#kt_environment_id'),
-            contentViewDropdown = $('#content_view_id'),
-            reposDropdown = $("#repository_id"),
-            tagsDropdown = $("#tag_id"),
-            capsuleDropdown = $("#capsule_id");
-        envDropdown.change(populateContentViews);
-        contentViewDropdown.change(populateRepositories);
-        reposDropdown.change(populateTags);
-        tagsDropdown.change(checkNextButton);
-        capsuleDropdown.change(checkNextButton);
-        resetContentViews();
-
-        orgDropdown.change(function() {
-            populateEnvironments();
-            populateCapsules();
-        });
-
-        if(orgDropdown.val() === "") {
-            resetOrgs();
-        }
-
-        $('#hub_tab').click(function() {
-            enableNext(true);
-        });
-
-        $('#registry_tab').click(function() {
-            enableNext(true);
-        });
-
-        $('#katello_tab').click(function() {
-            enableNext(false);
-        });
-    },
-    getCapsule = function() {
-        return $('#capsule_id').val();
-    },
-    getOrg = function() {
-        return $('#organization_id').val();
-    },
-    getEnvironment = function() {
-        return $('#kt_environment_id').val();
-    },
-    getContentView = function() {
-        return $('#content_view_id').val();
-    },
-    getRepo = function() {
-        return $('#repository_id').val();
-    },
-    getTag = function() {
-        return $('#tag_id').val();
-    },
-    populateCapsules = function() {
-        var capsuleDropdown = $('#capsule_id'),
-            noCapsules = $("#no_capsules"),
-            org = getOrg(),
-            spinner = $("#load_capsules"),
-            url = tfm.tools.foremanUrl("/api/smart_proxies"),
-            params = {
-                organization_id: getOrg(),
-                search: "feature = \"Pulp Node\" or feature = \"Pulp\"",
-                per_page: 9999999,
-            };
-
-        resetCapsules();
-        if (org !== "") {
-            showSpinner(spinner, true);
-            $.getJSON(url, params)
-                .done(function(data) {
-                        if(data.length > 0) {
-                            $.each(data, function(index, capsule) {
-                                capsuleDropdown.append(
-                                    $('<option></option>').val(capsule["id"]).html(capsule["name"]));
-                            });
-                            enableCapsules(true);
-                        } else {
-                            noCapsules.removeClass("hide");
-                        }
-                })
-                .fail(function(resp) {
-                    $("#error_capsules").removeClass("hide")
-                })
-                .always(function() {
-                    showSpinner(spinner, false);
-                });
-        }
-        checkNextButton();
-    },
-    populateEnvironments = function() {
-        var environmentDropdown = $('#kt_environment_id'),
-            org = getOrg(),
-            spinner = $("#load_environments"),
-            url = tfm.tools.foremanUrl("/katello/api/organizations/" + org + "/environments");
-
-        resetEnvironments();
-        if (org !== "") {
-            showSpinner(spinner, true);
-            $.getJSON(url, {})
-                .done(function(data) {
-                        $.each(data["results"], function(index, env) {
-                            environmentDropdown.append(
-                                $('<option></option>').val(env["id"]).html(env["name"]));
-                        });
-                        enableEnvironments(true);
-                })
-                .fail(function(resp) {
-                    $("#error_environments").removeClass("hide")
-                })
-                .always(function() {
-                    showSpinner(spinner, false);
-                });
-        }
-    },
-    populateContentViews = function() {
-        var contentViewDropdown = $('#content_view_id'),
-            noCV = $("#no_content_views"),
-            env = getEnvironment(),
-            spinner = $("#load_content_views"),
-            url = tfm.tools.foremanUrl("/katello/api/organizations/" + getOrg() + "/content_views");
-            params = {
-                environment_id : env
-            };
-
-        resetContentViews();
-        if (env !== "") {
-            showSpinner(spinner, true);
-            $.getJSON(url, params)
-                .done(function(data) {
-                        if (data["results"].length > 0) {
-                            $.each(data["results"], function(index, cv) {
-                                contentViewDropdown.append(
-                                    $('<option></option>').val(cv["id"]).html(cv["name"]));
-                            });
-                            enableContentViews(true);
-                            contentViewDropdown.val(pre_selection.content_view_id).trigger('change')
-                        } else {
-                            noCV.removeClass("hide");
-                        }
-
-                })
-                .fail(function(resp) {
-                    $("#error_content_views").removeClass("hide")
-                })
-                .always(function() {
-                    showSpinner(spinner, false);
-                });
-        }
-    },
-    populateRepositories = function() {
-        var reposDropdown = $("#repository_id"),
-            noRepos = $("#no_repositories"),
-            cv = getContentView(),
-            spinner = $("#load_repositories"),
-            url = tfm.tools.foremanUrl("/katello/api/repositories/"),
-            params = {
-                organization_id: getOrg(),
-                content_view_id: cv,
-                environment_id: getEnvironment(),
-                content_type: "docker"
-            };
-
-        resetRepositories();
-        if (cv !== "") {
-            showSpinner(spinner, true);
-            $.getJSON(url, params)
-                .done(function(data) {
-                        if(data["results"].length > 0) {
-                            $.each(data["results"], function(index, repo) {
-                                reposDropdown.append(
-                                    $('<option></option>').val(repo["id"]).html(repo["name"]));
-                            });
-                            enableRepositories(true);
-                            reposDropdown.val(pre_selection.repository_id).trigger('change');
-                        } else {
-                            noRepos.removeClass("hide");
-                        }
-                })
-                .fail(function(resp) {
-                    $("#error_repositories").removeClass("hide")
-                })
-                .always(function() {
-                    showSpinner(spinner, false);
-                });
-
-        }
-        checkNextButton();
-    },
-    populateTags = function() {
-        var repo = getRepo(),
-            tagsDropdown = $("#tag_id"),
-            spinner = $("#load_tags"),
-            url = tfm.tools.foremanUrl("/katello/api/repositories/" + repo + "/docker_tags"),
-            params = {};
-
-        resetTags();
-        if (repo !== "") {
-            showSpinner(spinner, true);
-            $.getJSON(url, params)
-                .done(function(data) {
-                        $.each(data["results"], function(index, tag) {
-                            tagsDropdown.append(
-                                $('<option></option>').val(tag["id"]).html(tag["name"]));
-                        });
-                        enableTags(true);
-                        tagsDropdown.val(pre_selection.tag_id).trigger('change')
-                })
-                .fail(function(resp) {
-                    $("#error_tags").removeClass("hide")
-                })
-                .always(function() {
-                    showSpinner(spinner, false);
-                });
-        }
-    },
-    checkNextButton = function() {
-        enableNext(getRepo() !== "" && getTag() !== "" && getCapsule() !== "")
-    },
-    resetOrgs = function () {
-        resetEnvironments();
-        resetCapsules();
-    },
-    resetEnvironments = function() {
-        $("#error_environments").addClass("hide");
-        resetContentViews();
-        $('#kt_environment_id option[value!=""]').remove();
-        enableEnvironments(false);
-    },
-    resetCapsules = function() {
-        $("#error_capsules").addClass("hide");
-        $("#no_capsules").addClass("hide");
-        $('#capsule_id option[value!=""]').remove();
-        enableCapsules(false);
-        enableNext(false);
-    },
-    resetContentViews = function() {
-        $("#no_content_views").addClass("hide");
-        $("#error_content_views").addClass("hide");
-        resetRepositories();
-        $('#content_view_id option[value!=""]').remove();
-        enableContentViews(false);
-    },
-    resetRepositories = function() {
-        $("#no_repositories").addClass("hide");
-        $("#error_repositories").addClass("hide");
-        resetTags();
-        $('#repository_id option[value!=""]').remove();
-        enableRepositories(false);
-    },
-    resetTags = function() {
-        $("#error_tags").addClass("hide");
-        $('#tag_id option[value!=""]').remove();
-        enableTags(false);
-        enableNext(false);
-    },
-    enableEnvironments = function(enable) {
-        $('#kt_environment_id').prop("disabled", !enable);
-    },
-    enableCapsules = function(enable) {
-        $('#capsule_id').prop("disabled", !enable);
-    },
-    enableContentViews = function(enable) {
-        $('#content_view_id').prop("disabled", !enable);
-    },
-    enableRepositories = function(enable) {
-        $('#repository_id').prop("disabled", !enable);
-    },
-    enableTags = function(enable) {
-        $('#tag_id').prop("disabled", !enable);
-    },
-    enableNext = function(enable) {
-        $('#next_katello').prop("disabled", !enable);
-    },
-    showSpinner = function(spinner, show) {
-        if (show) {
-            spinner.removeClass("hide");
-        } else {
-            spinner.addClass("hide")
-        }
-    };
-    setSelection = function(selection) {
-      pre_selection = selection;
-      $('#kt_environment_id').val(selection.environment_id)
-                             .trigger('change')
-    }
-    return {
-        setup: setup,
-        setSelection: setSelection,
-        enableNext: enableNext
-    };
-})();
-
-
-$(document).ready(function() {
-    KT.container.setup();
-});
-
-$(window).load(function() {
-    KT.container.enableNext(false);
-});

data/app/lib/katello/util/http_helper.rb

@@ -1,15 +0,0 @@
-#
-# Commons used helper methods pertaining to HTTP/Rest client etc
-#
-module Katello
-  module Util
-    module HttpHelper
-      def ignore_404_exception(*)
-        yield
-      rescue api.api_exception_class => e
-        raise e unless e.code == 404
-        nil
-      end
-    end
-  end
-end

data/app/models/732bd3db9f64c621c64d2be4f2a838727aac0845.patch

@@ -1,61 +0,0 @@
-From 732bd3db9f64c621c64d2be4f2a838727aac0845 Mon Sep 17 00:00:00 2001
-From: Quinn James <qjames@redhat.com>
-Date: Fri, 23 Jun 2023 19:06:34 +0000
-Subject: [PATCH] Fixes #36530 - Fixed up
- /katello/api/sync_plans/:sync_plan_id/products and
- /katello/api/repositories/:repository_id/sync API endpoints.
-
----
- app/controllers/katello/api/v2/sync_controller.rb | 1 -
- app/models/katello/repository.rb                  | 4 ++++
- app/views/katello/api/v2/sync/index.json.rabl     | 1 -
- config/routes/api/v2.rb                           | 1 +
- 4 files changed, 5 insertions(+), 2 deletions(-)
- delete mode 100644 app/views/katello/api/v2/sync/index.json.rabl
-
-diff --git a/app/controllers/katello/api/v2/sync_controller.rb b/app/controllers/katello/api/v2/sync_controller.rb
-index b43d502264f..cf324a004f6 100644
---- a/app/controllers/katello/api/v2/sync_controller.rb
-+++ b/app/controllers/katello/api/v2/sync_controller.rb
-@@ -4,7 +4,6 @@ class Api::V2::SyncController < Api::V2::ApiController
-     before_action :find_object, :only => [:index]
-     before_action :ensure_library, :only => [:index]
- 
--    api :GET, "/organizations/:organization_id/products/:product_id/sync", N_("Get status of repo synchronisation for given product")
-     api :GET, "/repositories/:repository_id/sync", N_("Get status of synchronisation for given repository")
-     def index
-       respond_for_async(:resource => @obj.sync_status)
-diff --git a/app/models/katello/repository.rb b/app/models/katello/repository.rb
-index 1fbf499ec44..ccd76734ba6 100644
---- a/app/models/katello/repository.rb
-+++ b/app/models/katello/repository.rb
-@@ -947,6 +947,10 @@ def in_content_view?(content_view)
-       content_view.repositories.include? self
-     end
- 
-+    def sync_status
-+      return latest_dynflow_sync
-+    end
-+
-     protected
- 
-     def unit_type_for_removal(type_class = nil)
-diff --git a/app/views/katello/api/v2/sync/index.json.rabl b/app/views/katello/api/v2/sync/index.json.rabl
-deleted file mode 100644
-index 4296aca962b..00000000000
---- a/app/views/katello/api/v2/sync/index.json.rabl
-+++ /dev/null
-@@ -1 +0,0 @@
--extends 'katello/api/v2/common/async'
-diff --git a/config/routes/api/v2.rb b/config/routes/api/v2.rb
-index 67ad91dbc2c..9ec5312b4e0 100644
---- a/config/routes/api/v2.rb
-+++ b/config/routes/api/v2.rb
-@@ -484,6 +484,7 @@ class ActionDispatch::Routing::Mapper
-         end
- 
-         api_resources :sync_plans, :only => [:index, :show, :update, :destroy] do
-+          api_resources :products, :only => [:index]
-           get :auto_complete_search, :on => :collection
-           put :sync
-         end