RubyGems - avo - Versions diffs - 0.2.4 → 0.4.2 - Mend

avo 0.2.4 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (87) hide show

data/app/controllers/avo/search_controller.rb ADDED

@@ -0,0 +1,55 @@
+require_dependency 'avo/application_controller'
+module Avo
+  class SearchController < ApplicationController
+    before_action :authorize_user
+    def index
+      resources = []
+      resources_to_search_through = App.get_resources
+        .select { |resource| resource.search.present? }
+        .select { |resource| AuthorizationService.authorize_action current_user, resource.model, 'index' }
+        .each do |resource_model|
+          found_resources = add_link_to_search_results(search_resource(resource_model), resource_model)
+          resources.push({
+            label: resource_model.name,
+            resources: found_resources
+          })
+        end
+      render json: {
+        resources: resources
+      }
+    end
+    def resource
+      render json: {
+        resources: add_link_to_search_results(search_resource(avo_resource), avo_resource)
+      }
+    end
+    private
+      def add_link_to_search_results(resources, avo_resource)
+        resources.map do |model|
+          {
+            id: model.id,
+            search_label: model.send(avo_resource.title),
+            link: "/resources/#{model.class.to_s.singularize.underscore}/#{model.id}",
+          }
+        end
+      end
+      def search_resource(avo_resource)
+        avo_resource.query_search(query: params[:q], via_resource_name: params[:via_resource_name], via_resource_id: params[:via_resource_id], user: current_user)
+      end
+      def authorize_user
+        return if params[:action] == 'index'
+        action = params[:action] == 'resource' ? :index : params[:action]
+        return render_unauthorized unless AuthorizationService::authorize_action current_user, avo_resource.model, action
+      end
+  end
+end

data/app/helpers/avo/application_helper.rb CHANGED

@@ -10,12 +10,16 @@ module Avo
       render partial: 'vendor/avo/partials/logo' rescue render partial: 'partials/logo'
     end
+    def render_header
+      render partial: 'vendor/avo/partials/header' rescue render partial: 'partials/header'
+    end
     def render_footer
       render partial: 'vendor/avo/partials/footer' rescue render partial: 'partials/footer'
     end
-    def render_header
-      render partial: 'vendor/avo/partials/header' rescue render partial: 'partials/header'
+    def render_scripts
+      render partial: 'vendor/avo/partials/scripts' rescue ''
     end
   end
 end

data/app/views/layouts/avo/_javascript.html.erb CHANGED

@@ -1,5 +1,8 @@
 <script>
   var rootPath = '<%= Avo.configuration.root_path %>';
   var timezone = '<%= Avo.configuration.timezone %>';
+  var locale = '<%= Avo.configuration.locale %>';
   var defaultViewType = '<%= Avo.configuration.default_view_type %>';
+  var license = <%= Avo::App.license.properties.to_json.html_safe %>;
+  var avoResources = <%= Avo::App.get_available_resources(current_user).as_json.html_safe %>;
 </script>

data/app/views/layouts/avo/_translations.html.erb ADDED

@@ -0,0 +1,5 @@
+<script>
+  I18n.defaultLocale = 'en';
+  I18n.locale = "<%= Avo.configuration.language_code %>";
+</script>
+<%= javascript_include_tag 'translations', skip_pipeline: true %>

data/app/views/layouts/avo/application.html.erb CHANGED

@@ -8,32 +8,54 @@
   <%= javascript_pack_tag 'application' %>
   <%= stylesheet_pack_tag 'application', media: 'all' %>
+  <%= render partial: 'layouts/avo/translations' %>
   <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700;900&display=swap" rel="stylesheet">
 </head>
 <body class="bg-gray-200">
 <div id="app" class="flex min-h-screen flex-row h-full">
