engine2 1.0.8 → 1.0.9

data/lib/engine2/model.rb

@@ -26,6 +26,8 @@ module Engine2
                 @before_destroy_processors = nil
                 @after_destroy_processors = nil
                 @type_info_synchronized = nil
+                @model_icon = :"list"
+                @model_route = cls.name.to_sym
             end
             cls.setup_schema
         end
@@ -54,12 +56,12 @@ module Engine2
                     when :integer
                         integer_field name
                     when :string
-                        if db_info[:db_type] == 'text'
-                            string_field name, 10
+                        string_field name, case db_info[:db_type]
+                        when 'text', 'character varying'
+                            100
                         else
-                            string_field name, Integer(db_info[:column_size] || db_info[:db_type][/\((\d+)\)/, 1])
+                            Integer(db_info[:column_size] || db_info[:db_type][/\((\d+)\)/, 1])
                         end
-
                     when :time
                         time_field name, LOCS[:default_time_format], LOCS[:default_time_model_format]
                     when :date
@@ -176,10 +178,17 @@ module Engine2
 
         def scheme s_name = :default, opts = nil, &blk
             @scheme_name = s_name
-            @scheme_args = [name.to_sym, self, opts]
-            SCHEMES::define_scheme name.to_sym, &blk
+            @scheme_args = [model_route, self, opts]
+            SCHEMES::define_scheme model_route, &blk
+        end
+
+        def model_icon icn = nil
+            icn ? @model_icon = icn : @model_icon
         end
 
+        def model_route rt = nil
+            rt ? @model_route = rt : @model_route
+        end
     end
 
     # def define_dummy_model
@@ -374,7 +383,7 @@ module Engine2
                 value.join(info[:separator])
             when :integer
                 value.reduce(0, :|)
-            end if value && info[:multiselect]
+            end if value && info[:multiselect] && !info[:dummy]
         }
     )
 
@@ -382,7 +391,7 @@ module Engine2
         file_store: lambda{|m, v, info|
             value = m.values[v]
             files = E2Files.db[:files]
-            owner = m.primary_key_values.join('|')
+            owner = Sequel::join_keys(m.primary_key_values)
             upload = info[:store][:upload]
             files_dir = info[:store][:files]
             value.each do |entry|
@@ -426,7 +435,7 @@ module Engine2
         file_store: lambda{|m, v, info|
             files = E2Files.db[:files]
             files_dir = info[:store][:files]
-            owner = m.primary_key_values.join('|')
+            owner = Sequel::join_keys(m.primary_key_values)
             files.select(:id, :name).where(owner: owner, model: m.model.name, field: v.to_s).all.each do |entry|
                 File.delete("#{files_dir}/#{entry[:name]}_#{entry[:id]}")
             end

data/lib/engine2/models/Files.rb

@@ -14,6 +14,8 @@ module Engine2
 
     class E2Files < Sequel::Model(E2DB[:files])
         extend Engine2::Model
+        model_icon :'file'
+        model_route :E2Files
 
         type_info do
             # list_select :model, Hash[@model.db.models.keys.map{|m| [m, m]}]

data/lib/engine2/scheme.rb

@@ -133,7 +133,7 @@ module Engine2
         end
 
         define_scheme :star_to_many do |assoc_name, assoc, model|
-            action.menu(:item_menu).option assoc_name, icon: "list" # , click: "action.show_assoc($index, \"#{assoc_name}!\")"
+            action.menu(:item_menu).option assoc_name, icon: Kernel::const_get(assoc[:class_name]).model_icon # , click: "action.show_assoc($index, \"#{assoc_name}!\")"
             options = assoc[:options] || Schemes::LINK
             define_node assoc_name, StarToManyListAction, model: model, assoc: assoc do
                 options.each{|k, v| run_scheme(k) if v}
@@ -236,10 +236,5 @@ module Engine2
                 end
             end
         end
-
-        define_scheme :array do |name, model|
-            define_node name, ArrayListAction, model: model do
-            end
-        end
     end
 end

data/lib/engine2/templates.rb

@@ -63,8 +63,13 @@ module Engine2
             end
 
             def list_select length, options = {}
+                template = if options[:multiple]
+                    "fields/list_mselect"
+                else
+                    options[:optional] ? "fields/list_select_opt" : "fields/list_select"
+                end
                 options.merge({
-                    template: options[:optional] ? "fields/list_select_opt" : "fields/list_select",
+                    template: template,
                     length: length
                 })
             end
@@ -91,6 +96,12 @@ module Engine2
                 })
             end
 
+            def list_mbuttons options = {}
+                options.merge({
+                    template: options[:optional] ? "fields/list_mbuttons_opt" : "fields/list_mbuttons"
+                })
+            end
+
             def select_picker options = {}
                 options.merge({
                     template: options[:optional] ? "fields/select_picker_opt" : "fields/select_picker"
@@ -117,8 +128,8 @@ module Engine2
                 })
             end
 
