engine2 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7de9cf2c556b8224ab4bdf70f0fd45ddb3f2f5b54dac443eac49184fc553633
-  data.tar.gz: b515c7f5b0af25479c54fa6e9459a1484efbd99ce270e78ba206f7e11480ca67
+  metadata.gz: cc5654aaf1573375a69ca96d3d957b07e1970ef777e0deb65c18f28c40666489
+  data.tar.gz: aa79d8a00f564a0e23e4520ea1198446a6049c241b5bdb714416aa7ed378de6d
 SHA512:
-  metadata.gz: d8ff090077415370c9c1d885aa791462a2b44a69c4794be276016665e6d743ef15de579781becbb77ab02f43e17ed8bda3e1965b63052c237778bb5b230e10f9
-  data.tar.gz: 7cf93650cf3a106d54c95df0a49c7dd8a49e491f2e9185a45b8e14fa1577af77fc808b464c3c7e84ffaa2c2a20179d1c81f3cdd000987c8b4f3892e940b39f5a
+  metadata.gz: 271c8416bd7551d08fa8574319be948aa9b8658fc431e432c65a19deb456deead3fc92e213259e2f9ad0783a77099a8dbce13c460fe45d715abab7bf09efc392
+  data.tar.gz: b65bd605e3d622586f433d5900d9da115e880e62a0827913f03c2e18dc9ce744fb6ebaa88f4a31e3582251c8551be9b71a0f03299498d1042082dd3eeb0f3074

data/Rakefile

@@ -1,17 +1,17 @@
 desc "Compile SLIM"
 task :compile_slim do
     require 'slim'
-    view_dirs = ["fields", "scaffold", "search_fields", "modals"]
+    view_dirs = ["fields", "scaffold", "search_fields", "modals", "panels"]
     slims = view_dirs.each.map do |view_dir|
         Dir["views/#{view_dir}/*.slim"].map do |slim_file|
             slim = Slim::Template.new(slim_file).render.gsub('"', '\"')
             tpl_name =  slim_file.sub("views/", "").sub(".slim", "")
-            "$templateCache.put('#{tpl_name}', \"#{slim}\");"
+            "c.put('#{tpl_name}', \"#{slim}\");"
         end
     end
 
     open("app/templates.js", "wb") << <<-EOF
