alchemy_cms 6.0.0.b1 → 6.0.0.pre.b5

data/app/views/alchemy/admin/resources/index.html.erb

@@ -21,10 +21,7 @@
     dialog: false,
     if_permitted_to: [:index, resource_model]
   ) %>
-  <%= render 'alchemy/admin/partials/search_form', additional_params: [
-    resource_has_filters ? :filter : nil,
-    resource_has_tags ? :tagged_with : nil
-  ].compact %>
+  <%= render 'alchemy/admin/partials/search_form' %>
 <% end %>
 
 <div id="archive_all" class="resources-table-wrapper<%= ' with_tag_filter' if resource_has_tags || resource_has_filters %>">
@@ -33,13 +30,8 @@
 
   <% if resource_has_tags || resource_has_filters %>
     <div id="library_sidebar">
-      <% if resource_has_filters %>
-        <%= render 'filter_bar' %>
-      <% end %>
-
-      <% if resource_has_tags %>
-        <%= render 'tag_list' %>
-      <% end %>
+      <%= render 'filter_bar' if resource_has_filters %>
+      <%= render 'tag_list' if resource_has_tags %>
     </div>
   <% end %>
 </div>

data/app/views/alchemy/ingredients/_boolean_editor.html.erb

@@ -3,7 +3,7 @@
   data: boolean_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, boolean_editor.ingredient) do |f| %>
     <%= f.label :value, style: "display: inline-block" do %>
-      <%= f.check_box :value %>
+      <%= f.check_box :value, id: nil %>
       <%= render_ingredient_role(boolean_editor) %>
     <% end %>
     <%= render_hint_for(boolean_editor) %>

data/app/views/alchemy/ingredients/_file_editor.html.erb

@@ -44,7 +44,9 @@
           },
           title: Alchemy.t(:edit_file_properties) %>
       </div>
-      <%= f.hidden_field :attachment_id, value: file_editor.attachment&.id %>
+      <%= f.hidden_field :attachment_id,
+        value: file_editor.attachment&.id,
+        id: file_editor.form_field_id(:attachment_id) %>
     </div>
   <% end %>
 <% end %>

data/app/views/alchemy/ingredients/_headline_editor.html.erb

@@ -3,7 +3,7 @@
   data: headline_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, headline_editor.ingredient) do |f| %>
     <%= ingredient_label(headline_editor) %>
-    <%= f.text_field :value %>
+    <%= f.text_field :value, id: nil %>
 
     <div class="input-row">
       <% if headline_editor.level_options.length > 1 %>

data/app/views/alchemy/ingredients/_html_editor.html.erb

@@ -3,6 +3,6 @@
   data: html_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, html_editor.ingredient) do |f| %>
     <%= ingredient_label(html_editor) %>
-    <%= f.text_area :value %>
+    <%= f.text_area :value, id: nil %>
   <% end %>
 <% end %>

data/app/views/alchemy/ingredients/_link_editor.html.erb

@@ -4,15 +4,15 @@
   <%= element_form.fields_for(:ingredients, link_editor.ingredient) do |f| %>
     <%= ingredient_label(link_editor) %>
     <%= f.text_field :value,
-      class: "thin_border text_with_icon disabled",
-      name: nil,
-      id: nil,
-      disabled: true
+      class: "thin_border text_with_icon readonly",
+      id: link_editor.form_field_id,
+      "data-link-value": true,
+      readonly: true,
+      tabindex: -1
     %>
-    <%= f.hidden_field :value, "data-link-value": true %>
-    <%= f.hidden_field :link_title, "data-link-title": true %>
-    <%= f.hidden_field :link_class_name, "data-link-class": true %>
-    <%= f.hidden_field :link_target, "data-link-target": true %>
+    <%= f.hidden_field :link_title, "data-link-title": true, id: nil %>
+    <%= f.hidden_field :link_class_name, "data-link-class": true, id: nil %>
+    <%= f.hidden_field :link_target, "data-link-target": true, id: nil %>
   <% end %>
   <%= render "alchemy/ingredients/shared/link_tools", ingredient_editor: link_editor %>
 <% end %>

data/app/views/alchemy/ingredients/_node_editor.html.erb

@@ -5,6 +5,7 @@
     <%= ingredient_label(node_editor, :node_id) %>
     <%= f.text_field :node_id,
       value: node_editor.node&.id,
+      id: node_editor.form_field_id(:node_id),
       class: 'alchemy_selectbox full_width' %>
   <% end %>
 <% end %>

data/app/views/alchemy/ingredients/_page_editor.html.erb

