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: Status field #60

Merged
merged 21 commits into from Jul 6, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ecf0522
feature: status_field done
mihaimdm22 Jun 26, 2020
3734941
Merge branch 'master' into feature/status-field
mihaimdm22 Jun 26, 2020
d3b420e
refactor: bring back the field in resource_fileds
adrianthedev Jun 26, 2020
ca0eb19
chore: remove empty new line
adrianthedev Jun 26, 2020
3ee3589
refactor and create StatusComponent
mihaimdm22 Jun 28, 2020
7864f91
Merge branch 'master' into feature/status-field
mihaimdm22 Jun 28, 2020
8e04977
fix: modified index.js and migrations
mihaimdm22 Jun 28, 2020
6e50e09
fix: removed unnecessary migration
mihaimdm22 Jul 2, 2020
78a7fd7
Merge branch 'master' into feature/status-field
mihaimdm22 Jul 2, 2020
ef83182
Merge branch 'feature/status-field' of https://github.com/AvocadoHQ/a…
adrianthedev Jul 2, 2020
2fcab9c
Merge branch 'master' into feature/status-field
adrianthedev Jul 2, 2020
9ef5b84
refactor: tidied up a bit
adrianthedev Jul 2, 2020
cb3b2ce
refactor: tidy up some more
adrianthedev Jul 2, 2020
6b7564d
Merge branch 'master' into feature/status-field
mihaimdm22 Jul 3, 2020
049daad
fix: modify hydrate method froms tatus
mihaimdm22 Jul 3, 2020
f93ad90
Merge branch 'master' into feature/status-field
adrianthedev Jul 3, 2020
bde96c9
Merge branch 'master' into feature/status-field
adrianthedev Jul 3, 2020
9dd3ca7
refactor: tidy up the components
adrianthedev Jul 3, 2020
afa367c
test: fix dash in testes
mihaimdm22 Jul 3, 2020
eefeba3
test: ensure status is empty
mihaimdm22 Jul 6, 2020
101931b
fix: export status mixin
mihaimdm22 Jul 6, 2020
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
3 changes: 3 additions & 0 deletions app/frontend/js/Avo.js
Expand Up @@ -25,6 +25,7 @@ Vue.component('index-datetime-field', require('@/js/components/Index/
Vue.component('index-file-field', require('@/js/components/Index/FileField.vue').default)
Vue.component('index-files-field', require('@/js/components/Index/FilesField.vue').default)
Vue.component('index-boolean-group-field', require('@/js/components/Index/BooleanGroupField.vue').default)
Vue.component('index-status-field', require('@/js/components/Index/StatusField.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)

Expand All @@ -40,6 +41,7 @@ Vue.component('show-datetime-field', require('@/js/components/Show/D
Vue.component('show-file-field', require('@/js/components/Show/FileField.vue').default)
Vue.component('show-files-field', require('@/js/components/Show/FilesField.vue').default)
Vue.component('show-boolean-group-field', require('@/js/components/Show/BooleanGroupField.vue').default)
Vue.component('show-status-field', require('@/js/components/Show/StatusField.vue').default)
Vue.component('show-belongs-to-field', require('@/js/components/Show/BelongsTo.vue').default)
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)
Expand All @@ -56,6 +58,7 @@ Vue.component('edit-datetime-field', require('@/js/components/Edit/D
Vue.component('edit-file-field', require('@/js/components/Edit/FileField.vue').default)
Vue.component('edit-files-field', require('@/js/components/Edit/FilesField.vue').default)
Vue.component('edit-boolean-group-field', require('@/js/components/Edit/BooleanGroupField.vue').default)
Vue.component('edit-status-field', require('@/js/components/Edit/StatusField.vue').default)
Vue.component('edit-belongs-to-field', require('@/js/components/Edit/BelongsTo.vue').default)
Vue.component('edit-has-one-field', require('@/js/components/Edit/HasOne.vue').default)

Expand Down
28 changes: 28 additions & 0 deletions app/frontend/js/components/Edit/StatusField.vue
@@ -0,0 +1,28 @@
<template>
<edit-field-wrapper :field="field" :errors="errors" :index="index">
<input-component
:id="field.id"
:class="classes"
:disabled="disabled"
:placeholder="field.placeholder"
v-model="value"
/>
</edit-field-wrapper>
</template>

<script>
import FormField from '@/js/mixins/form-field'

export default {
mixins: [FormField],
computed: {
classes() {
const classes = ['w-full']

if (this.hasErrors) classes.push('border-red-600')

return classes.join(' ')
},
},
}
</script>
72 changes: 72 additions & 0 deletions app/frontend/js/components/Index/StatusField.vue
@@ -0,0 +1,72 @@
<template>
<index-field-wrapper :field="field">
<div class="spinner" v-if="loading"></div>
<div :class="classes">
{{ value }}
</div>
</index-field-wrapper>
</template>

<style>
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
.spinner {
display: inline-block;

width: 18px;
height: 18px;
margin: 0px 5px -3px 0px;
background-color: #333;

border-radius: 100%;
-webkit-animation: sk-scaleout 1.0s infinite ease-in-out;
animation: sk-scaleout 1.0s infinite ease-in-out;
}

@-webkit-keyframes sk-scaleout {
0% { -webkit-transform: scale(0) }
100% {
-webkit-transform: scale(1.0);
opacity: 0;
}
}

@keyframes sk-scaleout {
0% {
-webkit-transform: scale(0);
transform: scale(0);
} 100% {
-webkit-transform: scale(1.0);
transform: scale(1.0);
opacity: 0;
}
}
</style>

<script>
export default {
props: ['field'],
computed: {
classes() {
const classes = ['inline-block']
let fail = false
this.field.failed_when.forEach((item) => {
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
if (this.field.value === item) fail = true
})
if (fail === true) classes.push(['text-red-700'])

return classes
},
loading() {
let load = false
this.field.loading_when.forEach((item) => {
if (this.field.value === item) load = true
})
if (load === true) return true

return false
},
value() {
return this.field.value
},
},
}
</script>
72 changes: 72 additions & 0 deletions app/frontend/js/components/Show/StatusField.vue
@@ -0,0 +1,72 @@
<template>
<show-field-wrapper :field="field" :index="index">
<div class="spinner" v-if="loading"></div>
<div :class="classes">
{{ value }}
</div>
</show-field-wrapper>
</template>

<style>
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
.spinner {
display: inline-block;

width: 18px;
height: 18px;
margin: 0px 5px -3px 0px;
background-color: #333;

border-radius: 100%;
-webkit-animation: sk-scaleout 1.0s infinite ease-in-out;
animation: sk-scaleout 1.0s infinite ease-in-out;
}

@-webkit-keyframes sk-scaleout {
0% { -webkit-transform: scale(0) }
100% {
-webkit-transform: scale(1.0);
opacity: 0;
}
}

@keyframes sk-scaleout {
0% {
-webkit-transform: scale(0);
transform: scale(0);
} 100% {
-webkit-transform: scale(1.0);
transform: scale(1.0);
opacity: 0;
}
}
</style>

<script>
export default {
props: ['field'],
computed: {
classes() {
const classes = ['inline-block']
let fail = false
this.field.failed_when.forEach((item) => {
if (this.field.value === item) fail = true
})
if (fail === true) classes.push(['text-red-700'])
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved

return classes
},
loading() {
let load = false
this.field.loading_when.forEach((item) => {
if (this.field.value === item) load = true
})
if (load === true) return true

return false
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
},
value() {
return this.field.value
},
},
}
</script>
5 changes: 5 additions & 0 deletions db/migrate/20200617164640_add_status_to_projects.rb
@@ -0,0 +1,5 @@
class AddStatusToProjects < ActiveRecord::Migration[6.0]
def change
add_column :projects, :status, :text, default: 'waiting'
end
end
26 changes: 26 additions & 0 deletions lib/avocado/app/fields/status_field.rb
@@ -0,0 +1,26 @@
require_relative 'field'

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

super(name, **args, &block)

@loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten : [:waiting, :running]
@failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten : [:failed]
end

def hydrate_resource(model, resource, view)
{
loading_when: @loading_when,
failed_when: @failed_when,
}
end
end
end
end
5 changes: 5 additions & 0 deletions lib/avocado/app/resource_fields.rb
Expand Up @@ -53,6 +53,11 @@ def boolean_group(name, **args, &block)
@@fields[self].push Avocado::Fields::BooleanGroupField::new(name, **args, &block)
end

def status(name, **args)
@@fields[self].push Avocado::Fields::StatusField::new(name, **args)
end


def belongs_to(name, **args)
@@fields[self].push Avocado::Fields::BelongsToField::new(name, **args)
end
Expand Down
1 change: 1 addition & 0 deletions spec/dummy/app/services/avocado/resources/project.rb
Expand Up @@ -11,6 +11,7 @@ def initialize
id :ID
text :Name, required: true
has_many :Users
status :Status, failed_when: ['stricat', 'closed', 'reject', 'failed'], loading_when: ['loading', 'running', 'waiting', 'asteapta']
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
end

# use_filter Avocado::Filters::IndicatorFilter
Expand Down
10 changes: 8 additions & 2 deletions spec/dummy/db/schema.rb
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_17_164640) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
Expand Down Expand Up @@ -42,6 +42,11 @@
t.datetime "updated_at", precision: 6, null: false
end

create_table "migrations", id: :serial, force: :cascade do |t|
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
t.string "migration", limit: 255, null: false
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
t.integer "batch", null: false
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
end

create_table "posts", force: :cascade do |t|
t.string "name"
t.text "body"
Expand All @@ -56,6 +61,7 @@
t.string "name"
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
t.text "status"
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
end

create_table "projects_users", force: :cascade do |t|
Expand Down Expand Up @@ -108,8 +114,8 @@
t.datetime "remember_created_at"
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
t.string "highlighted", default: "no"
t.date "birthday"
t.string "highlighted", default: "no"
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
t.index ["email"], name: "index_users_on_email", unique: true
t.index ["group_id"], name: "index_users_on_group_id"
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
Expand Down
68 changes: 68 additions & 0 deletions spec/system/avocado/avocado_status_fields_spec.rb
@@ -0,0 +1,68 @@
require 'rails_helper'

RSpec.describe "StatusFields", type: :system do
mihaimdm22 marked this conversation as resolved.
Show resolved Hide resolved
describe 'with regular input' do
let!(:project) { create :project }

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

expect(page).to have_text project.status
end
end

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

expect(page).to have_text project.status
end
end

context 'edit' do
it 'has the projects status prefilled' do
visit "/avocado/resources/projects/#{project.id}/edit"

expect(find_field('status').value).to eq ''
end

it 'changes the projects status to normal' do
visit "/avocado/resources/projects/#{project.id}/edit"

fill_in 'status', with: 'normal'

click_on 'Save'
wait_for_loaded

expect(current_path).to eql "/avocado/resources/projects/#{project.id}"
expect(page).to have_text 'normal'
end

it 'changes the projects status to failed' do
visit "/avocado/resources/projects/#{project.id}/edit"

fill_in 'status', with: 'failed'

click_on 'Save'
wait_for_loaded

expect(current_path).to eql "/avocado/resources/projects/#{project.id}"
expect(page).to have_text 'failed'
end

it 'changes the projects status to waiting' do
visit "/avocado/resources/projects/#{project.id}/edit"

fill_in 'status', with: 'waiting'

click_on 'Save'
wait_for_loaded

expect(current_path).to eql "/avocado/resources/projects/#{project.id}"
expect(page).to have_text 'waiting'
end

end
end
end