Merge pull request #556 from OSC/feature/app-info-html

Add support for custom info in batch connect apps

Author: ericfranz

apps/dashboard/app/helpers/batch_connect/sessions_helper.rb

@@ -42,12 +42,21 @@ def session_view(session)
           concat created(session)
           concat time(session)
           concat id(session)
+          safe_concat custom_info_view(session) if session.info_view
         end
       )
       concat content_tag(:div) { yield }
     end
   end
 
+  def custom_info_view(session)
+    content_tag(:div) do
+      content_tag(:hr) do
+        render partial: "batch_connect/sessions/connections/info", locals: { view: session.info_view, session: session }
+      end
+    end
+  end
+
   def created(session)
     content_tag(:p) do
       concat content_tag(:strong, t('dashboard.batch_connect_sessions_stats_created_at'))
@@ -182,6 +191,7 @@ def connection_tabs(id, tabs)
     else
       # tabs
       content_tag(:div) do
+        concat content_tag(:hr)
         # menu
         concat(
           content_tag(:ul, class: "nav nav-tabs") do

apps/dashboard/app/models/batch_connect/app.rb

@@ -200,6 +200,12 @@ def session_view
       file.read if file.file?
     end
 
+    # View used for session info if it exists
+    # @return [String, nil] session info
+    def session_info_view
+      Pathname.new(root).glob("info.{md,html}.erb").find(&:file?).try(:read)
+    end
+
     # Paths to custom javascript files
     # @return [Pathname] paths to custom javascript files that exist
     def custom_javascript_files

apps/dashboard/app/models/batch_connect/session.rb

@@ -41,14 +41,18 @@ def get_binding
     # @return [String, nil] session view
     attr_accessor :view
 
+    # The view used to display custom info for this session
+    # @return [String, nil] session info
+    attr_accessor :info_view
+
     # Batch connect script type
     # @return [String] script type
     attr_accessor :script_type
 
     # Attributes used for serialization
     # @return [Hash] attributes to be serialized
     def attributes
-      %w(id cluster_id job_id created_at token title view script_type).map do |attribute|
+      %w(id cluster_id job_id created_at token title view info_view script_type).map do |attribute|
         [ attribute, nil ]
       end.to_h
     end
@@ -139,6 +143,7 @@ def save(app:, context:, format: nil)
       self.token      = app.token
       self.title      = app.title
       self.view       = app.session_view
+      self.info_view  = app.session_info_view
       self.created_at = Time.now.to_i
 
       submit_script = app.submit_opts(context, fmt: format) # could raise an exception

apps/dashboard/app/views/batch_connect/sessions/connections/_info.html.erb

@@ -0,0 +1 @@
+<%= OodAppkit.markdown.render(ERB.new(view, nil, "-").result(session.instance_eval { binding })).html_safe %>