foreman_templates 7.0.6 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40c303f1207307e582859933360b3e2e9b2deb5793ff7816bf2fe2ccdd17b678
-  data.tar.gz: e25c5b35b84061c38f7051097e5c184a5369a1ba18974c40ae137e9828da3617
+  metadata.gz: 9583ee6b0f88f013c5a26f23dd90a22cf7bdcdeebbb8052c3fdffaf11960fb3d
+  data.tar.gz: 5b54607bfe06ca7cdd359d371afbb497e343310ae48d29c2f359bb4d43a6a38d
 SHA512:
-  metadata.gz: 78989629db36f53ca6aa96c396c3d32c02ed5176c3cf5026ccafb4ddc06aae85538ae8d68cdcd443bd9c8d8355c7bee507115606d7d9077d9c6d853052204286
-  data.tar.gz: 5ff10abf7e6c88946d008a17f6afe9fd8e5880b141d6b7ac9f833c2e789d40a42b03043aabc8024c02c473e18eb79fbaf0bde2dfd4d31c8adfee9d399dc7222c
+  metadata.gz: d6826d8bdd2c9bbc47d09cfe8a9cfeddb169a6aa65933fd670144921091267d20814b5cf4cf37e93629a81fa2b1b81120ce796dd53194d4740b02b7e10c04720
+  data.tar.gz: 2e019ce44797e7c28648f8b8913d224441a514fad0e75c977502c1c79c4bab09dbcb4b538a584c28fc8049c60df5ff3c270dfe2de2df97564c5a5af3125ebce5

data/app/controllers/api/v2/template_controller.rb

@@ -33,7 +33,8 @@ module Api
       param_group :taxonomies, ::Api::V2::BaseController
       def export
         @result = ForemanTemplates::TemplateExporter.new(template_export_params).export!
-        render :json => { :message => @result.to_h }, :status => @result.exported ? 200 : 500
+        @result[:templates] = @result[:templates].map(&:to_h)
+        render :json => { :message => @result }, :status => @result[:error] ? 500 : 200
       end
     end
   end

data/app/controllers/ui_template_syncs_controller.rb

@@ -18,7 +18,7 @@ class UiTemplateSyncsController < ApplicationController
   end
 
   def export
-    @result = ForemanTemplates::TemplateExporter.new(ui_template_export_params).export!
+    @result = OpenStruct.new ForemanTemplates::TemplateExporter.new(ui_template_export_params).export!
 
     if @result.error
       render_errors [@result.error]

data/app/services/foreman_templates/export_result.rb

@@ -1,42 +1,33 @@
 module ForemanTemplates
   class ExportResult
-    attr_accessor :exported, :error, :warning
-    attr_reader :templates, :git_user, :branch, :repo
+    attr_reader :template, :name, :template_file, :exported, :additional_info
 
-    def initialize(repo, branch, git_user)
-      @repo = repo
-      @branch = branch
-      @git_user = git_user
-      @error = nil
-      @warning = nil
-      @templates = []
-      @exported = false
-    end
-
-    def add_exported_templates(templates)
-      @templates.concat templates
+    def initialize(template, exported = true)
+      @template = template
+      @exported = exported
+      @name = template.name
+      @template_file = template.template_file
     end
 
     def to_h
-      { :error => @error,
-        :warning => @warning,
-        :repo => @repo,
-        :branch => @branch,
-        :git_user => @git_user,
-        :templates => dumped_files_result }
+      {
+        :id => template.id,
+        :name => @name,
+        :exported => @exported,
+        :type => template.class.name.underscore,
+        :additional_info => @additional_info
+      }
     end
 
-    private
-
-    def dumped_files_result
-      @templates.map { |template| to_template_h template }
+    def matching_filter
+      generic_info "Skipping, 'name' filtered out based on 'filter' and 'negate' settings"
     end
 
