avo 1.3.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92c5c1023654c2cd64f3d1873aa30288a3ea03e84c274b73b19c33cecbae0c90
-  data.tar.gz: 669c555d15547f2e2003d0a58020841d171f3593455f6e21dff6303b68a63649
+  metadata.gz: f31ebc9caf8e281af2cb0e8ce4d0423ab4852f3475843af1d632e795930f5df0
+  data.tar.gz: 8117f6fca30c9f9f90ff61f5c7bdeb2908cb13fd731e3168c6678b5c4427f0a9
 SHA512:
-  metadata.gz: '09409a21957aced0968d00c5486051369ed108ffa57b17745822c71b00fe0b49c5ede3ce9f1d617b3e7914d44dab5e4bec3ea27df098af8b77b1d0aec256b119'
-  data.tar.gz: 152a5e71bf27c50d4448548994b4efeb794d86bc28a2941c806c2e9cb2c1fb55409ed8f625fba298199f89a054909d3cdbbc93ef477d94b86a28e7dbc7944eab
+  metadata.gz: 4d1deeabbc3538d4094312e9c08b384355882e55d1124976981e4e8f5356ed8d032f6a595261065a9fc567ca7529e639926f627e72231baf409709b2d19626d0
+  data.tar.gz: 036e731952aaf067ba2397fefa5d79a714332f39e7779a6586bee49e247c17ceb80f4e4226f4fa4cbb73be45c8d4573b09e5d4d7df29e921df1a767b980aca1e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.3.1)
+    avo (1.3.5)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -187,7 +187,7 @@ GEM
     nokogiri (1.11.3-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (3.12.0)
+    pagy (3.13.0)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)

data/app/components/avo/common/key_value_component.html.erb

@@ -0,0 +1,53 @@
+<div class="w-full shadow-lg rounded-lg overflow-hidden"
+  data-controller="key-value"
+  data-key-value-target="controller"
+  data-options="<%= @field.options.to_json %>"
+  data-input-classes="<%= input_classes %>"
+  data-editable="<%= @view.in?([:edit, :create]) %>"
+>
+  <div class="w-full flex flex-col">
+    <div class="flex w-full">
+      <div class="flex w-full bg-gray-800 shadow overflow-hidden">
+        <div class="w-1/2 py-3 px-3 uppercase font-semibold text-xs text-white border-gray-600 border-r">
+          <%= @field.key_label %>
+        </div>
+        <div class="w-1/2 py-3 px-3 uppercase font-semibold text-xs text-white">
+          <%= @field.value_label %>
+        </div>
+        <% if @view.in?([:edit, :create]) %>
+          <div class="flex items-center justify-center p-2 px-3 border-l border-gray-600">
+            <a href="javascript:void(0);"
+              title="<%= @field.action_text %>"
+              data-tippy="tooltip"
+              data-button="add-row"
+              data-action="click->key-value#addRow"
+              <% if @field.disable_adding_rows %>
+                class="cursor-not-allowed"
+              <% end %>
+            >
+              <%= svg 'plus-circle', class: 'text-gray-400 h-5 hover:text-gray-500' %>
+            </a>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <div data-key-value-target="rows"></div>
+  </div>
+  <% if @form.present? %>
+    <%= @form.text_area @field.id,
+      value: @field.parsed_value,
+      class: 'hidden',
+      placeholder: @field.placeholder,
+      'data-key-value-target': 'input',
+      'data-view': :edit
+    %>
+  <% else %>
+    <%= text_area_tag @field.id,
+      @field.parsed_value,
+      class: 'hidden',
+      placeholder: @field.placeholder,
+      'data-key-value-target': 'input',
+      'data-view': :edit
+    %>
+  <% end %>
+</div>

data/app/components/avo/common/key_value_component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Avo::Common::KeyValueComponent < ViewComponent::Base
+  include Avo::ApplicationHelper
+
+  def initialize(field:, form: nil, view: :show)
+    @field = field
+    @form = form
+    @view = view
+  end
+end

data/app/components/avo/edit/fields/key_value_field_component.html.erb

@@ -0,0 +1,3 @@
+<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, full_width: true do %>
+  <%= render Avo::Common::KeyValueComponent.new field: @field, form: @form, view: :edit %>
+<% end %>

data/app/components/avo/edit/fields/key_value_field_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Edit::Fields::KeyValueFieldComponent < Avo::Edit::Fields::FieldComponent
+end

data/app/components/avo/edit/fields/trix_field_component.html.erb

