foreman_puppet 0.0.2 → 1.0.0

data/app/models/concerns/foreman_puppet/extensions/template_combination.rb

@@ -5,7 +5,7 @@ module ForemanPuppet
 
       included do
         if ForemanPuppet.extracted_from_core?
-          belongs_to :environment
+          belongs_to :environment, class_name: 'ForemanPuppet::Environment'
 
           validates :environment_id, uniqueness: { scope: %i[hostgroup_id provisioning_template_id] }
 

data/app/models/concerns/foreman_puppet/extensions/user.rb

@@ -3,19 +3,26 @@ module ForemanPuppet
     module User
       extend ActiveSupport::Concern
 
-      def visible_environments
-        authorized_scope = Environment.unscoped.authorized(:view_environments)
-        authorized_scope = authorized_scope
-                           .joins(:taxable_taxonomies)
-                           .where('taxable_taxonomies.taxonomy_id' => taxonomy_ids[:organizations] + taxonomy_ids[:locations])
-        result = authorized_scope.distinct.pluck(:name)
-        if User.current.admin?
-          # Admin users can also see Environments that do not have any organization or location, even when
-          # organizations and locations are enabled.
-          untaxed_environments = Environment.unscoped.where.not(id: TaxableTaxonomy.where(taxable_type: 'ForemanPuppet::Environment').distinct.select(:taxable_id)).pluck(:name)
-          result += untaxed_environments
+      included do
+        prepend PatchedMethods
+      end
+
+      module PatchedMethods
+        def visible_environments
+          authorized_scope = ForemanPuppet::Environment.unscoped.authorized(:view_environments)
+          authorized_scope = authorized_scope
+                             .joins(:taxable_taxonomies)
+                             .where('taxable_taxonomies.taxonomy_id' => taxonomy_ids[:organizations] + taxonomy_ids[:locations])
+          result = authorized_scope.distinct.pluck(:name)
+          if ::User.current.admin?
+            # Admin users can also see Environments that do not have any organization or location, even when
+            # organizations and locations are enabled.
+            untaxed_env_ids = TaxableTaxonomy.where(taxable_type: 'ForemanPuppet::Environment').distinct.select(:taxable_id)
+            untaxed_environments = ForemanPuppet::Environment.unscoped.where.not(id: untaxed_env_ids).pluck(:name)
+            result += untaxed_environments
+          end
+          result
         end
-        result
       end
     end
   end

data/app/models/foreman_puppet/environment.rb

@@ -2,6 +2,8 @@ module ForemanPuppet
   class Environment < ApplicationRecord
     self.table_name = 'environments'
 
+    graphql_type 'ForemanPuppet::Types::Environment'
+
     audited
     extend FriendlyId
     friendly_id :name, reserved_words: []

data/app/models/foreman_puppet/environment_class.rb

@@ -6,7 +6,7 @@ module ForemanPuppet
     belongs_to :puppetclass, inverse_of: :environment_classes
     belongs_to :puppetclass_lookup_key, inverse_of: :environment_classes, class_name: 'ForemanPuppet::PuppetclassLookupKey'
     validates :puppetclass_lookup_key_id, uniqueness: { scope: %i[environment_id puppetclass_id] }
-    validates :puppetclass_id, :environment_id, presence: true
+    validates :puppetclass, :environment, presence: true
     after_destroy :delete_orphaned_lookup_keys
 
     scope :parameters_for_class, lambda { |puppetclasses_ids, environment_id|

data/app/models/foreman_puppet/host_class.rb

@@ -6,7 +6,7 @@ module ForemanPuppet
     include Authorizable
 
     validates_lengths_from_database
-    belongs_to :puppetclass
+    belongs_to :puppetclass, class_name: 'ForemanPuppet::Puppetclass'
     belongs_to :host_puppet_facet
     has_one :host, through: :host_puppet_facet
 

data/app/models/foreman_puppet/host_puppet_facet.rb

@@ -4,9 +4,9 @@ module ForemanPuppet
     audited associated_with: :host
 
     include Facets::Base
-    include ForemanPuppet::HostCommon
+    include ForemanPuppet::PuppetFacetCommon
 
-    has_many :host_classes, dependent: :destroy
+    has_many :host_classes, dependent: :destroy, class_name: 'ForemanPuppet::HostClass'
     has_many :puppetclasses, through: :host_classes
 
     validates :environment_id, presence: true, unless: ->(facet) { facet.host.puppet_proxy_id.blank? }
@@ -18,10 +18,11 @@ module ForemanPuppet
       type ||= 'puppet'
       return unless type == 'puppet'
 
+      facet = host.puppet || host.build_puppet
       if Setting[:update_environment_from_facts]
-        host.set_non_empty_values parser, [:environment]
+        facet.environment = parser.environment if parser.environment.present?
       elsif parser.environment.present?
-        self.environment ||= parser.environment
+        facet.environment ||= parser.environment
       end
 
       # if proxy authentication is enabled and we have no puppet proxy set and the upload came from puppet,
@@ -42,7 +43,7 @@ module ForemanPuppet
     # the environment used by #clases nees to be self.environment and not self.parent.environment
     def parent_classes
       return [] unless host.hostgroup
-      host.hostgroup.puppet&.classes(environment)
+      host.hostgroup.puppet&.classes(environment) || []
     end
 
     def parent_config_groups

data/app/models/foreman_puppet/hostgroup_puppet_facet.rb

@@ -61,7 +61,7 @@ module ForemanPuppet
     audited associated_with: :hostgroup
     self.table_name = 'hostgroup_puppet_facets'
 
-    include ForemanPuppet::HostCommon
+    include ForemanPuppet::PuppetFacetCommon
     include Facets::HostgroupFacet
 
     has_many :hostgroup_classes, dependent: :destroy

data/app/models/{concerns/foreman_puppet/host_common.rb → foreman_puppet/puppet_facet_common.rb}

@@ -1,7 +1,7 @@
 module ForemanPuppet
   # Common methods between host and hostgroup
   # mostly for template rendering consistency
-  module HostCommon
+  module PuppetFacetCommon
     extend ActiveSupport::Concern
 
     included do

data/app/models/foreman_puppet/puppetclass.rb

@@ -2,6 +2,8 @@ module ForemanPuppet
   class Puppetclass < ApplicationRecord
     self.table_name = 'puppetclasses'
 
+    graphql_type 'ForemanPuppet::Types::Puppetclass'
+
     audited
     include Authorizable
     include ScopedSearchExtensions
@@ -29,6 +31,7 @@ module ForemanPuppet
     has_many :config_groups, through: :config_group_classes
 
     has_many :class_params, -> { distinct }, through: :environment_classes, source: :puppetclass_lookup_key
+    accepts_nested_attributes_for :environment_classes
     accepts_nested_attributes_for :class_params, reject_if: ->(a) { a[:key].blank? }, allow_destroy: true
 
     validates :name, uniqueness: true, presence: true, no_whitespace: true
@@ -72,6 +75,17 @@ module ForemanPuppet
       hash
     end
 
+    # For Audits to be correctly taxed for Puppetclass creation
+    # Puppetclass gets saved before the environment class and thus taxonomy ids are empty
+    # We collect the ids from unsaved environment_classes for the Audits correct taxation
+    def location_ids
+      environment_classes.select(&:new_record?).flat_map { |ec| ec.environment.location_ids }.concat(super).uniq
+    end
+
+    def organization_ids
+      environment_classes.select(&:new_record?).flat_map { |ec| ec.environment.organization_ids }.concat(super).uniq
+    end
+
     # returns module name (excluding of the class name)
     # if class separator does not exists (the "::" chars), then returns the whole class name
     def module_name
@@ -106,7 +120,7 @@ module ForemanPuppet
     # We are going through two associations, so we are on our own to define modifiers
     def hostgroup_ids=(hg_ids)
       hg_ids = Array(hg_ids).reject(&:blank?)
-      hg_to_facets_ids = Hash[HostgroupPuppetFacet.where(hostgroup_id: hg_ids).pluck(:hostgroup_id, :id)]
+      hg_to_facets_ids = HostgroupPuppetFacet.where(hostgroup_id: hg_ids).pluck(:hostgroup_id, :id).to_h
       missing_facet_ids = hg_ids.map(&:to_i) - hg_to_facets_ids.keys
       new_facet_ids = missing_facet_ids.map { |hg_id| HostgroupPuppetFacet.create(hostgroup_id: hg_id).id }
       self.hostgroup_puppet_facet_ids = hg_to_facets_ids.values + new_facet_ids

data/app/services/foreman_puppet/host_info_providers/config_groups_info.rb

@@ -2,6 +2,8 @@ module ForemanPuppet
   module HostInfoProviders
     class ConfigGroupsInfo < HostInfo::Provider
       def host_info
+        return {} unless host.puppet
+
         config_groups = (host.puppet.config_groups + host.puppet.parent_config_groups).uniq.map(&:name)
         { 'parameters' => { 'foreman_config_groups' => config_groups } }
       end

data/app/services/foreman_puppet/puppet_class_importer.rb

@@ -162,7 +162,7 @@ module ForemanPuppet
     end
 
     def db_environments
-      @db_environments ||= (Environment.pluck('environments.name') - ignored_environments)
+      @db_environments ||= (Environment.pluck(:name) - ignored_environments)
     end
 
     def actual_environments
@@ -248,15 +248,11 @@ module ForemanPuppet
     end
 
     def add_classes_to_foreman(env_name, klasses)
-      env         = find_or_create_env env_name
-      # look for Puppet class in all scopes to make sure we do not try to create a new record
-      # with a name that already exists and hit the uniqueness constraint on name
-      new_classes = klasses.map { |k| find_or_create_puppetclass(name: k[0]) }
+      env = find_or_create_env env_name
 
-      new_classes.each do |new_class|
-        EnvironmentClass.find_or_create_by! puppetclass_id: new_class.id, environment_id: env.id
-        class_params = klasses[new_class.to_s]
-        add_new_parameter(env, new_class, class_params) if class_params.any?
+      klasses.each do |klass_name, klass_params|
+        puppetclass = find_or_create_puppetclass_for_env(klass_name, env)
+        add_new_parameter(env, puppetclass, klass_params) if klass_params.any?
       end
     end
 
@@ -302,7 +298,7 @@ module ForemanPuppet
       changed_params['new'].map do |param_name, value|
         param = find_or_create_puppet_class_param klass, param_name, value
         EnvironmentClass.find_or_create_by! puppetclass_id: klass.id, environment_id: env.id,
-                                            puppetclass_lookup_key_id: param.id
+          puppetclass_lookup_key_id: param.id
       end
     end
 
@@ -317,10 +313,9 @@ module ForemanPuppet
         Host.where(environment_id: env).update_all(environment_id: nil)
         Hostgroup.where(environment_id: env).update_all(environment_id: nil)
         # rubocop:enable Rails/SkipsModelValidations
-
-        # we can't guaranty that the env would be removed as it might have hosts attached to it.
-        env.destroy if klasses.include? '_destroy_'
       end
+      # we can't guaranty that the env would be removed as it might have hosts attached to it.
+      env.destroy if klasses.include? '_destroy_'
       # remove all klasses that have no environment now
       classes.not_in_any_environment.destroy_all
     end
@@ -331,8 +326,8 @@ module ForemanPuppet
 
     def find_or_create_env(env)
       user_visible_environment(env) || Environment.create!(name: env,
-                                                           organizations: User.current.my_organizations,
-                                                           locations: User.current.my_locations)
+        organizations: User.current.my_organizations,
+        locations: User.current.my_locations)
     end
 
     def user_visible_environment(env)