-    def to_template_h(template)
-      { :id => template.id,
-        :name => template.name,
-        :exported => @exported,
-        :type => template.class.name.underscore }
+    def generic_info(additional_msg)
+      @exported = false
+      @additional_info = additional_msg
+      Logging.logger('app').debug "Not exporting #{@template.name}: #{additional_msg}"
+      self
     end
   end
 end

data/app/services/foreman_templates/template_exporter.rb

@@ -4,27 +4,29 @@ module ForemanTemplates
       super + %i(metadata_export_mode)
     end
 
+    def initialize(args = {})
+      super args
+      @result_lines = []
+    end
+
     def export!
-      @export_result = ExportResult.new(@repo, @branch, foreman_git_user)
       if git_repo?
         export_to_git
       else
         export_to_files
       end
-
-      return @export_result
+      export_result
     end
 
     def export_to_files
       @dir = get_absolute_repo_path
       verify_path!(@dir)
       dump_files!
-      @export_result.exported = true
     end
 
     def export_to_git
       @dir = Dir.mktmpdir
-      return @export_result if branch_missing?
+      return if branch_missing?
 
       git_repo = Git.clone(@repo, @dir)
       logger.debug "cloned '#{@repo}' to '#{@dir}'"
@@ -42,15 +44,13 @@ module ForemanTemplates
       if new_repo || status.added.any? || status.changed.any? || status.deleted.any? || status.untracked.any?
         git_repo.commit "Templates export made by Foreman user #{foreman_git_user}"
         git_repo.push 'origin', branch
-        @export_result.exported = true
       else
-        @export_result.warning = 'No change detected, skipping the commit and push'
+        @warning = 'No change detected, skipping the commit and push'
       end
     rescue StandardError => e
-      @export_result.error = e.message
+      @error = e.message
     ensure
       FileUtils.remove_entry_secure(@dir) if File.exist?(@dir)
-      @export_result
     end
 
     def setup_git_branch(git_repo)
@@ -70,22 +70,18 @@ module ForemanTemplates
     end
 
     def dump_files!
-      templates = templates_to_dump
-      begin
-        templates.map do |template|
-          current_dir = get_dump_dir(template)
-          FileUtils.mkdir_p current_dir
-          filename = File.join(current_dir, template.template_file)
-          File.open(filename, 'w+') do |file|
-            logger.debug "Writing to file #{filename}"
-            bytes = file.write template.public_send(export_method)
-            logger.debug "finished writing #{bytes}"
-          end
+      templates_to_dump.map do |template|
+        current_dir = get_dump_dir(template)
+        FileUtils.mkdir_p current_dir
+        filename = File.join(current_dir, template.template_file)
+        File.open(filename, 'w+') do |file|
+          logger.debug "Writing to file #{filename}"
+          bytes = file.write template.public_send(export_method)
+          logger.debug "finished writing #{bytes}"
         end
-      rescue StandardError => e
-        raise PathAccessException, e.message
       end
-      @export_result.add_exported_templates templates
+    rescue StandardError => e
+      raise PathAccessException, e.message
     end
 
     def get_dump_dir(template)
@@ -96,18 +92,23 @@ module ForemanTemplates
     end
 
     def templates_to_dump