@@ -1,6 +1,6 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
   <% trix_id = "trix_#{@resource.name.underscore}_#{@field.id}" %>
-  <trix-editor input="<%= trix_id %>" value="<%= @field.value %>" placeholder="<%= @field.placeholder %>"><%== @field.value %></trix-editor>
+  <trix-editor input="<%= trix_id %>" placeholder="<%= @field.placeholder %>"><%== @field.value %></trix-editor>
   <%= @form.text_area @field.id,
     id: trix_id,
     class: helpers.input_classes('w-full hidden', has_error: (@resource.model.present? and @resource.model.errors.include?(@field.id))),

data/app/components/avo/show/fields/key_value_field_component.html.erb

@@ -0,0 +1,3 @@
+<%= show_field_wrapper field: @field, index: @index, full_width: true do %>
+  <%= render Avo::Common::KeyValueComponent.new field: @field, view: :show %>
+<% end %>

data/app/components/avo/show/fields/key_value_field_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Show::Fields::KeyValueFieldComponent < Avo::Show::Fields::FieldComponent
+end

data/app/helpers/avo/application_helper.rb

@@ -4,7 +4,7 @@ module Avo
     include ::Pagy::Frontend
 
     def current_webpacker_instance
-      return Avo.webpacker if Avo::IN_DEVELOPMENT || Rails.env.test?
+      return Avo.webpacker if Avo::IN_DEVELOPMENT
 
       super
     end

data/app/packs/entrypoints/application.js

@@ -19,6 +19,19 @@ window.Turbolinks = Turbo
 
 Mousetrap.bind('r r r', () => Turbo.visit(window.location.href, { action: 'replace' }))
 
+function initTippy() {
+  tippy('[data-tippy="tooltip"]', {
+    theme: 'light',
+    content(reference) {
+      const title = reference.getAttribute('title')
+      reference.removeAttribute('title')
+
+      return title
+    },
+  })
+}
+window.initTippy = initTippy
+
 const application = Application.start()
 
 const context = require.context('./../js/controllers', true, /\.js$/)
@@ -29,16 +42,7 @@ application.load(definitionsFromContext(fieldsContext))
 
 document.addEventListener('turbo:load', () => {
   document.body.classList.remove('turbo-loading')
-
-  tippy('[data-tippy="tooltip"]', {
-    theme: 'light',
-    content(reference) {
-      const title = reference.getAttribute('title')
-      reference.removeAttribute('title')
-
-      return title
-    },
-  })
+  initTippy()
 })
 document.addEventListener('turbo:visit', () => document.body.classList.add('turbo-loading'))
 document.addEventListener('turbo:submit-start', () => document.body.classList.add('turbo-loading'))

data/app/packs/js/controllers/fields/code_field_controller.js

@@ -12,6 +12,7 @@ import 'codemirror/mode/shell/shell'
 import 'codemirror/mode/sql/sql'
 import 'codemirror/mode/vue/vue'
 import 'codemirror/mode/xml/xml'
+import 'codemirror/mode/yaml/yaml'
 
 import { Controller } from 'stimulus'
 import { castBoolean } from '@/js/helpers/cast_boolean'

data/app/packs/js/controllers/fields/key_value_controller.js

