From 4fafaec164169470882ce9f7dd9b5f8cc87db9f1 Mon Sep 17 00:00:00 2001
From: MontrealSergiy <sergeboroday@gmail.com>
Date: Tue, 9 Sep 2025 03:40:54 -0400
Subject: [PATCH 1/3] fix cbrain list task submission and viewing #1551

---
 .../boutiques_task/views/_form_js.html.erb           |  2 +-
 .../cbrain_file_list/views/_cb_file_list.html.erb    | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/BrainPortal/cbrain_plugins/cbrain-plugins-base/cbrain_task/boutiques_task/views/_form_js.html.erb b/BrainPortal/cbrain_plugins/cbrain-plugins-base/cbrain_task/boutiques_task/views/_form_js.html.erb
index 268cc5b10..f8adacca5 100644
--- a/BrainPortal/cbrain_plugins/cbrain-plugins-base/cbrain_task/boutiques_task/views/_form_js.html.erb
+++ b/BrainPortal/cbrain_plugins/cbrain-plugins-base/cbrain_task/boutiques_task/views/_form_js.html.erb
@@ -35,7 +35,7 @@
     cbcsvs       = interface_files.where(:type => 'CbrainFileList').to_a
     cbcsvToFiles = cbcsvs.map do |f|                       # Only used for preview button
       f.sync_to_cache # silly and blocking
-      ids = f.ordered_raw_ids.reject { |i| i.blank? || i == 0 }
+      ids = f.ordered_raw_ids.reject { |i| i.blank? || i == 0 } rescue []
       names = Userfile.find_all_accessible_by_user(@task.user, :access_requested => :read).where( 'userfiles.id' => ids).pluck(:name)
       [ f.name, names ]
     end.to_h
diff --git a/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb b/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb
index cdfa2695b..930127b0d 100644
--- a/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb
+++ b/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb
@@ -38,8 +38,16 @@
     can be missing or wrong).
     </p>
 
-    <%
-      csv_array     = @userfile.cached_csv_array
+  <%
+     csv_array     = @userfile.cached_csv_array rescue nil
+  %>
+
+  <% if csv_array.nil? %>
+    <em>Invalid CBRAIN File list, failed to find any files<em>
+  <% end %>
+
+  <%
+      csv_array   ||= []
       per_page      = 500
       nb_row        = csv_array.size
       page          = (params[:page] || 1).to_i

From 809d8b8237221bab438cb25e1d8fa97bc96e90bb Mon Sep 17 00:00:00 2001
From: MontrealSergiy <sergeboroday@gmail.com>
Date: Tue, 9 Sep 2025 08:02:14 -0400
Subject: [PATCH 2/3] even better cbrain list validation message from viewer
 #1551

---
 .../views/_cb_file_list.html.erb              | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb b/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb
index 930127b0d..6641a12a2 100644
--- a/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb
+++ b/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb
@@ -22,7 +22,16 @@
 #
 -%>
 
-<% if @userfile.is_locally_synced? %>
+<%
+   csv_array  = @userfile.cached_csv_array rescue nil
+%>
+
+<% if csv_array.nil? %>
+    <span class="warning">
+      <em> Invalid CBRAIN File list, possibly not even CSV, please check is type is correct - failed to find any files <em>
+    </span>
+
+<% elsif @userfile.is_locally_synced? %>
 
     <p class="medium_paragraphs">
     This type of file contains a list of other CBRAIN files that can be used as input
@@ -38,15 +47,8 @@
     can be missing or wrong).
     </p>
 
-  <%
-     csv_array     = @userfile.cached_csv_array rescue nil
-  %>
-
-  <% if csv_array.nil? %>
-    <em>Invalid CBRAIN File list, failed to find any files<em>
-  <% end %>
 
-  <%
+    <%
       csv_array   ||= []
       per_page      = 500
       nb_row        = csv_array.size

From 88f01bbc9a0a3ff29581805d5c423d6127ae8514 Mon Sep 17 00:00:00 2001
From: MontrealSergiy <sergeboroday@gmail.com>
Date: Tue, 9 Sep 2025 08:30:54 -0400
Subject: [PATCH 3/3] even friendlier cbrain list validation message from
 viewer #1551

---
 .../cbrain_file_list/views/_cb_file_list.html.erb      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb b/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb
index 6641a12a2..b06b29be0 100644
--- a/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb
+++ b/BrainPortal/cbrain_plugins/cbrain-plugins-base/userfiles/cbrain_file_list/views/_cb_file_list.html.erb
@@ -23,13 +23,15 @@
 -%>
 
 <%
-   csv_array  = @userfile.cached_csv_array rescue nil
+   csv_array = @userfile.cached_csv_array rescue nil
 %>
 
 <% if csv_array.nil? %>
-    <span class="warning">
-      <em> Invalid CBRAIN File list, possibly not even CSV, please check is type is correct - failed to find any files <em>
-    </span>
+    
+    <br>
+    <div class="errorExplanation">
+      Invalid CBRAIN File list, possibly not even CSV. Please verify <em> the file type</em>. No files found. <em>
+    </div>
 
 <% elsif @userfile.is_locally_synced? %>