-  <application-sidebar :resources='<%= Avo::App.get_resources_navigation.as_json.html_safe %>'>
-    <%= render_logo %>
-  </application-sidebar>
-  <div class="flex-1 h-full overflow-auto">
-    <div class="relative bg-white p-2 shadow-md h-16 w-full flex items-center z-40">
-      <div class="ml-6">
-        <%= render_header %>
-      </div>
-      <div class="flex-1 flex justify-center">
-        <div class="w-64">
-          <resources-search :global="true">
+  <app-layout class="flex flex-1 w-full"
+    :router-key="routerKey"
+    :layout="layout"
+    inline-template
+  >
+    <div>
+      <application-sidebar v-if="layout !== 'blank'">
+        <template #logo>
+          <%= render_logo %>
+        </template>
+        <template #licensing>
+          <license-warnings></license-warnings>
+        </template>
+      </application-sidebar>
+      <div class="flex-1 flex flex-col h-full overflow-auto">
+        <div class="relative bg-white p-2 shadow-md h-16 w-full flex flex-shrink-0 items-center z-50" v-if="layout !== 'blank'">
+          <div class="ml-6">
+            <%= render_header %>
+          </div>
+          <div class="flex-1 flex justify-center">
+            <div class="w-64">
+              <resources-search :global="true">
+            </div>
+          </div>
         </div>
-      </div>
-    </div>
-    <div class="content p-8">
-      <%= yield %>
-      <%= render_footer %>
+        <div v-if="layout === 'blank'" class="h-full w-full flex justify-center items-center">
+          <%= yield %>
+        </div>
+        <div class="content p-8 flex-1 flex flex-col justify-between items-stretch" v-else>
+          <%= yield %>
+          <%= render_footer %>
+        </div>
+      </div>
     </div>
-  </div>
+  </app-layout>
 </div>
+<%= render_scripts %>
 </body>
 </html>

data/avo.gemspec CHANGED

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name        = 'avo'
   spec.version     = Avo::VERSION
   spec.authors     = ['Adrian Marin', 'Mihai Marin']
-  spec.email       = ['adrian@avohq.io']
+  spec.email       = ['avo@avohq.io']
   spec.homepage    = 'https://avohq.io'
   spec.summary     = 'Configuration-based, no-maintenance, extendable Ruby on Rails admin.'
   spec.description = 'Avo is a beautiful next-generation framework that empowers you, the developer, to create fantastic admin panels for your Ruby on Rails apps with the flexibility to fit your needs as you grow.'
@@ -38,4 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'inline_svg'
   spec.add_dependency 'webpacker'
   spec.add_dependency 'countries'
+  spec.add_dependency 'pundit'
+  spec.add_dependency 'httparty'
+  spec.add_dependency 'i18n-js'
 end

data/config/credentials.yml.enc ADDED

@@ -0,0 +1 @@

+ u5m9Je6F3j/LCnOwcN7cXW37M63Bs0KNZC1fHRObWx4YQkV9DJl1k9H9+mlvV3irAC7NZB9H0BExhxquReVe2N0v6s3E3EvOWY8wfZhFONJpK8V0qerYJIhJvCOOPv0hfS/HQdcvUQx/i1faXEgr8QVR7nGVBHUzulwgab0lUBSAV0jjEbT6o+amTojFudelgtw0zmlZW9JL7OZ/IwZ7zxbi8/yoWB52lU4VKOxZV7AEWAVDzL/0ZogLRG12BsTSmqC0jS5ocdnOgV0X7oNeYL9HINqLLM5suBB+BOf3xL6vgngu7UDRAAQ/mN2TDGsvklF8bwVz0dDVQ0RuvdeQ9TWEeM75hhzGKG6wPKBjh4ebrKp7g9TT76F6omLe/hG30MbohGxaLVHIJjyJixfKlLlYwdNWeOjXwYsn--7CEWrUIlraWa8R0S--ia1zVj/2AXISMmbinw6S7g==

data/config/routes.rb CHANGED

@@ -1,20 +1,24 @@
 Avo::Engine.routes.draw do
   root 'home#index'