-angular.module('Engine2').run(['$templateCache', function($templateCache) {
+angular.module('Engine2').run(['$templateCache', function(c) {
 #{slims.join("\n")}
 }]);
 EOF

data/app/actions.coffee

@@ -51,9 +51,16 @@ angular.module('Engine2')
                     @meta.panel.modal_action = false
                     @meta.panel.footer = true unless @meta.panel.footer == false
 
+
+            if scope && @meta.invokable != false
+                scope.$on action_info.action_resource, (e, args) => @invoke(args)
+
             @websocket_connect() if @meta.websocket
             @initialize()
 
+        broadcast: (sub_action, args) ->
+            @scope().$broadcast(@action_info().action_resource + '/' + sub_action, args)
+
         initialize: ->
             @process_static_meta()
             console.info "CREATE #{@action_info().action_resource}"
@@ -68,7 +75,13 @@ angular.module('Engine2')
                 if action_info.access
                     $rootScope.$broadcast "relogin", element?, create
                 else
-                    @globals().modal().error("#{err.status}: #{err.data.message}", err.data.cause || err.data.message)
+                    tle = "#{err.status}: #{err.data.message}"
+                    msg = err.data.cause || err.data.message
+                    if msg.length > 500
+                        @globals().modal().error(tle, msg)
+                    else
+                        @globals().toastr().error(tle, msg, extendedTimeOut: 5000, closeButton: true)
+
             $q.reject(err)
 
         save_state: () ->
@@ -100,28 +113,35 @@ angular.module('Engine2')
 
         create_action_path: (action_names, sc, elem) ->
             last_name = action_names.pop()
-            _.reduce(action_names, ((pr, nm) -> pr.then (act) -> act.create_action(nm)), $q.when(@)).then (act) ->
+            _.reduce(action_names, ((pr, nm) -> pr.then (act) -> act.create_action(nm)), $q.when(@)).then (act) -> # self = @
                 act.create_action(last_name, sc, elem).then (act) -> sc.action = act
 
         globals: -> globals
+        _ : -> _
+        current: -> @globals().current_action
         action_pending: -> globals.action_pending == @
         pre_invoke: ->
         post_invoke: ->
 
         invoke: (params) ->
+            @globals().current_action = @
             params ?= {}
             @globals().action_pending = if @meta.panel then @ else @parent()
             @pre_invoke(params)
-            _.merge(params, @meta.arguments) if @meta.arguments
+            if @meta.arguments # _.merge(params, @meta.arguments)
+                _.each @meta.arguments, (v, k) =>
+                    if _.endsWith(k, '!') then params[k.slice(0, -1)] = @scope().$eval(v) else params[k] = v
+
 
             info = @action_info()
             get_invoke = if @meta.invokable == false then $q.when(data: (response: {})) else
                 params.initial = true if @meta.panel && !@action_invoked && info.method == 'get'
                 $http[info.method](info.action_resource, if info.method == 'post' then params else (params: params))
 
+            @execute_commands('pre_execute')
             get_invoke.then (response) =>
                 @arguments = _.keys(response.data)
-                E2.merge(@, response.data)
+                E2.merge_meta(@, response.data)
                 @process_meta()
 
                 promise = if @meta.panel # persistent action
@@ -131,20 +151,22 @@ angular.module('Engine2')
                 else
                     prnt = @parent()
                     throw "Attempted parent merge for root action: #{info.name}" unless prnt
-                    E2.merge(prnt, response.data)
+                    E2.merge_meta(prnt, response.data)
 
                 @post_invoke(params)
-                @execute_commands() if @meta.execute
+                @execute_commands('execute')
                 if @meta.repeat
                     @scope().$on "$destroy", => @destroyed = true
                     $timeout (=> @invoke(params)), @meta.repeat unless @destroyed
                     delete @meta.repeat
 
                 @globals().action_pending = false
+                @globals().current_action = null
                 promise
             ,
             (err) =>
                 @globals().action_pending = false
+                @globals().current_action = null
                 @handle_error(err, info, @element())
 
         panel_render: ->
@@ -203,26 +225,28 @@ angular.module('Engine2')
         websocket_connect: ->
             l = $location
             ws_meta = @meta.websocket
-            ws = $websocket "ws#{l.protocol().slice(4, 5)}://#{l.host()}:#{l.port()}/#{@action_info().action_resource}", undefined, ws_meta.options
+            ws = $websocket "ws#{l.protocol().slice(4, 5)}://#{l.host()}:#{l.port()}#{'/'}#{@action_info().action_resource}", undefined, ws_meta.options
             _.each @globals().ws_methods, (method) =>
                 ws_method_impl = @["ws_#{method}"]
                 ws["on#{_.capitalize(method)}"] (evt) =>
                     if method == 'message'
                         msg = JSON.parse(evt.data)
                         if msg.error then @globals().modal().error("WebSocket [#{evt.origin}] - #{msg.error.method}", msg.error.exception) else
-                            E2.merge(@, msg)
+                            E2.merge_meta(@, msg)
                             @process_meta()
                     else msg = evt
                     ws_method_impl.bind(@)(msg, ws, evt) if ws_method_impl
-                    @execute_commands() if @meta.execute
-                    delete @meta.execute
+                    @execute_commands('execute')
 
             @web_socket = -> ws
             @scope().$on "$destroy", -> ws.close()
 
-        execute_commands: ->
-            scope = @scope()
-            _.reduce(@meta.execute, ((pr, cmd) -> pr.then -> scope.$eval(cmd)), $q.when())
+        execute_commands: (execute) ->
+            if @meta[execute]
+                scope = @scope()
+                _.reduce(@meta[execute], ((pr, cmd) -> pr.then -> scope.$eval(cmd)), $q.when())
+                @meta[execute].splice(0, @meta[execute].length)
+                delete @meta[execute]
 
         console_log: (o) ->
             console.log o
@@ -303,7 +327,7 @@ angular.module('Engine2')
                     $urlRouter.otherwise(otherwise)
                     @register(menu.entries)
                     @scope().routes = menu.entries
-                    out = if _.size(menu.entries) == 0 then angular.element("<div></div>") else $compile(@traverse(menu.entries))(@scope())
+                    out = $compile(@traverse(menu.entries))(@scope())
                     @element().replaceWith(out)
                     @element = -> out
                     loc = $location.path().slice(1)
@@ -331,7 +355,9 @@ angular.module('Engine2')
             menu_sub_tmpl = _.template("<li {{show}} {{hide}} e2-dropdown='{{dropdown}}' nav='true' data-animation='{{animation}}'><a href='javascript://'>{{icon}} {{loc}}<span class='caret'></span></a></li>")
             animation = @meta.menus.menu.properties.animation
             out = routes.map (route, i) ->
-                if route.menu
+                if route.render == false
+                    ''
+                else if route.menu
                     menu_sub_tmpl
                         dropdown: "routes[#{i}].menu.entries"
                         animation: animation
@@ -346,7 +372,8 @@ angular.module('Engine2')
                         show: route.show && "ng-show=\"#{route.show}\"" || ''
                         hide: route.hide && "ng-hide=\"#{route.hide}\"" || ''
                         icon: route.icon && E2.icon(route.icon) || ''
-            out.join('')
+            out = out.join('')
+            if _.size(out) == 0 then "<div></div>" else out
 
     list: class ListAction extends Action
         initialize: ->
@@ -391,7 +418,7 @@ angular.module('Engine2')
         menu_show_meta: ->
             @globals().modal().show
                 the_meta: @meta
-                meta: panel: (panel_template: "close_m", template_string: "<pre>{{action.the_meta | json}}</pre>", title: "Meta", class: "modal-huge", backdrop: true, footer: true)
+                meta: panel: (panel_template: "close_m", template_string: "<pre>{{action.the_meta | yaml}}</pre>", title: "Meta", class: "modal-huge", backdrop: true, footer: true)
 
         # show_assoc: (index, assoc) ->
         #     # parent_id = E2.id_for(@entries[index], @meta)
@@ -453,12 +480,12 @@ angular.module('Engine2')
         search_field_change: (f) ->
             info = @meta.fields[f]
 
-            @scope().$eval(info.onchange) if info.onchange
+            @scope().$eval(info.onchange.action) if info.onchange
 
             if remote_onchange = info.remote_onchange
                 params = value: @query.search[f]
-                params.record = @query.search if info.remote_onchange_record
-                @invoke_action(remote_onchange, params).then =>
+                params.record = @query.search if remote_onchange.record
+                @invoke_action(remote_onchange.action, params).then =>
                     @load_new() if info.search_live
             else
                 @load_new() if info.search_live
@@ -490,6 +517,11 @@ angular.module('Engine2')
         entry_moved: (index) ->
             @moved_from = index
 
+        list_parent_action: ->
+            parent = @parent()
+            parent = parent.parent() until parent instanceof ListAction
+            parent
+
     bulk_delete: class BulkDeleteAction extends Action
         invoke: ->
             super(ids: [_.keys(@parent().parent().selection)]).then =>
@@ -502,17 +534,6 @@ angular.module('Engine2')
     form_base_action: class FormBaseAction extends Action
         initialize: ->
             super()
-            _.each @meta.fields, (info, name) =>
-                if info.remote_onchange
-                    @scope().$watch (=> @record?[name]), (n) => if n? #if typeof(n) != "undefined"
-                        params = value: @record[name]
-                        params.record = @record if info.remote_onchange_record
-                        @invoke_action(info.remote_onchange, params)
-
-                if info.onchange
-                    @scope().$watch (=> @record?[name]), (n) => if n?
-                        @scope().$eval(info.onchange)
-
             if @meta.tab_list
                 @scope().$watch "action.activeTab", (tab) => if tab? # && tab >= 0
                     @panel_shown()
@@ -522,12 +543,26 @@ angular.module('Engine2')
         post_invoke: (args) ->
             super()
             _.each @meta.fields, (info, name) =>
-                if _.isString(@record[name]) && !info.dont_strip
+                if @record[name] is undefined
+                    @record[name] = null
+                else if _.isString(@record[name]) && !info.dont_strip
                     @record[name] = @record[name].trim()
 
+                if info.onchange || info.remote_onchange
+                    onchange = => @scope().$eval(info.onchange.action)
+                    remote_onchange = =>
+                        params = value: @record[name]
+                        params.record = @record if info.remote_onchange.record
+                        @invoke_action(info.remote_onchange.action, params)
+
+                    @scope().$watch (=> @record[name]), (n, o) => if n != o
+                        onchange() if info.onchange
+                        remote_onchange() if info.remote_onchange
+
+                    onchange() if info.onchange?.trigger_on_start
+                    remote_onchange() if info.remote_onchange?.trigger_on_start
+
         panel_menu_default_action: ->
-            _.each @meta.fields, (v, n) =>
-                @record[n] = null if @record[n] is undefined
             params = record: @record
             params.parent_id ?= @parent().query?.parent_id # and StarToManyList ?
             @invoke_action(@default_action_name, params).then =>
@@ -734,29 +769,31 @@ angular.module('Engine2')
     typeahead: class TypeAheadAction extends DecodeAction
         initialize: ->
             super()
-            @if_fk_values (fk_values) =>
-                @invoke(id: E2.join_keys(fk_values)).then =>
-                    if @entry
-                        @decode = id: E2.id_for(@entry, @meta), value: @decode_description(@entry)
-
             @scope().$on "$typeahead.select", (e, v, index) =>
                 e.stopPropagation()
                 _(@dinfo.fields).zip(E2.split_keys(@values[index].id)).each(([fk, k]) => @record()[fk] = E2.parse_entry(k, @parentp().meta.fields[fk])).value
+                @parentp().scope().$digest()
                 @parentp().search_field_change?(@decode_field)
 
-            @scope().$watch "action.decode", (e) => if e?
-                @reset() if e.length == 0
+            @scope().$watch "action.decode", (e) => @reset() if e == null
+
+            @if_fk_values (fk_values) =>
+                @invoke(id: E2.join_keys(fk_values)).then =>
+                    if @entry
+                        @decode = id: E2.id_for(@entry, @meta), value: @decode_description(@entry)
+
+            @decode = '' unless @decode?
+            # @dinfo.render.min_length == 0
 
         load: (value) ->
-            if value? && value.length > 0 && @key_pressed # check again after strap updates ?
-                @invoke(query: value).then =>
-                    if @entries # ?
-                        @values = @entries.map (e) => id: E2.id_for(e, @meta), value: @decode_description(e)
-                        delete @entries
-                        @values
+            if _.isString(value)
+                @invoke(query: value).then => if @entries # ?
+                    @values = @entries.map (e) => id: E2.id_for(e, @meta), value: @decode_description(e)
+                    delete @entries
+                    @values
 
         clean: ->
-            delete @decode
+            @decode = ''
             @clear_record()
 
     many_to_one_list: class ManyToOneListAction extends ListAction
@@ -780,7 +817,7 @@ angular.module('Engine2')
     star_to_many_list: class StarToManyList extends ListAction
         initialize: ->
             super()
-            @query.parent_id = @parent().current_id()
+            @query.parent_id = @list_parent_action().current_id()
 
         # link_list: implicit
         item_menu_confirm_unlink: (args) ->
@@ -860,7 +897,7 @@ angular.module('Engine2')
                     else
                         pparent.changes.modify.push @parent().record
                 else # CreateAction
-                    _(@parent().meta.primary_fields).each (k) => @parent().record[k] = E2.uuid(5)
+                    _(@parent().meta.primary_fields).each (k) => @parent().record[k] = E2.uuid()
                     if draggable = pparent.meta.draggable
                         max = _.maxBy(pparent.entries, (e) -> e.position)
                         @parent().record[draggable.position_field] = if max then max[draggable.position_field] + 1 else 1

data/app/app.css

@@ -62,7 +62,8 @@ tr.tr_hover {
 }
 
 textarea {
-  white-space: nowrap;
+  /*white-space: nowrap;*/
+  white-space: pre-wrap;
 }
 
 /*.modal-backdrop{

data/app/engine2.coffee

@@ -13,7 +13,7 @@ require 'angular-drag-and-drop-lists'
 
 _.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
 
-angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule', 'angularLoad', 'ngWebSocket', 'ui.router', 'dndLists']) # 'ui.select'
+angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule', 'angularLoad', 'ngWebSocket', 'ui.router', 'dndLists', 'toastr']) # 'ui.select'
 .config ($httpProvider, $compileProvider, localStorageServiceProvider, $logProvider, $qProvider, $locationProvider, $provide) ->
     $httpProvider.interceptors.push 'e2HttpInterceptor'
     $provide.decorator '$httpBackend', ($delegate) ->
@@ -44,6 +44,9 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
         $delegate
 
 .factory 'PushJS', -> require 'push.js'
+.factory 'PrettyYAML', -> require 'json-to-pretty-yaml'
+.filter 'yaml', (PrettyYAML) -> (input) -> PrettyYAML.stringify(input, 4)
+
 .factory 'MetaCache', ($cacheFactory) -> $cacheFactory('MetaCache')
 .factory 'e2HttpInterceptor', ($q, $injector, E2Snippets) ->
     loaderToggle = (toggle) -> angular.element(document.querySelectorAll('.loader')).eq(-1).css("visibility", toggle)
@@ -97,7 +100,7 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
         _.each(o.class, (v, k) -> out.push "'#{k}': #{v}") if o.class?
         if out.length > 0 then "ng-class=\"{#{out.join(',')}}\"" else ""
 
-.factory 'E2', ($templateCache, $http, E2Snippets, $q, $dateFormatter, $parse, PushJS, $state, $e2Modal) ->
+.factory 'E2', ($templateCache, $http, E2Snippets, $q, $dateFormatter, $parse, PushJS, $state, $e2Modal, toastr) ->
     globals:
         element: (id) ->
             element = document.querySelector(id)
@@ -107,11 +110,12 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
         notification: (name, body, icon, timeoutx, on_close) ->
             PushJS.create name, body: body, icon: icon, timeout: timeoutx, onClick: on_close
 
+        toastr: -> toastr
         state: -> $state
         modal: -> $e2Modal
 
     uuid: (length) ->
-        Math.random().toString(36).substring(length)
+        Math.random().toString(10).substr(2, 8)
 
     compact: (o) ->
         _.each o, (v, k) =>
@@ -125,17 +129,19 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
             else if _.isObject(v) && !_.isDate(v)
                 @clean(v)
             else
-                # delete o[k]
-                o[k] = null
+                o[k] = null # delete o[k]
 
-    merge: (dst, src) ->
+    merge_meta: (dst, src) ->
         for k, v of src
             throw "Attempted to override function '#{k}'" if _.isFunction(dst[k])
-            insn = k.slice(-1)
-            if _.isObject(v) && !_.isArray(v)
-                if insn == '!' then dst[k.slice(0, -1)] = v else dst[k] = @merge(dst[k] ? {}, v)
+            if (k == 'execute' || k == 'pre_execute') && dst[k] && src[k]
+                dst[k] = dst[k].concat(src[k])
             else
-                if insn == '?' then dst[k.slice(0, -1)] ?= v else dst[k] = v
+                insn = k.slice(-1)
+                if _.isObject(v) && !_.isArray(v)
+                    if insn == '!' then dst[k.slice(0, -1)] = v else dst[k] = @merge_meta(dst[k] ? {}, v)
+                else
+                    if insn == '?' then dst[k.slice(0, -1)] ?= v else dst[k] = v
         dst
 
     transpose: (a) ->
@@ -289,7 +295,7 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
         if elem[0].type in ['text', 'password']
             elem.on 'keypress', (ev) ->
                 scope.$apply ->
-                    scope.action.panel_menu_default_action() if ev.keyCode == 13
+                    scope.action.panel_menu_default_action?() if ev.keyCode == 13
 
                 ev.stopPropagation()
 
@@ -337,9 +343,13 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
     scope: false
     restrict: 'A'
     link: (scope, elem, attrs) ->
+        table_scope = null
         scope.$on 'render_table', (a, ev) ->
             # ev.stopPropagation()
-            action = scope.action
+            table_scope.$destroy() if table_scope
+            table_scope = scope.$new(false)
+
+            action = table_scope.action
             meta = action.meta
             draggable = meta.draggable
             position = meta.menus.item_menu.properties.position ? 0
@@ -382,7 +392,7 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
 
             tbody_attrs = if draggable then 'dnd-list=\"action.entries\" dnd-drop=\"action.entry_dropped(index, external, type)\"' else ''
             elem.empty()
-            elem.append($compile(table_tmpl thead: thead, tbody: tbody, tbody_attrs: tbody_attrs)(scope))
+            elem.append($compile(table_tmpl thead: thead, tbody: tbody, tbody_attrs: tbody_attrs)(table_scope))
 
 .directive 'e2Dropdown', ($parse, $dropdown, $timeout, E2Snippets) ->
     event_num = 0
@@ -466,7 +476,7 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
                         hide: m.hide && "ng-hide=\"#{m.hide}\"" || ''
                         icon: m.icon && E2Snippets.icon(m.icon) || ''
                         loc: !(m.button_loc == false) && m.loc || ''
-                        title: (m.button_loc == false) && "title=\"#{m.loc}\"" || ''
+                        title: if m.title then "title=\"#{m.title}\"" else ((m.button_loc == false) && "title=\"#{m.loc}\"" || '')
 
             if menu.entries.length > brk
                 out += button_set_arr_tmpl
@@ -516,27 +526,35 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
             when "decimal_date"
                 match = value.match(/^(\d{4}|\d{2})(\d{2})(\d{2})$/)
                 if match then match.slice(1, 4).join('-') else value
-            else value
+            else
+                match = value.match(/(.*)(?:\s[-+]\d+)$/)
+                if match then match[1] else value
 
     scope: true
     require: 'ngModel'
     link: (scope, element, attr, controller) ->
         action = scope.action
         mode = attr.e2Datepicker
+        has_mode = !_.isEmpty(mode)
         field = scope.other_date ? scope.other_time ? scope.f
         info = action.meta.fields[field]
 
         if action.query
-            scope.value[mode] = parse(action.query.search[scope.f][mode], info)
-            scope.$on "search_reset", -> scope.value[mode] = null
+            f = action.query.search[scope.f]
+            if has_mode
+                scope.value[mode] = parse(f[mode], info)
+                scope.$on "search_reset", -> scope.value[mode] = null
+            else
+                scope.value.at = parse(f, info)
+                scope.$on "search_reset", -> scope.value.at = null
         else
             value = parse(action.record[field], info)
-            if mode then scope.value[mode] = value else scope.value = value
+            if has_mode then scope.value[mode] = value else scope.value = value
 
         scope.$watch attr.ngModel, (model, o) -> if model != o
             date = format(model, attr.e2ModelFormat)
             if action.query
-                action.query.search[scope.f][mode] = date
+                if has_mode then action.query.search[scope.f][mode] = date else action.query.search[scope.f] = date
                 scope.action.search_field_change(scope.f) if date?
             else
                 action.record[field] = date