@@ -343,11 +338,15 @@ module ForemanPuppet
     def find_or_create_puppet_class_param(klass, param_name, value)
       klass.class_params.where(key: param_name).first ||
         PuppetclassLookupKey.create!(key: param_name, default_value: value,
-                                     key_type: Foreman::ImporterPuppetclass.suggest_key_type(value))
+          key_type: Foreman::ImporterPuppetclass.suggest_key_type(value))
     end
 
-    def find_or_create_puppetclass(name:)
-      puppetclass = Puppetclass.unscoped.find_or_create_by!(name: name)
+    def find_or_create_puppetclass_for_env(klass_name, env)
+      # look for Puppet class in all scopes to make sure we do not try to create a new record
+      # with a name that already exists and hit the uniqueness constraint on name
+      puppetclass = Puppetclass.find_or_initialize_by(name: klass_name)
+      puppetclass.environment_classes.find_or_initialize_by(environment_id: env.id)
+      puppetclass.save
       raise Foreman::Exception.new('Failed to create Puppetclass: %s', puppetclass.errors.full_messages.to_sentence) unless puppetclass.errors.empty?
       puppetclass
     end

data/app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb

@@ -0,0 +1,62 @@
+<% title _("Changed environments") %>
+<%= form_tag controller.send("obsolete_and_new_#{controller_name}_path") do %>
+  <h4><%= _("Select the changes you want to apply to Foreman") %></h4>
+  <h6>
+  <%= _("Toggle") %>:
+  <%= link_to_function(icon_text("check", _("New")),
+                       "toggleCheckboxesBySelector('.env_select_boxes_new')",
+                       :title => _("Check/Uncheck new")) %> |
+  <%= link_to_function(icon_text("check", _("Updated")),
+                       "toggleCheckboxesBySelector('.env_select_boxes_updated')",
+                       :title => _("Check/Uncheck updated")) %> |
+  <%= link_to_function(icon_text("check", _("Obsolete")),
+                       "toggleCheckboxesBySelector('.env_select_boxes_obsolete')",
+                       :title => _("Check/Uncheck obsolete")) %>
+  </h6>
+  <table class="<%= table_css_classes %>">
+    <thead>
+      <tr>
+        <th class="ca">
+          <%= link_to_function(icon_text("check"),
+                               "toggleCheckboxesBySelector('.env_select_boxes')",
+                               :title => _("Check/Uncheck all")) %>
+        </th>
+        <th><%= _("Environment") %></th>
+        <th><%= _("Operation") %></th>
+        <th><%= _("Puppet Modules") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% for kind in ["new", "obsolete", "updated", "ignored"] %>
+        <% unless (envs = @changed[kind]).empty? %>
+          <% for env in envs.keys.sort %>
+            <tr>
+              <% unless kind == 'ignored' %>
+                <td>
+                  <%= check_box_tag "changed[#{kind}][#{env}]", @changed[kind][env].to_json, false, :class => "env_select_boxes env_select_boxes_#{kind} env_select_boxes_env_#{env}" %>
+                </td>
+                <td>
+                  <%= link_to_function("#{env}", "toggleCheckboxesBySelector('.env_select_boxes_env_#{env}')", :title => _("Check/Uncheck all %s changes") % env) %>
+                </td>
+              <% else %>
+                <td>&nbsp;</td>
+                <td><%= env %></td>
+              <% end %>
+              <td>
+                <%= {"new" => _("Add:"), "obsolete" => _("Remove:"), "updated" => _("Update:"), "ignored" => _("Ignored:")}[kind] %>
+              </td>
+              <td>
+                <% pcs = @changed[kind][env] %>
+                <%= class_update_text pcs, env %>
+              </td>
+            </tr>
+          <% end %>
+        <% end %>
+      <% end %>
+    </tbody>
+  </table>
+  <div>
+    <%= link_to _("Cancel"), controller.send("#{controller_name}_path"), :class => "btn btn-default" %>
+    <%= submit_tag _("Update"), :class => "btn btn-primary" %>
+  </div>
+<% end %>

