avo 1.0.4 → 1.3.0.pre.1

data/lib/avo/base_resource.rb

@@ -21,6 +21,7 @@ module Avo
     class_attribute :filters_loader
     class_attribute :fields
     class_attribute :grid_loader
+    class_attribute :visible_on_sidebar, default: true
 
     class << self
       def grid(&block)
@@ -260,28 +261,27 @@ module Avo
       end
     end
 
-    # For :new views we're hydrating the model with the values from the resource's default attribute.
     # We will not overwrite any attributes that come pre-filled in the model.
     def hydrate_model_with_default_values
       default_values = get_fields.select do |field|
         !field.computed
       end
         .map do |field|
-                         id = field.id
-                         value = field.value
+          id = field.id
+          value = field.value
 
-                         if field.respond_to? :foreign_key
-                           id = field.foreign_key.to_sym
+          if field.respond_to? :foreign_key
+            id = field.foreign_key.to_sym
 
-                           reflection = @model._reflections[@params[:via_relation]]
+            reflection = @model._reflections[@params[:via_relation]]
 
-                           if reflection.present? && reflection.foreign_key.present?
-                             value = @params[:via_resource_id]
-                           end
-                         end
+            if reflection.present? && reflection.foreign_key.present? && field.id.to_s == @params[:via_relation].to_s
+              value = @params[:via_resource_id]
+            end
+          end
 
-                         [id, value]
-                       end
+          [id, value]
+        end
         .to_h
         .select do |id, value|
         value.present?

data/lib/avo/configuration.rb

@@ -19,10 +19,12 @@ module Avo
     attr_accessor :full_width_index_view
     attr_accessor :cache_resources_on_index_view
     attr_accessor :context
+    attr_accessor :display_breadcrumbs
+    attr_accessor :initial_breadcrumbs
 
     def initialize
       @root_path = "/avo"
-      @app_name = Rails.application.class.to_s.split("::").first.underscore.humanize(keep_id_suffix: true)
+      @app_name = ::Rails.application.class.to_s.split("::").first.underscore.humanize(keep_id_suffix: true)
       @timezone = "UTC"
       @per_page = 24
       @per_page_steps = [12, 24, 48, 72]
@@ -48,6 +50,10 @@ module Avo
       @full_width_index_view = false
       @cache_resources_on_index_view = Avo::PACKED
       @context = proc {}
+      @initial_breadcrumbs = proc {
+        add_breadcrumb I18n.t("avo.home").humanize, avo.root_path
+      }
+      @display_breadcrumbs = true
     end
 
     def locale_tag
@@ -71,6 +77,10 @@ module Avo
     def set_context(&block)
       @context = block if block.present?
     end
+
+    def set_initial_breadcrumbs(&block)
+      @initial_breadcrumbs = block if block.present?
+    end
   end
 
   def self.configuration

data/lib/avo/fields/belongs_to_field.rb

@@ -50,8 +50,6 @@ module Avo
         foreign_key.to_sym
       end
 
-      private
-
       def target_resource
         if @model._reflections[id.to_s].klass.present?
           App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s

data/lib/avo/fields/key_value_field.rb

@@ -3,6 +3,11 @@ require "json"
 module Avo
   module Fields
     class KeyValueField < BaseField
+      attr_reader :key_label
+      attr_reader :value_label
+      attr_reader :action_text
+      attr_reader :disable_adding_rows
+
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: "key-value-field"
@@ -33,7 +38,13 @@ module Avo
         [:"#{id}", "#{id}": {}]
       end
 
-      def hydrate_field(fields, model, resource, view)
+      def parsed_value
+        value.to_json
+      rescue
+        {}
+      end
+
+      def options
         {
           key_label: @key_label,
           value_label: @value_label,
@@ -44,6 +55,18 @@ module Avo
           disable_deleting_rows: @disable_deleting_rows
         }
       end
+
+      def fill_field(model, key, value)
+        begin
+          new_value = JSON.parse(value)
+        rescue
+          new_value = {}
+        end
+
+        model[key] = new_value
+
+        model
+      end
     end
   end
 end

data/lib/avo/grid_collector.rb

@@ -27,7 +27,7 @@ module Avo
     def hydrate(model:, view:, resource:)
       cover_field.hydrate(model: model, view: view, resource: resource) if cover_field.present?
       title_field.hydrate(model: model, view: view, resource: resource) if title_field.present?
-      body_field.hydrate(model: model, view: view, resource: resource) if title_field.present?
+      body_field.hydrate(model: model, view: view, resource: resource) if body_field.present?
 
       self
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.0.4"
+  VERSION = "1.3.0.pre.1"
 end

data/lib/generators/avo/eject_generator.rb

