trek 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8836f5f71ee9aeae0475df30e1e941038aeac1d3ba5a1f0a8bc548ddf87cedff
-  data.tar.gz: 2b07e244708e2e9a6258d9d352f04fc03bba3777e11b2a6ae3a7ad7e0e100fd5
+  metadata.gz: 5cea2a831c71a33aa66c06d9c482aaa195a32eab3d15036892d42b7ad780d896
+  data.tar.gz: 8589d77eec5df070bea04c13fea05a46e7b516533e3a044f5bbf10a1551dda27
 SHA512:
-  metadata.gz: 568c5f70e0482e4ef6c86e66d4ffe46bc5828848c28ec8646129468bbc4db60c362fb3ddd4bee9ba9e747fffc5d24385f3198876bc8a3dc9031658c3eb1dc380
-  data.tar.gz: 322f0ab2ab3fc8d3bef7cabc8fadbd750b43b790163e9abf915c7bb8766c594bec7161980695e020e6d0e8b7a3e8e4a6c47309edefea2a2df72bd1918a8ffe77
+  metadata.gz: 0d9a672bbf54060d276ae97b2897b5fb5769d15ab3a64ad8cda2fedfe7875395d89a04bc0116100ee667b195197d1ba610a2e3ff5180492a7743ff8294877d44
+  data.tar.gz: df786a478a60fa19944403b15bf41d2c2c9eef5f25e1d5ed638ae2a8be7a8bcf8d33482cec0a1c68254a6424668ad0ac3afc472b49da85882cb2250cd70a7a90

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trek (0.1.20)
+    trek (0.1.21)
       action_policy (~> 0.6)
       actioncable
       acts_as_list (~> 1.1)
@@ -37,7 +37,7 @@ GEM
   specs:
     action_policy (0.7.5)
       ruby-next-core (>= 1.0)
-    action_text-trix (2.1.16)
+    action_text-trix (2.1.17)
       railties
     actioncable (8.1.1)
       actionpack (= 8.1.1)
@@ -200,7 +200,7 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    erb (6.0.1)
+    erb (6.0.2)
     erubi (1.13.1)
     fastimage (2.4.0)
     ffi (1.17.3-arm64-darwin)
@@ -230,12 +230,13 @@ GEM
       mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.8.2)
-    irb (1.16.0)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.18.0)
+    json (2.19.2)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -254,7 +255,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.25.0)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lookbook (2.3.14)
@@ -280,7 +281,8 @@ GEM
     mini_magick (5.3.1)
       logger
     mini_mime (1.1.5)
-    minitest (6.0.1)
+    minitest (6.0.2)
+      drb (~> 2.0)
       prism (~> 1.5)
     mobility (1.3.2)
       i18n (>= 0.6.10, < 2)
@@ -295,9 +297,9 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nokogiri (1.19.1-arm64-darwin)
+    nokogiri (1.19.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.1-x86_64-darwin)
+    nokogiri (1.19.2-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.27.0)
     parser (3.3.10.0)
@@ -312,7 +314,7 @@ GEM
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.7.0)
+    prism (1.9.0)
     prosemirror_to_html (0.3.0)
       nokogiri
     psych (5.3.1)
@@ -349,8 +351,8 @@ GEM
     rails-healthcheck (1.4.0)
       actionpack
       railties
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (8.1.0)
       i18n (>= 0.7, < 2)
@@ -369,7 +371,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (7.0.3)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -483,7 +485,7 @@ GEM
     temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    thor (1.4.0)
+    thor (1.5.0)
     tilt (2.6.1)
     timeout (0.6.0)
     tsort (0.2.0)
@@ -513,7 +515,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.38)
-    zeitwerk (2.7.4)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   arm64-darwin-24

data/app/components/trek/dashboard/tile_component/tile_component.html.slim

@@ -1,4 +1,4 @@
-= link_to href, class: classes
+= link_to href, class: classes, rel: rel, target: target
   - if icon
     = render Trek::IconComponent.new(icon, classnames: class_for("icon"))
   span(class=class_for("text")) = formatted_text

data/app/components/trek/dashboard/tile_component.rb

@@ -5,6 +5,8 @@ module Trek
     option :color, default: proc { :slate }
     option :href
     option :icon, optional: true
+    option :rel, optional: true
+    option :target, optional: true
     option :text
     option :allowed_to, default: -> { true }
 

data/app/components/trek/form/image_field_component/image_field_component.css

@@ -9,6 +9,7 @@
 
   align-items: center;
   background-color: var(--slate-4);
+  flex-shrink: 0;
   border: 1px solid var(--slate-a6);
   border-radius: 0.2rem;
   color: var(--slate-8);
@@ -29,3 +30,10 @@
 .preview img {
   object-fit: contain;
 }
+
+.actions {
+  align-items: flex-start;
+  display: flex;
+  flex-direction: column;
+  gap: 0.8rem;
+}