@@ -5,6 +5,7 @@
     <%= ingredient_label(page_editor, :page_id) %>
     <%= f.text_field :page_id,
       value: page_editor.page&.id,
+      id: page_editor.form_field_id(:page_id),
       class: 'alchemy_selectbox full_width' %>
   <% end %>
 <% end %>

data/app/views/alchemy/ingredients/_picture_editor.html.erb

@@ -44,16 +44,17 @@
       </div>
     <% end %>
     <%= f.hidden_field :picture_id, value: picture_editor.picture&.id,
+      id: picture_editor.form_field_id(:picture_id),
       data: {
         picture_id: true,
         image_file_width: picture_editor.image_file_width,
         image_file_height: picture_editor.image_file_height
       } %>
-    <%= f.hidden_field :link, data: { link_value: true } %>
-    <%= f.hidden_field :link_title, data: { link_title: true } %>
-    <%= f.hidden_field :link_class_name, data: { link_class: true } %>
-    <%= f.hidden_field :link_target, data: { link_target: true } %>
-    <%= f.hidden_field :crop_from, data: { crop_from: true } %>
-    <%= f.hidden_field :crop_size, data: { crop_size: true } %>
+    <%= f.hidden_field :link, data: { link_value: true }, id: nil %>
+    <%= f.hidden_field :link_title, data: { link_title: true }, id: nil %>
+    <%= f.hidden_field :link_class_name, data: { link_class: true }, id: nil %>
+    <%= f.hidden_field :link_target, data: { link_target: true }, id: nil %>
+    <%= f.hidden_field :crop_from, data: { crop_from: true }, id: nil %>
+    <%= f.hidden_field :crop_size, data: { crop_size: true }, id: nil %>
   <% end %>
 <% end %>

data/app/views/alchemy/ingredients/_select_editor.html.erb

@@ -22,6 +22,7 @@
         options_tags = options_for_select(select_values, select_editor.value)
       end %>
       <%= f.select :value, options_tags, {}, {
+        id: nil,
         class: ["alchemy_selectbox", "ingredient-editor-select"]
       } %>
     <% end %>

data/app/views/alchemy/ingredients/_text_editor.html.erb

@@ -7,12 +7,13 @@
     <%= ingredient_label(text_editor) %>
     <%= f.text_field :value,
       class: text_editor.settings[:linkable] ? "text_with_icon" : "",
+      id: nil,
       type: text_editor.settings[:input_type] || "text" %>
     <% if text_editor.settings[:linkable] %>
-      <%= f.hidden_field :link, "data-link-value": true %>
-      <%= f.hidden_field :link_title, "data-link-title": true %>
-      <%= f.hidden_field :link_class_name, "data-link-class": true%>
-      <%= f.hidden_field :link_target, "data-link-target": true %>
+      <%= f.hidden_field :link, "data-link-value": true, id: nil %>
+      <%= f.hidden_field :link_title, "data-link-title": true, id: nil %>
+      <%= f.hidden_field :link_class_name, "data-link-class": true, id: nil %>
+      <%= f.hidden_field :link_target, "data-link-target": true, id: nil %>
       <%= render "alchemy/ingredients/shared/link_tools", ingredient_editor: text_editor %>
     <% end %>
   <% end %>

data/config/locales/alchemy.en.yml

@@ -57,6 +57,90 @@ en:
       main_menu: Main Menu
       footer_menu: Footer Menu
 
