katello 4.15.0 → 4.16.0.rc1

data/config/initializers/monkeys.rb

@@ -1,4 +1,3 @@
 #place where monkey patches are required
 require 'monkeys/ar_postgres_evr_t'
-require 'monkeys/fx_sqlite_skip'
 require 'monkeys/remove_hidden_distribution'

data/config/initializers/pagelets.rb

@@ -4,3 +4,9 @@ Pagelets::Manager.with_key "hosts/_form" do |mgr|
     :partial => "overrides/activation_keys/host_environment_select",
     :priority => 80
 end
+
+Pagelets::Manager.with_key "http_proxies/_form" do |mgr|
+  mgr.add_pagelet :main_tab_fields,
+    :partial => "overrides/http_proxies/update_setting_input",
+    :priority => 80
+end

data/config/routes/api/registry.rb

@@ -19,6 +19,7 @@ Katello::Engine.routes.draw do
       match '/v2' => 'registry_proxies#ping', :via => :get
       match '/v1/_ping' => 'registry_proxies#v1_ping', :via => :get
       match '/v1/search' => 'registry_proxies#v1_search', :via => :get
+      match '/index/static' => 'registry_proxies#static_index', :via => :get
     end
   end
 end

data/config/routes/api/v2.rb

@@ -15,6 +15,25 @@ Katello::Engine.routes.draw do
           get :auto_complete_search, :on => :collection
         end
 
+        api_resources :flatpak_remotes, :only => [:index, :show, :create, :update, :destroy] do
+          get :auto_complete_search, :on => :collection
+          member do
+            post :scan
+          end
+          api_resources :flatpak_remote_repositories, :only => [:index, :show]
+        end
+
+        api_resources :flatpak_remote_repositories, :only => [:index, :show] do
+          get :auto_complete_search, :on => :collection
+          member do
+            post :mirror
+          end
+        end
+
+        api_resources :host_bootc_images, :only => [:auto_complete_search] do
+          get :auto_complete_search, :on => :collection
+        end
+
         api_resources :capsules, :only => [:index, :show] do
           member do
             resource :content, :only => [], :controller => 'capsule_content' do
@@ -263,6 +282,8 @@ Katello::Engine.routes.draw do
               get :manifest_history
             end
           end
+          api_resources :flatpak_remotes, :only => [:index, :show]
+          api_resources :flatpak_remote_repositories, :only => [:index, :show]
         end
 
         match "/packages/thindex" => "packages#thindex", :via => :get

data/config/routes/overrides.rb

@@ -59,6 +59,7 @@ Foreman::Application.routes.draw do
 
           collection do
             match '/auto_complete_search' => 'host_autocomplete#auto_complete_search', :via => :get
+            match '/bootc_images' => 'host_bootc_images#bootc_images', :via => :get
             match '/bulk/add_host_collections' => 'hosts_bulk_actions#bulk_add_host_collections', :via => :put
             match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put
             match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put

data/config/routes.rb

@@ -33,6 +33,8 @@ Katello::Engine.routes.draw do
   match '/alternate_content_sources' => 'react#index', :via => [:get]
   match '/alternate_content_sources/*page' => 'react#index', :via => [:get]
 
+  match '/booted_container_images' => 'react#index', :via => [:get]
+
   Katello::RepositoryTypeManager.generic_ui_content_types(false).each do |type|
     get "/#{type.pluralize}", to: redirect("/content/#{type.pluralize}")
     get "/#{type.pluralize}/:page", to: redirect("/content/#{type.pluralize}/%{page}")

data/db/migrate/20190605014649_add_purpose_addons.rb

@@ -12,18 +12,6 @@ class AddPurposeAddons < ActiveRecord::Migration[5.2]
     add_foreign_key :katello_subscription_facet_purpose_addons, :katello_subscription_facets, column: :subscription_facet_id, name: :katello_sub_facet_purpose_addon_facet_id
     add_foreign_key :katello_subscription_facet_purpose_addons, :katello_purpose_addons, column: :purpose_addon_id, name: :katello_sub_facet_purpose_addon_purpose_addon_id
 
