avo 2.5.2.pre.2 → 2.5.2.pre.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.5.2.pre.2
+  version: 2.5.2.pre.3
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -254,7 +254,6 @@ files:
 - app/assets/config/avo_manifest.js
 - app/assets/stylesheets/avo.css
 - app/assets/stylesheets/css/active-storage.css
-- app/assets/stylesheets/css/alerts.css
 - app/assets/stylesheets/css/breadcrumbs.css
 - app/assets/stylesheets/css/buttons.css
 - app/assets/stylesheets/css/components/code.css
@@ -265,7 +264,6 @@ files:
 - app/assets/stylesheets/css/pagination.css
 - app/assets/stylesheets/css/search.css
 - app/assets/stylesheets/css/spinner.css
-- app/assets/stylesheets/css/tags.css
 - app/assets/stylesheets/css/tailwindcss/base.css
 - app/assets/stylesheets/css/tailwindcss/components.css
 - app/assets/stylesheets/css/tailwindcss/utilities.css
@@ -954,14 +952,6 @@ files:
 - app/components/avo/fields/status_field/index_component.rb
 - app/components/avo/fields/status_field/show_component.html.erb
 - app/components/avo/fields/status_field/show_component.rb
-- app/components/avo/fields/tags_field/edit_component.html.erb
-- app/components/avo/fields/tags_field/edit_component.rb
-- app/components/avo/fields/tags_field/index_component.html.erb
-- app/components/avo/fields/tags_field/index_component.rb
-- app/components/avo/fields/tags_field/show_component.html.erb
-- app/components/avo/fields/tags_field/show_component.rb
-- app/components/avo/fields/tags_field/tag_component.html.erb
-- app/components/avo/fields/tags_field/tag_component.rb
 - app/components/avo/fields/text_field/edit_component.html.erb
 - app/components/avo/fields/text_field/edit_component.rb
 - app/components/avo/fields/text_field/index_component.html.erb
@@ -1061,9 +1051,7 @@ files:
 - app/javascript/js/controllers.js
 - app/javascript/js/controllers/action_controller.js
 - app/javascript/js/controllers/actions_picker_controller.js
-- app/javascript/js/controllers/alerts_controller.js
 - app/javascript/js/controllers/attachments_controller.js
-- app/javascript/js/controllers/base_controller.js
 - app/javascript/js/controllers/boolean_filter_controller.js
 - app/javascript/js/controllers/copy_to_clipboard_controller.js
 - app/javascript/js/controllers/dashboard_card_controller.js
@@ -1072,8 +1060,6 @@ files:
 - app/javascript/js/controllers/fields/date_field_controller.js
 - app/javascript/js/controllers/fields/key_value_controller.js
 - app/javascript/js/controllers/fields/simple_mde_controller.js
-- app/javascript/js/controllers/fields/tags_field_controller.js
-- app/javascript/js/controllers/fields/tags_field_helpers.js
 - app/javascript/js/controllers/fields/trix_field_controller.js
 - app/javascript/js/controllers/filter_controller.js
 - app/javascript/js/controllers/hidden_input_controller.js
@@ -1164,7 +1150,6 @@ files:
 - lib/avo/base_card.rb
 - lib/avo/base_resource.rb
 - lib/avo/concerns/fetches_things.rb
-- lib/avo/concerns/handles_field_args.rb
 - lib/avo/configuration.rb
 - lib/avo/dashboards/base_dashboard.rb
 - lib/avo/dashboards/base_divider.rb
@@ -1204,7 +1189,6 @@ files:
 - lib/avo/fields/progress_bar_field.rb
 - lib/avo/fields/select_field.rb
 - lib/avo/fields/status_field.rb
-- lib/avo/fields/tags_field.rb
 - lib/avo/fields/text_field.rb
 - lib/avo/fields/textarea_field.rb
 - lib/avo/fields/trix_field.rb
@@ -1225,7 +1209,6 @@ files:
 - lib/avo/hosts/dashboard_card.rb
 - lib/avo/hosts/dashboard_visibility.rb
 - lib/avo/hosts/ordering.rb
-- lib/avo/hosts/record_host.rb
 - lib/avo/licensing/community_license.rb
 - lib/avo/licensing/h_q.rb
 - lib/avo/licensing/license.rb

data/app/assets/stylesheets/css/alerts.css