data/app/views/foreman_puppet/config_groups/index.html.erb

@@ -17,12 +17,12 @@
   <tbody>
     <% @config_groups.each do |config_group| %>
       <tr>
-        <td class="ellipsis"><%= link_to_if_authorized config_group.name, hash_for_edit_config_group_path(config_group).merge(:auth_object => config_group, :authorizer => authorizer) %></td>
+        <td class="ellipsis"><%= link_to_if_authorized config_group.name, hash_for_edit_config_group_path(config_group).merge(engine: foreman_puppet, :auth_object => config_group, :authorizer => authorizer) %></td>
         <td><%= link_to config_group.puppetclasses.size, puppetclasses_path(:search => %Q{config_group = "#{config_group}"}) %></td>
         <td><%= link_to config_group.hosts_count, main_app.hosts_path(:search => %Q{config_group = "#{config_group}"}) %></td>
         <td><%= link_to config_group.hostgroups_count, main_app.hostgroups_path(:search => %Q{config_group = "#{config_group}"}) %></td>
         <td><%= action_buttons(
-                  display_delete_if_authorized(hash_for_config_group_path(config_group).merge(:auth_object => config_group, :authorizer => authorizer), :data => { :confirm => _('Delete %s?') % config_group.name }))%>
+                  display_delete_if_authorized(hash_for_config_group_path(config_group).merge(engine: foreman_puppet, :auth_object => config_group, :authorizer => authorizer), :data => { :confirm => _('Delete %s?') % config_group.name }))%>
         </td>
       </tr>
     <% end %>

