spina 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ef91e5dd1c106347beca681a8cf055e3dd9ca7753a86305e1fd7a79624b24ac
-  data.tar.gz: 63ef08f9333d470b982a23fe33f0c258d7610adbee22fd5d6f59be78d317ac1c
+  metadata.gz: bd9893ef78c55c7d8a448cce6e8bc04fe22d3f48cde3f07bbef32c03d9aaf00e
+  data.tar.gz: bc9fd36b1599b808d0313fabb1508506e4cf9e9e4f26908f645f906db3c5c79a
 SHA512:
-  metadata.gz: 55001a4b71435d2cb16cca6402538e815ce165a74d983164ec35aafdf9866a3d2bea0aefecbc042c0df927f62023de652f5dd0e10040355662dd38a0eb9d7d12
-  data.tar.gz: 85032055e23c4545acdbb21ef8dbd49d8517991a88f7270bc3c59917b482f665268ed8ba880533010e68dba4a1a6c1bcea6c69110bd83ec20b3ea296a1872c84
+  metadata.gz: 6c71bf70aa732fe118cdac86c234a99d88adfd0bf2669551a5f94c6847401ca87d0ebabc5afe522749d95d6c9e5f79c1abec95916080f735e5e29d36461c042c
+  data.tar.gz: 8d2da67450bc5c70cfd73c61dadca688ccbacb6b971d465559cca95c9cc2969a02c6f8e84e7dd02e794329a08f94e7fcff31f48382ce93ad64ac84c75333e480

data/app/controllers/spina/admin/attachments_controller.rb

@@ -32,13 +32,21 @@ module Spina
       
       def update
         @attachment = Attachment.find(params[:id])
+        old_signed_id = @attachment.file&.blob&.signed_id
+        @attachment.update(attachment_params) if params[:attachment].present?
         if params[:filename].present?
           extension = @attachment.file.filename.extension
           filename = "#{params[:filename]}.#{extension}"
           @attachment.file.blob.update(filename: filename)
         end
-        
-        redirect_to [:admin, @attachment]
+
+        # Replace all occurrences of the old signed blob ID 
+        # with the new ID in a background job
+        if @attachment.reload.file&.blob&.signed_id != old_signed_id
+          Spina::ReplaceSignedIdJob.perform_later(old_signed_id, @attachment.file&.blob&.signed_id)
+        end
+                
+        render @attachment
       end
 
       def destroy

data/app/controllers/spina/admin/images_controller.rb

@@ -44,15 +44,23 @@ module Spina
       
       def update
         @image = Image.find(params[:id])
+        old_signed_id = @image.file&.blob&.signed_id
         @image.update(image_params) if params[:image].present?
         if params[:filename].present?
           extension = @image.file.filename.extension
           filename = "#{params[:filename]}.#{extension}"
           @image.file.blob.update(filename: filename)
         end
+        
         if @image.saved_change_to_media_folder_id?
           render :update
         else
+          # Replace all occurrences of the old signed blob ID 
+          # with the new ID in a background job
+          if @image.reload.file&.blob&.signed_id != old_signed_id
+            Spina::ReplaceSignedIdJob.perform_later(old_signed_id, @image.file&.blob&.signed_id)
+          end
+          
           @media_folders = MediaFolder.order(:name)
           render @image
         end
@@ -82,7 +90,7 @@ module Spina
         end
         
         def image_params
-          params.require(:image).permit(:media_folder_id)
+          params.require(:image).permit(:media_folder_id, :file)
         end
 
     end

data/app/jobs/spina/replace_signed_id_job.rb

@@ -0,0 +1,24 @@
+module Spina
+  class ReplaceSignedIdJob < ApplicationJob
+    queue_as { Spina.config.queues[:page_updates] }
+  
+    def perform(old_signed_id, new_signed_id)
+      return if old_signed_id.blank? || new_signed_id.blank?
+      
+      pages = get_pages(old_signed_id)
+      accounts = Spina::Account.all
+      
+      [pages, accounts].each do |records|
+        records.update_all("json_attributes = REGEXP_REPLACE(json_attributes::text, '#{old_signed_id}', '#{new_signed_id}', 'g')::jsonb")  
+      end
+    end
+    
+    private
+    
+      def get_pages(signed_id)
+        return Spina::Page.none unless signed_id.present?
+        Spina::Page.where("json_attributes::text LIKE ?", "%#{signed_id}%")
+      end
+    
+  end
+end

data/app/models/spina/page.rb

@@ -47,7 +47,7 @@ module Spina
     translates :menu_title, :seo_title, :url_title, default: -> { title }
 
     def to_s