-  get '/avo-api/search',                  to: 'resources#search'
-  get '/avo-api/:resource_name/search',   to: 'resources#search'
-  get '/avo-api/:resource_name',          to: 'resources#index'
-  get '/avo-api/:resource_name/filters',  to: 'resources#filters'
+  get '/avo-api/:resource_name/filters',  to: 'filters#index'
   get '/avo-api/:resource_name/actions',  to: 'actions#index'
   post '/avo-api/:resource_name/actions', to: 'actions#handle'
+  get '/avo-api/search',                  to: 'search#index'
+  get '/avo-api/:resource_name/search',   to: 'search#resource'
+  get '/avo-api/:resource_name',          to: 'resources#index'
   post '/avo-api/:resource_name',         to: 'resources#create'
-  get '/avo-api/:resource_name/fields',   to: 'resources#fields'
+  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'
-  post '/avo-api/:resource_name/:id/attach/:attachment_name/:attachment_id', to: 'resources#attach'
-  post '/avo-api/:resource_name/:id/detach/:attachment_name/:attachment_id', to: 'resources#detach'
+  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'
   # Tools
   get '/avo-tools/resource-overview', to: 'resource_overview#index'

data/lib/avo.rb CHANGED

@@ -11,8 +11,12 @@ require_relative 'avo/app/filters/select_filter'
 require_relative 'avo/app/resource'
+require_relative 'avo/app/licensing/license_manager'
 module Avo
   ROOT_PATH = Pathname.new(File.join(__dir__, '..'))
+  IN_DEVELOPMENT = ENV['AVO_IN_DEVELOPMENT'] == '1'
+  PACKED = !IN_DEVELOPMENT
   class << self
     def webpacker

data/lib/avo/app/action.rb CHANGED

@@ -15,6 +15,7 @@ module Avo
       #   filename: String
       # }
       attr_accessor :response
+      attr_accessor :no_confirmation
       @@default = nil
@@ -37,15 +38,16 @@ module Avo
       def initialize
         @name ||= name
-        @message ||= 'Are you sure you want to run this action?'
+        @message ||= I18n.t('avo.are_you_sure_you_want_to_run_this_option')
         @default ||= ''
         @fields ||= []
-        @confirm_text = 'Run'
-        @cancel_text = 'Cancel'
+        @confirm_text = I18n.t('avo.run')
+        @cancel_text = I18n.t('avo.cancel')
         @response ||= {}
         @response[:message_type] ||= :success
-        @response[:message] ||= 'Action ran successfully!'
+        @response[:message] ||= I18n.t('avo.action_ran_successfully')
         @theme ||= 'success'
+        @no_confirmation ||= false
       end
       def render_response(model, resource)
@@ -61,6 +63,7 @@ module Avo
           cancel_text: cancel_text,
           default: default,
           action_class: self.class.to_s,
+          no_confirmation: no_confirmation,
         }
       end
@@ -87,7 +90,7 @@ module Avo
       end
       def name
-        self.class.name.demodulize.underscore.humanize
+        self.class.name.demodulize.underscore.humanize(keep_id_suffix: true)
       end
       def succeed(text)

data/lib/avo/app/app.rb CHANGED

@@ -4,37 +4,47 @@ require_relative 'filters/select_filter'
 require_relative 'filters/boolean_filter'
 require_relative 'resource'
 require_relative 'tool'
+require_relative 'services/authorization_service'
 module Avo
   class App
     @@app = {
       root_path: '',
-      tools: [],
-      tool_classes: [],
       resources: [],
       field_names: {},
+      cache_store: nil
     }
+    @@license = nil
     class << self
-      def init
+      def boot
         @@app[:root_path] = Pathname.new(File.join(__dir__, '..', '..'))
-        # get_tools
-        # init_tools
         init_fields
+        I18n.locale = Avo.configuration.language_code
+        if Rails.cache.class == ActiveSupport::Cache::NullStore
+          @@app[:cache_store] ||= ActiveSupport::Cache::MemoryStore.new
+        else
+          @@app[:cache_store] = Rails.cache
+        end
+      end
+      def init(current_request = nil)
         init_resources
+        @@license = LicenseManager.new(HQ.new(current_request).response).license
       end
       def app
         @@app
       end