@@ -1,35 +0,0 @@
-#toast-container > div {
-  box-shadow: none;
-  background-size: 1.5rem;
-  background-position: 0.8rem 0.8rem;
-  width: 500px;
-
-  @apply shadow-md opacity-100 border border-gray-200 rounded-md pt-3 pr-3 pb-3 bg-white;
-
-  &:hover {
-    @apply shadow-xl;
-  }
-
-  .toast-title {
-    @apply text-gray-800;
-  }
-  .toast-message {
-    @apply text-gray-800;
-  }
-
-  &.toast-success {
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0iIzM4YTE2OSI+CiAgPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNNi4yNjcgMy40NTVhMy4wNjYgMy4wNjYgMCAwMDEuNzQ1LS43MjMgMy4wNjYgMy4wNjYgMCAwMTMuOTc2IDAgMy4wNjYgMy4wNjYgMCAwMDEuNzQ1LjcyMyAzLjA2NiAzLjA2NiAwIDAxMi44MTIgMi44MTJjLjA1MS42NDMuMzA0IDEuMjU0LjcyMyAxLjc0NWEzLjA2NiAzLjA2NiAwIDAxMCAzLjk3NiAzLjA2NiAzLjA2NiAwIDAwLS43MjMgMS43NDUgMy4wNjYgMy4wNjYgMCAwMS0yLjgxMiAyLjgxMiAzLjA2NiAzLjA2NiAwIDAwLTEuNzQ1LjcyMyAzLjA2NiAzLjA2NiAwIDAxLTMuOTc2IDAgMy4wNjYgMy4wNjYgMCAwMC0xLjc0NS0uNzIzIDMuMDY2IDMuMDY2IDAgMDEtMi44MTItMi44MTIgMy4wNjYgMy4wNjYgMCAwMC0uNzIzLTEuNzQ1IDMuMDY2IDMuMDY2IDAgMDEwLTMuOTc2IDMuMDY2IDMuMDY2IDAgMDAuNzIzLTEuNzQ1IDMuMDY2IDMuMDY2IDAgMDEyLjgxMi0yLjgxMnptNy40NCA1LjI1MmExIDEgMCAwMC0xLjQxNC0xLjQxNEw5IDEwLjU4NiA3LjcwNyA5LjI5M2ExIDEgMCAwMC0xLjQxNCAxLjQxNGwyIDJhMSAxIDAgMDAxLjQxNCAwbDQtNHoiIGNsaXAtcnVsZT0iZXZlbm9kZCIgLz4KPC9zdmc+Cg==) !important;
-  }
-
-  &.toast-warning {
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0icmdiYSgyMTcsIDExOSwgNiwgMSkiPgogIDxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTguMjU3IDMuMDk5Yy43NjUtMS4zNiAyLjcyMi0xLjM2IDMuNDg2IDBsNS41OCA5LjkyYy43NSAxLjMzNC0uMjEzIDIuOTgtMS43NDIgMi45OEg0LjQyYy0xLjUzIDAtMi40OTMtMS42NDYtMS43NDMtMi45OGw1LjU4LTkuOTJ6TTExIDEzYTEgMSAwIDExLTIgMCAxIDEgMCAwMTIgMHptLTEtOGExIDEgMCAwMC0xIDF2M2ExIDEgMCAwMDIgMFY2YTEgMSAwIDAwLTEtMXoiIGNsaXAtcnVsZT0iZXZlbm9kZCIgLz4KPC9zdmc+Cg==) !important;
-  }
-
-  &.toast-info {
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0icmdiYSgzNywgOTksIDIzNSwgMSkiPgogIDxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTE4IDEwYTggOCAwIDExLTE2IDAgOCA4IDAgMDExNiAwem0tNy00YTEgMSAwIDExLTIgMCAxIDEgMCAwMTIgMHpNOSA5YTEgMSAwIDAwMCAydjNhMSAxIDAgMDAxIDFoMWExIDEgMCAxMDAtMnYtM2ExIDEgMCAwMC0xLTFIOXoiIGNsaXAtcnVsZT0iZXZlbm9kZCIgLz4KPC9zdmc+Cg==) !important;
-  }
-
-  &.toast-error {
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0icmdiYSgyMjAsIDM4LCAzOCwgMSkiPgogIDxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTE4IDEwYTggOCAwIDExLTE2IDAgOCA4IDAgMDExNiAwem0tNyA0YTEgMSAwIDExLTIgMCAxIDEgMCAwMTIgMHptLTEtOWExIDEgMCAwMC0xIDF2NGExIDEgMCAxMDIgMFY2YTEgMSAwIDAwLTEtMXoiIGNsaXAtcnVsZT0iZXZlbm9kZCIgLz4KPC9zdmc+Cg==) !important;
-  }
-}

