avo 0.4.7 → 0.5.0.beta2

data/bin/rspec

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+require 'bundler/setup'
+load Gem.bin_path('rspec-core', 'rspec')

data/bin/spring

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# This file loads Spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+  require 'rubygems'
+  require 'bundler'
+
+  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+  spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
+  if spring
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem 'spring', spring.version
+    require 'spring/binstub'
+  end
+end

data/bin/test

@@ -0,0 +1,21 @@
+#!/bin/bash -e
+
+export RAILS_ENV="test"
+export NODE_ENV="test"
+
+# Run unit tests
+if [[ -z "$1" ]] || [[ "$1" == "unit" ]]; then
+  bundle exec rspec ./spec --tag type:feature
+  bundle exec rspec ./spec --tag type:controller
+fi;
+
+# Run system tests
+if [[ -z "$1" ]] || [[ "$1" == "system" ]]; then
+  bin/webpack
+  bundle exec rspec ./spec --tag type:system
+fi;
+
+# Run open-ended test paths
+if [[ "$@" ]] && [[ "$1" != "unit" ]] && [[ "$1" != "system" ]]; then
+  bundle exec rspec $@
+fi;

data/bin/webpack

@@ -1,19 +1,18 @@
 #!/usr/bin/env ruby
 
-ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= "development"
+ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] || 'development'
+ENV['NODE_ENV']  ||= 'development'
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-require "webpacker"
-require "webpacker/webpack_runner"
+require 'webpacker'
+require 'webpacker/webpack_runner'
 
-APP_ROOT = File.expand_path("..", __dir__)
+APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
   Webpacker::WebpackRunner.run(ARGV)
 end

data/bin/webpack-dev-server

@@ -1,19 +1,18 @@
 #!/usr/bin/env ruby
 
-ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= "development"
+ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] || 'development'
+ENV['NODE_ENV']  ||= 'development'
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-require "webpacker"
-require "webpacker/dev_server_runner"
+require 'webpacker'
+require 'webpacker/dev_server_runner'
 
-APP_ROOT = File.expand_path("..", __dir__)
+APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
   Webpacker::DevServerRunner.run(ARGV)
 end

data/config/cable.yml

@@ -0,0 +1,11 @@
+development:
+  adapter: redis
+  url: redis://localhost:6379/1
+
+test:
+  adapter: test
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: dummy_production

data/config/initializers/inline_svg.rb

@@ -0,0 +1,33 @@
+# Overriding the 1.7.1 version of WebpackAssetFinder to add custom webpacker instance
+module InlineSvg
+  class WebpackAssetFinder
+    def initialize(filename)
+      @filename = filename
+      @webpacker = Avo.webpacker
+      @asset_path = @webpacker.manifest.lookup(@filename)
+    end
+
+    def pathname
+      return if @asset_path.blank?
+
+      if @webpacker.dev_server.running?
+        dev_server_asset(@asset_path)
+      elsif @webpacker.config.public_path.present?
+        File.join(@webpacker.config.public_path, @asset_path)
+      end
+    end
+
+    private
+
+    def fetch_from_dev_server(file_path)
+      http = Net::HTTP.new(@webpacker.dev_server.host, @webpacker.dev_server.port)
+      http.use_ssl = @webpacker.dev_server.https?
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      http.request(Net::HTTP::Get.new(file_path)).body
+    rescue StandardError => e
+      Rails.logger.error "[inline_svg] Error fetching #{@filename} from webpack-dev-server: #{e}"
+      raise
+    end
+  end
+end

data/config/initializers/pagy.rb

@@ -0,0 +1 @@
+require 'pagy/extras/trim'

data/config/routes.rb

@@ -1,28 +1,32 @@
 Avo::Engine.routes.draw do
   root 'home#index'
 
-  get '/avo-api/:resource_name/filters',  to: 'filters#index'
+  get 'resources', to: redirect('/avo')
 
-  get '/avo-api/:resource_name/actions',  to: 'actions#index'
-  post '/avo-api/:resource_name/actions', to: 'actions#handle'
+  scope 'resources', as: 'resources' do
+    # Attachments
+    get    '/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id', to: 'attachments#show'
+    delete '/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id', to: 'attachments#destroy'
 