-            def typeahead_picker
-                {template: "fields/typeahead_picker", animation: BS_ANIMATION}
+            def typeahead_picker options = {}
+                {template: "fields/typeahead_picker", length: 20, limit: 10, min_length: 0, animation: BS_ANIMATION}.merge(options)
             end
 
             def email length
@@ -147,6 +158,10 @@ module Engine2
                 })
             end
 
+            def checkbox_button options = {}
+                {template: "fields/checkbox_button"}.merge(options)
+            end
+
             def radio_checkbox
                 {template: "fields/radio_checkbox"}
             end
@@ -171,6 +186,13 @@ module Engine2
                 })
             end
 
+            def date_picker options = {}
+                options.merge({
+                    template: "search_fields/date",
+                    animation: BS_ANIMATION
+                })
+            end
+
             def integer_range
                 {template: "search_fields/integer_range"}
             end
@@ -199,8 +221,8 @@ module Engine2
                 })
             end
 
-            def typeahead_picker
-                {template: "search_fields/typeahead_picker", animation: BS_ANIMATION}
+            def typeahead_picker options = {}
+                {template: "search_fields/typeahead_picker", limit: 10, min_length: 0, animation: BS_ANIMATION}.merge(options)
             end
 
             # def checkbox_search true_v = "1", false_v = "0"
@@ -230,9 +252,13 @@ module Engine2
                 {template: "search_fields/list_buttons"}
             end
 
+            def list_mbuttons
+                {template: "search_fields/list_mbuttons"}
+            end
+
             def decimal_date
                 {template: "search_fields/decimal_date_range", animation: BS_ANIMATION}
             end
         end
     end
-end
+end

data/lib/engine2/type_info.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 module Engine2
-
     class TypeInfo
         def initialize model
             @model = model
@@ -74,7 +73,7 @@ module Engine2
             end
         end
 
-        def boolean field, true_value = 1, false_value = 0
+        def boolean field, true_value = true, false_value = false
             modify_field field do |info|
                 info[:type] = :boolean
                 info[:true_value] = true_value
@@ -244,6 +243,12 @@ module Engine2
             end
         end
 
+        def length field, len
+            modify_field field do |info|
+                info[:length] = len
+            end
+        end
+
         def date_range from, to
             depends_on(from, to)
             modify_field from do |info|
@@ -338,7 +343,7 @@ module Engine2
 
                 raise E2Error.new("type '#{values.class}' not supported for list_select modifier for field #{name}") unless values.is_a?(Hash)
                 info[:values] = values.to_a
-                info[:validations][:list_select] = true
+                info[:validations][:list_select] = true unless values.empty?
             end
         end
 
@@ -364,6 +369,5 @@ module Engine2
                 info[:sequence] = seq_name
             end
         end
-
     end
-end
+end

data/lib/engine2/version.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 module Engine2
-    MAJOR, MINOR, TINY = [1, 0, 8]
+    MAJOR, MINOR, TINY = [1, 0, 9]
     VERSION = [MAJOR, MINOR, TINY].join('.').freeze
     def self.version
         VERSION

data/package.json