-      name
+      title
     end
 
     def page_id

data/app/views/spina/admin/attachments/_attachment.html.erb

@@ -5,6 +5,15 @@
       <span class="truncate"><%= attachment.file.filename %></span>
     
       <div class="absolute h-full opacity-0 group-hover:opacity-100 flex items-center right-0 pr-3 top-0">
+        <%= form_with model: attachment, url: spina.admin_attachment_path(attachment), data: {turbo_frame: dom_id(attachment), controller: "form loading-button", loading_message: t('spina.media_library.uploading'), action: "turbo:submit-end->loading-button#doneLoading"} do |f| %>          
+          <%= f.file_field :file, id: "attachment_#{attachment.id}_file_field", class: 'hidden', data: {action: "loading-button#loading form#requestSubmit"} %>
+          
+          <button type="button" class="btn btn-default h-7 px-2 mr-2 text-xs" data-controller="delegate-click" data-action="delegate-click#click" data-loading-button-target="button" data-delegate-click-target="#attachment_<%= attachment.id %>_file_field">
+            <%= heroicon("upload", style: :solid, class: "w-4 h-4 mr-1 text-gray-600") %>
+            <%=t 'spina.ui.replace' %>
+          </button>
+        <% end %>
+        
         <%= link_to spina.edit_admin_attachment_path(attachment), class: "btn btn-default h-7 px-2 mr-2 text-xs" do %>
           <%= heroicon('pencil', style: :solid, class: 'w-4 h-4 mr-1 text-gray-600') %>
           <%=t 'spina.ui.rename' %>

data/app/views/spina/admin/images/_image.html.erb

@@ -10,6 +10,16 @@
       <span class="truncate"><%= image.file.filename %></span>
     
       <div class="absolute h-full opacity-0 group-hover:opacity-100 flex items-center right-0 pr-3 top-0">
+        
+        <%= form_with model: image, url: spina.admin_image_path(image), data: {turbo_frame: dom_id(image), controller: "form loading-button", loading_message: t('spina.media_library.uploading'), action: "turbo:submit-end->loading-button#doneLoading"} do |f| %>          
+          <%= f.file_field :file, accept: "image/*", id: "image_#{image.id}_file_field", class: 'hidden', data: {action: "loading-button#loading form#requestSubmit"} %>
+          
+          <button type="button" class="btn btn-default h-7 px-2 mr-2 text-xs" data-controller="delegate-click" data-action="delegate-click#click" data-loading-button-target="button" data-delegate-click-target="#image_<%= image.id %>_file_field">
+            <%= heroicon("upload", style: :solid, class: "w-4 h-4 mr-1 text-gray-600") %>
+            <%=t 'spina.ui.replace' %>
+          </button>
+        <% end %>
+        
         <%= link_to spina.edit_admin_image_path(image), class: "btn btn-default h-7 px-2 mr-2 text-xs" do %>
           <%= heroicon('pencil', style: :solid, class: 'w-4 h-4 mr-1 text-gray-600') %>
           <%=t 'spina.ui.rename' %>

data/config/locales/de.yml

@@ -352,6 +352,7 @@ de:
       new_entry: Neuer Eintrag
       optional: Optional
       rename: Umbenennen
+      replace: Ersetzen
       save_changes: Änderungen speichern
       saving: Speichern...
     user_mailer:

data/config/locales/en.yml

@@ -345,6 +345,7 @@ en:
       new_entry: New entry
       optional: Optional
       rename: Rename
+      replace: Replace
       save_changes: Save changes
       saving: Saving...
     user_mailer:

data/config/locales/nl.yml

@@ -316,6 +316,7 @@ nl:
       new_entry: Nieuw item
       optional: Optioneel
       rename: Hernoemen
+      replace: Vervangen
       save_changes: Wijzigingen opslaan
       saving: Opslaan...
     users:

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "2.9.1"
+  VERSION = "2.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Bram Jetten
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -972,6 +972,7 @@ files:
 - app/helpers/spina/pages_helper.rb
 - app/helpers/spina/spina_helper.rb
 - app/jobs/spina/application_job.rb
+- app/jobs/spina/replace_signed_id_job.rb
 - app/jobs/spina/resource_pages_update_job.rb
 - app/mailers/spina/application_mailer.rb
 - app/mailers/spina/user_mailer.rb
@@ -1176,7 +1177,7 @@ metadata:
   documentation_uri: https://www.spinacms.com/docs
   changelog_uri: https://github.com/SpinaCMS/Spina/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/SpinaCMS/Spina
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1191,8 +1192,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Spina
 test_files: []