-  get '/avo-api/search',                  to: 'search#index'
-  get '/avo-api/:resource_name/search',   to: 'search#resource'
+    # Actions
+    get  '/:resource_name(/:id)/actions/:action_id', to: 'actions#show'
+    post '/:resource_name(/:id)/actions/:action_id', to: 'actions#handle'
 
-  get '/avo-api/:resource_name',          to: 'resources#index'
-  post '/avo-api/:resource_name',         to: 'resources#create'
-  get '/avo-api/:resource_name/new',      to: 'resources#new'
-  get '/avo-api/:resource_name/:id',      to: 'resources#show'
-  get '/avo-api/:resource_name/:id/edit', to: 'resources#edit'
-  put '/avo-api/:resource_name/:id',      to: 'resources#update'
-  delete '/avo-api/:resource_name/:id',   to: 'resources#destroy'
+    # Generate resource routes as below:
+    # resources :posts
+    instance_eval(&Avo::App.draw_routes)
 
-  post '/avo-api/:resource_name/:id/attach/:attachment_name/:attachment_id', to: 'relations#attach'
-  post '/avo-api/:resource_name/:id/detach/:attachment_name/:attachment_id', to: 'relations#detach'
+    # Relations
+    get    '/:resource_name/:id/:related_name/new',         to: 'relations#new'
+    get    '/:resource_name/:id/:related_name/',            to: 'relations#index'
+    get    '/:resource_name/:id/:related_name/:related_id', to: 'relations#show'
+    post   '/:resource_name/:id/:related_name',             to: 'relations#create'
+    delete '/:resource_name/:id/:related_name/:related_id', to: 'relations#destroy'
+  end
 
-  # Tools
-  get '/avo-tools/resource-overview', to: 'resource_overview#index'
+  # get '/avo-api/search',                  to: 'search#index'
+  # get '/avo-api/:resource_name/search',   to: 'search#resource'
 
-  # Catch them all
-  get '/:view/(:tool)/(:resource_name)/(:option)', to: 'home#index'
+  # Tools
+  # get '/avo-tools/resource-overview', to: 'resource_overview#index'
 end

data/config/spring.rb

@@ -0,0 +1,7 @@
+Spring.application_root = './spec/dummy'
+Spring.watch(
+  '.ruby-version',
+  '.rbenv-vars',
+  'tmp/restart.txt',
+  'tmp/caching-dev.txt'
+)

data/config/webpack/environment.js

@@ -1,14 +1,18 @@
 const { environment } = require('@rails/webpacker')
-const { VueLoaderPlugin } = require('vue-loader')
-
 const aliases = require('./aliases')
-const vue = require('./loaders/vue')
-const vueSvg = require('./loaders/vue-svg')
-// const vueCss = require('./loaders/vue-post-css')
-
-environment.loaders.append('vueSvg', vueSvg)
-environment.plugins.append('VueLoaderPlugin', new VueLoaderPlugin())
-environment.loaders.append('vue', vue)
-// environment.loaders.append('vueCss', vueCss)
+
 environment.config.merge(aliases)
+
+// Fix the post-css loader config format
+environment.loaders.keys().forEach(loaderName => {
+  let loader = environment.loaders.get(loaderName);
+  loader.use.forEach(loaderConfig => {
+    if (loaderConfig.options && loaderConfig.options.config) {
+      loaderConfig.options.postcssOptions = loaderConfig.options.config;
+      delete loaderConfig.options.config;
+    }
+  });
+});
+
+
 module.exports = environment

data/config/webpacker.yml

@@ -3,13 +3,12 @@
 default: &default
   source_path: app/frontend
   source_entry_path: packs
-  # public_root_path: public
+  public_root_path: public
   cache_path: tmp/cache/webpacker
   check_yarn_integrity: false
   # use a different sub-folder name
   public_output_path: avo-packs
-  webpack_compile_output: false
-  public_root_path: public
+  webpack_compile_output: true
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
@@ -79,7 +78,6 @@ development:
       ignored: '**/node_modules/**'
     env_prefix: "AVO_WEBPACKER_DEV_SERVER"
 