@@ -0,0 +1,137 @@
+/* eslint-disable max-len */
+import { Controller } from 'stimulus'
+import { castBoolean } from '@/js/helpers/cast_boolean'
+
+export default class extends Controller {
+  static targets = ['input', 'controller', 'rows']
+
+  fieldValue = []
+
+  options = {}
+
+  get keyInputDisabled() {
+    return !this.options.editable || this.options.disable_editing_keys
+  }
+
+  get valueInputDisabled() {
+    return !this.options.editable
+  }
+
+  connect() {
+    this.setOptions()
+
+    try {
+      const objectValue = JSON.parse(this.inputTarget.value)
+      Object.keys(objectValue).forEach((key) => this.fieldValue.push([key, objectValue[key]]))
+    } catch (error) {
+      this.fieldValue = []
+    }
+
+    this.updateKeyValueComponent()
+  }
+
+  addRow() {
+    if (this.options.disable_adding_rows || !this.options.editable) return
+    this.fieldValue.push(['', ''])
+    this.updateKeyValueComponent()
+    this.focusLastRow()
+  }
+
+  deleteRow(event) {
+    if (this.options.disable_deleting_rows || !this.options.editable) return
+    const { index } = event.target.dataset
+    this.fieldValue.splice(index, 1)
+    this.updateTextareaInput()
+    this.updateKeyValueComponent()
+  }
+
+  focusLastRow() {
+    return this.rowsTarget.querySelector('.flex.key-value-row:last-child .key-value-input-key').focus()
+  }
+
+  valueFieldUpdated(event) {
+    const { value } = event.target
+    const { index } = event.target.dataset
+    this.fieldValue[index][1] = value
+
+    this.updateTextareaInput()
+  }
+
+  keyFieldUpdated(event) {
+    const { value } = event.target
+    const { index } = event.target.dataset
+    this.fieldValue[index][0] = value
+
+    this.updateTextareaInput()
+  }
+
+  updateTextareaInput() {
+    if (!this.hasInputTarget) return
+    let result = {}
+    if (this.fieldValue && this.fieldValue.length > 0) {
+      result = Object.assign(...this.fieldValue.map(([key, val]) => ({ [key]: val })))
+    }
+    this.inputTarget.innerText = JSON.stringify(result)
+  }
+
+  updateKeyValueComponent() {
+    let result = ''
+    let index = 0
+    this.fieldValue.forEach((row) => {
+      const [key, value] = row
+      result += this.interpolatedRow(key, value, index)
+      index++
+    })
+    this.rowsTarget.innerHTML = result
+    window.initTippy()
+  }
+
+  interpolatedRow(key, value, index) {
+    let result = `<div class="flex key-value-row">
+      ${this.inputField('key', index, key, value)}
+      ${this.inputField('value', index, key, value)}`
+    if (this.options.editable) {
+      result += `<a
+  href="javascript:void(0);"
+  data-index="${index}"
+  data-action="click->key-value#deleteRow"
+  title="${this.options.delete_text}"
+  data-tippy="tooltip"
+  data-button="delete-row"
+  tabindex="-1"
+  ${this.options.disable_deleting_rows ? "disabled='disabled'" : ''}
+  class="flex items-center justify-center p-2 px-3 border-none ${this.options.disable_deleting_rows ? 'cursor-not-allowed' : ''}"
+><svg class="pointer-events-none text-gray-500 h-5 hover:text-gray-500" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24" stroke="currentColor"><path d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path></svg></a>`
+    }
+    result += '</div>'
+
+    return result
+  }
+
+  inputField(id = 'key', index, key, value) {
+    return `<input
+  class="${this.options.inputClasses} !rounded-none border-gray-600 border-r border-l-0 border-b-0 border-t-0 focus:border-gray-300 w-1/2 focus:outline-none outline-none key-value-input-${id}"
+  data-action="input->key-value#${id}FieldUpdated"
+  placeholder="${this.options[`${id}_label`]}"
+  data-index="${index}"
+  ${this[`${id}InputDisabled`] ? "disabled='disabled'" : ''}
+  value="${id === 'key' ? key : value}"
+  autofocus
+/>`
+  }
+
+  setOptions() {
+    let fieldOptions
+
+    try {
+      fieldOptions = JSON.parse(this.controllerTarget.dataset.options)
+    } catch (error) {
+      fieldOptions = {}
+    }
+    this.options = {
+      ...fieldOptions,
+      inputClasses: this.controllerTarget.dataset.inputClasses,
+      editable: castBoolean(this.controllerTarget.dataset.editable),
+    }
+  }
+}

data/lib/avo.rb

@@ -27,7 +27,7 @@ module Avo
         root_path: ROOT_PATH,
         public_output_dir: "avo-packs",
         cache_manifest: Rails.env.production?,
-        fallback_to_webpacker: -> { Avo::IN_DEVELOPMENT || Rails.env.test?}
+        fallback_to_webpacker: -> { Avo::IN_DEVELOPMENT }
       )
     end
   end

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/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.3.1"
+  VERSION = "1.3.5"
 end

data/lib/generators/avo/action_generator.rb

@@ -7,7 +7,7 @@ module Generators
       namespace "avo:action"
 
       def create_resource_file
-        template "action.rb", "app/avo/actions/#{singular_name}.rb"
+        template "action.tt", "app/avo/actions/#{singular_name}.rb"
       end
     end
   end

data/lib/generators/avo/locales_generator.rb

@@ -6,10 +6,10 @@ module Generators
       source_root File.expand_path("templates", __dir__)
 
       namespace "avo:locales"
-      desc "Creates an Avo initializer adds the route to the routes file."
+      desc "Add Avo locale files to your project."
 
       def create_files
-        template "locales/avo.en.yml", "config/locales/avo.en.yml"
+        directory File.join(__dir__, "templates", "locales"), "config/locales"
       end
     end
   end

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

