engine2 1.0.8 → 1.0.9

data/app/modal.coffee

@@ -97,11 +97,16 @@ angular.module('Engine2')
                     modal.show()
                     modal
 
-        error: (title, msg, html) ->
-            body = if html then msg else "<div class='alert alert-danger'>#{msg}</div>"
-            clazz = if html then "modal-huge" else "modal-large"
+        show_modal: (title, msg, options = {html: false, alert_class: 'alert-danger', modal_class: 'modal-large'}) ->
+            body = if options.html then msg else "<div class='alert alert-#{options.alert_class}'>#{msg}</div>"
+            clazz = if options.html then "modal-huge" else options.modal_class
             @show meta: panel: (panel_template: "close_m", template_string: body, title: title, class: clazz, footer: true) # message: msg,
 
+
+        info: (title, msg, options = {alert_class: 'info', modal_class: 'modal-large'}) -> @show_modal(title, msg, options)
+        warning: (title, msg, options = {alert_class: 'warning', modal_class: 'modal-large'}) -> @show_modal(title, msg, options)
+        error: (title, msg, options = {alert_class: 'danger', modal_class: 'modal-huge'}) -> @show_modal(title, msg, options)
+
         confirm: (title, msg, action) ->
             body = "<div class='alert alert-warning'>#{msg}</div>"
             clazz = "modal-large"

data/bower.json

