Merge branch 'master' of https://github.com/AvocadoHQ/avo

app/frontend/js/components/Edit/SelectField.vue

@@ -5,11 +5,11 @@
       :class="inputClasses"
       v-model="value"
     >
-      <option value="null" disabled>{{field.placeholder}}</option>
+      <option v-if="!value" :value="value" v-text="field.placeholder" disabled selected hidden/>
       <option v-for="(option, key) in field.options"
         :value="key"
         :key="key"
-        v-text="option"
+        v-text="(!field.display_value && option) ? option : key"
       />
     </select>
   </edit-field-wrapper>

app/frontend/js/components/Index/GravatarField.vue

@@ -32,12 +32,12 @@ export default {
   ],
   computed: {
     element() {
-      if (this.field.as_link_to_resource) return 'router-link'
+      if (this.field.link_to_resource) return 'router-link'
 
       return 'div'
     },
     to() {
-      if (this.field.as_link_to_resource) {
+      if (this.field.link_to_resource) {
         return {
           name: 'show',
           params: {
@@ -54,7 +54,7 @@ export default {
       return null
     },
     title() {
-      if (this.field.as_link_to_resource) return `View ${this.resourceNameSingular}`
+      if (this.field.link_to_resource) return `View ${this.resourceNameSingular}`
 
       return null
     },

app/frontend/js/components/Index/IdField.vue

@@ -25,12 +25,12 @@ export default {
   ],
   computed: {
     element() {
-      if (this.field.as_link_to_resource) return 'router-link'
+      if (this.field.link_to_resource) return 'router-link'
 
       return 'div'
     },
     to() {
-      if (this.field.as_link_to_resource) {
+      if (this.field.link_to_resource) {
         return {
           name: 'show',
           params: {
@@ -47,7 +47,7 @@ export default {
       return null
     },
     title() {
-      if (this.field.as_link_to_resource) return `View ${this.resourceNameSingular}`
+      if (this.field.link_to_resource) return `View ${this.resourceNameSingular}`
 
       return null
     },

app/frontend/js/components/Index/SelectField.vue

@@ -10,11 +10,11 @@ export default {
   data: () => ({}),
   props: ['field'],
   computed: {
-    displayValue() {
+    label() {
       return this.field.options[this.field.value]
     },
     value() {
-      if (this.field.display_with_value && this.displayValue) return this.displayValue
+      if (!this.field.display_value && this.label) return this.label
 
       return this.field.value
     },

app/frontend/js/components/Index/TextField.vue

@@ -25,12 +25,12 @@ export default {
   ],
   computed: {
     element() {
-      if (this.field.as_link_to_resource) return 'router-link'
+      if (this.field.link_to_resource) return 'router-link'
 
       return 'div'
     },
     to() {
-      if (this.field.as_link_to_resource) {
+      if (this.field.link_to_resource) {
         return {
           name: 'show',
           params: {
@@ -47,7 +47,7 @@ export default {
       return null
     },
     title() {
-      if (this.field.as_link_to_resource) return `View ${this.resourceNameSingular}`
+      if (this.field.link_to_resource) return `View ${this.resourceNameSingular}`
 
       return null
     },

app/frontend/js/components/Show/SelectField.vue

@@ -13,7 +13,7 @@ export default {
       return this.field.options[this.field.value]
     },
     value() {
-      if (this.field.display_with_value && this.label) return this.label
+      if (!this.field.display_value && this.label) return this.label
 
       return this.field.value
     },

lib/avo/app/fields/badge_field.rb

@@ -11,8 +11,8 @@ def initialize(name, **args, &block)
 
         hide_on [:edit, :create]
 
-        default_map = { info: :info, success: :success, danger: :danger, warning: :warning }
-        @map = args[:map].present? ? default_map.merge(args[:map]) : default_map
+        default_options = { info: :info, success: :success, danger: :danger, warning: :warning }
+        @options = args[:options].present? ? default_options.merge(args[:options]) : default_options
       end
 
       def hydrate_field(fields, model, resource, view)
@@ -24,7 +24,7 @@ def hydrate_field(fields, model, resource, view)
 
         value = {}
 
-        @map.invert.each do |values, type|
+        @options.invert.each do |values, type|
           db_value = model[id] || ''
 
           if [values].flatten.map { |value| value.to_s }.include? db_value

lib/avo/app/fields/gravatar_field.rb

@@ -18,7 +18,7 @@ def initialize(name, **args, &block)
         @rounded = args[:rounded].present? ? args[:rounded] : true
         @size = args[:size].present? ? args[:size].to_i : 40
         @default = args[:default].present? ? ERB::Util.url_encode(args[:default]).to_s : ''
-        @as_link_to_resource = args[:as_link_to_resource].present? ? args[:as_link_to_resource] : false
+        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
 
       def hydrate_field(fields, model, resource, view)
@@ -33,7 +33,7 @@ def hydrate_field(fields, model, resource, view)
           rounded: @rounded,
           default: @default,
           size: @size,
-          as_link_to_resource: @as_link_to_resource,
+          link_to_resource: @link_to_resource,
         }
       end
     end

lib/avo/app/fields/id_field.rb

@@ -23,12 +23,12 @@ def initialize(name, **args, &block)
 
         super(name, **args, &block)
 
-        @as_link_to_resource = args[:as_link_to_resource].present? ? args[:as_link_to_resource] : false
+        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
 
       def hydrate_field(fields, model, resource, view)
         {
-          as_link_to_resource: @as_link_to_resource,
+          link_to_resource: @link_to_resource,
         }
       end
     end

lib/avo/app/fields/select_field.rb

@@ -10,14 +10,14 @@ def initialize(name, **args, &block)
         super(name, **args, &block)
 
         @options = args[:options].present? ? args[:options] : {}
-        @display_with_value = args[:display_with_value].present? ? args[:display_with_value] : false
+        @display_value = args[:display_value].present? ? args[:display_value] : false
         @placeholder = args[:placeholder].present? ? args[:placeholder].to_s : 'Choose an option'
       end
 
       def hydrate_field(fields, model, resource, view)
         {
           options: @options,
-          display_with_value: @display_with_value,
+          display_value: @display_value,
           placeholder: @placeholder,
         }
       end

lib/avo/app/fields/text_field.rb

@@ -10,12 +10,12 @@ def initialize(name, **args, &block)
 
         super(name, **args, &block)
 
-        @as_link_to_resource = args[:as_link_to_resource].present? ? args[:as_link_to_resource] : false
+        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
 
       def hydrate_field(fields, model, resource, view)
         {
-          as_link_to_resource: @as_link_to_resource,
+          link_to_resource: @link_to_resource,
         }
       end
     end

spec/dummy/app/avo/resources/project.rb

@@ -8,11 +8,11 @@ def initialize
       end
 
       fields do
-        id as_link_to_resource: true
+        id link_to_resource: true
         text :name, required: true
         status :status, failed_when: [:closed, :rejected, :failed], loading_when: [:loading, :running, :waiting], nullable: true
-        badge :stage, map: { info: [:discovery, :ideea], success: :done, warning: 'on hold', danger: :cancelled }
-        select :stage, hide_on: [:show, :index], options: { discovery: 'Discovery', ideea: 'Ideea', done: 'Done', 'on hold': 'On hold', cancelled: 'Cancelled' }, placeholder: 'Choose the stage.'
+        select :stage, hide_on: [:show, :index], options: { discovery: 'Discovery', ideea: 'Ideea', done: 'Done', 'on hold': 'On hold', cancelled: 'Cancelled' }, placeholder: 'Choose the stage.', display_value: true
+        badge :stage, options: { info: [:discovery, :ideea], success: :done, warning: 'on hold', danger: :cancelled }
         currency :budget, currency: 'EUR', locale: 'de-DE'
         country :country
         number :users_required

spec/dummy/app/avo/resources/team_membership.rb

@@ -8,7 +8,7 @@ def initialize
 
       fields do
         id
-        select :level, options: { beginner: 'Beginner', intermediate: 'Intermediate', advanced: 'Advanced' }, default: -> (model, resource, view, field) { Time.now.hour < 12 ? 'advanced' : 'beginner' }
+        select :level, options: { beginner: 'Beginner', intermediate: 'Intermediate', advanced: 'Advanced' }, display_value: true, default: -> (model, resource, view, field) { Time.now.hour < 12 ? 'advanced' : 'beginner' }
         belongs_to :user
         belongs_to :team
       end

spec/dummy/app/avo/resources/user.rb

@@ -10,7 +10,7 @@ def initialize
 
       fields do
         id
-        gravatar :email, as_link_to_resource: true
+        gravatar :email, link_to_resource: true
         heading 'User information'
         text :first_name, required: true, placeholder: 'John'
         text :last_name, required: true, placeholder: 'Doe'

spec/dummy/config/puma.rb

@@ -4,28 +4,28 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
-min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
+max_threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 }
+min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count }
 threads min_threads_count, max_threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
-port        ENV.fetch("PORT") { 3000 }
+port        ENV.fetch('PORT') { 3030 }
 
 # Specifies the `environment` that Puma will run in.
 #
-environment ENV.fetch("RAILS_ENV") { "development" }
+environment ENV.fetch('RAILS_ENV') { 'development' }
 
 # Specifies the `pidfile` that Puma will use.
-pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
+pidfile ENV.fetch('PIDFILE') { 'tmp/pids/server.pid' }
 
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked web server processes. If using threads and workers together
 # the concurrency of the application would be max `threads` * `workers`.
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).
 #
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+# workers ENV.fetch('WEB_CONCURRENCY') { 2 }
 
 # Use the `preload_app!` method when specifying a `workers` number.
 # This directive tells Puma to first boot the application and load code

spec/system/avo/default_field_spec.rb

@@ -38,9 +38,9 @@
         wait_for_loaded
 
         if Time.now.hour < 12
-          expect(find_field_element(:level)).to have_text 'Advanced'
+          expect(find_field_element(:level)).to have_text 'advanced'
         else
-          expect(find_field_element(:level)).to have_text 'Beginner'
+          expect(find_field_element(:level)).to have_text 'beginner'
         end
       end
 

spec/system/avo/as_link_to_resources_spec.rb → spec/system/avo/link_to_resource_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe 'AsLinkToResources', type: :system do
+RSpec.describe 'LinkToResource', type: :system do
   describe 'for id field' do
     let!(:project) { create :project }
 

spec/system/avo/select_field_spec.rb

@@ -24,7 +24,7 @@
         visit "/avo/resources/projects/#{project.id}/edit"
 
         select 'Romania', from: :country
-        find("[field-id='stage'] [data-slot='value'] select").select 'Discovery'
+        find("[field-id='stage'] [data-slot='value'] select").select 'discovery'
 
         click_on 'Save'
         wait_for_loaded
@@ -40,7 +40,7 @@
         visit "/avo/resources/projects/#{project.id}/edit"
 
         select 'Romania', from: :country
-        find("[field-id='stage'] [data-slot='value'] select").select 'Cancelled'
+        find("[field-id='stage'] [data-slot='value'] select").select 'cancelled'
 
         click_on 'Save'
         wait_for_loaded