@@ -1,13 +1,9 @@
-module Avo
-  module Actions
-    class <%= class_name.camelize %> < Action
-      self.name = '<%= name.underscore.humanize %>'
+class <%= class_name.camelize %> < Avo::BaseAction
+  self.name = '<%= name.underscore.humanize %>'
 
-      def handle(models:, fields:)
-        models.each do |model|
-          # Do something with your models.
-        end
-      end
+  def handle(models:, fields:)
+    models.each do |model|
+      # Do something with your models.
     end
   end
 end

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -59,6 +59,7 @@ en:
     and_x_other_resources: 'and %{count} other resources'
     go_back: 'Go back'
     home: 'Home'
+    new: 'new'
     attach_item: 'Attach %{item}'
     choose_item: 'Choose %{item}'
     create_new_item: 'Create new %{item}'

data/lib/generators/avo/templates/locales/avo.nb-NO.yml

@@ -0,0 +1,81 @@
+nb:
+  avo:
+    dashboard: 'Dashboard'
+    choose_a_country: 'Velg et land'
+    choose_an_option: 'Velg et alternativ'
+    are_you_sure_you_want_to_run_this_option: 'Er du sikker?'
+    are_you_sure_detach_item: 'Er du sikker på at du vil koble fra %{item}.'
+    run: 'Kjør'
+    cancel: 'Avslutt'
+    action_ran_successfully: 'Suksess!'
+    resource_details: "%{item} detaljer: %{title}"
+    update_item: 'Oppdatert %{item}: %{title}'
+    unauthorized: 'Ikke autorisert'
+    attachment_class_attached: '%{attachment_class} lagt til.'
+    attachment_class_detached: '%{attachment_class} fjernet.'
+    resource_updated: 'Ressurs oppdatert'
+    resource_created: 'Ressurs generert'
+    resource_destroyed: 'Ressurs slettet'
+    switch_to_view: "Bytt til %{view_type} vis"
+    click_to_reveal_filters: "Vis filter"
+    attachment_destroyed: 'Vedlett slettet'
+    failed_to_find_attachment: 'Fant ikke vedlegg'
+    you_missed_something_check_form: 'Her mangler du noe. Vennligst sjekk skjemaet.'
+    remove_selection: 'Fjern valg'
+    select_item: 'Velg'
+    delete_file: 'Slett fil'
+    delete: 'slett'
+    delete_item: 'Slett %{item}'
+    download_item: 'Last ned %{item}'
+    download_file: 'Last ned fil'
+    download: 'Last ned'
+    view: 'Vis'
+    view_item: 'vis %{item}'
+    edit: 'endre'
+    edit_item: 'endre %{item}'
+    detach_item: 'koble fra %{item}'
+    number_of_items:
+      zero: 'ingen %{item}'
+      one: 'en %{item}'
+      other: '%{count} %{item}'
+    are_you_sure: 'Er du sikker?'
+    filters: 'Filter'
+    per_page: 'Per side'
+    more: 'Mer'
+    attach: 'Legg til'
+    cancel: 'Avslutt'
+    save: 'Lagre'
+    attach_and_attach_another: 'Legg til & Legg til ny'
+    hide_content: 'Skjul innhold'
+    show_content: 'Vis innhold'
+    no_related_item_found: 'Ingen relaterte %{item} funnet'
+    no_item_found: 'Ingen %{item} funnet'
+    loading: 'Laster'
+    confirm: 'Bekreft'
+    actions: 'Handlinger'
+    resources: 'Ressurser'
+    oops_nothing_found: 'Oops! Ingen ting funnet...'
+    type_to_search: 'Søk.'
+    and_x_other_resources: 'og %{count} andre ressurser'
+    go_back: 'Gå tilbake'
+    home: 'Hjem'
+    attach_item: 'Legg til %{item}'
+    choose_item: 'Velge %{item}'
+    create_new_item: 'Lag ny %{item}'
+    table_view: 'Tabell visning'
+    grid_view: 'Grid visning'
+    next_page: 'Neste side'
+    prev_page: 'Forrige side'
+    list_is_empty: 'Listen er tom'
+    field_translations:
+      file:
+        zero: 'filer'
+        one: 'fil'
+        other: 'filer'
+    resource_translations:
+      user:
+        zero: 'brukere'
+        one: 'bruker'
+        other: 'brukere'
+    reset_filters: 'Nullstill filter'
+    not_authorized: 'Du er ikke autorisert til å gjøre denne handlingen.'