@@ -2,9 +2,10 @@
   "name": "engine2",
   "version": "1.0.0",
   "dependencies": {
-    "angular-strap": "^2.3.10",
+    "angular-strap": "^2.3.12",
     "angular": "^1.5.8",
-    "angular-websocket": "^2.0.0"
+    "angular-websocket": "^2.0.0",
+    "angular-toastr": "^2.1.1"
   },
   "overrides": {
     "angular": {

data/conf/message.yaml

@@ -10,11 +10,14 @@
 :decode_selected:               selected
 :list_select_selected:          Selected
 
+:E2Files:                       Files
+:files:                         File
 :name:                          Name
 :mime:                          Mime
 :owner:                         Owner
 :model:                         Model
 :field:                         Field
+:uploaded:                      Uploaded
 :updated:                       Updated
 
 :ok:                            Ok

data/conf/message_pl.yaml

@@ -10,11 +10,14 @@
 :decode_selected:               wybranych
 :list_select_selected:          Wybranych
 
+:E2Files:                       Pliki
+:files:                         Plik
 :name:                          Nazwa
 :mime:                          Mime
 :owner:                         Właściciel
 :model:                         Model
 :field:                         Pole
+:uploaded:                      Wysłany
 :updated:                       Aktualizowany
 
 :ok:                            Ok
@@ -31,12 +34,12 @@
 :select_toggle:                 Zaznacz
 :confirm_delete:                Usuń
 :confirm_delete_title:          <span class='glyphicon glyphicon-trash'></span> Potwierdzenie
-:confirm_bulk_delete:           Usuń zaznacznone
+:confirm_bulk_delete:           Usuń zaznaczone
 :delete_restricted:             Blokujące relacje
 :confirm_bulk_delete_title:     <span class='glyphicon glyphicon-trash'></span> Potwierdzenie
 :confirm_unlink:                Odłącz
 :confirm_unlink_title:          <span class='glyphicon glyphicon-minus'></span> Potwierdzenie
-:confirm_bulk_unlink:           Odłącz zaznacznone
+:confirm_bulk_unlink:           Odłącz zaznaczone
 :confirm_bulk_unlink_title:     <span class='glyphicon glyphicon-minus'></span> Potwierdzenie
 :debug_info:                    Debug info
 :show_meta:                     Metainfo

data/config.coffee

@@ -24,8 +24,8 @@ exports.config =
   files:
     javascripts:
       joinTo:
-        'engine2vendor.js': /^node_modules|bower_components/
-        'engine2.js': /^app/
+        'assets/engine2vendor.js': /^node_modules|bower_components/
+        'assets/engine2.js': /^app/
       order:
         before: [
           "app/engine2.coffee"
@@ -33,35 +33,36 @@ exports.config =
 
     stylesheets:
       joinTo:
-        'engine2vendor.css': /^node_modules/
-        'engine2.css': /^app/
-      order:
-        before: [
-          /bootstrap.css$/
-        ]
+        'assets/engine2vendor.css': /^(?:node_modules||bower_components)\/(?!(bootstrap\/))/
+        'assets/bootstrap.css': /^node_modules\/(bootstrap\/)/
+        'assets/engine2.css': /^app/
+      # order:
+      #   before: [
+      #     /bootstrap\.css$/
+      #   ]
 
   plugins:
     on: ["ng-annotate-brunch"]
 
     uglify:
-      mangle: false
+      mangle: true
       compress:
         global_defs:
           DEBUG: false
 
     replacement:
       replacements: [
-        files: [/vendor.js$/]
+        files: [/vendor\.js$/]
         match: (
             fix = "$modal.$element = compileData.link(modalScope, function(clonedElement, scope) {});"
             find: fix.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1")
             replace: "#{fix}$modal.$backdrop = backdropElement;"
-        ),
-        files: [/vendor\.css$/]
-        match: (
-            find: "../fonts"
-            replace: "fonts"
         )
+        # files: [/\.css$/]
+        # match: (
+        #     find: "../fonts"
+        #     replace: "fonts"
+        # )
       ]
 
     copycat:

data/engine2.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'faye-websocket', '~> 0.10'
 
     spec.add_development_dependency "bundler", "~> 2.00"
-    spec.add_development_dependency "rake", "~> 12"
+    spec.add_development_dependency "rake", "~> 13"
 end

data/lib/engine2/action.rb

@@ -69,7 +69,7 @@ module Engine2
                 action = self.class.new(node, assets, self)
                 result = action.instance_exec(handler, *action.request_action_proc_params(handler), &rmp)
                 action.post_process
-                response = @requestable ? (result || {}) : action.invoke(handler)
+                response = @requestable ? (result.is_a?(Hash) ? result : {}) : action.invoke(handler)
                 response[:meta] = action.meta
                 response
             else
@@ -82,7 +82,7 @@ module Engine2
         end
 
         def arguments args
-            @meta[:arguments] = args
+            (@meta[:arguments] ||= {}).merge! args
         end
 
         def execute command
@@ -235,7 +235,8 @@ module Engine2
     class RootAction < Action
         def initialize *args
             super
-            @meta.merge! environment: Handler::environment, application: Engine2::SETTINGS[:name], key_separator: Engine2::SETTINGS[:key_separator], ws_methods: ActionWebSocketSupport::WS_METHODS
+            @meta.merge! environment: Handler::environment, application: Engine2::SETTINGS[:name], uuid: SecureRandom.uuid,
+                key_separator: Engine2::SETTINGS[:key_separator], ws_methods: ActionWebSocketSupport::WS_METHODS
         end
     end
 
@@ -459,7 +460,7 @@ module Engine2
 
     module ActionAngularSupport
         def ng_execute expr
-            (@meta[:execute] ||= "") << expr + ";"
+            (@meta[:execute] ||= String.new) << expr + ";"
         end
 
         def ng_record! name, value
@@ -586,13 +587,12 @@ module Engine2
     end
 
     module ActionOnChangeSupport
-        def on_change field, &blk
+        def on_change field, trigger_on_start = false, &blk
             node_name = :"#{field}_on_change"
-            nd = node.define_node node_name, (blk.arity > 2 ? OnChangeGetAction : OnChangePostAction)
+            nd = node.define_node node_name, (blk.arity <= 2 ? OnChangeGetAction : OnChangePostAction)
             nd.*{request &blk}
 
-            fields! field, remote_onchange: node_name
-            fields! field, remote_onchange_record: :true if blk.arity > 2
+            fields! field, remote_onchange: {action: node_name, record: blk.arity > 2, trigger_on_start: trigger_on_start}
         end
 
         class OnChangeAction < Action
@@ -608,9 +608,9 @@ module Engine2
                 end
             end
 
-            def invoke handler
-                {}
-            end
+            # def invoke handler
+            #     {}
+            # end
         end
 
         class OnChangeGetAction < OnChangeAction
@@ -635,17 +635,17 @@ module Engine2
 
     module ActionListSupport
         include ActionModelSupport, ActionAPISupport, ActionTabSupport, ActionPanelSupport, ActionMenuSupport, ActionOnChangeSupport, ActionDraggableSupport
-        attr_reader :filters, :orders
+        attr_reader :filters, :orders, :default_order_field
 
         def pre_run
             super
             config.merge!(per_page: 10, use_count: false, selectable: true) # search_active: false,
 
             panel_template 'scaffold/list'
-            panel_title "#{:list.icon} #{LOCS[assets[:model].name.to_sym]}"
+            panel_title "#{assets[:model].model_icon.icon} #{LOCS[assets[:model].model_route]}"
             loc! LOCS[:list_locs]
             menu :menu do
-                properties break: 2, group_class: "btn-group-xs"
+                properties break: 2, group_class: "btn-group-sm"
                 option :search_toggle, icon: "search", show: "action.meta.search_field_list", active: "action.ui_state.search_active", button_loc: false
                 # divider
                 option :refresh, icon: "refresh", button_loc: false
@@ -657,7 +657,7 @@ module Engine2
             end
 
             menu :item_menu do
-                properties break: 1, group_class: "btn-group-xs"
+                properties break: 1, group_class: "btn-group-sm"
             end
 
             @meta[:state] = [:query, :ui_state]
@@ -676,6 +676,8 @@ module Engine2
         end
 
         def post_run
+            super
+
             unless panel[:class]
                 panel_class case @meta[:field_list].size
                 when 1..3; ''
@@ -684,7 +686,6 @@ module Engine2
                 end
             end
 
-            super
             @meta[:primary_fields] = assets[:model].primary_keys
         end
 
@@ -744,8 +745,15 @@ module Engine2
             fields! *flds, sort: true
         end
 
+        def default_order order
+            @default_order_field = order
+        end
+
         def search_live *flds
-            flds = @meta[:search_field_list] if flds.empty?
+            if flds.empty?
+                flds = @meta[:search_field_list]
+                @meta[:disable_search_button] = true
+            end
             fields! *flds, search_live: true
         end
 
@@ -770,8 +778,12 @@ module Engine2
         end
 
         def filter_case_insensitive name
-            raise E2Error.new("Field '#{name}' needs to be a string one") unless assets[:model].find_type_info(name)[:otype] == :string
-            filter(name){|handler, query, hash| query.where(name.ilike("%#{hash[name]}%")) }
+            model = assets[:model]
+            raise E2Error.new("Field '#{name}' needs to be a string") unless model.find_type_info(name)[:otype] == :string
+            filter name do |handler, query, hash|
+                value = hash[name]
+                value ? query.where(model.table_name.q(name).ilike("%#{value}%")) : query
+            end
         end
 
         def order name, &blk
@@ -817,7 +829,10 @@ module Engine2
             model = assets[:model]
             handler.permit json_rec.is_a?(Hash)
             val_fields = (dynamic? ? static.validate_fields : @validate_fields) || model.type_info.keys
-            handler.permit (json_rec.keys - val_fields).empty?
+            left_fields = (json_rec.keys - val_fields)
+
+            puts "Left: #{left_fields.inspect}" unless left_fields.empty?
+            handler.permit left_fields.empty?
 
             record = model.call(json_rec)
             record.validate_fields = val_fields
@@ -1025,6 +1040,14 @@ module Engine2
         def hr_after field, message = '-'
             fields! field, hr: message
         end
+
+        def create?
+            @action_type == :create
+        end
+
+        def modify?
+            @action_type == :modify
+        end
     end
 
     module ActionCreateSupport
@@ -1037,7 +1060,7 @@ module Engine2
         def pre_run
             super
             panel_title "#{LOCS[:create_title]} - #{LOCS[assets[:model].table_name]}"
-            node.parent.*.menu(:menu).option_at 0, node.name, icon: "plus-sign", button_loc: false if node.parent.*.is_a?(ListAction)
+            node.parent.*.menu(:menu).option_at 0, node.name, icon: "plus-sign", button_loc: false if node.parent.*.is_a?(ActionListSupport)
 
             hide_pk unless assets[:model].natural_key
         end
@@ -1305,6 +1328,10 @@ module Engine2
             action.fields(field)[:render] ||= {}
             action.fields(field)[:render].merge! format: info[:format], model_format: info[:model_format] # Model::DEFAULT_DATE_FORMAT
         },
+        datetime: lambda{|action, field, info|
+            action.fields(field)[:render] ||= {}
+            action.fields(field)[:render].merge! format: info[:date_format], model_format: info[:date_model_format] # Model::DEFAULT_DATE_FORMAT
+        },
         decimal_date: lambda{|action, field, info|
             SearchRendererPostProcessors[:date].(action, field, info)
         }
@@ -1330,11 +1357,11 @@ module Engine2
         email: lambda{|action, info| Templates.email(info[:length])},
         password: lambda{|action, info| Templates.password(info[:length])},
         # date_range: lambda{|action, info| Templates.date_range},
-        boolean: lambda{|action, info| Templates.checkbox_buttons(optional: !info[:required])},
+        boolean: lambda{|action, info| Templates.checkbox_button},
         currency: lambda{|action, info| Templates.currency},
         list_select: lambda{|action, info|
             length = info[:values].length
-            max_length = info[:values].map(&:last).max_by(&:length).length
+            max_length = length > 0 ? info[:values].map(&:last).max_by(&:length).length : 0
             if info[:multiselect]
                 Templates.list_bsmselect(max_length)
             elsif length <= 3
@@ -1360,6 +1387,7 @@ module Engine2
 
     (DefaultSearchRenderers ||= {}).merge!(
         date: lambda{|action, info| SearchTemplates.date_range},
+        datetime: lambda{|action, info| SearchTemplates.date_range},
         decimal_date: lambda{|action, info| SearchTemplates.date_range},
         integer: lambda{|action, info| SearchTemplates.integer_range},
         string: lambda{|action, info| SearchTemplates.input_text},

data/lib/engine2/action/array.rb

@@ -93,4 +93,97 @@ module Engine2
             entries
         end
     end
-end
+
+    class ArrayViewAction < Action
+        include ActionViewSupport
+
+        def find_record handler, id
+            node.parent.*.data_source(handler)[id.to_i]
+        end
+    end
+
+    class ArrayFormAction < Action
+    end
+
+    class ArrayCreateAction < ArrayFormAction
+        include ActionCreateSupport
+    end
+
+    class ArrayModifyAction < ArrayFormAction
+        include ActionModifySupport
+
+        def find_record handler, id
+            node.parent.*.data_source(handler)[id.to_i]
+        end
+    end
+
+    class ArrayDeleteAction < Action
+        include ActionDeleteSupport
+
+        def invoke handler
+            handler.permit id = handler.params[:id]
+            node.parent.parent.*.data_source(handler).delete_at(id.to_i)
+        end
+    end
+
+    class ArraySaveAction < Action
+        include ActionApproveSupport
+    end
+
+    class ArrayInsertAction < ArraySaveAction
+        include ActionInsertSupport
+        action_type :approve
+
+        def after_approve handler, record
+            # handler.permit id = record[:id]
+            # ds = node.parent.parent.*.data_source(handler)
+        end
+    end
+
+    class ArrayUpdateAction < ArraySaveAction
+        include ActionUpdateSupport
+        action_type :approve
+
+        def after_approve handler, record
+            handler.permit id = record[:id]
+            node.parent.parent.*.data_source(handler)[id].merge!(record.values)
+        end
+    end
+
+    class Schemes
+        ARRAY_CRUD ||= {array_create: true, array_view: true, array_modify: true, array_delete: true}.freeze
+        ARRAY_VIEW ||= {array_view: true}
+    end
+
+    SCHEMES.instance_eval do
+        define_scheme :array_view do |name = :view|
+            define_node name, ArrayViewAction
+        end
+
+        define_scheme :array_modify do |name = :modify|
+            define_node name, ArrayModifyAction do
+                define_node :approve, ArrayUpdateAction
+            end
+        end
+
+        define_scheme :array_create do |name = :create|
+            define_node name, ArrayCreateAction do
+                define_node :approve, ArrayInsertAction
+            end
+        end
+
+        define_scheme :array_delete do
+            run_scheme :confirm, :delete, ArrayDeleteAction,
+                message: LOCS[:delete_question], title: LOCS[:confirm_delete_title]
+        end
+
+        define_scheme :array do |name, model, options|
+            options ||= Schemes::ARRAY_CRUD
+            define_node name, ArrayListAction, model: model do
+                options.each{|k, v| run_scheme(k) if v}
+
+                define_node_bundle :form, :create, :modify if options[:array_create] && options[:array_modify]
+            end
+        end
+    end
+end