-
 test:
   <<: *default
   compile: true
@@ -94,5 +92,8 @@ production:
   # Production depends on precompilation of packs prior to booting for performance.
   compile: false
 
+  # Extract and emit a css file
+  extract_css: true
+
   # Cache manifest.json for performance
   cache_manifest: true

data/config/webpacker_packed.yml

@@ -0,0 +1,86 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  source_path: app/frontend
+  source_entry_path: packs
+  public_root_path: public
+  cache_path: tmp/cache/webpacker
+  check_yarn_integrity: false
+  # use a different sub-folder name
+  public_output_path: avo-packs
+  webpack_compile_output: true
+
+  # Additional paths webpack should lookup modules
+  # ['app/assets', 'engine/foo/app/assets']
+  resolved_paths: []
+
+  # Reload manifest.json on all requests so we reload latest compiled packs
+  cache_manifest: false
+
+  # Extract and emit a css file
+  extract_css: true
+
+  static_assets_extensions:
+    - .jpg
+    - .jpeg
+    - .png
+    - .gif
+    - .tiff
+    - .ico
+    - .svg
+    - .eot
+    - .otf
+    - .ttf
+    - .woff
+    - .woff2
+
+  extensions:
+    - .ts
+    - .vue
+    - .mjs
+    - .js
+    - .sass
+    - .scss
+    - .css
+    - .module.sass
+    - .module.scss
+    - .module.css
+    - .png
+    - .svg
+    - .gif
+    - .jpeg
+    - .jpg
+
+# We override the development env. when packed.
+# Avo needs to be packed and compiled for when the dev uses it in his development env.
+development:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Extract and emit a css file
+  extract_css: true
+
+  # Cache manifest.json for performance
+  cache_manifest: true
+
+test:
+  <<: *default
+  compile: true
+
+  # Compile test packs to a separate directory
+  public_output_path: packs-test
+  public_root_path: spec/dummy/public
+
+production:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Extract and emit a css file
+  extract_css: true
+
+  # Cache manifest.json for performance
+  cache_manifest: true

data/db/factories.rb

@@ -18,15 +18,22 @@ FactoryBot.define do
     name { Faker::Quote.famous_last_words }
     body { Faker::Lorem.paragraphs(number: rand(4...10)).join("\n") }
     is_featured { [true, false].sample }
-    published_at { Time.now - rand(10...365).days }
+    published_at do
+      if [false, true].sample
+        Time.now - rand(10...365).days
+      else
+        nil
+      end
+    end
   end
 
   factory :project do
-    name { Faker::Hacker.say_something_smart }
+    name { Faker::App.name }
     status { [:closed, :rejected, :failed, :loading, :running, :waiting].sample }
-    stage { ['Discovery', 'Ideea', 'Done', 'On hold', 'Cancelled'].sample }
+    stage { ['Discovery', 'Idea', 'Done', 'On hold', 'Cancelled'].sample }
     budget { Faker::Number.decimal(l_digits: 4) }
     country { Faker::Address.country_code }
+    description { Faker::Markdown.sandwich(sentences: 5) }
     users_required { Faker::Number.between(from: 10, to: 100) }
     started_at { Time.now - rand(10...365).days }
     meta { [{ foo: 'bar', hey: 'hi' }, { bar: 'baz' }, { hoho: 'hohoho' }].sample }

data/db/migrate/20210305082639_add_url_to_teams.rb

@@ -0,0 +1,5 @@
+class AddUrlToTeams < ActiveRecord::Migration[6.0]
+  def change
+    add_column :teams, :url, :string
+  end
+end

data/lib/avo.rb

@@ -9,6 +9,9 @@ require_relative 'avo/app/filter'
 require_relative 'avo/app/filters/boolean_filter'
 require_relative 'avo/app/filters/select_filter'
 
+require_relative 'avo/app/fields_loader'
+require_relative 'avo/app/actions_loader'
+# require_relative 'avo/app/fields_loader_helper'
 require_relative 'avo/app/resource'
 
 require_relative 'avo/app/licensing/license_manager'

data/lib/avo/app/action.rb

