avo 2.30.1.pre4.pr1683 → 2.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7026eb5ccd2fa76aab49f686e6e3d87e310e54ed6d220aab367c87283690d29e
-  data.tar.gz: 3de5de591bb61c2d022eb71e25b08cceb225dc5af6f92ba2d4431abf594bbe45
+  metadata.gz: 7162a2279663c821bd7bd45d46606874d27cec50facbe95868b5e6e9f7cad108
+  data.tar.gz: 364cdaa46a18459fb2193334cce6c9a40b18b46e0570eb0a8f769f2c10237059
 SHA512:
-  metadata.gz: 005c54601761b2d69acea075c89a433c9a170d591db6e7d3cfdfd6b7cc75d36d87eee9eedec207aea59413c6ebc9efebed14896e5ed2a51eb46bfbd532a8c4e7
-  data.tar.gz: 89376982016bd362d2148cd57244fe9e8c3b5e998f081f3b34557e484a09e55c7d7370a22d2f7047bb418813c5edc7b7b124284a53a7eb58c59481183cb0229f
+  metadata.gz: 42f77ef3c0fd013c1940ecef19ff1e7d6f15386ce7dc211d9ca2eb3b18c162d31579f589ac20ef82b98f10e8bb309a6b76f63cda580186da594a9826b717c274
+  data.tar.gz: 4bddfafbec2fad7372daea55f5926ae7e0bddb34984c1c848f926e5112f0fc86edf452573f9bad7e28a22753dfccd2f2fbabce15aec73fd773c3931524255566

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.30.1.pre4.pr1683)
+    avo (2.30.1)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/components/avo/field_wrapper_component.html.erb

@@ -2,7 +2,7 @@
   class: classes,
   style: style,
   data: data do %>
-  <div class="h-full <% if stacked? %> md:pt-4 <% else %> md:pt-0 md:h-14 <% end %> pt-4 flex self-start items-center flex-shrink-0 <%= @field.get_html(:classes, view: view, element: :label) %> w-48 <% if compact? %> md:w-48 xl:w-64 <% else %> md:w-64 <% end %> px-6 uppercase font-semibold text-gray-500 text-sm" data-slot="label">
+  <div class="h-full <% if stacked? %> md:pt-4 <% else %> md:pt-0 md:h-14 <% end %> pt-4 flex self-start items-center <%= @field.get_html(:classes, view: view, element: :label) %> w-48 <% if compact? %> md:w-48 xl:w-64 <% else %> md:w-64 <% end %> px-6 uppercase font-semibold text-gray-500 text-sm" data-slot="label">
     <% if form.present? %>
       <%= form.label field.id, label %>
     <% else %>
@@ -11,7 +11,7 @@
     <% if on_edit? && field.is_required? %> <span class="text-red-600 ml-1">*</span> <% end %>
   </div>
   <div class="flex-1 flex flex-row md:min-h-inherit py-2 <% if stacked? %> pb-4 <% else %><% end %> px-6 <%= @field.get_html(:classes, view: view, element: :content) %>" data-slot="value">
-    <div class="self-center w-full <% if full_width? || compact? || stacked? %> <% else %> md:w-8/12 <% end %>">
+    <div class="self-center <% if full_width? || compact? || stacked? %> w-full <% else %> md:w-8/12 <% end %>">
       <% if on_show? %>
         <% if field.value.blank? and dash_if_blank %>
           —

data/app/components/avo/fields/common/files_list_viewer_component.html.erb

@@ -0,0 +1,5 @@
+<div class="relative py-3 grid xs:grid-cols-2 sm:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-3 rounded-xl">
+  <% @field.value.attachments.each do |file| %>
+    <%= render Avo::Fields::Common::SingleFileViewerComponent.new field: @field, resource: @resource, file: file %>
+  <% end %>
+</div>

data/app/components/avo/fields/common/files_list_viewer_component.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Avo::Fields::Common::FilesListViewerComponent < ViewComponent::Base
+  def initialize(field:, resource:)
+    @field = field
+    @resource = resource
+  end
+end

data/app/components/avo/fields/common/single_file_viewer_component.html.erb

