remove default image caption and remove default grid border (#670)

* remove default image caption and remove default grid border

* ladz load editor assets

Author: jmilljr24

app/controllers/resources_controller.rb

@@ -35,6 +35,12 @@ def new
   def edit
     @resource = Resource.find(resource_id_param).decorate
     set_form_variables
+
+    if turbo_frame_request?
+      render :rich_text_assets
+    else
+      render :edit
+    end
   end
 
   def show

app/controllers/workshops_controller.rb

@@ -80,6 +80,12 @@ def new
   def edit
     @workshop = Workshop.find(params[:id])
     set_form_variables
+
+    if turbo_frame_request?
+      render :rich_text_assets
+    else
+      render :edit
+    end
   end
 
   def show

app/frontend/javascript/rhino/grid/gridCell.js

@@ -19,7 +19,7 @@ export const GridCell = Node.create({
         default: 1,
       },
       hasBorder: {
-        default: true,
+        default: false,
       },
     };
   },

app/views/active_storage/blobs/_blob.html.erb

@@ -6,9 +6,6 @@
   <figcaption class="attachment__caption text-center">
     <% if caption = blob.try(:caption) %>
       <%= caption %>
-    <% else %>
-      <span class="attachment__name"><%= blob.filename %></span>
-      <span class="attachment__size"><%= number_to_human_size blob.byte_size %></span>
     <% end %>
   </figcaption>
 </figure>

app/views/resources/edit.html.erb

@@ -1,19 +1,20 @@
-<% resource = @resource.respond_to?(:object) ? @resource.object : @resource %>
-
 <div class="min-h-screen py-8">
   <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
     <div class="max-w-5xl mx-auto <%= DomainTheme.bg_class_for(:resources) %> border border-gray-200 rounded-xl shadow-lg hover:shadow-xl transition-shadow duration-200 p-6">
       <div class="flex items-center justify-between mb-3">
-        <h1 class="text-2xl font-semibold text-gray-900">Edit <%= resource.class.model_name.human %></h1>
+        <h1 class="text-2xl font-semibold text-gray-900">Edit <%= @resource.class.model_name.human %></h1>
 
         <div class="text-right text-end">
-          <%= link_to "View", resource_path(resource), class: "btn btn-secondary-outline" %>
+          <%= link_to "View", resource_path(@resource), class: "btn btn-secondary-outline" %>
         </div>
       </div>
 
       <div class="space-y-6">
         <div class="mt-4 bg-white rounded p-3"><%= render "form" %></div>
-        <%= render 'rich_text_assets/form', owner: resource %>
+
+        <%= turbo_frame_tag "editor_assets_lazy", src: edit_resource_path(@resource) do %>
+          <span>Loading..</span>
+        <% end %>
       </div>
     </div>
   </div>

app/views/resources/rich_text_assets.html.erb

@@ -0,0 +1,3 @@
+<%= turbo_frame_tag "editor_assets_lazy"  do %>
+  <%= render 'rich_text_assets/form', owner: @resource %>
+<% end %>

app/views/rich_text_assets/_form.html.erb

@@ -41,7 +41,14 @@
       </div>
 
       <div>
-        <%= f.submit "Upload Asset", class: "w-full bg-indigo-600 text-white font-semibold py-2 px-4 rounded-lg hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-300 transition" %>
+        <%= f.submit "Upload Asset",
+            class: "w-full bg-indigo-600 text-white font-semibold py-2 px-4 rounded-lg
+                    hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-300
+                    transition
+                    disabled:bg-indigo-400 disabled:cursor-not-allowed disabled:opacity-70",
+            data: {
+              disable_with: "Uploading..."
+            } %>
       </div>
     <% end %>
   <% end %>

app/views/workshops/edit.html.erb

@@ -12,6 +12,8 @@
     <div class="mt-4"><%= render "form", workshop: @workshop %></div>
     <div class="mt-4"><%# render "form_old", workshop: @workshop %></div>
 
-    <%= render 'rich_text_assets/form', owner: @workshop %>
+    <%= turbo_frame_tag "editor_assets_lazy", src: edit_workshop_path(@workshop) do %>
+      <span>Loading..</span>
+    <% end %>
   </div>
 </div>

app/views/workshops/rich_text_assets.html.erb

@@ -0,0 +1,3 @@
+<%= turbo_frame_tag "editor_assets_lazy"  do %>
+  <%= render 'rich_text_assets/form', owner: @workshop %>
+<% end %>