@@ -1,3 +1,6 @@
+require_relative 'fields_loader'
+
+
 module Avo
   module Actions
     class Action
@@ -16,55 +19,57 @@ module Avo
       # }
       attr_accessor :response
       attr_accessor :no_confirmation
+      attr_accessor :model
+      attr_accessor :resource
+      attr_accessor :user
 
-      @@default = nil
-
-      class << self
-        @@fields = {}
-
-        def fields(&block)
-          @@fields[self] ||= []
-          yield
-        end
+      attr_accessor :field_loader
 
-        def get_fields
-          @@fields[self] or []
-        end
+      alias :field :field_loader
+      alias :f :field
 
-        def add_field(action, field)
-          @@fields[action].push field
-        end
-      end
+      @@default = nil
 
       def initialize
         @name ||= name
         @message ||= I18n.t('avo.are_you_sure_you_want_to_run_this_option')
         @default ||= ''
         @fields ||= []
-        @confirm_text = I18n.t('avo.run')
-        @cancel_text = I18n.t('avo.cancel')
+        @confirm_text ||= I18n.t('avo.run')
+        @cancel_text ||= I18n.t('avo.cancel')
         @response ||= {}
-        @response[:message_type] ||= :success
+        @response[:message_type] ||= :notice
         @response[:message] ||= I18n.t('avo.action_ran_successfully')
         @theme ||= 'success'
         @no_confirmation ||= false
       end
 
-      def render_response(model, resource)
-        fields = get_fields.map { |field| field.fetch_for_action(model, resource) }
-
-        {
-          id: id,
-          name: name,
-          fields: fields,
-          message: message,
-          theme: theme,
-          confirm_text: confirm_text,
-          cancel_text: cancel_text,
-          default: default,
-          action_class: self.class.to_s,
-          no_confirmation: no_confirmation,
-        }
+      def boot_fields(request)
+        @field_loader = Avo::FieldsLoader.new
+        fields request if self.respond_to? :fields
+      end
+
+      def get_fields(view_type: :table)
+        get_field_definitions.map do |field|
+          field.hydrate(action: self, model: @model)
+        end
+        .select do |field|
+          field.can_see.present? ? field.can_see.call : true
+        end
+      end
+
+      def get_field_definitions
+        @field_loader.bag.map do |field|
+          field.hydrate(action: self)
+        end
+      end
+
+      def hydrate(model: nil, resource: nil, user: nil)
+        @model = model if model.present?
+        @resource = resource if resource.present?
+        @user = user if user.present?
+
+        self
       end
 
       def handle_action(request, models, raw_fields)
@@ -85,7 +90,7 @@ module Avo
         self
       end
 
-      def id
+      def param_id
         self.class.name.underscore.gsub '/', '_'
       end
 
@@ -94,29 +99,26 @@ module Avo
       end
 
       def succeed(text)
-        self.response[:message_type] = :success
+        self.response[:message_type] = :notice
         self.response[:message] = text
 
         self
       end
 
       def fail(text)
-        self.response[:message_type] = :error
+        self.response[:message_type] = :alert
         self.response[:message] = text
 
         self
       end
 
-      def redirect(path)
+      def redirect_to(path = nil, &block)
         self.response[:type] = :redirect
-        self.response[:path] = path
-
-        self
-      end
-
-      def http_redirect(path)
-        self.response[:type] = :http_redirect
-        self.response[:path] = path
+        if block.present?
+          self.response[:path] = block
+        else
+          self.response[:path] = path
+        end
 
         self
       end
@@ -127,19 +129,6 @@ module Avo
         self
       end
 
-      def reload_resources
-        self.response[:type] = :reload_resources
-
-        self
-      end
-
-      def open_in_new_tab(path)
-        self.response[:type] = :open_in_new_tab
-        self.response[:path] = path
-
-        self
-      end
-
       def download(path, filename)
         self.response[:type] = :download
         self.response[:path] = path
@@ -148,8 +137,8 @@ module Avo
         self
       end
 
-      def get_fields
-        self.class.get_fields
+      def self.param_id
+        self.name.underscore.gsub '/', '_'
       end
     end
   end