data/app/assets/stylesheets/css/tags.css

@@ -1,16 +0,0 @@
-tags.tagify {
-  --tag-inset-shadow-size: 3em;
-}
-
-tags.tagify {
-  @apply !p-0;
-
-  span.tagify__input {
-    @apply my-1;
-  }
-}
-
-tag.tagify__tag {
-  @apply text-sm my-1 mb-0;
-}
-

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

@@ -1,27 +0,0 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <div data-controller="tags-field">
-    <%# dummy field %>
-    <%= text_field_tag "#{@field.id}-dummy", '',
-      class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
-      placeholder: @field.placeholder,
-      disabled: @field.readonly,
-      value: '',
-      data: {
-        'tags-field-target': 'fakeInput',
-      } %>
-    <%# real field %>
-    <%= @form.text_field @field.id,
-      class: helpers.input_classes('hidden w-full', has_error: @field.model_errors.include?(@field.id)),
-      placeholder: @field.placeholder,
-      disabled: @field.readonly,
-      value: @field.field_value.to_json,
-      data: {
-        'tags-field-target': 'input',
-        'whitelist-items': @field.suggestions.to_json,
-        'blacklist-items': @field.blacklist.to_json,
-        'enforce-suggestions': @field.enforce_suggestions ? 1 : 0,
-        'delimiters': @field.delimiters,
-        'close-on-select': @field.close_on_select ? 1 : 0,
-      } %>
-  </div>
-<% end %>

data/app/components/avo/fields/tags_field/edit_component.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class Avo::Fields::TagsField::EditComponent < Avo::Fields::EditComponent
-end

data/app/components/avo/fields/tags_field/index_component.html.erb

@@ -1,14 +0,0 @@
-<%= index_field_wrapper field: @field do %>
-  <div class="flex gap-1 items-center flex-nowrap">
-    <% value.take(3).each do |item| %>
-      <% if @field.acts_as_taggable_on.present? %>
-        <%= render Avo::Fields::TagsField::TagComponent.new(label: item['value']) %>
-      <% else %>
-        <%= render Avo::Fields::TagsField::TagComponent.new(label: item) %>
-      <% end %>
-    <% end %>
-    <% if value.count > 3 %>
-      <%= render Avo::Fields::TagsField::TagComponent.new(label: '...', title: I18n.t('avo.x_items_more', count: value.count - 3)) %>
-    <% end %>
-  </div>
-<% end %>

data/app/components/avo/fields/tags_field/index_component.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class Avo::Fields::TagsField::IndexComponent < Avo::Fields::IndexComponent
-  def value
-    @field.field_value
-  end
-end

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

@@ -1,7 +0,0 @@
-<%= show_field_wrapper field: @field, index: @index do %>
-  <div class="flex gap-1 items-center flex-wrap">
-    <% @field.field_value.each do |item| %>
-      <%= render Avo::Fields::TagsField::TagComponent.new(label: label_from_item(item)) %>
-    <% end %>
-  </div>
-<% end %>

data/app/components/avo/fields/tags_field/show_component.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class Avo::Fields::TagsField::ShowComponent < Avo::Fields::ShowComponent
-  def label_from_item(item)
-    if @field.acts_as_taggable_on.present?
-      item['value']
-    else
-      item
-    end
-  end
-end

data/app/components/avo/fields/tags_field/tag_component.html.erb

@@ -1,9 +0,0 @@
-<div class="flex px-2 py-1 rounded bg-gray-200 text-sm text-gray-800 font-normal flex-shrink-0"
-  <% if title.present? %>
-    data-tippy="tooltip"
-    title="<%= title %>"
-  <% end %>
-  data-target="tag-component"
->
-  <%= label %>
-</div>

data/app/components/avo/fields/tags_field/tag_component.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class Avo::Fields::TagsField::TagComponent < ViewComponent::Base
-  attr_reader :label
-  attr_reader :title
-
-  def initialize(label: nil, title: nil)
-    @label = label
-    @title = title
-  end
-end