@@ -0,0 +1,57 @@
+<div class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-3">
+  <% if file.present? %>
+    <div class="flex flex-col justify-between h-full">
+      <% if file.representable? && is_image? %>
+        <div class="max-h-[42rem] h-full flex">
+          <%= image_tag helpers.main_app.url_for(file), class: 'rounded-lg object-cover' %>
+        </div>
+      <% elsif is_audio? %>
+        <%= audio_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
+      <% elsif is_video? %>
+        <%= video_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
+      <% else %>
+        <div class="relative flex flex-col justify-evenly items-center px-2 rounded-lg border bg-white border-gray-500 min-h-24">
+          <div class="flex flex-col justify-center items-center w-full">
+            <%= helpers.svg 'document-text', class: 'h-10 text-gray-600 mb-2' %>
+          </div>
+        </div>
+      <% end %>
+      <% if field.display_filename %>
+        <span class="text-gray-500 mt-2 text-sm truncate" title="<%= file.filename %>"><%= file.filename %></span>
+      <% end %>
+    </div>
+    <div class="flex space-x-2">
+      <div class="flex">
+        <% if can_download_file? %>
+          <%= a_link Rails.application.routes.url_helpers.rails_blob_path(file, only_path: true, disposition: :attachment),
+            icon: 'heroicons/outline/download',
+            color: :primary,
+            download: true,
+            class: 'text-center',
+            title: t('avo.download_file'),
+            data: { tippy: :tooltip },
+            compact: true,
+            size: :xs %>
+        <% end %>
+      </div>
+      <div>
+        <% if can_delete_file? %>
+          <%= a_link destroy_path,
+            icon: 'heroicons/outline/trash',
+            color: :red,
+            compact: true,
+            size: :xs,
+            class: 'text-center',
+            title: t('avo.delete_file', item: file.filename),
+            data: {
+              turbo_method: :delete,
+              turbo_confirm: t('avo.are_you_sure'),
+              tippy: :tooltip
+            } %>
+        <% end %>
+      </div>
+    </div>
+  <% else %>
+    –
+  <% end %>
+</div>

data/app/components/avo/fields/common/{files/view_type/grid_component.rb → single_file_viewer_component.rb}

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
-class Avo::Fields::Common::Files::ViewType::GridComponent < ViewComponent::Base
-  attr_reader :field, :resource
+class Avo::Fields::Common::SingleFileViewerComponent < ViewComponent::Base
+  include Avo::ApplicationHelper
+  include Avo::Fields::Concerns::FileAuthorization
+
+  attr_reader :field
 
   def initialize(field:, resource:, file: nil)
     @file = file
@@ -9,6 +12,10 @@ class Avo::Fields::Common::Files::ViewType::GridComponent < ViewComponent::Base
     @resource = resource
   end
 
+  def destroy_path
+    Avo::Services::URIService.parse(@resource.record_path).append_paths("active_storage_attachments", id, file.id).to_s
+  end
+
   def id
     field.id
   end

data/app/components/avo/fields/file_field/edit_component.html.erb

@@ -1,7 +1,7 @@
 <%= field_wrapper **field_wrapper_args do %>
   <% if @field.value.present? %>
     <div class="mb-2">
-      <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
+      <%= render Avo::Fields::Common::SingleFileViewerComponent.new resource: @resource, field: @field %>
     </div>
   <% end %>
 

data/app/components/avo/fields/file_field/show_component.html.erb

@@ -1,3 +1,3 @@
 <%= field_wrapper **field_wrapper_args do %>
-  <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
+  <%= render Avo::Fields::Common::SingleFileViewerComponent.new resource: @resource, field: @field %>
 <% end %>

data/app/components/avo/fields/files_field/edit_component.html.erb

@@ -1,5 +1,5 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
+  <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 
   <% if can_upload_file? %>
     <div class="mt-2">

data/app/components/avo/fields/files_field/show_component.html.erb

@@ -1,3 +1,3 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
+  <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 <% end %>

data/app/views/avo/partials/_view_toggle_button.html.erb

@@ -11,10 +11,6 @@
         new_icon: 'grid-view-type',
         translation_key: 'avo.grid_view',
       },
-      list: {
-        new_view_type: 'list',
-        new_icon: 'queue-list',
-      },
     }
   %>
   <div class="flex">

data/lib/avo/configuration.rb

@@ -71,7 +71,7 @@ module Avo
       @id_links_to_resource = false
       @full_width_container = false
       @full_width_index_view = false