+    # == Mime Types translations
+    # These are human readable mime types used for the document-type row in archive files.
+    #
+    mime_types: &mime_types
+      application/msexcel: Excel Spreadsheet
+      application/mspowerpoint: PowerPoint Presentation
+      application/msword: Word Document
+      application/pdf: PDF Document
+      application/rtf: RTF Document
+      application/vcard: vCard
+      application/vnd:
+        ms-excel: Excel Spreadsheet
+        ms-powerpoint: PowerPoint Presentation
+        ms-word: Word Document
+        openxmlformats-officedocument:
+          presentationml:
+            presentation: PowerPoint 2007 Presentation
+          spreadsheetml:
+            sheet: Excel 2007 Spreadsheet
+          wordprocessingml:
+            document: Word 2007 Document
+      application/x-flash-video: Flash Video
+      application/x-rar: RAR Archive
+      application/x-shockwave-flash: Flash Movie
+      application/zip: ZIP Archive
+      audio/mp4: MPEG-4 Audio
+      audio/mpeg: MP3 Audio
+      audio/wav: WAV Audio
+      audio/x-wav: WAV Audio
+      image/gif: GIF Image
+      image/jpeg: JPG Image
+      image/png: PNG Image
+      image/tiff: TIFF Image
+      image/x-psd: Photoshop File
+      image/svg+xml: SVG Image
+      text/plain: Plain Text Document
+      text/x-vcard: vCard
+      video/mp4: MPEG-4 Video
+      video/mpeg: MPEG Video
+      video/quicktime: Quicktime Video
+      video/x-flv: Flash Video
+      video/x-ms-wmv: Windows Media Video
+      video/x-msvideo: AVI Video
+
+    # === Translations for filter names and values
+    # Used in the right filter column in case the model has `alchemy_resource_filters` defined.
+    #
+    filters:
+      page:
+        by_page_layout:
+          name: Page Type
+        status:
+          name: Status
+          values:
+            not_public: Unpublished
+            published: Published
+            restricted: Restricted
+      picture:
+        by_file_format:
+          name: File Type
+          values:
+            gif: GIF Image
+            jpeg: JPG Image
+            png: PNG Image
+            tiff: TIFF Image
+        misc:
+          name: Miscellaneous
+          values:
+            last_upload: Last upload only
+            recent: Recently uploaded only
+            without_tag: Without tag
+      attachment:
+        by_file_type:
+          name: File Type
+          values:
+            <<: *mime_types
+        misc:
+          name: Miscellaneous
+          values:
+            last_upload: Last upload only
+            recent: Recently uploaded only
+            without_tag: Without tag
+            deletable: Not linked by file content
+
     # === Translations for content validations
     # Used when a user did not enter (correct) values to the content field.
     #
@@ -132,49 +216,6 @@ en:
       editor: "Editor"
       admin: "Administrator"
 
-    # == Mime Types translations
-    # These are human readable mime types used for the document-type row in archive files.
-    mime_types:
-      application/msexcel: Excel Spreadsheet
-      application/mspowerpoint: PowerPoint Presentation
-      application/msword: Word Document
-      application/pdf: PDF Document
-      application/rtf: RTF Document
-      application/vcard: vCard
-      application/vnd:
-        ms-excel: Excel Spreadsheet
-        ms-powerpoint: PowerPoint Presentation
-        ms-word: Word Document
-        openxmlformats-officedocument:
-          presentationml:
-            presentation: PowerPoint 2007 Presentation
-          spreadsheetml:
-            sheet: Excel 2007 Spreadsheet
-          wordprocessingml:
-            document: Word 2007 Document
-      application/x-flash-video: Flash Video
-      application/x-rar: RAR Archive
-      application/x-shockwave-flash: Flash Movie
-      application/zip: ZIP Archive
-      audio/mp4: MPEG-4 Audio
-      audio/mpeg: MP3 Audio
-      audio/wav: WAV Audio
-      audio/x-wav: WAV Audio
-      image/gif: GIF Image
-      image/jpeg: JPG Image
-      image/png: PNG Image
-      image/tiff: TIFF Image
-      image/x-psd: Photoshop File
-      image/svg+xml: SVG Image
-      text/plain: Plain Text Document
-      text/x-vcard: vCard
-      video/mp4: MPEG-4 Video
-      video/mpeg: MPEG Video
-      video/quicktime: Quicktime Video
-      video/x-flv: Flash Video
-      video/x-ms-wmv: Windows Media Video
-      video/x-msvideo: AVI Video
-
     link_target_options:
       default: Same Window
       blank: New Window/Tab
@@ -403,6 +444,7 @@ en:
     female: "Female"
     file: "File"
     file_rename_error: "Error renaming file."
+    filtered_by: "Filtered by"
     from_at: "from %{by} at %{at}"
     height: "Height"
     help:
@@ -435,7 +477,6 @@ en:
     javascript_disabled_text: "Alchemy needs Javascript to run smoothly. Please enable it in your browser settings."
     language_code_placeholder: 'i.e. en'
     language_pages_copied: "Language tree successfully copied."
-    last_upload_only: "Last upload only"
     left: "left"
     legacy_url_info_text: "A link is a redirect from an old URL to the current URL of this page. This redirect happens with a <a href='https://support.google.com/webmasters/answer/93633' target='_blank'>301 status code</a>."
     link_image: "Link this image."
@@ -519,11 +560,6 @@ en:
         comma_seperated: "Separate by comma"
     password: "Password"
     paste: "paste"
-    picture_library:
-      filter:
-        last_upload: "from last upload"
-        recent: "that where recently uploaded"
-        without_tag: "without tag"
     pictures_in_page: "%{page} in %{pictures}"
     place_link: "Link text"
     player_version: "Flash Player version"