data/app/components/trek/form/image_field_component/image_field_component.html.slim

@@ -10,12 +10,24 @@
                           value: cached_data,
                           id: nil,
                           data: stimulus_target_hash("hiddenInput")
+      = form.hidden_field "remove_#{method_name}",
+                          value: nil,
+                          id: nil,
+                          data: stimulus_target_hash("removeInput")
+
+      div(class=class_for("actions"))
+        = render Trek::ButtonComponent.new( \
+            tag: :label,
+            text: button_text,
+            size: :narrow,
+          )
+          = form.file_field method_name,
+                            class: "sr-only",
+                            data: file_field_data_attributes
 
-      = render Trek::ButtonComponent.new( \
-          tag: :label,
-          text: button_text,
-          size: :narrow,
-        )
-        = form.file_field method_name,
-                          class: "sr-only",
-                          data: file_field_data_attributes
+        - if image&.exists?
+          = render Trek::ButtonComponent.new( \
+              text: t("admin.actions.remove"),
+              size: :narrow,
+              data: remove_button_data_attributes,
+            )

data/app/components/trek/form/image_field_component/image_field_component.js

@@ -8,7 +8,13 @@ import French from "@uppy/locales/lib/fr_FR";
 import "@uppy/core/dist/style.css";
 
 export class Controller extends BaseController {
-  static targets = ["content", "fileInput", "hiddenInput", "preview"];
+  static targets = [
+    "content",
+    "fileInput",
+    "hiddenInput",
+    "preview",
+    "removeInput",
+  ];
 
   connect() {
     this.uppy = new Uppy({
@@ -48,6 +54,9 @@ export class Controller extends BaseController {
       const uploadedFileData = response.body["data"];
 
       this.hiddenInputTarget.value = JSON.stringify(uploadedFileData);
+
+      // Clear the remove flag when a new file is uploaded
+      this.removeInputTarget.value = "";
     });
 
     this.uppy.on("file-removed", () => {
@@ -64,6 +73,19 @@ export class Controller extends BaseController {
     this.uppy = null;
   }
 
+  removeImage() {
+    // Clear the cached upload data
+    this.hiddenInputTarget.value = "";
+
+    // Set the remove flag so Shrine deletes the attachment on save
+    this.removeInputTarget.value = "1";
+
+    // Reset preview to placeholder icon
+    this.previewTarget.innerHTML = `<svg class="c-trek--icon-root c-trek--icon-trek--pic" role="img" focusable="false">
+      <use xlink:href="#c-icon-trek--pic"></use>
+    </svg>`;
+  }
+
   addFiles(event) {
     const files = Array.from(event.target.files);
 

data/app/components/trek/form/image_field_component.rb

@@ -7,6 +7,13 @@ module Trek
       include StimulusHelpers
       include Turbo::FramesHelper
 
+      # Ensure the placeholder icon is in the sprite even when an image exists,
+      # because the JS removeImage action needs it.
+      def before_render
+        Current.icons ||= []
+        Current.icons << "trek--pic" unless Current.icons.include?("trek--pic")
+      end
+
       private
 
       def preview
@@ -48,6 +55,12 @@ module Trek
         }.merge(stimulus_target_hash("fileInput"))
       end
 
+      def remove_button_data_attributes
+        {
+          action: stimulus_action("removeImage")
+        }
+      end
+
       def button_text
         image&.exists? ? t("admin.actions.replace") : t("admin.actions.browse")
       end

data/config/locales/trek.en.yml

@@ -43,6 +43,7 @@ en:
         n: New %{resource}
       reorder_resource:
         n: Reorder %{resources}
+      remove: Remove
       replace: Replace
       search_resource:
         n: Search for a %{resource}

data/config/locales/trek.fr.yml

@@ -49,6 +49,7 @@ fr:
         f: Réorganiser les %{resources}
         m: Réorganiser les %{resources}
         m_alt: Réorganiser les %{resources}
+      remove: Enlever
       replace: Remplacer
       search_resource:
         "n": Rechercher un·e %{resources}

data/lib/generators/trek/templates/initializers/shrine.rb

@@ -35,6 +35,7 @@ end
 
 Shrine.plugin :activerecord
 Shrine.plugin :cached_attachment_data # for retaining the cached file across form redisplays
+Shrine.plugin :remove_attachment
 Shrine.plugin :restore_cached_data # re-extract metadata when attaching a cached file
 Shrine.plugin :determine_mime_type, analyzer: :marcel
 Shrine.plugin :pretty_location

data/lib/trek/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Trek
-  VERSION = "0.1.20"
+  VERSION = "0.1.21"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etaminstudio/trek",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "A modern CMS for Ruby on Rails",
   "main": "app/javascript/trek.js",
   "repository": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trek
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Mohamed Bengrich