data/app/views/foreman_puppet/config_groups/welcome.html.erb

@@ -1,12 +1,13 @@
 <% title _("Config Groups") %>
-<div class="blank-slate-pf">
-  <div class="blank-slate-pf-icon">
-    <%= icon_text("object-group", "", kind: "fa") %>
-  </div>
-  <h1><%= _('Config Groups') %></h1>
-  <p><%= _("A config group provides a one-step method of associating many Puppet classes to either a host or host group. Typically this would be used to add a particular application profile or stack in one step.") %></p>
-  <p><%= link_to _('Learn more about this in the documentation.'), documentation_url("using-config-groups")%></p>
-  <div class="blank-slate-pf-main-action">
-    <%= new_link(_("Create Config Group"), { engine: foreman_puppet }, { class: 'btn-lg' }) %>
-  </div>
-</div>
+
+<%= webpacked_plugins_js_for :foreman_puppet %>
+<% description = _("A config group provides a one-step method of associating many Puppet classes to either a host or host group. Typically this would be used to add a particular application profile or stack in one step.")%>
+<% action = { :title => _("Create Config Group"), :url => new_config_group_path } if authorized_for(:action => :new)%>
+<%= react_component('EmptyState', {
+                                    :icon => 'object-group',
+                                    :iconType => 'fa',
+                                    :header => _('Config Groups'),
+                                    :description => description,
+                                    :documentation => { :url => documentation_url("using-config-groups") },
+                                    :action => action
+                                  }) %>

data/app/views/foreman_puppet/environments/index.html.erb

@@ -20,7 +20,7 @@
         <td>
           <%= action_buttons(
                 link_to(_('Classes'), puppetclasses_path(search: "environment = #{environment}")),
-                import_proxy_links(hash_for_import_environments_environments_path(env: environment)),
+                import_proxy_links(hash_for_import_environments_environments_path(env: environment).merge(engine: foreman_puppet)),
                 display_delete_if_authorized(hash_for_environment_path(environment).merge(engine: foreman_puppet, auth_object: environment, authorizer: authorizer),
                                              data: { confirm: "Delete #{environment.name}?" })
               ) %>

data/app/views/foreman_puppet/environments/welcome.html.erb

@@ -1,16 +1,4 @@
 <% content_for(:title, _("Puppet environments")) %>