-    Katello::Host::SubscriptionFacet.pluck(:id, :purpose_addons).each do |facet|
-      yaml_string = facet[1]
-      next if yaml_string.nil?
-
-      parsed = YAML.parse(yaml_string)
-      addon_names = parsed.root.children.map(&:value)
-      addon_names.each do |addon|
-        purpose_addon = Katello::PurposeAddon.find_or_create_by(name: addon)
-        Katello::SubscriptionFacetPurposeAddon.create(purpose_addon_id: purpose_addon.id, subscription_facet_id: facet[0])
-      end
-    end
-
     remove_column :katello_subscription_facets, :purpose_addons, :text
   end
 end

data/db/migrate/20200213184848_create_evr_type.rb

@@ -4,7 +4,132 @@ class CreateEvrType < ActiveRecord::Migration[5.2]
   def up
     unless connection.adapter_name.downcase.include?('sqlite')
 
-      enable_extension "evr"
+      execute <<~SQL
+              create type evr_array_item as (
+          n       NUMERIC,
+          s       TEXT
+        );
+
+        create type evr_t as (
+          epoch INT,
+          version evr_array_item[],
+          release evr_array_item[]
+        );
+
+        CREATE FUNCTION evr_trigger() RETURNS trigger AS $$
+          BEGIN
+            NEW.evr = (select ROW(coalesce(NEW.epoch::numeric,0),
+                                  rpmver_array(coalesce(NEW.version,'empty'))::evr_array_item[],
+                                  rpmver_array(coalesce(NEW.release,'empty'))::evr_array_item[])::evr_t);
+            RETURN NEW;
+          END;
+        $$ language 'plpgsql';
+
+        create or replace FUNCTION empty(t TEXT)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        		return t ~ '^[[:space:]]*$';
+        	END;
+        $$ language 'plpgsql';
+
+        create or replace FUNCTION isalpha(ch CHAR)
+          RETURNS BOOLEAN as $$
+          BEGIN
+            if ascii(ch) between ascii('a') and ascii('z') or
+                ascii(ch) between ascii('A') and ascii('Z')
+            then
+              return TRUE;
+            end if;
+            return FALSE;
+          END;
+        $$ language 'plpgsql';
+
+        create or replace FUNCTION isalphanum(ch CHAR)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        		if ascii(ch) between ascii('a') and ascii('z') or
+        			ascii(ch) between ascii('A') and ascii('Z') or
+        			ascii(ch) between ascii('0') and ascii('9')
+        		then
+        			return TRUE;
+        		end if;
+        		return FALSE;
+        	END;
+        $$ language 'plpgsql';
+
+        create or replace function isdigit(ch CHAR)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        	  if ascii(ch) between ascii('0') and ascii('9')
+        	  then
+        		return TRUE;
+        	  end if;
+        	  return FALSE;
+        	END ;
+        $$ language 'plpgsql';
+
+        create or replace FUNCTION rpmver_array (string1 IN VARCHAR)
+        	RETURNS evr_array_item[] as $$
+        	declare
+        		str1 VARCHAR := string1;
+        		digits VARCHAR(10) := '0123456789';
+        		lc_alpha VARCHAR(27) := 'abcdefghijklmnopqrstuvwxyz';
+        		uc_alpha VARCHAR(27) := 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        		alpha VARCHAR(54) := lc_alpha || uc_alpha;
+        		one VARCHAR;
+        		isnum BOOLEAN;
+        		ver_array evr_array_item[] := ARRAY[]::evr_array_item[];
+        	BEGIN
+        		if str1 is NULL
+        		then
+        			RAISE EXCEPTION 'VALUE_ERROR.';
+        		end if;
+
+        		one := str1;
+        		<<segment_loop>>
+        		while one <> ''
+        		loop
+        			declare
+        				segm1 VARCHAR;
+        				segm1_n NUMERIC := 0;
+        			begin
+        				-- Throw out all non-alphanum characters
+        				while one <> '' and not isalphanum(one)
+        				loop
+        					one := substr(one, 2);
+        				end loop;
+        				str1 := one;
+        				if str1 <> '' and isdigit(str1)
+        				then
+        					str1 := ltrim(str1, digits);
+        					isnum := true;
+        				else
+        					str1 := ltrim(str1, alpha);
+        					isnum := false;
+        				end if;
+        				if str1 <> ''
+        				then segm1 := substr(one, 1, length(one) - length(str1));
+        				else segm1 := one;
+        				end if;
+
+        				if segm1 = '' then return ver_array; end if; /* arbitrary */
+        				if isnum
+        				then
+        					segm1 := ltrim(segm1, '0');
+        					if segm1 <> '' then segm1_n := segm1::numeric; end if;
+        					segm1 := NULL;
+        				else
+        				end if;
+        				ver_array := array_append(ver_array, (segm1_n, segm1)::evr_array_item);
+        				one := str1;
+        			end;
+        		end loop segment_loop;
+
+        		return ver_array;
+        	END ;
+        $$ language 'plpgsql';
+
+      SQL
 
       add_column :katello_rpms, :evr, :evr_t
       add_column :katello_installed_packages, :evr, :evr_t