-      @cache_resources_on_index_view = false
+      @cache_resources_on_index_view = Avo::PACKED
       @cache_resource_filters = false
       @context = proc {}
       @initial_breadcrumbs = proc {

data/lib/avo/fields/files_field.rb

@@ -6,7 +6,6 @@ module Avo
       attr_accessor :direct_upload
       attr_accessor :accept
       attr_reader :display_filename
-      attr_reader :hide_view_type_switcher
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -16,8 +15,6 @@ module Avo
         @direct_upload = args[:direct_upload].present? ? args[:direct_upload] : false
         @accept = args[:accept].present? ? args[:accept] : nil
         @display_filename = args[:display_filename].nil? ? true : args[:display_filename]
-        @view_type = args[:view_type] || :grid
-        @hide_view_type_switcher = args[:hide_view_type_switcher]
       end
 
       def view_component_name
@@ -40,14 +37,6 @@ module Avo
 
         model
       end
-
-      def viewer_component
-        "Avo::Fields::Common::Files::ViewType::#{view_type.to_s.capitalize}Component".constantize
-      end
-
-      def view_type
-        (@resource.params.dig(:view_type) || @view_type).to_sym
-      end
     end
   end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.30.1.pre4.pr1683" unless const_defined?(:VERSION)
+  VERSION = "2.30.1" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -47,7 +47,7 @@ Avo.configure do |config|
   # config.per_page_steps = [12, 24, 48, 72]
   # config.via_per_page = 8
   # config.id_links_to_resource = false
-  # config.cache_resources_on_index_view = false
+  # config.cache_resources_on_index_view = true
   ## permanent enable or disable cache_resource_filters, default value is false
   # config.cache_resource_filters = false
   ## provide a lambda to enable or disable cache_resource_filters per user/resource.

data/public/avo-assets/avo.base.css

@@ -6386,10 +6386,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   grid-column:1 / -1
 }
 
-.col-span-4{
-  grid-column:span 4 / span 4
-}
-
 .float-right{
   float:right
 }
@@ -6599,10 +6595,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   margin-bottom:0.25rem
 }
 
-.-mt-9{
-  margin-top:-2.25rem
-}
-
 .block{
   display:block
 }
@@ -6639,10 +6631,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   aspect-ratio:1 / 1
 }
 
-.aspect-video{
-  aspect-ratio:16 / 9
-}
-
 .h-36{
   height:9rem
 }
@@ -6723,6 +6711,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   height:2.25rem
 }
 
+.max-h-\[42rem\]{
+  max-height:42rem
+}
+
 .max-h-full{
   max-height:100%
 }
@@ -6926,10 +6918,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   grid-template-columns:repeat(1, minmax(0, 1fr))
 }
 
-.grid-cols-6{
-  grid-template-columns:repeat(6, minmax(0, 1fr))
-}
-
 .flex-row{
   flex-direction:row
 }
@@ -7010,6 +6998,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   gap:1.5rem
 }
 
+.gap-3{
+  gap:0.75rem
+}
+
 .gap-1{
   gap:0.25rem
 }
@@ -7074,6 +7066,12 @@ trix-toolbar .trix-button-group:not(:first-child){
   margin-left:calc(0.75rem * calc(1 - var(--tw-space-x-reverse)))
 }
 
+.space-y-3 > :not([hidden]) ~ :not([hidden]){
+  --tw-space-y-reverse:0;
+  margin-top:calc(0.75rem * calc(1 - var(--tw-space-y-reverse)));
+  margin-bottom:calc(0.75rem * var(--tw-space-y-reverse))
+}
+
 .divide-y > :not([hidden]) ~ :not([hidden]){
   --tw-divide-y-reverse:0;
   border-top-width:calc(1px * calc(1 - var(--tw-divide-y-reverse)));
@@ -7563,11 +7561,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   background-color:rgb(94 100 110 / var(--tw-bg-opacity))
 }
 
-.bg-slate-100{
-  --tw-bg-opacity:1;
-  background-color:rgb(241 245 249 / var(--tw-bg-opacity))
-}
-
 .bg-opacity-25{
   --tw-bg-opacity:0.25
 }
@@ -7608,10 +7601,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   padding:0.25rem
 }
 