-<div class="blank-slate-pf">
-  <div class="blank-slate-pf-icon">
-    <%= icon_text("th", '', kind: "fa") %>
-  </div>
-  <h1><%= _('Environments') %></h1>
-  <p><%= _("If you are planning to use Foreman as an external node classifier you should provide information about one or more environments. This information is commonly imported from a pre-existing Puppet configuration by the use of the %{link_start}Puppet classes and environment importer%{link_end}.").html_safe % { link_start: tag(:a, href: documentation_url("4.2.2Classes"), rel: 'external'), link_end: '</a>'.html_safe } %>
-  </p>
-  <p><%= link_to(_('Learn more about this in the documentation.'), documentation_url("4.2.1Environments")) %></p>
-  <div class="blank-slate-pf-main-action">
-    <%= new_link(_('Create Puppet Environment'), { engine: foreman_puppet }, { class: "btn-lg" }) %>
-  </div>
-  <div class="blank-slate-pf-secondary-action">
-    <%= import_proxy_select(hash_for_import_environments_environments_path) %>
-  </div>
-</div>
+
+<%= webpacked_plugins_js_for :foreman_puppet %>
+<%= react_component('WelcomeEnv', {canCreate: authorized_for(action: :new)}) %>

data/app/views/foreman_puppet/puppetclass_lookup_keys/welcome.html.erb

@@ -1,9 +1,11 @@
 <% title _("Smart Class Parameters") %>
-<div class="blank-slate-pf">
-  <div class="blank-slate-pf-icon">
-    <%= icon_text("info-circle", "", :kind => "fa") %>
-  </div>
-  <h1><%= _('Smart Class Parameters') %></h1>
-  <p><%= _("Parameterized class support permits detecting, importing, and supplying parameters directly to classes which support it, via the ENC and depending on a set of rules (Smart Matchers).") %></p>
-  <p><%= link_to _('Learn more about this in the documentation.'), documentation_url("4.2.5ParameterizedClasses")%></p>
-</div>
+
+<%= webpacked_plugins_js_for :foreman_puppet %>
+<% description = _("Parameterized class support permits detecting, importing, and supplying parameters directly to classes which support it, via the ENC and depending on a set of rules (Smart Matchers).")%>
+<%= react_component('EmptyState', {
+                                    :icon => 'info-circle',
+                                    :iconType => 'fa',
+                                    :header => _('Smart Class Parameters'),
+                                    :description => description,
+                                    :documentation => { :url => documentation_url("4.2.5ParameterizedClasses") },
+                                  }) %>

data/app/views/foreman_puppet/puppetclasses/_classes.html.erb

@@ -1,4 +1,4 @@
-<% Puppetclass.classes2hash(puppetclasses).sort.in_groups(2,nil) do |group| %>
+<% ForemanPuppet::Puppetclass.classes2hash(puppetclasses).sort.in_groups(2,nil) do |group| %>
   <div class="col-md-6 classes">
     <% group.each do |list| %>
       <% next if list.nil? %>

data/app/views/foreman_puppet/puppetclasses/_selected_classes.html.erb

@@ -1,4 +1,4 @@
-<%= content_tag :li, id: "selected_puppet_class_#{klass.id}", class: [dom_class(klass, 'selected'), cycle('even', 'odd'), ('unavailable' unless klass.environments.include?(@environment))] do %>
+<%= content_tag :li, id: "selected_puppetclass_#{klass.id}", class: [dom_class(klass, 'selected'), cycle('even', 'odd'), ('unavailable' unless klass.environments.include?(@environment))] do %>
   <%= link_to_remove_puppetclass(klass, obj) %>
   <%= hidden_field_tag "#{resource_type}[puppetclass_ids][]", klass.id %>
 <% end %>

data/app/views/foreman_puppet/puppetclasses/index.html.erb

@@ -1,6 +1,6 @@
 <% title _("Puppet Classes") %>
 
-<% title_actions import_proxy_select(hash_for_import_environments_puppetclasses_path),
+<% title_actions import_proxy_select(hash_for_import_environments_puppetclasses_path.merge(engine: foreman_puppet)),
                  documentation_button('4.2.2Classes') %>
 
 <table class="<%= table_css_classes 'table-fixed' %>">