data/db/migrate/20200818192230_update_system_purpose_status.rb

@@ -2,7 +2,6 @@ class UpdateSystemPurposeStatus < ActiveRecord::Migration[6.0]
   def change
     purpose_types = [
       "Katello::PurposeStatus",
-      "Katello::PurposeAddonsStatus",
       "Katello::PurposeRoleStatus",
       "Katello::PurposeSlaStatus",
       "Katello::PurposeUsageStatus",

data/db/migrate/20240207191223_remove_entitlement_mode_host_statuses.rb

@@ -8,7 +8,6 @@ class RemoveEntitlementModeHostStatuses < ActiveRecord::Migration[6.1]
     obsolete_statuses = [
       "Katello::SubscriptionStatus",
       "Katello::PurposeStatus",
-      "Katello::PurposeAddonsStatus",
       "Katello::PurposeRoleStatus",
       "Katello::PurposeSlaStatus",
       "Katello::PurposeUsageStatus",

data/db/migrate/20240924161240_katello_recreate_evr_constructs.rb

@@ -0,0 +1,160 @@
+class KatelloRecreateEvrConstructs < ActiveRecord::Migration[6.1]
+  def up
+    if !extension_enabled?('evr')
+      return
+    else
+      execute <<~SQL
+        DROP EXTENSION evr CASCADE;
+      SQL
+
+      execute <<~SQL
+              create type evr_array_item as (
+          n       NUMERIC,
+          s       TEXT
+        );
+
+        create type evr_t as (
+          epoch INT,
+          version evr_array_item[],
+          release evr_array_item[]
+        );
+
+        CREATE FUNCTION evr_trigger() RETURNS trigger AS $$
+          BEGIN
+            NEW.evr = (select ROW(coalesce(NEW.epoch::numeric,0),
+                                  rpmver_array(coalesce(NEW.version,'empty'))::evr_array_item[],
+                                  rpmver_array(coalesce(NEW.release,'empty'))::evr_array_item[])::evr_t);
+            RETURN NEW;
+          END;
+        $$ language 'plpgsql';
+
+        create or replace FUNCTION empty(t TEXT)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        		return t ~ '^[[:space:]]*$';
+        	END;
+        $$ language 'plpgsql';
+
+        create or replace FUNCTION isalpha(ch CHAR)
+          RETURNS BOOLEAN as $$
+          BEGIN
+            if ascii(ch) between ascii('a') and ascii('z') or
+                ascii(ch) between ascii('A') and ascii('Z')
+            then
+              return TRUE;
+            end if;
+            return FALSE;
+          END;
+        $$ language 'plpgsql';
+
+        create or replace FUNCTION isalphanum(ch CHAR)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        		if ascii(ch) between ascii('a') and ascii('z') or
+        			ascii(ch) between ascii('A') and ascii('Z') or
+        			ascii(ch) between ascii('0') and ascii('9')
+        		then
+        			return TRUE;
+        		end if;
+        		return FALSE;
+        	END;
+        $$ language 'plpgsql';
+
+        create or replace function isdigit(ch CHAR)
+        	RETURNS BOOLEAN as $$
+        	BEGIN
+        	  if ascii(ch) between ascii('0') and ascii('9')
+        	  then
+        		return TRUE;
+        	  end if;
+        	  return FALSE;
+        	END ;
+        $$ language 'plpgsql';
+
+        create or replace FUNCTION rpmver_array (string1 IN VARCHAR)
+        	RETURNS evr_array_item[] as $$
+        	declare
+        		str1 VARCHAR := string1;
+        		digits VARCHAR(10) := '0123456789';
+        		lc_alpha VARCHAR(27) := 'abcdefghijklmnopqrstuvwxyz';
+        		uc_alpha VARCHAR(27) := 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        		alpha VARCHAR(54) := lc_alpha || uc_alpha;
+        		one VARCHAR;
+        		isnum BOOLEAN;
+        		ver_array evr_array_item[] := ARRAY[]::evr_array_item[];
+        	BEGIN
+        		if str1 is NULL
+        		then
+        			RAISE EXCEPTION 'VALUE_ERROR.';
+        		end if;
+
+        		one := str1;
+        		<<segment_loop>>
+        		while one <> ''
+        		loop
+        			declare
+        				segm1 VARCHAR;
+        				segm1_n NUMERIC := 0;
+        			begin
+        				-- Throw out all non-alphanum characters
+        				while one <> '' and not isalphanum(one)
+        				loop
+        					one := substr(one, 2);
+        				end loop;
+        				str1 := one;
+        				if str1 <> '' and isdigit(str1)
+        				then
+        					str1 := ltrim(str1, digits);
+        					isnum := true;
+        				else
+        					str1 := ltrim(str1, alpha);
+        					isnum := false;
+        				end if;
+        				if str1 <> ''
+        				then segm1 := substr(one, 1, length(one) - length(str1));
+        				else segm1 := one;
+        				end if;
+
+        				if segm1 = '' then return ver_array; end if; /* arbitrary */
+        				if isnum
+        				then
+        					segm1 := ltrim(segm1, '0');
+        					if segm1 <> '' then segm1_n := segm1::numeric; end if;
+        					segm1 := NULL;
+        				else
+        				end if;
+        				ver_array := array_append(ver_array, (segm1_n, segm1)::evr_array_item);
+        				one := str1;
+        			end;
+        		end loop segment_loop;
+
+        		return ver_array;
+        	END ;
+        $$ language 'plpgsql';
+
+      SQL
+
+      add_column :katello_rpms, :evr, :evr_t
+      add_column :katello_installed_packages, :evr, :evr_t
+
+      execute <<-SQL
+        update katello_rpms SET evr = (ROW(coalesce(epoch::numeric,0),
+                                           rpmver_array(coalesce(version,'empty'))::evr_array_item[],
+                                           rpmver_array(coalesce(release,'empty'))::evr_array_item[])::evr_t);
+
+        update katello_installed_packages SET evr = (ROW(coalesce(epoch::numeric,0),
+                                                         rpmver_array(coalesce(version,'empty'))::evr_array_item[],
+                                                         rpmver_array(coalesce(release,'empty'))::evr_array_item[])::evr_t);
+      SQL
+
+      create_trigger :evr_insert_trigger_katello_rpms, on: :katello_rpms
+      create_trigger :evr_update_trigger_katello_rpms, on: :katello_rpms
+      create_trigger :evr_insert_trigger_katello_installed_packages, on: :katello_installed_packages
+      create_trigger :evr_update_trigger_katello_installed_packages, on: :katello_installed_packages
+    end
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20241022121706_add_sync_dependencies_option.rb

@@ -0,0 +1,5 @@
+class AddSyncDependenciesOption < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_root_repositories, :sync_dependencies, :boolean, :default => true
+  end
+end

data/db/migrate/20241101144625_remove_system_purpose_addons.rb

@@ -0,0 +1,9 @@
+class RemoveSystemPurposeAddons < ActiveRecord::Migration[6.1]
+  def change
+    remove_foreign_key :katello_subscription_facet_purpose_addons, :katello_purpose_addons, column: :purpose_addon_id
+
+    drop_table :katello_activation_key_purpose_addons
+    drop_table :katello_purpose_addons
+    drop_table :katello_subscription_facet_purpose_addons
+  end
+end

data/db/migrate/20241107002541_add_registry_url_to_katello_flatpak_remotes.rb

@@ -0,0 +1,5 @@
+class AddRegistryURLToKatelloFlatpakRemotes < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_flatpak_remotes, :registry_url, :string
+  end
+end

data/db/migrate/20241112145802_add_manifest_entity_to_content_facets.rb

@@ -0,0 +1,7 @@
+class AddManifestEntityToContentFacets < ActiveRecord::Migration[6.1]
+  def change
+    add_reference :katello_content_facets, :manifest_entity, polymorphic: true, index: true
+    change_column_null :katello_content_facets, :manifest_entity_type, true
+    change_column_null :katello_content_facets, :manifest_entity_id, true
+  end
+end

data/db/migrate/20241120213713_add_allow_other_types_to_content_view_erratum_filter_rules.rb

@@ -0,0 +1,6 @@
+class AddAllowOtherTypesToContentViewErratumFilterRules < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_content_view_erratum_filter_rules, :allow_other_types, :boolean,
+      :default => false, :null => false
+  end
+end

data/db/migrate/20241206183052_add_content_type_to_container_manifests_and_lists.rb

@@ -0,0 +1,9 @@
+class AddContentTypeToContainerManifestsAndLists < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_docker_manifests, :content_type, :string, :limit => 255
+    add_column :katello_docker_manifest_lists, :content_type, :string, :limit => 255
+
+    add_index :katello_docker_manifests, :content_type
+    add_index :katello_docker_manifest_lists, :content_type
+  end
+end

data/db/seeds.d/75-job_templates.rb

@@ -1,8 +1,12 @@
 User.as_anonymous_admin do
   JobTemplate.without_auditing do
+    # let's name root template as *_action.erb
+    root_action_files = Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*_action.erb")]
     template_files = Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*.erb")]
     template_files.reject! { |file| file.end_with?('_ansible_default.erb') } unless Katello.with_ansible?
-    template_files.each do |template|
+
+    # root templates need to be imported first
+    (root_action_files + (template_files - root_action_files)).each do |template|
       sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
       template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
 

data/engines/bastion/vendor/assets/javascripts/bastion/angular/angular.js

@@ -9593,7 +9593,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
         if (writeAttr !== false) {
           if (value === null || isUndefined(value)) {
-            this.$$element.removeAttr(attrName);
+            this.$$element.prop(attrName, false);
           } else {
             if (SIMPLE_ATTR_NAME.test(attrName)) {
               // jQuery skips special boolean attrs treatment in XML nodes for
@@ -9602,7 +9602,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
               // in XHTML, call `removeAttr` in such cases instead.
               // See https://github.com/jquery/jquery/issues/4249
               if (booleanKey && value === false) {
-                this.$$element.removeAttr(attrName);
+                this.$$element.prop(attrName, false);
               } else {
                 this.$$element.attr(attrName, value);
               }

data/engines/bastion/vendor/assets/javascripts/bastion/angular-bootstrap/ui-bootstrap-tpls.js

@@ -6083,7 +6083,7 @@ angular.module('ui.bootstrap.timepicker', [])
     padHours = angular.isDefined($attrs.padHours) ? $scope.$parent.$eval($attrs.padHours) : true;
 
   $scope.tabindex = angular.isDefined($attrs.tabindex) ? $attrs.tabindex : 0;
-  $element.removeAttr('tabindex');
+  $element.prop('tabIndex', false);
 
   this.init = function(ngModelCtrl_, inputs) {
     ngModelCtrl = ngModelCtrl_;
@@ -6806,7 +6806,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
       });
 
       if (hintInputElem.attr('id')) {
-        hintInputElem.removeAttr('id'); // remove duplicate id if present.
+        hintInputElem.prop('id', false); // remove duplicate id if present.
       }
       inputsContainer.append(hintInputElem);
       hintInputElem.after(element);
@@ -6855,7 +6855,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
     // This attribute is added or removed automatically when the `activeIdx` changes.
     scope.$watch('activeIdx', function(index) {
       if (index < 0) {
-        element.removeAttr('aria-activedescendant');
+        element.prop('aria-activedescendant', false);
       } else {
         element.attr('aria-activedescendant', getMatchId(index));
       }

data/engines/bastion/vendor/assets/javascripts/bastion/angular-bootstrap/ui-bootstrap.js

@@ -6082,7 +6082,7 @@ angular.module('ui.bootstrap.timepicker', [])
     padHours = angular.isDefined($attrs.padHours) ? $scope.$parent.$eval($attrs.padHours) : true;
 
   $scope.tabindex = angular.isDefined($attrs.tabindex) ? $attrs.tabindex : 0;
-  $element.removeAttr('tabindex');
+  $element.prop('tabindex', false);
 
   this.init = function(ngModelCtrl_, inputs) {
     ngModelCtrl = ngModelCtrl_;
@@ -6805,7 +6805,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
       });
 
       if (hintInputElem.attr('id')) {
-        hintInputElem.removeAttr('id'); // remove duplicate id if present.
+        hintInputElem.prop('id', false); // remove duplicate id if present.
       }
       inputsContainer.append(hintInputElem);
       hintInputElem.after(element);
@@ -6854,7 +6854,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap
     // This attribute is added or removed automatically when the `activeIdx` changes.
     scope.$watch('activeIdx', function(index) {
       if (index < 0) {
-        element.removeAttr('aria-activedescendant');
+        element.prop('aria-activedescendant', '');
       } else {
         element.attr('aria-activedescendant', getMatchId(index));
       }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details-info.controller.js

@@ -117,11 +117,6 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsInfoCo
             $scope.save($scope.activationKey);
         };
 
-        $scope.clearAddOns = function () {
-            $scope.activationKey['purpose_addons'] = [];
-            $scope.save($scope.activationKey);
-        };
-
         $scope.contentViews = function () {
             var deferred = $q.defer();
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js

@@ -22,11 +22,9 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsContro
         $scope.defaultRoles = ['Red Hat Enterprise Linux Server', 'Red Hat Enterprise Linux Workstation', 'Red Hat Enterprise Linux Compute Node'];
         $scope.defaultUsages = ['Production', 'Development/Test', 'Disaster Recovery'];
 
-        $scope.purposeAddonsCount = 0;
         $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
 
-        $scope.organization = Organization.get({id: CurrentOrganization}, function(org) {
-            $scope.purposeAddonsCount += org.system_purposes.addons.length;
+        $scope.organization = Organization.get({id: CurrentOrganization}, function() {
         });
 
         $scope.panel = {
@@ -113,43 +111,5 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsContro
                 return _.union(roles, $scope.defaultRoles);
             });
         };
-
-
-        $scope.savePurposeAddons = function (key) {
-
-            if ($scope.purposeAddonsList) {
-                key['purpose_addons'] = _.chain($scope.purposeAddonsList).filter(function(addOn) {
-                    return addOn.selected;
-                }).map(function(addOn) {
-                    return addOn.name;
-                }).value();
-            }
-
-            return $scope.save(key);
-        };
-
-
-        $scope.purposeAddons = function () {
-            var purposeAddons;
-            var addOns;
-
-            return $scope.organization.$promise.then(function(org) {
-                $scope.purposeAddonsList = [];
-                addOns = org.system_purposes.addons;
-
-                purposeAddons = $scope.activationKey.purpose_addons;
-                angular.forEach(purposeAddons, function(addOn) {
-                    if (addOn && !_.includes(addOns, addOn)) {
-                        addOns.push(addOn);
-                    }
-                });
-
-                angular.forEach(addOns, function (addOn) {
-                    $scope.purposeAddonsList.push({"name": addOn, "selected": purposeAddons.indexOf(addOn) > -1});
-                });
-
-                return $scope.purposeAddonsList;
-            });
-        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html

@@ -93,18 +93,6 @@
           on-delete="clearRole()"
           on-save="save(activationKey)">
       </dd>
-
-      <dt translate>Add ons</dt>
-      <dd bst-edit-multiselect="activationKey.purpose_addons"
-          readonly="denied('edit_activation_keys', activationKey) || purposeAddonsCount === 0"
-          options="purposeAddons()"
-          formatter="arrayToString"
-          deletable="true"
-          on-delete="clearAddOns()"
-          selector="activationKey.purpose_addons"
-          on-save="savePurposeAddons(activationKey)">
-      </dd>
-
     </dl>
   </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html

@@ -40,7 +40,7 @@
        </td>
        <td bst-table-cell><div subscription-type="subscription"></div></td>
        <td bst-table-cell><div subscription-start-date="subscription"></div></td>
-       <td bst-table-cell><date date="subscription.end_date" /></td>
+       <td bst-table-cell><date date="subscription.end_date" ></date></td>
        <td bst-table-cell>{{ subscription.support_level }}</td>
        <td bst-table-cell>{{ subscription.contract_number }}</td>
        <td bst-table-cell>{{ subscription.account_number }}</td>