-      # def tools
-      #   @@app[:tools]
-      # end
+      def license
+        @@license
+      end
-      # def get_tools
-      #   @@app[:tool_classes] = ToolsManager.get_tools
-      # end
+      def cache_store
+        @@app[:cache_store]
+      end
       # This method will take all fields available in the Avo::Fields namespace and create a method for them.
       #
@@ -129,23 +139,20 @@ module Avo
         name.to_s.camelize.singularize
       end
-      # def init_tools
-      #   @@app[:tool_classes].each do |tool_class|
-      #     @@app[:tools].push tool_class.new
-      #   end
-      # end
-      # def render_navigation
-      #   navigation = []
-      #   @@app[:tools].each do |tool|
-      #     navigation.push(tool.render_navigation) if tool.class.method_defined?(:render_navigation)
-      #   end
-      #   navigation.join('')
-      # end
-      def get_resources_navigation
-        App.get_resources.map { |resource| { label: resource.resource_name_plural.humanize, resource_name: resource.url.pluralize } }.to_json.to_s.html_safe
+      def get_available_resources(user)
+        App.get_resources
+          .select { |resource| AuthorizationService::authorize user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index'] }
+          .map do |resource|
+            {
+              label: resource.plural_name.humanize(keep_id_suffix: true),
+              resource_name: resource.url.pluralize,
+              translation_key: resource.translation_key
+            }
+          end
+          .reject { |i| i.blank? }
+          .to_json
+          .to_s
+          .html_safe
       end
     end
   end

data/lib/avo/app/fields/belongs_to.rb CHANGED

@@ -7,7 +7,7 @@ module Avo
       def initialize(name, **args, &block)
         @defaults = {
           component: 'belongs-to-field',
-          placeholder: "Choose #{name.downcase}",
+          placeholder: I18n.t('avo.choose_an_option')
         }
         @searchable = args[:searchable] == true ? true : false
@@ -49,7 +49,7 @@ module Avo
           end
         end
-        fields[:resource_name_plural] = target_resource.resource_name_plural
+        fields[:plural_name] = target_resource.plural_name
         fields
       end

data/lib/avo/app/fields/code_field.rb CHANGED

@@ -12,12 +12,14 @@ module Avo
         @language = args[:language].present? ? args[:language].to_s : 'javascript'
         @theme = args[:theme].present? ? args[:theme].to_s : 'material-darker'
+        @height = args[:height].present? ? args[:height].to_s : 'auto'
       end
       def hydrate_field(fields, model, resource, view)
         {
           language: @language,
           theme: @theme,
+          height: @height,
         }
       end
     end

data/lib/avo/app/fields/country_field.rb CHANGED

@@ -5,7 +5,7 @@ module Avo
         @defaults = {
           sortable: true,
           component: 'country-field',
-          placeholder: 'Choose a country',
+          placeholder: I18n.t('avo.choose_a_country'),
         }
         super(name, **args, &block)

data/lib/avo/app/fields/field.rb CHANGED

@@ -9,6 +9,7 @@ module Avo
       attr_accessor :id
       attr_accessor :name
+      attr_accessor :translation_key
       attr_accessor :component
       attr_accessor :updatable
       attr_accessor :sortable
@@ -35,7 +36,8 @@ module Avo
         # The field properties as a hash {property: default_value}
         @field_properties = {
           id: id,
-          name: id.to_s.humanize,
+          name: id.to_s.humanize(keep_id_suffix: true),
+          translation_key: nil,
           block: block,
           component: 'field',
           required: false,

data/lib/avo/app/fields/field_extensions/visible_in_different_views.rb CHANGED

@@ -15,12 +15,16 @@ module Avo
         end
         def show_on(*where)
+          return show_on_all if where.include? :all
           normalize_views(where).flatten.each do |view|
             show_on_view view
           end
         end
         def hide_on(*where)
+          return hide_on_all if where.include? :all
           normalize_views(where).flatten.each do |view|
             hide_on_view view
           end