data/lib/alchemy/forms/builder.rb

@@ -18,11 +18,31 @@ module Alchemy
         super
       end
 
+      # Renders a simple_form input that displays a datepicker
+      #
+      def datepicker(attribute_name, options = {})
+        options[:wrapper] = :alchemy
+
+        type = options[:as] || :date
+        value = options.fetch(:input_html, {}).delete(:value)
+        date = value || object.send(attribute_name.to_sym).presence
+        date = Time.zone.parse(date) if date.is_a?(String)
+
+        input_options = {
+          type: :text,
+          class: type,
+          data: { datepicker_type: type },
+          value: date&.iso8601,
+        }.merge(options[:input_html] || {})
+
+        input attribute_name, as: :string, input_html: input_options
+      end
+
       # Renders a button tag wrapped in a div with 'submit' class.
       #
       def submit(label, options = {})
         options = {
-          wrapper_html: {class: "submit"},
+          wrapper_html: { class: "submit" },
         }.update(options)
         template.content_tag("div", options.delete(:wrapper_html)) do
           template.content_tag("button", label, options.delete(:input_html))

data/lib/alchemy/resource_filter.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class ResourceFilter
+    attr_reader :name
+
+    def initialize(filter, resource_name)
+      @filter = filter
+      @name = filter[:name]
+      @resource_name = resource_name
+      @values = filter[:values].presence || []
+    end
+
+    def options_for_select
+      translated_values.zip(values)
+    end
+
+    def values
+      if translated?
+        @values.map { |v| v[1] }
+      else
+        @values
+      end
+    end
+
+    private
+
+    def translated?
+      @values.first.is_a?(Array)
+    end
+
+    def translated_values
+      if translated?
+        @values.map { |a| a[0] }
+      else
+        @values.map { |v| Alchemy.t(v.to_sym, scope: ["filters", @resource_name, @name, "values"]) }
+      end
+    end
+  end
+end

data/lib/alchemy/resources_helper.rb

@@ -107,12 +107,10 @@ module Alchemy
       when "boolean"
         options
       when "date", "time", "datetime"
-        date = resource_instance_variable.send(attribute[:name]) || Time.current
         options.merge(
           as: "string",
           input_html: {
-            "data-datepicker-type" => input_type,
-            value: date ? date.iso8601 : nil,
+            data: { datepicker_type: input_type },
           },
         )
       when "text"
@@ -171,18 +169,5 @@ module Alchemy
     def resource_has_tags
       resource_model.respond_to?(:tag_counts) && resource_model.tag_counts.any?
     end
-
-    def resource_has_filters
-      resource_model.respond_to?(:alchemy_resource_filters)
-    end
-
-    def resource_filter_select
-      resource_model.alchemy_resource_filters.map do |filter_scope|
-        [
-          Alchemy.t(filter_scope.to_sym, scope: ["resources", resource_name, "filters"]),
-          filter_scope,
-        ]
-      end
-    end
   end
 end

data/lib/alchemy/test_support/shared_ingredient_examples.rb

@@ -16,7 +16,6 @@ RSpec.shared_examples_for "an alchemy ingredient" do
   it { is_expected.to belong_to(:related_object).optional }
   it { is_expected.to validate_presence_of(:role) }
   it { is_expected.to validate_presence_of(:type) }
-  it { expect(subject.data).to eq({}) }
 
   describe "#settings" do
     subject { ingredient.settings }
@@ -28,6 +27,16 @@ RSpec.shared_examples_for "an alchemy ingredient" do
     end
 
     context "with element" do
+      before do
+        expect(element).to receive(:ingredient_definition_for) do
+          {
+            settings: {
+              linkable: true,
+            },
+          }.with_indifferent_access
+        end
+      end
+
       it { is_expected.to eq({ linkable: true }.with_indifferent_access) }
     end
   end
@@ -42,15 +51,23 @@ RSpec.shared_examples_for "an alchemy ingredient" do
     end
 
     context "with element" do
-      it do
-        is_expected.to eq({
+      let(:definition) do
+        {
           role: "headline",
           type: "Text",
           default: "Hello World",
           settings: {
             linkable: true,
           },
-        }.with_indifferent_access)
+        }.with_indifferent_access
+      end
+
+      before do
+        expect(element).to receive(:ingredient_definition_for) { definition }
+      end
+
+      it "returns ingredient definition" do
+        is_expected.to eq(definition)
       end
     end
   end