Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: Badge field #66

Merged
merged 17 commits into from
Jul 3, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved

{
"name": "Rails server",
"type": "Ruby",
Expand All @@ -14,4 +16,4 @@
]
}
]
}
}
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ group :development, :test do
gem 'database_cleaner'

gem 'ruby-debug-ide', require: false
gem 'debase'
end

group :development, :test do
Expand Down
4 changes: 4 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ GEM
concurrent-ruby (1.1.6)
crass (1.0.6)
database_cleaner (1.8.5)
debase (0.2.4.1)
debase-ruby_core_source (>= 0.10.2)
debase-ruby_core_source (0.10.9)
devise (4.7.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand Down Expand Up @@ -301,6 +304,7 @@ DEPENDENCIES
byebug
capybara (>= 2.15)
database_cleaner
debase
devise
dotenv-rails
factory_bot_rails
Expand Down
27 changes: 27 additions & 0 deletions app/frontend/js/components/Index/BadgeField.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<template>
<index-field-wrapper :field="field">
<span v-if="field.value" :class="classes">{{ field.value }}</span>
<div v-else>
-
</div>
</index-field-wrapper>
</template>

<script>
export default {
props: ['field'],
computed: {
classes() {
const classes = []
const value = this.field.map[this.field.value.toLowerCase()]

if (value === 'info') classes.push('rounded-full bg-blue-500 uppercase px-2 py-1 text-xs font-bold text-white')
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
if (value === 'success') classes.push('rounded-full bg-green-500 uppercase px-2 py-1 text-xs font-bold text-white')
if (value === 'danger') classes.push('rounded-full bg-red-500 uppercase px-2 py-1 text-xs font-bold text-white')
if (value === 'warning') classes.push('rounded-full bg-yellow-500 uppercase px-2 py-1 text-xs font-bold text-white')

return classes.join(' ')
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
},
},
}
</script>
27 changes: 27 additions & 0 deletions app/frontend/js/components/Show/BadgeField.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<template>
<show-field-wrapper :field="field" :index="index">
<span v-if="field.value" :class="classes">{{ field.value }}</span>
<div v-else>
-
</div>
</show-field-wrapper>
</template>

<script>
export default {
props: ['field', 'index'],
computed: {
classes() {
const classes = []
const value = this.field.map[this.field.value.toLowerCase()]
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved

if (value === 'info') classes.push('rounded-full bg-blue-500 uppercase px-2 py-1 text-xs font-bold text-white')
if (value === 'success') classes.push('rounded-full bg-green-500 uppercase px-2 py-1 text-xs font-bold text-white')
if (value === 'danger') classes.push('rounded-full bg-red-500 uppercase px-2 py-1 text-xs font-bold text-white')
if (value === 'warning') classes.push('rounded-full bg-yellow-500 uppercase px-2 py-1 text-xs font-bold text-white')

return classes.join(' ')
},
},
}
</script>
2 changes: 2 additions & 0 deletions app/frontend/js/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Vue.component('index-files-field', require('@/js/components/In
Vue.component('index-boolean-group-field', require('@/js/components/Index/BooleanGroupField.vue').default)
Vue.component('index-belongs-to-field', require('@/js/components/Index/BelongsTo.vue').default)
Vue.component('index-has-one-field', require('@/js/components/Index/HasOne.vue').default)
Vue.component('index-badge-field', require('@/js/components/Index/BadgeField.vue').default)

Vue.component('show-field-wrapper', require('@/js/components/Show/FieldWrapper.vue').default)
Vue.component('show-id-field', require('@/js/components/Show/IdField.vue').default)
Expand All @@ -35,6 +36,7 @@ Vue.component('show-belongs-to-field', require('@/js/components/Sh
Vue.component('show-has-one-field', require('@/js/components/Show/HasOne.vue').default)
Vue.component('show-has-many-field', require('@/js/components/Show/HasMany.vue').default)
Vue.component('show-has--adn-belongs-to-many-field', require('@/js/components/Show/HasAndBelongsToMany.vue').default)
Vue.component('show-badge-field', require('@/js/components/Show/BadgeField.vue').default)

Vue.component('edit-field-wrapper', require('@/js/components/Edit/FieldWrapper.vue').default)
Vue.component('edit-id-field', require('@/js/components/Edit/IdField.vue').default)
Expand Down
5 changes: 5 additions & 0 deletions db/migrate/20200630092650_add_condition_to_projects.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddConditionToProjects < ActiveRecord::Migration[6.0]
def change
add_column :projects, :condition, :text, :default => 'success'
end
end
25 changes: 25 additions & 0 deletions lib/avocado/app/fields/badge_field.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
require_relative 'field'

module Avocado
module Fields
class BadgeField < Field
def initialize(name, **args, &block)
@defaults = {
sortable: true,
component: 'badge-field',
}

super(name, **args, &block)

default_map = { info: 'info', success: 'success', danger: 'danger', warning: 'warning' }
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
@map = args[:map].present? ? default_map.merge(args[:map]) : default_map
end

def hydrate_resource(model, resource, view)
{
map: @map,
}
end
end
end
end
4 changes: 4 additions & 0 deletions lib/avocado/app/resource_fields.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ def file(name, **args)
def files(name, **args)
@@fields[self].push Avocado::Fields::FilesField::new(name, **args)
end

def badge(name, **args, &block)
@@fields[self].push Avocado::Fields::BadgeField::new(name, **args, &block)
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
end
end
end
end
Expand Down
1 change: 1 addition & 0 deletions spec/dummy/app/services/avocado/resources/project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ def initialize
fields do
id :ID
text :Name, required: true
badge :condition, map: { informations: 'info', failure: 'danger', cancelled: 'danger' }
has_and_belongs_to_many :users
end

Expand Down
4 changes: 3 additions & 1 deletion spec/dummy/db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2020_06_10_141228) do
ActiveRecord::Schema.define(version: 2020_06_30_092650) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
Expand Down Expand Up @@ -56,6 +56,8 @@
t.string "name"
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
t.text "status", default: "running"
t.text "condition"
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
end

create_table "projects_users", force: :cascade do |t|
Expand Down
31 changes: 31 additions & 0 deletions spec/system/avocado/avocado_badge_fields_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
require 'rails_helper'

RSpec.describe "BadgeFields", type: :system do
let!(:project) { create :project, condition: 'info' }

context 'index' do
it 'displays the projects condition' do
visit '/avocado/resources/projects'

expect(find_field_element('condition')).to have_text project.condition.upcase
expect(find_field_element('condition')).to have_css '.rounded-full'
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
expect(find_field_element('condition')).to have_css '.bg-blue-500'
expect(find_field_element('condition')).to have_css '.uppercase'
expect(find_field_element('condition')).to have_css '.font-bold'
expect(find_field_element('condition')).to have_css '.text-white'
end
end

context 'show' do
it 'displays the projects condition' do
visit "/avocado/resources/projects/#{project.id}"

expect(find_field_element('condition')).to have_text project.condition.upcase
expect(find_field_element('condition')).to have_css '.rounded-full'
expect(find_field_element('condition')).to have_css '.bg-blue-500'
expect(find_field_element('condition')).to have_css '.uppercase'
expect(find_field_element('condition')).to have_css '.font-bold'
expect(find_field_element('condition')).to have_css '.text-white'
end
end
end