@@ -9,23 +9,24 @@
     "build": "brunch build --production"
   },
   "dependencies": {
-    "@uirouter/angularjs": "^1.0.22",
-    "@uirouter/core": "^5.0.23",
-    "angular": "^1.7.8",
-    "angular-animate": "^1.7.8",
-    "angular-cookies": "^1.7.8",
+    "@uirouter/angularjs": "1.0.23",
+    "@uirouter/core": "6.0.1",
+    "angular": "^1.8.0",
+    "angular-animate": "^1.8.0",
+    "angular-cookies": "^1.8.0",
     "angular-drag-and-drop-lists": "^2.1.0",
     "angular-load": "^0.5.0",
     "angular-local-storage": "^0.7.0",
     "angular-motion": "^0.4.0",
-    "angular-sanitize": "^1.7.8",
+    "angular-sanitize": "^1.8.0",
     "angular-ui-tree": "^2.22.0",
     "bootstrap": "^3.4.1",
     "bootstrap-additions": "0.3.1",
     "fork-awesome": "^1.1.7",
-    "lodash": "^4.17.11",
+    "json-to-pretty-yaml": "1.2.2",
+    "lodash": "^4.17.15",
     "ng-file-upload": "^12.2.0",
-    "push.js": "^1.0.9"
+    "push.js": "^1.0.12"
   },
   "devDependencies": {
     "auto-reload-brunch": "^2.7.1",

data/views/fields/checkbox_button.slim

@@ -0,0 +1,6 @@
+.col-lg-12
+  .div ng-init="(action.record[f] === null || action.record[f] === undefined) && (action.record[f] = field.render.false_value)" ng-model="action.record[f]" e2-field=""
+    a.btn.btn-default.btn-sm ng-show="action.record[f] === field.render.true_value" ng-class="action.record[f] === field.render.true_value && 'active'" ng-click="action.record[f] = field.render.false_value" ng-disabled="field.disabled"
+      span.glyphicon.glyphicon-check
+    a.btn.btn-default.btn-sm ng-show="action.record[f] === field.render.false_value" ng-click="action.record[f] = field.render.true_value" ng-disabled="field.disabled"
+      span.glyphicon.glyphicon-unchecked

data/views/fields/checkbox_buttons.slim

@@ -1,5 +1,5 @@
 .col-lg-12
-  .btn-group.btn-group-sm ng-init="(action.record[f] === undefined) && (action.record[f] = field.render.false_value)" ng-model="action.record[f]" e2-field=""
+  .btn-group.btn-group-sm ng-init="(action.record[f] === null || action.record[f] === undefined) && (action.record[f] = field.render.false_value)" ng-model="action.record[f]" e2-field=""
     a.btn.btn-default ng-class="action.record[f] === field.render.true_value && 'active'" ng-click="action.record[f] = field.render.true_value" ng-disabled="field.disabled"
       span.glyphicon.glyphicon-check
     a.btn.btn-default ng-class="action.record[f] === field.render.false_value && 'active'" ng-click="action.record[f] = field.render.false_value" ng-disabled="field.disabled"

data/views/fields/list_mbuttons.slim

@@ -0,0 +1,9 @@
+.col-lg-12
+  .btn-group.btn-group-sm ng-model="action.record[f]" e2-field=""
+    a.btn.btn-default[
+      ng-class="action.record[f].includes(v[0]) && 'active'"
+      ng-click="action.record[f].includes(v[0]) ? action._().pull(action.record[f], v[0]) : action.record[f].push(v[0])"
+      ng-repeat="v in field.render.values"
+      ng-bind-html="v[1]"
+      ng-disabled="field.disabled"
+    ]

data/views/fields/list_mbuttons_opt.slim

@@ -0,0 +1,11 @@
+.col-lg-12
+  .btn-group.btn-group-sm ng-model="action.record[f]" e2-field=""
+    a.btn.btn-default[
+      ng-class="action.record[f].includes(v[0]) && 'active'"
+      ng-click="action.record[f].includes(v[0]) ? action._().pull(action.record[f], v[0]) : action.record[f].push(v[0])"
+      ng-repeat="v in field.render.values"
+      ng-bind-html="v[1]"
+      ng-disabled="field.disabled"
+    ]
+    a.btn.btn-default ng-disabled="action.record[f].length == 0 || field.disabled" ng-click="action.record[f] = []"
+      span.glyphicon.glyphicon-remove

data/views/fields/list_mselect.slim

@@ -0,0 +1,12 @@
+/.col-lg-7.col-md-8.col-sm-12
+div e2-input-cols="{{::field.render.length}}"
+  select.btn.btn-default.btn-sm [
+    multiple="true"
+    size="{{field.render.size}}"
+    ng-model="action.record[f]"
+    ng-options="v[0] as v[1] for v in field.render.values"
+    ng-disabled="field.disabled"
+    ng-class="field.render.class"
+    class="form-control input-sm"
+    e2-field=""
+  ]

data/views/fields/scaffold.slim

@@ -1,2 +1,2 @@
-.col-lg-10.col-md-10.col-sm-10
+.col-lg-12.col-md-12.col-sm-10
   e2-action action="field.assoc"

data/views/fields/typeahead_picker.slim

@@ -1,11 +1,12 @@
 e2-action action="[field.assoc, 'typeahead']"
-  .col-lg-7.col-md-8.col-sm-12
+  /.col-lg-7.col-md-8.col-sm-12
+  div e2-input-cols="{{::field.render.length}}"
     .input-group.input-group-sm
       input.btn.btn-default [
+        style="text-align:left"
         type="text"
         ng-model="action.decode"
-        bs-options="v.value for v in action.load($viewValue)"
-        ng-keypress="action.key_pressed = true"
+        bs-options="v.value for v in action.load(action.decode)"
 
         ng-disabled="field.disabled"
         ng-class="field.render.class"
@@ -14,11 +15,13 @@ e2-action action="[field.assoc, 'typeahead']"
         data-animation="{{::field.render.animation}}"
         placeholder="..."
         data-html="true"
-        data-limit="10"
+        data-limit="{{::field.render.limit}}"
+        data-min-length="{{::field.render.min_length}}"
+        data-trigger="focus"
         bs-typeahead=""
         e2-field=""
       ]
       span.input-group-addon: span.glyphicon.glyphicon-font
       .input-group-btn
-        a.btn.btn-default ng-disabled="field.disabled || action.decode == null" ng-click="!field.disabled && action.reset()"
+        a.btn.btn-default ng-disabled="field.disabled || !action.decode" ng-click="!field.disabled && action.reset()"
           span.glyphicon.glyphicon-off

data/views/infra/inspect.slim

@@ -1,4 +1,4 @@
-e2-action action="'inspect'"
+e2-action action="'inspect_' + action.globals().application"
   div bs-tabs=""
     br
     div title="API" bs-pane=""
@@ -8,7 +8,7 @@ e2-action action="'inspect'"
             .panel-body
               script type="text/ng-template" id="nodes_renderer.html"
                 div data-nodrag="" ng-init="stack = stack.concat([$index])"
-                  span.glyphicon.glyphicon-cog ng-if="node.terminal"
+                  span.glyphicon ng-class="{'glyphicon-cog': node.access, 'glyphicon-exclamation-sign': !node.access}" ng-if="node.terminal"
                   a ng-click="action.open(stack, node, collapsed, true); toggle(this)" ng-if="!node.terminal"
                     span.glyphicon ng-class="{'glyphicon-play-circle': collapsed && node.access, 'glyphicon-download': !collapsed, 'glyphicon-exclamation-sign': collapsed && !node.access}"
                   span< ng-bind="node.name + ' ' + node.number" ng-click="action.open(stack, node, collapsed, false)" style="cursor: pointer; {{action.number == node.number && 'font-weight: bold;'}}"
@@ -24,13 +24,13 @@ e2-action action="'inspect'"
               div bs-tabs="" bs-active-pane="actionTab" ng-init="actionTab = 0"
                 div title="Action" bs-pane=""
                   br
-                  pre ng-bind="action.action_json | json"
+                  pre ng-bind="action.action_json | yaml"
                 div title="Meta" bs-pane=""
                   br
-                  pre ng-bind="action.meta_json | json"
+                  pre ng-bind="action.meta_json | yaml"
                 div title="State" bs-pane=""
                   br
-                  pre ng-bind="action.action_state | json"
+                  pre ng-bind="action.action_state | yaml"
 
     div title="Model" bs-pane=""
       .row
@@ -58,13 +58,13 @@ e2-action action="'inspect'"
               div bs-tabs="" bs-active-pane="modelTab" ng-init="modelTab = 0"
                 div title="Model" bs-pane=""
                   br
-                  pre ng-bind="action.model.info | json"
+                  pre ng-bind="action.model.info | yaml"
                 div title="Schema" bs-pane=""
                   br
-                  pre ng-bind="action.model.schema | json"
+                  pre ng-bind="action.model.schema | yaml"
                 div title="Type info" bs-pane=""
                   br
-                  pre ng-bind="action.model.type_info | json"
+                  pre ng-bind="action.model.type_info | yaml"
                 div title="Associations" bs-pane="" ng-if="action.model && action.has_assoc(action.model)"
                   br
                   .row
@@ -78,36 +78,39 @@ e2-action action="'inspect'"
                   br
                   .row
                     .col-lg-12
-                      pre ng-bind="action.activeAssoc | json"
+                      pre ng-bind="action.activeAssoc | yaml"
     div title="Globals" bs-pane=""
       .panel.panel-default
         .panel-body
-          pre ng-bind="action.globals() | json"
+          pre ng-bind="action.globals() | yaml"
 
     div title="Environment" bs-pane=""
       .panel.panel-default
         .panel-body
-          pre ng-bind="action.environment | json"
+          pre ng-bind="action.environment | yaml"
 
     div title="Local storage" bs-pane=""
       .panel.panel-default
         .panel-body
-          pre ng-bind="action.local_storage | json"
-          pre ng-bind="action.local_storage.keys() | json"
+          pre ng-bind="action.local_storage | yaml"
+          pre ng-bind="action.local_storage.keys() | yaml"
           a.btn.btn-default ng-click="action.local_storage.clearAll()"
             | Clear
 
     div title="Diagnostics" bs-pane=""
       .panel.panel-default
         .panel-body
-          a.btn.btn-default ng-click="action.globals().notification('Name', 'Body', undefined, 2000)"
-            | Push
+          .btn-group
+            a.btn.btn-default ng-click="action.globals().notification('Name', 'Body', undefined, 2000)"
+              | Push
+            a.btn.btn-default ng-click="action.globals().toastr().success('Name', 'Body')"
+              | Toastr
           hr
           a.btn.btn-default> ng-click="action.web_socket().send({number: action.number})"
             | Websocket
           | {{action.number}}
           br
           | Event
-          pre ng-bind="action.event | json"
+          pre ng-bind="action.event | yaml"
           | Socket
           pre ng-bind="action.web_socket() | json"