data/app/javascript/js/controllers/alerts_controller.js

@@ -1,26 +0,0 @@
-import { Controller } from '@hotwired/stimulus'
-
-export default class extends Controller {
-  static targets = ['container']
-
-  connect() {
-    window.toastr[this.type](this.message)
-  }
-
-  get type() {
-    const typeMap = {
-      info: 'info',
-      warning: 'warning',
-      success: 'success',
-      error: 'error',
-      notice: 'info',
-      alert: 'error',
-    }
-
-    return typeMap[this.containerTarget.dataset.alertType]
-  }
-
-  get message() {
-    return this.containerTarget.innerHTML
-  }
-}

data/app/javascript/js/controllers/base_controller.js

@@ -1,22 +0,0 @@
-import { Controller } from '@hotwired/stimulus'
-
-export default class extends Controller {
-  /**
-  * Helper that parses the data attribute value to JSON
-  */
-  getJsonAttribute(target, attribute, defaultValue = []) {
-    let result = defaultValue
-    try {
-      result = JSON.parse(target.getAttribute(attribute))
-    } catch (error) {}
-
-    return result
-  }
-
-  /**
-  * Parses the attribute to boolean
-  */
-  getBooleanAttribute(target, attribute) {
-    return target.getAttribute(attribute) === '1'
-  }
-}

data/app/javascript/js/controllers/fields/tags_field_controller.js

@@ -1,86 +0,0 @@
-import { first, isObject, merge } from 'lodash'
-import Tagify from '@yaireo/tagify'
-
-import BaseController from '../base_controller'
-
-import { suggestionItemTemplate, tagTemplate } from './tags_field_helpers'
-
-export default class extends BaseController {
-  static targets = ['input', 'fakeInput'];
-
-  tagify = null;
-
-  get whitelistItems() {
-    return this.getJsonAttribute(this.inputTarget, 'data-whitelist-items', [])
-  }
-
-  get blacklistItems() {
-    return this.getJsonAttribute(this.inputTarget, 'data-blacklist-items', [])
-  }
-
-  get enforceSuggestions() {
-    return this.getBooleanAttribute(this.inputTarget, 'data-enforce-suggestions')
-  }
-
-  get closeOnSelect() {
-    return this.getBooleanAttribute(this.inputTarget, 'data-close-on-select')
-  }
-
-  get delimiters() {
-    return this.getJsonAttribute(this.inputTarget, 'data-delimiters', [])
-  }
-
-  get suggestionsAreObjects() {
-    return isObject(first(this.whitelistItems))
-  }
-
-  get tagifyOptions() {
-    let options = {
-      whitelist: this.whitelistItems,
-      blacklist: this.blacklistItems,
-      enforceWhitelist: this.enforceSuggestions,
-      delimiters: this.delimiters.join('|'),
-      maxTags: 10,
-      dropdown: {
-        maxItems: 20,
-        enabled: 0,
-        closeOnSelect: this.closeOnSelect,
-      },
-    }
-
-    if (this.suggestionsAreObjects) {
-      options = merge(options, {
-        tagTextProp: 'label',
-        dropdown: {
-          searchKeys: ['label'],
-        },
-        templates: {
-          tag: tagTemplate,
-          dropdownItem: suggestionItemTemplate,
-        },
-      })
-    }
-
-    return options
-  }
-
-  connect() {
-    if (this.hasInputTarget) {
-      this.hideFakeInput()
-      this.showRealInput()
-      this.initTagify()
-    }
-  }
-
-  initTagify() {
-    this.tagify = new Tagify(this.inputTarget, this.tagifyOptions)
-  }
-
-  hideFakeInput() {
-    this.fakeInputTarget.classList.add('hidden')
-  }
-
-  showRealInput() {
-    this.inputTarget.classList.remove('hidden')
-  }
-}

data/app/javascript/js/controllers/fields/tags_field_helpers.js