-.p-1\.5{
-  padding:0.375rem
-}
-
 .px-1{
   padding-left:0.25rem;
   padding-right:0.25rem
@@ -9713,6 +9702,10 @@ trix-editor {
     grid-template-columns:repeat(4, minmax(0, 1fr))
   }
 
+  .xl\:grid-cols-3{
+    grid-template-columns:repeat(3, minmax(0, 1fr))
+  }
+
   .xl\:flex-row{
     flex-direction:row
   }
@@ -9771,4 +9764,8 @@ trix-editor {
   .\32xl\:grid-cols-6{
     grid-template-columns:repeat(6, minmax(0, 1fr))
   }
+
+  .\32xl\:grid-cols-4{
+    grid-template-columns:repeat(4, minmax(0, 1fr))
+  }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.30.1.pre4.pr1683
+  version: 2.30.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -1371,14 +1371,8 @@ files:
 - app/components/avo/fields/common/boolean_check_component.rb
 - app/components/avo/fields/common/boolean_group_component.html.erb
 - app/components/avo/fields/common/boolean_group_component.rb
-- app/components/avo/fields/common/files/controls_component.html.erb
-- app/components/avo/fields/common/files/controls_component.rb
-- app/components/avo/fields/common/files/list_viewer_component.html.erb
-- app/components/avo/fields/common/files/list_viewer_component.rb
-- app/components/avo/fields/common/files/view_type/grid_component.html.erb
-- app/components/avo/fields/common/files/view_type/grid_component.rb
-- app/components/avo/fields/common/files/view_type/list_component.html.erb
-- app/components/avo/fields/common/files/view_type/list_component.rb
+- app/components/avo/fields/common/files_list_viewer_component.html.erb
+- app/components/avo/fields/common/files_list_viewer_component.rb
 - app/components/avo/fields/common/gravatar_viewer_component.html.erb
 - app/components/avo/fields/common/gravatar_viewer_component.rb
 - app/components/avo/fields/common/heading_component.html.erb
@@ -1387,6 +1381,8 @@ files:
 - app/components/avo/fields/common/key_value_component.rb
 - app/components/avo/fields/common/progress_bar_component.html.erb
 - app/components/avo/fields/common/progress_bar_component.rb
+- app/components/avo/fields/common/single_file_viewer_component.html.erb
+- app/components/avo/fields/common/single_file_viewer_component.rb
 - app/components/avo/fields/common/status_viewer_component.html.erb
 - app/components/avo/fields/common/status_viewer_component.rb
 - app/components/avo/fields/concerns/item_labels.rb
@@ -1704,7 +1700,6 @@ files:
 - config/credentials.yml.enc
 - config/i18n-tasks.yml
 - config/initializers/pagy.rb
-- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1966,9 +1961,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.3
 signing_key: 

data/app/components/avo/fields/common/files/controls_component.html.erb

@@ -1,29 +0,0 @@
-<div class="flex">
-  <% if can_download_file? %>
-    <%= a_link Rails.application.routes.url_helpers.rails_blob_path(file, only_path: true, disposition: :attachment),
-      icon: 'heroicons/outline/download',
-      color: :primary,
-      download: true,
-      class: 'text-center',
-      title: t('avo.download_file'),
-      data: { tippy: :tooltip },
-      compact: true,
-      size: :xs %>
-  <% end %>
-</div>
-<div>
-  <% if can_delete_file? %>
-    <%= a_link destroy_path,
-      icon: 'heroicons/outline/trash',
-      color: :red,
-      compact: true,
-      size: :xs,
-      class: 'text-center',
-      title: t('avo.delete_file', item: file.filename),
-      data: {
-        turbo_method: :delete,
-        turbo_confirm: t('avo.are_you_sure'),
-        tippy: :tooltip
-      } %>
-  <% end %>
-</div>

data/app/components/avo/fields/common/files/controls_component.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class Avo::Fields::Common::Files::ControlsComponent < ViewComponent::Base
-  include Avo::ApplicationHelper
-  include Avo::Fields::Concerns::FileAuthorization
-
-  attr_reader :file, :field, :resource
-  delegate :id, to: :field
-
-  def initialize(field:, file:, resource:)
-    @field = field
-    @file = file
-    @resource = resource
-  end
-
-  def destroy_path
-    Avo::Services::URIService.parse(@resource.record_path).append_paths("active_storage_attachments", id, file.id).to_s
-  end
-end

data/app/components/avo/fields/common/files/list_viewer_component.html.erb

@@ -1,14 +0,0 @@
-<%= content_tag :div, class: wrapper_classes do %>
-  <%= turbo_frame_tag @field.id do %>
-    <% unless @field.hide_view_type_switcher %>
-      <div class="justify-self-end flex justify-end items-center space-x-3">
-        <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: @field.view_type, turbo_frame: @field.id } %>
-      </div>
-    <% end %>
-    <div class="<%= classes %>">
-      <% @field.value.attachments.each do |file| %>
-        <%= render @field.viewer_component.new field: @field, resource: @resource, file: file %>
-      <% end %>
-    </div>
-  <% end %>
-<% end %>

data/app/components/avo/fields/common/files/list_viewer_component.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-class Avo::Fields::Common::Files::ListViewerComponent < ViewComponent::Base
-  include Turbo::FramesHelper
-
-  attr_reader :field
-
-  def initialize(field:, resource:)
-    @field = field
-    @resource = resource
-  end
-
-  def classes
-    base_classes = "py-4 rounded-xl max-w-full"
-
-    view_type_classes = if @field.view_type == :list
-      "flex flex-col space-y-2"
-    else
-      "relative grid xs:grid-cols-2 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-6 gap-6"
-    end
-
-    "#{base_classes} #{view_type_classes}"
-  end
-
-  def wrapper_classes
-    (field.stacked && !field.hide_view_type_switcher) ? "-mt-9" : ""
-  end
-
-  def available_view_types
-    [:list, :grid]
-  end
-end

data/app/components/avo/fields/common/files/view_type/grid_component.html.erb

@@ -1,27 +0,0 @@
-<div class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-2">
-  <% if file.present? %>
-    <div class="flex flex-col justify-between h-full">
-      <% if file.representable? && is_image? %>
-        <%= image_tag helpers.main_app.url_for(file), class: 'rounded-lg object-cover w-full aspect-video' %>
-      <% elsif is_audio? %>
-        <%= audio_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
-      <% elsif is_video? %>
-        <%= video_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
-      <% else %>
-        <div class="relative flex flex-col justify-evenly items-center px-2 rounded-lg border bg-white border-gray-500 min-h-24">
-          <div class="flex flex-col justify-center items-center w-full">
-            <%= helpers.svg 'document-text', class: 'h-10 text-gray-600 mb-2' %>
-          </div>
-        </div>
-      <% end %>
-      <% if field.display_filename %>
-        <span class="text-gray-500 mt-1 text-sm truncate" title="<%= file.filename %>"><%= file.filename %></span>
-      <% end %>
-    </div>
-    <div class="flex space-x-2">
-      <%= render Avo::Fields::Common::Files::ControlsComponent.new(field: field, file: file, resource: resource) %>
-    </div>
-  <% else %>
-    –
-  <% end %>
-</div>

data/app/components/avo/fields/common/files/view_type/list_component.html.erb

@@ -1,22 +0,0 @@
-<div class="relative min-h-full max-w-full flex-1 flex">
-  <% if file.present? %>
-    <div class="grid grid-cols-6 gap-2 items-center max-w-full w-full">
-      <div class="col-span-4 flex-1 flex flex-row items-center text-gray-700 overflow-x-auto mac-styled-scrollbar ">
-        <div class="rounded-full bg-slate-100 border border-gray-500 p-1.5 flex items-center justify-center">
-          <%= helpers.svg icon_for_file, class: "h-5 text-gray-600" %>
-        </div>
-        <p class="items-center h-full p-2 flex-shrink-0">
-          <%= file.filename %>
-        </p>
-      </div>
-      <div class="text-gray-700 flex-shrink-0 text-sm">
-        <%= helpers.number_to_human_size(file.byte_size) %>
-      </div>
-      <div class="flex space-x-2 justify-end col-span-1 flex-shrink-0">
-        <%= render Avo::Fields::Common::Files::ControlsComponent.new(field: field, file: file, resource: resource) %>
-      </div>
-    </div>
-  <% else %>
-    –
-  <% end %>
-</div>

data/app/components/avo/fields/common/files/view_type/list_component.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class Avo::Fields::Common::Files::ViewType::ListComponent < Avo::Fields::Common::Files::ViewType::GridComponent
-  def icon_for_file
-    if is_image?
-      "photo"
-    elsif is_audio?
-      "speaker-wave"
-    elsif is_video?
-      "video-camera"
-    else
-      "document"
-    end
-  end
-end

data/config/master.key

@@ -1 +0,0 @@
-2aeb23d82b909d9c6b5abb62f7058c2a