@@ -0,0 +1,55 @@
+require "rails/generators"
+require "fileutils"
+
+module Generators
+  module Avo
+    class EjectGenerator < ::Rails::Generators::Base
+      argument :filename, type: :string, required: true
+
+      source_root ::Avo::Engine.root
+
+      namespace "avo:eject"
+
+      TEMPLATES = {
+        sidebar: "app/views/avo/sidebar/_sidebar.html.erb",
+        logo: "app/views/avo/partials/logo.html.erb",
+        header: "app/views/avo/partials/header.html.erb",
+        footer: "app/views/avo/partials/footer.html.erb",
+        scripts: "app/views/avo/partials/scripts.html.erb"
+      }
+
+      def handle
+        if @filename.starts_with?(":")
+          template_id = path_to_sym @filename
+          template_path = TEMPLATES[template_id]
+
+          if path_exists? template_path
+            eject template_path
+          else
+            say("Failed to find the `#{template_id.to_sym}` template.", :yellow)
+          end
+        elsif path_exists? @filename
+          eject @filename
+        else
+          say("Failed to find the `#{@filename}` template.", :yellow)
+        end
+      end
+
+      no_tasks do
+        def path_to_sym(filename)
+          template_id = filename.dup
+          template_id[0] = ""
+          template_id.to_sym
+        end
+
+        def path_exists?(path)
+          path.present? && File.file?(::Avo::Engine.root.join(path))
+        end
+
+        def eject(path)
+          copy_file ::Avo::Engine.root.join(path), ::Rails.root.join(path)
+        end
+      end
+    end
+  end
+end

data/lib/generators/avo/templates/tool/controller.tt

@@ -0,0 +1,2 @@
+class Avo::ToolsController < Avo::ApplicationController
+end

data/lib/generators/avo/templates/tool/sidebar_item.tt

@@ -0,0 +1 @@
+<%%= render Avo::NavigationLinkComponent.new label: '<%= human_name %>', path: '/avo/<%= file_name %>' %>

data/lib/generators/avo/templates/tool/view.tt

@@ -0,0 +1,27 @@
+<div class="flex flex-col">
+  <%%= render Avo::PanelComponent.new title: '<%= human_name %>' do |c| %>
+    <%% c.tools do %>
+      <div class="text-sm italic">This is the panels tools section.</div>
+    <%% end %>
+
+    <%% c.body do %>
+      <div class="flex flex-col justify-between py-6 min-h-24">
+        <div class="px-6 space-y-4">
+          <h3>What a nice new tool 👋</h3>
+
+          <p>
+            You can edit this file here <%= in_code "app/views/avo/tools/#{file_name}.html.erb" %>.
+          </p>
+
+          <p>
+            For this tool we created the <%= in_code file_name %> method in the <%= in_code "Avo::ToolsController" %>. You may delete it or move it to your own controller.
+          </p>
+
+          <p>
+            A new <%= in_code human_name %> item should have been added to the sidebar. Edit it in <%= in_code "app/views/avo/sidebar/items/_#{file_name}.html.erb" %>
+          </p>
+        </div>
+      </div>
+    <%% end %>
+  <%% end %>
+</div>

data/lib/generators/avo/tool_generator.rb

@@ -0,0 +1,62 @@
+require "rails/generators"
+require "fileutils"
+
+module Generators
+  module Avo
+    class ToolGenerator < ::Rails::Generators::Base
+      argument :name, type: :string, required: true
+
+      source_root File.expand_path("templates", __dir__)
+
+      namespace "avo:tool"
+
+      def handle
+        # Sidebar items
+        template "tool/sidebar_item.tt", "app/views/avo/sidebar/items/_#{file_name}.html.erb"
+
+        # Add controller if it doesn't exist
+        controller_path = "app/controllers/avo/tools_controller.rb"
+        unless File.file?(Rails.root.join(controller_path))
+          template "tool/controller.tt", controller_path
+        end
+
+        # Add controller method
+        inject_into_class controller_path, "Avo::ToolsController" do
+          <<-METHOD
+  def #{file_name}
+    @page_title = "#{human_name}"
+    add_breadcrumb "#{human_name}"
+  end
+          METHOD
+        end
+
+        # Add view file
+        template "tool/view.tt", "app/views/avo/tools/#{file_name}.html.erb"
+
+        route <<-ROUTE
+namespace :#{::Avo.configuration.root_path.gsub('/', '')} do
+  get "#{file_name}", to: "tools##{file_name}"
+end
+        ROUTE
+      end
+
+      no_tasks do
+        def file_name
+          name.to_s.underscore
+        end
+
+        def controller_name
+          file_name.to_s
+        end
+
+        def human_name
+          file_name.humanize
+        end
+
+        def in_code(text)
+          "<code class='p-1 rounded bg-gray-500 text-white text-sm'>#{text}</code>"
+        end
+      end
+    end
+  end
+end

data/public/avo-packs/css/{application-9d115b7e.css → application-5af67922.css}

@@ -1388,7 +1388,7 @@ span.flatpickr-weekday {
   }
 }
 
-/*! tailwindcss v2.0.4 | MIT License | https://tailwindcss.com *//*! modern-normalize v1.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */
+/*! tailwindcss v2.1.1 | MIT License | https://tailwindcss.com *//*! modern-normalize v1.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */
 
 /*
 Document
@@ -1915,7 +1915,7 @@ object {
 
 /**
  * Constrain images and videos to the parent width and preserve
- * their instrinsic aspect ratio.
+ * their intrinsic aspect ratio.
  *
  * https://github.com/mozdevs/cssremedy/issues/14
  */
@@ -2329,6 +2329,10 @@ select {
 	z-index: 10;
 }
 
+.focus\:border-none:focus {
+	border-style: none;
+}
+
 .focus\:border-blue-300:focus {
 	--tw-border-opacity: 1;
 	border-color: rgba(147, 197, 253, var(--tw-border-opacity));
@@ -2339,6 +2343,11 @@ select {
 	border-color: rgba(148, 163, 184, var(--tw-border-opacity));
 }
 
+.focus\:border-gray-700:focus {
+	--tw-border-opacity: 1;
+	border-color: rgba(55, 65, 81, var(--tw-border-opacity));
+}
+
 .focus\:bg-white:focus {
 	--tw-bg-opacity: 1;
 	background-color: rgba(255, 255, 255, var(--tw-bg-opacity));
@@ -3051,6 +3060,40 @@ svg.tea #steamR {
   color: rgba(255, 255, 255, var(--tw-text-opacity))
 }
 
+.breadcrumbs {
+
+  position: relative;
+
+  font-size: 0.875rem;
+
+  line-height: 1.25rem;
+
+  font-weight: 700;
+
+  --tw-text-opacity: 1;
+
+  color: rgba(156, 163, 175, var(--tw-text-opacity));
+}
+
+  .breadcrumbs a, .breadcrumbs span {
+
+  display: inline-block
+}
+
+  .breadcrumbs a, .breadcrumbs span {
+
+  --tw-text-opacity: 1;
+
+  color: rgba(156, 163, 175, var(--tw-text-opacity))
+}
+
+  .breadcrumbs a:hover {
+
+  --tw-text-opacity: 1;
+
+  color: rgba(107, 114, 128, var(--tw-text-opacity))
+}
+
 .spinner {
   position: relative;
   display: inline-block;
@@ -4273,6 +4316,9 @@ span.CodeMirror-selectedtext { background: none; }
 .focus\:z-10:focus {
     z-index: 10;
 }
+.focus\:border-none:focus {
+    border-style: none;
+}
 .focus\:border-blue-300:focus {
     --tw-border-opacity: 1;
     border-color: rgba(147, 197, 253, var(--tw-border-opacity));
@@ -4281,6 +4327,10 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-border-opacity: 1;
     border-color: rgba(148, 163, 184, var(--tw-border-opacity));
 }
+.focus\:border-gray-700:focus {
+    --tw-border-opacity: 1;
+    border-color: rgba(55, 65, 81, var(--tw-border-opacity));
+}
 .focus\:bg-white:focus {
     --tw-bg-opacity: 1;
     background-color: rgba(255, 255, 255, var(--tw-bg-opacity));
@@ -4488,6 +4538,9 @@ span.CodeMirror-selectedtext { background: none; }
     }
 }
 
+.pointer-events-none {
+    pointer-events: none
+}
 .visible {
     visibility: visible
 }
@@ -4533,6 +4586,9 @@ span.CodeMirror-selectedtext { background: none; }
 .bottom-0 {
     bottom: 0px
 }
+.top-\[-1px\] {
+    top: -1px
+}
 .z-10 {
     z-index: 10
 }
@@ -4637,9 +4693,6 @@ span.CodeMirror-selectedtext { background: none; }
 .mb-6 {
     margin-bottom: 1.5rem
 }
-.mb-3 {
-    margin-bottom: 0.75rem
-}
 .mb-8 {
     margin-bottom: 2rem
 }
@@ -4655,24 +4708,24 @@ span.CodeMirror-selectedtext { background: none; }
 .block {
     display: block
 }
-.inline-flex {
-    display: inline-flex
-}
-.flex {
-    display: flex
+.inline-block {
+    display: inline-block
 }
 .inline {
     display: inline
 }
-.grid {
-    display: grid
+.flex {
+    display: flex
 }
-.inline-block {
-    display: inline-block
+.inline-flex {
+    display: inline-flex
 }
 .table {
     display: table
 }
+.grid {
+    display: grid
+}
 .hidden {
     display: none
 }
@@ -4700,15 +4753,15 @@ span.CodeMirror-selectedtext { background: none; }
 .h-16 {
     height: 4rem
 }
+.h-3 {
+    height: 0.75rem
+}
 .h-10 {
     height: 2.5rem
 }
 .h-12 {
     height: 3rem
 }
-.h-3 {
-    height: 0.75rem
-}
 .max-h-168 {
     max-height: 42rem
 }
@@ -4760,6 +4813,9 @@ span.CodeMirror-selectedtext { background: none; }
 .w-64 {
     width: 16rem
 }
+.w-1\/2 {
+    width: 50%
+}
 .w-11\/12 {
     width: 91.666667%
 }
@@ -4824,6 +4880,9 @@ span.CodeMirror-selectedtext { background: none; }
 .cursor-wait {
     cursor: wait
 }
+.cursor-not-allowed {
+    cursor: not-allowed
+}
 .appearance-none {
     -webkit-appearance: none;
             appearance: none
@@ -4953,6 +5012,9 @@ span.CodeMirror-selectedtext { background: none; }
 .rounded {
     border-radius: 0.25rem
 }
+.rounded-none {
+    border-radius: 0px
+}
 .rounded-full {
     border-radius: 9999px
 }
@@ -4980,6 +5042,18 @@ span.CodeMirror-selectedtext { background: none; }
 .border-r {
     border-right-width: 1px
 }
+.border-l-0 {
+    border-left-width: 0px
+}
+.border-b-0 {
+    border-bottom-width: 0px
+}
+.border-t-0 {
+    border-top-width: 0px
+}
+.border-l {
+    border-left-width: 1px
+}
 .border-pink-600 {
     --tw-border-opacity: 1;
     border-color: rgba(219, 39, 119, var(--tw-border-opacity))
@@ -5187,14 +5261,14 @@ span.CodeMirror-selectedtext { background: none; }
     padding-top: 1px;
     padding-bottom: 1px
 }
-.py-0 {
-    padding-top: 0px;
-    padding-bottom: 0px
-}
 .py-3 {
     padding-top: 0.75rem;
     padding-bottom: 0.75rem
 }
+.py-0 {
+    padding-top: 0px;
+    padding-bottom: 0px
+}
 .py-8 {
     padding-top: 2rem;
     padding-bottom: 2rem
@@ -5378,12 +5452,37 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
     box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
 }
+.shadow-lg {
+    --tw-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
+    box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
+}
+.shadow {
+    --tw-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
+    box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
+}
 .outline-none {
     outline: 2px solid transparent;
     outline-offset: 2px
 }
+.filter {
+    --tw-blur: var(--tw-empty,/*!*/ /*!*/);
+    --tw-brightness: var(--tw-empty,/*!*/ /*!*/);
+    --tw-contrast: var(--tw-empty,/*!*/ /*!*/);
+    --tw-grayscale: var(--tw-empty,/*!*/ /*!*/);
+    --tw-hue-rotate: var(--tw-empty,/*!*/ /*!*/);
+    --tw-invert: var(--tw-empty,/*!*/ /*!*/);
+    --tw-saturate: var(--tw-empty,/*!*/ /*!*/);
+    --tw-sepia: var(--tw-empty,/*!*/ /*!*/);
+    --tw-drop-shadow: var(--tw-empty,/*!*/ /*!*/);
+    filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)
+}
+.invert {
+    --tw-invert: invert(100%)
+}
 .transition {
-    transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform;
+    transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
+    transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+    transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
     transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
     transition-duration: 150ms
 }
@@ -5578,6 +5677,9 @@ span.CodeMirror-selectedtext { background: none; }
 .focus\:z-10:focus {
     z-index: 10
 }
+.focus\:border-none:focus {
+    border-style: none
+}
 .focus\:border-blue-300:focus {
     --tw-border-opacity: 1;
     border-color: rgba(147, 197, 253, var(--tw-border-opacity))
@@ -5586,6 +5688,10 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-border-opacity: 1;
     border-color: rgba(148, 163, 184, var(--tw-border-opacity))
 }
+.focus\:border-gray-700:focus {
+    --tw-border-opacity: 1;
+    border-color: rgba(55, 65, 81, var(--tw-border-opacity))
+}
 .focus\:bg-white:focus {
     --tw-bg-opacity: 1;
     background-color: rgba(255, 255, 255, var(--tw-bg-opacity))
@@ -5819,7 +5925,9 @@ html, body{
   --tw-scale-x: 1;
   --tw-scale-y: 1;
   transform: translateX(var(--tw-translate-x)) translateY(var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-  transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform;
+  transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
+  transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
+  transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
   transition-duration: 150ms;
   transition-duration: 150ms;
@@ -5869,4 +5977,4 @@ html, body{
 }
 
 
-/*# sourceMappingURL=application-9d115b7e.css.map*/
+/*# sourceMappingURL=application-5af67922.css.map*/