-      base = find_templates
-      if filter.present?
-        method = negate ? :reject : :select
-        base.public_send(method) { |template| template.name.match(/#{filter}/i) }
-      else
-        base
+      find_templates.each do |template|
+        if filter.present?
+          exportable = template.name =~ /#{filter}/i ? !negate : negate
+          result = ExportResult.new(template, exportable)
+          next @result_lines << result.matching_filter unless exportable
+
+          @result_lines << result
+        else
+          @result_lines << ExportResult.new(template)
+        end
       end
+      @result_lines.select(&:exported).map(&:template)
     end
 
     def branch_missing?
       if @branch.blank?
-        @export_result.error = "Please specify a branch when exporting into a git repo"
+        @error = "Please specify a branch when exporting into a git repo"
         return true
       end
       false
@@ -129,6 +130,13 @@ module ForemanTemplates
       end
     end
 
+    def export_result
+      {
+        :templates => @result_lines, :repo => @repo, :branch => @branch,
+        :git_user => foreman_git_user, :error => @error, :warning => @warning
+      }
+    end
+
     private
 
     def find_templates

data/app/views/template_syncs/index.html.erb

@@ -1,5 +1,9 @@
-<%= webpacked_plugins_js_for :foreman_templates %>
-<%= webpacked_plugins_css_for :foreman_templates %>
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :foreman_templates %>
+<% end %>
+<% content_for(:stylesheets) do %>
+  <%= webpacked_plugins_css_for :foreman_templates %>
+<% end %>
 
 <div id="foreman-templates"/>
 

data/app/views/ui_template_syncs/template_export_result.rabl

@@ -1,7 +1,7 @@
-object @template
+object @template_result
 
-attributes :name, :template_file
+attributes :name, :template_file, :additional_info
 
-node(false) do |template|
-  partial "ui_template_syncs/template_attrs", :object => template
+node(false) do |result|
+  partial "ui_template_syncs/template_attrs", :object => result.template
 end

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = '7.0.6'.freeze
+  VERSION = '7.0.7'.freeze
 end

data/webpack/__mocks__/foremanReact/components/Layout/LayoutSelectors.js

@@ -0,0 +1,4 @@
+export const selectLayout = jest.fn(() => ({
+  currentOrganization: {},
+  currentLocation: {},
+}));

data/webpack/components/NewTemplateSync/components/NewTemplateSyncForm/NewTemplateSyncForm.js

@@ -8,8 +8,26 @@ import SyncSettingsFields from '../SyncSettingFields';
 import SyncTypeRadios from '../SyncTypeRadios';
 import { NEW_TEMPLATE_SYNC_FORM_NAME } from './NewTemplateSyncFormConstants';
 
+const addTaxParams = key => (params, currentTax) => {
+  if (currentTax.id) {
+    params[key] = [currentTax.id];
+  }
+  return params;
+};
+
+const addOrgParams = addTaxParams('organization_ids');
+const addLocParams = addTaxParams('location_ids');
+
 const submit = syncType => (formValues, dispatch, props) => {
-  const { submitForm, importUrl, exportUrl, history, currentFields } = props;
+  const {
+    submitForm,
+    importUrl,
+    exportUrl,
+    history,
+    currentFields,
+    currentLocation,
+    currentOrganization,
+  } = props;
   const url = syncType === 'import' ? importUrl : exportUrl;
   const currentFieldNames = Object.keys(currentFields);
   const postValues = Object.keys(formValues).reduce((memo, key) => {
@@ -21,7 +39,10 @@ const submit = syncType => (formValues, dispatch, props) => {
 
   return submitForm({
     url,
-    values: postValues,
+    values: addOrgParams(
+      addLocParams(postValues, currentLocation),
+      currentOrganization
+    ),
     message: `Templates were ${syncType}ed.`,
     item: 'TemplateSync',
   }).then(args => {

data/webpack/components/NewTemplateSync/components/NewTemplateSyncForm/index.js

@@ -3,6 +3,8 @@ import { reduxForm } from 'redux-form';
 
 import * as FormActions from 'foremanReact/redux/actions/common/forms';
 
+import { selectLayout } from 'foremanReact/components/Layout/LayoutSelectors';
+
 import { NEW_TEMPLATE_SYNC_FORM_NAME } from './NewTemplateSyncFormConstants';
 import NewTemplateSyncForm from './NewTemplateSyncForm';
 
@@ -32,6 +34,8 @@ const mapStateToProps = (state, ownProps) => {
     importSettings,
     exportSettings,
     currentFields,
+    currentOrganization: selectLayout(state).currentOrganization,
+    currentLocation: selectLayout(state).currentLocation,
   };
 };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 7.0.6
+  version: 7.0.7
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -96,6 +96,7 @@ files:
 - webpack/ForemanTemplates.js
 - webpack/Routes.js
 - webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/components/Layout/LayoutSelectors.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/common/forms/CommonForm.js
 - webpack/__mocks__/foremanReact/components/common/forms/Form.js