@@ -1,47 +0,0 @@
-export function tagTemplate(tagData) {
-  const suggestions = this.settings.whitelist || []
-
-  const possibleSuggestion = suggestions.find(
-    // eslint-disable-next-line eqeqeq
-    (item) => item.value == tagData.value,
-  )
-  const possibleLabel = possibleSuggestion
-    ? possibleSuggestion.label
-    : tagData.value
-
-  return `
-<tag title="${tagData.value}"
-  contenteditable='false'
-  spellcheck='false'
-  tabIndex="-1"
-  class="tagify__tag ${tagData.class ? tagData.class : ''}"
-  ${this.getAttributes(tagData)}
->
-  <x title='' class='tagify__tag__removeBtn' role='button' aria-label='remove tag'></x>
-  <div>
-      <span class='tagify__tag-text'>${possibleLabel}</span>
-  </div>
-</tag>
-`
-}
-
-export function suggestionItemTemplate(tagData) {
-  return `
-<div ${this.getAttributes(tagData)}
-  class='tagify__dropdown__item flex items-center ${
-  tagData.class ? tagData.class : ''
-}'
-  tabindex="0"
-  role="option">
-  ${
-  tagData.avatar
-    ? `
-  <div class='rounded w-8 h-8 block mr-2'>
-      <img onerror="this.style.visibility='hidden'" class="w-full" src="${tagData.avatar}">
-  </div>`
-    : ''
-}
-  <span>${tagData.label}</span>
-</div>
-`
-}

data/lib/avo/concerns/handles_field_args.rb

@@ -1,36 +0,0 @@
-module Avo
-  module Concerns
-    module HandlesFieldArgs
-      extend ActiveSupport::Concern
-
-      private
-
-      # Add an instance variable from args
-      # That may be a string, boolean, or array
-      # Each args should also have a default value
-      def add_prop_from_args(args = {}, name: nil, type: :string, default: nil)
-        value = default
-
-        if type == :boolean
-          value = args[name.to_sym] == true
-        else
-          value = args[name.to_sym] unless args.dig(name.to_sym).nil?
-        end
-
-        instance_variable_set(:"@#{name}", value)
-      end
-
-      def add_boolean_prop(args, name, default = false)
-        add_prop_from_args args, name: name, default: default, type: :boolean
-      end
-
-      def add_array_prop(args, name, default = [])
-        add_prop_from_args args, name: name, default: default, type: :array
-      end
-
-      def add_string_prop(args, name, default = [])
-        add_prop_from_args args, name: name, default: default, type: :string
-      end
-    end
-  end
-end

data/lib/avo/fields/tags_field.rb

@@ -1,82 +0,0 @@
-module Avo
-  module Fields
-    class TagsField < BaseField
-      attr_reader :acts_as_taggable_on
-      attr_reader :close_on_select
-      attr_reader :delimiters
-      attr_reader :enforce_suggestions
-
-      def initialize(id, **args, &block)
-        super(id, **args, &block)
-
-        add_boolean_prop args, :close_on_select
-        add_boolean_prop args, :enforce_suggestions
-        add_string_prop args, :acts_as_taggable_on
-        add_array_prop args, :blacklist
-        add_array_prop args, :delimiters, [","]
-        add_array_prop args, :suggestions
-      end
-
-      def field_value
-        return json_value if acts_as_taggable_on.present?
-
-        value || []
-      end
-
-      def json_value
-        value.map do |item|
-          {
-            value: item.name
-          }
-        end.as_json
-      end
-
-      def fill_field(model, key, value, params)
-        if acts_as_taggable_on.present?
-          model.send(act_as_taggable_attribute(key), parsed_value(value))
-        else
-          model.send("#{key}=", parsed_value(value))
-        end
-
-        model
-      end
-
-      def suggestions
-        return @suggestions if @suggestions.is_a? Array
-
-        if @suggestions.respond_to? :call
-          return Avo::Hosts::RecordHost.new(block: @suggestions, record: model).handle
-        end
-
-        []
-      end
-
-      def blacklist
-        return @blacklist if @blacklist.is_a? Array
-
-        if @blacklist.respond_to? :call
-          return Avo::Hosts::RecordHost.new(block: @blacklist, record: model).handle
-        end
-
-        []
-      end
-
-      private
-
-      def act_as_taggable_attribute(key)
-        "#{key.singularize}_list="
-      end
-
-      def parsed_value(value)
-        JSON.parse(value).pluck("value")
-      rescue
-        []
-      end
-
-      private
-
-      def parse_suggestions_from_args(args)
-      end
-    end
-  end
-end

data/lib/avo/hosts/record_host.rb

@@ -1,7 +0,0 @@
-module Avo
-  module Hosts
-    class RecordHost < BaseHost
-      option :record
-    end
-  end
-end