foreman_templates 9.0.1 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46560d67a9e22719b19e71c43a0298d960ef8859a37fa0fdba12d0a2ea91fa21
-  data.tar.gz: b57fa4cf54bff7ca216d6e3a2abbbe77215e078ee7feb896053603f3d56a07fe
+  metadata.gz: f43c3bbc33be62b6f39ce0abfaa0475f9635d2230f4a7f6bb551e66cf7f7fb0b
+  data.tar.gz: 3fdf3c192b4e639bc0fdc0a98deef65f344e1be65853dbeebb876bde4592405c
 SHA512:
-  metadata.gz: 6422b8cd5feb8b24e541dfa819aa8f063f65385fdfe4ad884e48474d1e76ad7d327c13e60336803e48de9034a299b6a01bc727966384e75e73c9162fc29cf069
-  data.tar.gz: ddb404bc9683c683403c4a401ccacb2118dadc197b998272f70192525738fa68746f290264ead24c42a2c4ca97d49db115aafe6f8e3cac2c416eacc6ca420230
+  metadata.gz: 20d726f2cb66074badb1779ad8b49613ad0f2e899fd3d8db9559a9590cec9224f98d7b2828072b4dd046cf053b5799a7cfcfeafb99723efa867cb9625ac33aa9
+  data.tar.gz: 2a2e07c0374ce30e0ecf900262f41e33d16f0a5a494841e5a00eaf3c5c00cbec90df3cd6d785cc68c99916783245f640af3628b7d47cc365bbf8a659416643ba

data/app/controllers/ui_template_syncs_controller.rb

@@ -43,6 +43,6 @@ class UiTemplateSyncsController < ApplicationController
   end
 
   def render_errors(messages, severity = 'danger')
-    render :json => { :error => { :errors => { :base => messages }, :severity => severity } }, :status => :unprocessable_entity
+    render :json => { :error => { :errors => { :base => messages }, full_messages: messages, :severity => severity } }, :status => :unprocessable_entity
   end
 end

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

@@ -5,20 +5,17 @@
   <%= webpacked_plugins_css_for :foreman_templates %>
 <% end %>
 
-<div id="foreman-templates"/>
-
-<%= mount_react_component('ForemanTemplates',
-                          '#foreman-templates',
-                          { :apiUrls => {
-                              :exportUrl => export_ui_template_syncs_path,
-                              :syncSettingsUrl => sync_settings_ui_template_syncs_path,
-                              :importUrl => import_ui_template_syncs_path
-                              },
-                            :validationData => { :repo => ForemanTemplates::Action.repo_start_with },
-                            :editPaths => edit_paths,
-                            :fileRepoStartWith => ForemanTemplates::Action.file_repo_start_with,
-                            :userPermissions => {
-                              :import => authorized_for(:controller => :ui_template_syncs, :action => :import),
-                              :export => authorized_for(:controller => :ui_template_syncs, :action => :export)
-                            }
-                          }.to_json )%>
+<%= react_component('ForemanTemplates',
+                      { :apiUrls => {
+                          :exportUrl => export_ui_template_syncs_path,
+                          :syncSettingsUrl => sync_settings_ui_template_syncs_path,
+                          :importUrl => import_ui_template_syncs_path
+                          },
+                        :validationData => { :repo => ForemanTemplates::Action.repo_start_with },
+                        :editPaths => edit_paths,
+                        :fileRepoStartWith => ForemanTemplates::Action.file_repo_start_with,
+                        :userPermissions => {
+                          :import => authorized_for(:controller => :ui_template_syncs, :action => :import),
+                          :export => authorized_for(:controller => :ui_template_syncs, :action => :export)
+                        }
+                      })%>

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = '9.0.1'.freeze
+  VERSION = '9.0.2'.freeze
 end

data/webpack/ForemanTemplates.js

@@ -4,26 +4,30 @@ import PropTypes from 'prop-types';
 
 import Routes from './Routes';
 
-const ForemanTemplates = ({ data }) => (
+const ForemanTemplates = ({
+  apiUrls,
+  validationData,
+  fileRepoStartWith,
+  userPermissions,
+  editPaths,
+}) => (
   <Router>
     <Routes
-      apiUrls={data.apiUrls}
-      validationData={data.validationData}
-      editPaths={data.editPaths}
-      fileRepoStartWith={data.fileRepoStartWith}
-      userPermissions={data.userPermissions}
+      apiUrls={apiUrls}
+      validationData={validationData}
+      editPaths={editPaths}
+      fileRepoStartWith={fileRepoStartWith}
+      userPermissions={userPermissions}
     />
   </Router>
 );
 
 ForemanTemplates.propTypes = {
-  data: PropTypes.shape({
-    apiUrls: PropTypes.object,
-    validationData: PropTypes.object,
-    editPaths: PropTypes.object,
-    userPermissions: PropTypes.object,
-    fileRepoStartWith: PropTypes.array,
-  }).isRequired,
+  apiUrls: PropTypes.object.isRequired,
+  validationData: PropTypes.object.isRequired,
+  editPaths: PropTypes.object.isRequired,
+  userPermissions: PropTypes.object.isRequired,
+  fileRepoStartWith: PropTypes.array.isRequired,
 };
 
 export default ForemanTemplates;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.0.2
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy