engine2 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6174073612b4abd1d1a7c2fefbbf071874c2c566
-  data.tar.gz: 081dee914669d77bb0a9e32d13c219612aa79d75
+SHA256:
+  metadata.gz: cc5654aaf1573375a69ca96d3d957b07e1970ef777e0deb65c18f28c40666489
+  data.tar.gz: aa79d8a00f564a0e23e4520ea1198446a6049c241b5bdb714416aa7ed378de6d
 SHA512:
-  metadata.gz: 5631fd58edca95f2c3966ccc240a29b0089c78e7a80b9d3a7e5e239e2a001e0a02f7baa9ed6cdff6a0d98f061022f02d0768282513b457bf6e9fd180c8adf96e
-  data.tar.gz: bcc3a19a71996a4c2e8f5f2d511354dc1085de8bdd5eacce667cbe1f24a91587dee04892fb22d51276f7a152a4b21c72681e90f379731ad2f1d546f9c5940294
+  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/engine2templates.js", "wb") << <<-EOF
-angular.module('Engine2').run(['$templateCache', function($templateCache) {
+    open("app/templates.js", "wb") << <<-EOF
+angular.module('Engine2').run(['$templateCache', function(c) {
 #{slims.join("\n")}
 }]);
 EOF

data/app/{engine2actions.coffee → actions.coffee}

@@ -8,7 +8,7 @@ angular.module('Engine2')
             throw "Invalid action path: '#{action_attr}'" unless action_names
             action_names = action_names.split('/') if _.isString(action_names)
             create = (action) ->
-                action.create_action_path(action_names, $scope, $element).then (act) -> act.invoke() if $attrs.invoke
+                action.create_action_path(action_names, $scope, $element).then (act) -> act.invoke($parse($attrs.invoke)($scope)) if $attrs.invoke?
 
             sc = $scope
             if sc.action
@@ -22,13 +22,13 @@ angular.module('Engine2')
             $http.get("api/meta").then (mresponse) -> $scope.$broadcast "bootstrap_action",
                 $scope.action = new E2Actions.root(mresponse.data, $scope, null, $element, action_resource: 'api')
 
-.factory 'E2Actions', (E2, $http, $timeout, $e2Modal, $injector, $compile, $templateCache, $q, localStorageService, $route, $window, $rootScope, $location) ->
+.factory 'E2Actions', (E2, $http, $timeout, $injector, $compile, $templateCache, $q, localStorageService, $rootScope, $location, angularLoad, $websocket, MetaCache, $stateRegistry, $urlRouter) ->
     globals = E2.globals
     action: class Action
         constructor: (response, scope, parent, element, action_info) ->
             @find_action_info = (name, raise = true) ->
                 act = response.actions[name]
-                throw "Undefined action '#{name}' for action #{@action_info().name} (under #{@parent()?.action_info().action_resource})" if raise && !act
+                throw "Undefined action '#{name}' for action #{@parent()?.action_info().action_resource}/#{@action_info().name}" if raise && !act
                 act
 
             _.each response.actions, (act, nm) -> act.name = nm
@@ -51,11 +51,19 @@ 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.log "CREATE #{@action_info().action_resource}"
+            console.info "CREATE #{@action_info().action_resource}"
 
         process_static_meta: ->
             if @meta.menus
@@ -67,45 +75,28 @@ angular.module('Engine2')
                 if action_info.access
                     $rootScope.$broadcast "relogin", element?, create
                 else
-                    $e2Modal.error("#{err.status}: #{err.data.message}", err.data.cause || err.data.message)
-            $q.reject(err)
-
-        perform_invoke: (params) ->
-            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))
+                    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)
 
-            globals.action_pending = if @meta.panel then @ else @parent()
+            $q.reject(err)
 
-            get_invoke.then (response) =>
-                if exec = response.data.$execute
-                    @scope().$eval(exec)
-                    delete response.data.$execute
+        save_state: () ->
+            _.each @meta.state, (s) => localStorageService.set("#{@globals().application}/#{@action_info().action_resource}/#{s}", @[s])
+        load_state: () ->
+            _.each @meta.state, (s) => _.merge(@[s], localStorageService.get("#{@globals().application}/#{@action_info().action_resource}/#{s}"))
 
-                E2.merge(@, response.data)
-                @process_meta()
-                (if @meta.reload_routes then $route.load_routes() else $q.when({})).then =>
-                    @arguments = _.keys(response.data)
-                    unless @meta.panel # persistent action
-                        prnt = @parent()
-                        throw "Attempted parent merge for root action: #{info.name}" unless prnt
-                        E2.merge(prnt, response.data)
-
-                    globals.action_pending = false
-                    if @meta.panel && !@action_invoked
-                        @action_invoked = true
-                        @panel_render()
-            ,
-            (err) =>
-                globals.action_pending = false
-                @handle_error(err, info, @element())
+        destroy: (e) ->
+            console.log "DESTROY #{@action_info().action_resource}"
 
         create_action: (name, sc, el) ->
             info = @find_action_info(name)
             info.action_resource = "#{@action_info().action_resource}/#{info.name}"
             get_meta = if !info.terminal || info.meta
-                $http.get("#{info.action_resource}/meta", cache: true).then (response) =>
+                $http.get("#{info.action_resource}/meta", cache: MetaCache).then (response) =>
                     if info.recheck_access
                         $http.get("#{info.action_resource}/meta", params: (access: true, parent_id: @current_id())).then (aresponse) ->
                             response.data.actions[k].access = v for k, v of aresponse.data
@@ -113,7 +104,7 @@ angular.module('Engine2')
                     else response # $q.when ^
             else $q.when(data: (meta: {}, actions: []))
             E2A = $injector.get("E2Actions")
-            get_meta.then (mresponse) => new (E2A[info.meta_type] ? E2A.default_action)(mresponse.data, sc, @, el, info)
+            get_meta.then (mresponse) => new (E2A[info.action_type] ? E2A.default_action)(mresponse.data, sc, @, el, info)
             ,
             (err) => @handle_error(err, info, el)
 
@@ -122,34 +113,61 @@ 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: (args) ->
-            @pre_invoke(args)
-            _.merge(args ?= {}, @meta.arguments) if @meta.arguments
-            @perform_invoke(args).then =>
-                @post_invoke(args)
-                @scope().$eval(@meta.execute) if @meta.execute
-                if @meta.repeat
-                    unless @meta.destroy_repeat
-                        @scope().$on("$destroy", => delete @meta.repeat)
-                        @meta.destroy_repeat = true
-                    $timeout (=> @invoke(args)), @meta.repeat
-                @
+        invoke: (params) ->
+            @globals().current_action = @
+            params ?= {}
+            @globals().action_pending = if @meta.panel then @ else @parent()
+            @pre_invoke(params)
+            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
 
-        save_state: () ->
-            _.each @meta.state, (s) => localStorageService.set("#{globals.application}/#{@action_info().action_resource}/#{s}", @[s])
-        load_state: () ->
-            _.each @meta.state, (s) => _.merge(@[s], localStorageService.get("#{globals.application}/#{@action_info().action_resource}/#{s}"))
 
-        destroy: (e) ->
-            console.log "DESTROY #{@action_info().action_resource}"
+            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_meta(@, response.data)
+                @process_meta()
+
+                promise = if @meta.panel # persistent action
+                    if !@action_invoked
+                        @action_invoked = true
+                        @panel_render()
+                else
+                    prnt = @parent()
+                    throw "Attempted parent merge for root action: #{info.name}" unless prnt
+                    E2.merge_meta(prnt, response.data)
+
+                @post_invoke(params)
+                @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: ->
             if @meta.panel.modal_action
@@ -161,13 +179,13 @@ angular.module('Engine2')
                         @panel_shown?()
 
                 else
-                    $e2Modal.show(@)
+                    @globals().modal().show(@).then => @
             else
                 @panel_scope?().$destroy()
                 act = @
                 act = act.parent() until act.element()
                 element = act.element() # @element()
-                is_modal = $e2Modal.is_modal() && !@element()
+                is_modal = @globals().modal().is_modal() && !@element()
                 E2.fetch_panel(@meta.panel, is_modal).then (template) =>
                     @panel_show?()
                     # @panel_scope().$destroy()
@@ -190,7 +208,7 @@ angular.module('Engine2')
         panel_close: ->
             if @meta.panel.modal_action
                 @modal_hide()
-            else
+            else if @parent().parent()
                 # @parent().panel_refresh()
                 @panel_hide?()
                 @panel_hidden()
@@ -201,12 +219,47 @@ angular.module('Engine2')
         panel_menu_cancel: ->
             @panel_close()
 
+        panel_menu_close: ->
+            @panel_close()
+
+        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
+            _.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_meta(@, msg)
+                            @process_meta()
+                    else msg = evt
+                    ws_method_impl.bind(@)(msg, ws, evt) if ws_method_impl
+                    @execute_commands('execute')
+
+            @web_socket = -> ws
+            @scope().$on "$destroy", -> ws.close()
+
+        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
+
     root: class RootAction extends Action
         initialize: ->
             super()
             _.merge(globals, @meta)
             @meta  = {}
 
+        invoke: (args) ->
+            console.warn "Root action invoked"
+
     default_action: class DefaultAction extends Action
         initialize: ->
             super()
@@ -217,6 +270,8 @@ angular.module('Engine2')
             super()
             @tree = actions: [name: 'api', number: 0, access: true]
             @invoke_action('models')
+            @invoke_action('environment')
+            @local_storage = localStorageService
 
         open: (stack, node, collapsed, expand) ->
             tree = @tree
@@ -244,7 +299,10 @@ angular.module('Engine2')
                     _.each response.data.actions, (act, nm) -> act.name = nm
                     tree.actions ?= _.toArray(response.data.actions)
                     @meta_json = response.data.meta
-                    @action_state = if @meta_json.state then _.zipObject(@meta_json.state.map (k) -> [k, localStorageService.get("#{path}/#{k}")]) else {}
+                    if @meta_json.state
+                        @action_state = {}
+                        _.each @meta_json.state, (s) => @action_state[s] = localStorageService.get("#{@globals().application}/#{path.join('/')}/#{s}")
+                        @action_state
             ,
             (err) =>
                 delete @meta_json
@@ -253,65 +311,69 @@ angular.module('Engine2')
         has_assoc: (model) ->
             _.size(model.assoc) > 0
 
+        ws_message: (msg, ws, evt) ->
+            @event = evt
+
     menu: class MenuAction extends Action
         process_static_meta: ->
 
         initialize: ->
             super()
-            $route.load_routes = =>
+            $stateRegistry.load_routes = (init) =>
                 @invoke().then =>
-                    _.each _.keys($route.routes), (k) -> delete $route.routes[k]
                     menu = @meta.menus.menu
-                    $route.routes[null] = reloadOnSearch: true, redirectTo: '/' + (menu.properties.default ? menu.entries[0].name)
+                    _.each $stateRegistry.get(), (s) -> $stateRegistry.deregister(s.name) unless _.isEmpty(s.name)
+                    otherwise = menu.properties.default ? menu.entries[0].name
+                    $urlRouter.otherwise(otherwise)
                     @register(menu.entries)
-                    $route.reload() # $location.path('')
                     @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
-            $route.load_routes()
+                    loc = $location.path().slice(1)
+                    @globals().state().go(if init && !_.isEmpty($location.path()) && $stateRegistry.get(loc)? then loc else otherwise)
+
+            $stateRegistry.load_routes(true)
 
         register: (routes) ->
             _.each routes, (route) =>
-                if route.menu then @register(route.menu.entries) else
-                    name = '/' + route.name
-                    route.href = '#' + route.name
-                    if route.bootstrap?
-                        action = if route.bootstrap == true then '' else route.bootstrap + '/'
-                        $templateCache.put(route.name + '_route_template!', "<div e2-action='' action=\"'#{action}#{route.name}'\" invoke='true'></div>")
-
-                    $route.routes[name] =
-                        reloadOnSearch: true
-                        templateUrl: if route.bootstrap? then route.name + '_route_template!' else route.name
-                        originalPath: name
-                        regexp: new RegExp("^#{name}$")
-                        keys: []
-
-                    $route.routes[name + '/'] =
-                        redirectTo: name
-                        originalPath: name + '/'
-                        regexp: new RegExp("^#{name}/$")
-                        keys: []
+                unless route.divider
+                    if route.menu then @register(route.menu.entries) else
+                        route.href = route.name
+                        if route.bootstrap?
+                            action = if route.bootstrap == true then '' else route.bootstrap + '/'
+                            $templateCache.put(route.name + '_route_template!', "<div e2-action='' action=\"'#{action}#{route.name}'\" invoke='true'></div>")
+
+                        $stateRegistry.register
+                            name: route.name
+                            templateUrl: if route.bootstrap? then route.name + '_route_template!' else route.name
+                            url: '/' + route.name
+                            # reloadOnSearch: true
 
         traverse: (routes) ->
-            menu_tmpl = _.template("<li><a href='{{href}}'>{{icon}}{{aicon}} {{loc}}</a></li>")
-            menu_sub_tmpl = _.template("<li e2-dropdown='{{dropdown}}' data-animation='{{animation}}'><a href='javascript://'>{{icon}}{{aicon}} {{loc}}<span class='caret'></span></a></li>")
+            menu_tmpl = _.template("<li {{show}} {{hide}} ui-sref-active='active'><a {{href}}>{{icon}} {{loc}}</a></li>")
+            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
-                        icon: route.menu.icon && E2.icon(route.menu.icon) || ""
-                        aicon: route.menu.aicon && E2.aicon(route.menu.aicon) || ""
                         loc: route.menu.loc
+                        show: route.show && "ng-show=\"#{route.show}\"" || ''
+                        hide: route.hide && "ng-hide=\"#{route.hide}\"" || ''
+                        icon: route.menu.icon && E2.icon(route.menu.icon) || ""
                 else
                     menu_tmpl
-                        href: route.href
+                        href: "ui-sref='#{route.name}'"
                         loc: route.loc
+                        show: route.show && "ng-show=\"#{route.show}\"" || ''
+                        hide: route.hide && "ng-hide=\"#{route.hide}\"" || ''
                         icon: route.icon && E2.icon(route.icon) || ''
-                        aicon: route.aicon && E2.aicon(route.aicon) || ''
-            out.join('')
+            out = out.join('')
+            if _.size(out) == 0 then "<div></div>" else out
 
     list: class ListAction extends Action
         initialize: ->
@@ -320,9 +382,8 @@ angular.module('Engine2')
             @ui_state = {}
             @load_state()
 
-            delete @query.order unless @meta.info[@query.order]?.sort # _.includes(@meta.fields, @query.order)
-            _.each @query.search, ((sv, sn) => delete @query.search[sn] unless _.includes(@meta.search_fields, sn))
-            # $window.addEventListener 'beforeunload', (e, v) => @save_state()
+            delete @query.order unless @meta.fields[@query.order]?.sort # _.includes(@meta.field_list, @query.order)
+            _.each @query.search, ((sv, sn) => delete @query.search[sn] unless _.includes(@meta.search_field_list, sn))
 
         destroy: ->
             @save_state()
@@ -331,10 +392,13 @@ angular.module('Engine2')
         process_meta: ->
             super()
             meta = @meta
-            meta.fields = meta.fields.filter((f) => !meta.info[f].hidden) if meta.fields
+            meta.field_list = meta.field_list.filter((f) => !meta.fields[f].hidden) if meta.field_list
 
         # confirm_create, view, confirm_modify, confirm_delete, assocs - implicit
 
+        render_table: ->
+            @scope().$broadcast 'render_table'
+
         menu_search_toggle: ->
             @ui_state.search_active = !@ui_state.search_active
             @save_state() unless @ui_state.search_active
@@ -348,12 +412,13 @@ angular.module('Engine2')
 
         menu_select_toggle: ->
             if @selection then delete @selection else @selection = {}
-            @scope().$broadcast 'render_table'
+            @render_table()
+
 
         menu_show_meta: ->
-            $e2Modal.show
+            @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)
@@ -370,7 +435,7 @@ angular.module('Engine2')
             E2.id_for(@current_entry(), @meta)
 
         list_cell: (e, f) ->
-            E2.render_field(e, f, @meta)
+            E2.render_field(e, f, @meta, "<br>")
 
         invoke: (args = {}) ->
             @save_state()
@@ -380,7 +445,7 @@ angular.module('Engine2')
             super(query).then =>
                 @ui = _.pick @query, ['order', 'asc', 'page']
                 @ui.pagination_active = @ui.page != 0 || @entries.length >= @meta.config.per_page
-                @scope().$broadcast 'render_table'
+                @render_table()
 
         load_new: ->
             @query.page = 0
@@ -413,14 +478,14 @@ angular.module('Engine2')
             @load_new()
 
         search_field_change: (f) ->
-            info = @meta.info[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
@@ -441,6 +506,22 @@ angular.module('Engine2')
         selected_info: ->
             @meta.loc.selected + ": " + @selected_size()
 
+        entry_dropped: (moved_to, render = true) ->
+            from = @entries[@moved_from]
+            @entries.splice(@moved_from, 1)
+            @entries.splice((if moved_to > @moved_from then moved_to - 1 else moved_to), 0, from)
+            delete @moved_from
+            @render_table() if render
+            true
+
+        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 =>
@@ -448,79 +529,81 @@ angular.module('Engine2')
 
     view: class ViewAction extends Action
         view_cell: (e, f) ->
-            E2.render_field(e, f, @meta)
+            E2.render_field(e, f, @meta, "<br>")
 
     form_base_action: class FormBaseAction extends Action
         initialize: ->
             super()
-            _.each @meta.info, (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.tabs
+            if @meta.tab_list
                 @scope().$watch "action.activeTab", (tab) => if tab? # && tab >= 0
                     @panel_shown()
 
             @["panel_menu_#{@default_action_name}"] = -> @panel_menu_default_action()
-            @scope().$on "return_pressed", (e) => @panel_menu_default_action()
 
         post_invoke: (args) ->
             super()
-            _.each @meta.info, (info, name) =>
-                if _.isString(@record[name]) && !info.dont_strip
+            _.each @meta.fields, (info, name) =>
+                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.info, (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 =>
                 dfd = $q.defer()
                 if @errors
-                    if @meta.tabs
+                    if @meta.tab_list
                         [i, first, curr] = [0, null, false]
-                        for tab in @meta.tabs
-                            if _(tab.fields).find((f) => @errors[f])
+                        for tab_name in @meta.tab_list
+                            tab = @meta.tabs[tab_name]
+                            if _(tab.field_list).find((f) => @errors[f])
                                 first = i if not first?
                                 act = true if @activeTab == i
                             i++
                         @activeTab = first unless act
 
                         if @activeTab?
-                            field = _(@meta.tabs[@activeTab].fields).find((f) => @errors[f])
+                            field = _(@meta.tabs[@meta.tab_list[@activeTab]].field_list).find((f) => @errors[f])
                             # console.log field undefined ?
                         else
                             @activeTab = 0
                             @alert = @errors
                     else
-                        field = _(@meta.fields).find((f) => @errors[f])
-                        @alert = @errors if (!field || !@meta.info[field] || @meta.info[field].hidden) # ?
+                        field = _(@meta.field_list).find((f) => @errors[f])
+                        @alert = @errors if (!field || !@meta.fields[field] || @meta.fields[field].hidden) # ?
                     $timeout => @scope().$broadcast("focus_field", field)
                     #e.scope.$eval(meta.execute) if meta.execute # ?
-                    dfd.reject(@errors)
+                    dfd.resolve()
                 else
-                    @panel_close()
                     dfd.resolve(@record) # $q.when(true) ?
                 dfd.promise
 
         panel_shown: ->
-            field = if @meta.tabs
-                tab = @meta.tabs[@activeTab]
+            field = if @meta.tab_list
+                tab = @meta.tabs[@meta.tab_list[@activeTab]]
                 if @errors
-                    _(tab.fields).find((f) => @errors[f]) || _(tab.fields).find((f) => !@meta.info[f].hidden)
+                    _(tab.field_list).find((f) => @errors[f]) || _(tab.field_list).find((f) => !@meta.fields[f].hidden)
                 else
-                    tab ?= @meta.tabs[0]
-                    _(tab.fields).find((f) => !@meta.info[f].hidden && !@meta.info[f].disabled)
+                    tab ?= @meta.tabs[@meta.tab_list[0]]
+                    _(tab.field_list).find((f) => !@meta.fields[f].hidden && !@meta.fields[f].disabled)
             else
-                _(@meta.fields).find((f) => !@meta.info[f].hidden && !@meta.info[f].disabled)
+                _(@meta.field_list).find((f) => !@meta.fields[f].hidden && !@meta.fields[f].disabled)
             $timeout (=> @scope().$broadcast("focus_field", field)), 300 # hack, on shown ?
 
     infra: class InfraAction extends Action
@@ -530,33 +613,34 @@ angular.module('Engine2')
                 if @user
                     @invoke_action('login_form').then (act) =>
                         act.record = name: @user.name
-                        act.meta.info.name.disabled = true
+                        act.meta.fields.name.disabled = true
                         act.dont_reload_routes = !reload_routes # true
                 else
-                    @invoke().then => @set_access(true, true)
+                    @invoke().then => @set_access(true, true, @user)
 
-        set_access: (login, load_routes) ->
-            @find_action_info('logout_form').access = login
-            @find_action_info('inspect_modal').access = login
-            @find_action_info('login_form').access = !login
-            $route.load_routes() if load_routes
+            @scope().$on "set_access", (evt, login, load_routes, user) => @set_access(login, load_routes, user)
+
+        set_access: (login, load_routes, user) ->
+            if user || !login
+                @user = user
+                @find_action_info('logout_form').access = login
+                @find_action_info('inspect_modal').access = login
+                @find_action_info('login_form').access = !login
+                $stateRegistry.load_routes() if load_routes
 
     login_form: class LoginFormAction extends FormBaseAction
         panel_menu_default_action: ->
             super().then =>
-                @parent().user = @user
-                @parent().set_access(true, !@dont_reload_routes)
+                $rootScope.$broadcast "set_access", true, !@dont_reload_routes, @user
 
     logout_form: class LogoutForm extends Action
         panel_menu_logout: ->
             @invoke_action('logout').then =>
-                @parent().user = null
-                @parent().set_access(false, true)
+                $rootScope.$broadcast "set_access", false, true, null
                 @panel_close()
+                MetaCache.removeAll()
 
     form: class FormAction extends FormBaseAction
-        panel_menu_default_action: ->
-            super().then => @parent().invoke()
 
     create: class CreateAction extends FormAction
         invoke: (args) ->
@@ -568,26 +652,18 @@ angular.module('Engine2')
     modify: class ModifyAction extends FormAction
         # invoke: (args) ->
         #     super(args).then =>
-        #         _.each @meta.primary_fields, (f) => @meta.info[f].disabled = true
-
-    on_change: class OnChangeAction extends Action
-        post_invoke: ->
-            super()
-            @parent().scope().$eval(@meta.execute) if @meta.execute
+        #         _.each @meta.primary_fields, (f) => @meta.fields[f].disabled = true
 
     confirm: class ConfirmAction extends Action
         panel_menu_approve: ->
             @initial_arguments ?= @arguments
-            @invoke_action(@default_action_name, _.pick(@, @initial_arguments)).then (act) =>
-                unless @errors
-                    @parent().invoke()
-                    @panel_close()
+            @invoke_action(@default_action_name, _.pick(@, @initial_arguments))
 
     decode_action: class DecodeAction extends Action
         initialize: ->
             super()
             @decode_field = @scope().f
-            @dinfo = @parentp().meta.info[@decode_field]
+            @dinfo = @parentp().meta.fields[@decode_field]
             throw "Primary and foreign key list lengths dont match: [#{@meta.primary_fields}] and [#{@dinfo.fields}]" unless @meta.primary_fields.length == @dinfo.fields.length
             @scope().$on "search_reset", => @clean()
 
@@ -606,8 +682,7 @@ angular.module('Engine2')
             @parentp().search_field_change?(@decode_field)
 
         decode_description: (entry) ->
-            fields = @meta.decode_fields ? @meta.fields
-            fields.map((f) => E2.render_field(entry, f, @meta)).join(@meta.separator)
+            @meta.decode_fields.map((f) => E2.render_field(entry, f, @meta, ', ')).join(@meta.separator)
 
         parentp: ->
             @parent().parent()
@@ -634,11 +709,11 @@ angular.module('Engine2')
                 if @selected.length > 0
                     _.each @dinfo.fields, (fk) -> record[fk] = []
                     _.each @selected, (sel) =>
-                        _(@dinfo.fields).zip(E2.split_keys(sel)).each(([fk, k]) => record[fk].push E2.parse_entry(k, @parentp().meta.info[fk])).value
+                        _(@dinfo.fields).zip(E2.split_keys(sel)).each(([fk, k]) => record[fk].push E2.parse_entry(k, @parentp().meta.fields[fk])).value
                 else @clear_record()
             else
                 if @selected
-                    _(@dinfo.fields).zip(E2.split_keys(@selected)).each(([fk, k]) => record[fk] = E2.parse_entry(k, @parentp().meta.info[fk])).value
+                    _(@dinfo.fields).zip(E2.split_keys(@selected)).each(([fk, k]) => record[fk] = E2.parse_entry(k, @parentp().meta.fields[fk])).value
                 else @clear_record()
 
             @parentp().search_field_change?(@decode_field)
@@ -660,12 +735,12 @@ angular.module('Engine2')
                 if @multiple
                     _.each @dinfo.fields, (fk) => record[fk] = []
                     _.each sel, (rec, ids) =>
-                        _(@dinfo.fields).zip(E2.split_keys(ids)).each(([k, v]) => record[k].push E2.parse_entry(v, @parentp().meta.info[k])).value
+                        _(@dinfo.fields).zip(E2.split_keys(ids)).each(([k, v]) => record[k].push E2.parse_entry(v, @parentp().meta.fields[k])).value
                     @invoke_decode _.values(sel)
                     delete @decode if _.isEmpty(sel)
                 else
                     [ids, rec] = _(sel).toPairs().head()
-                    _(@dinfo.fields).zip(E2.split_keys(ids)).each(([k, v]) => record[k] = E2.parse_entry(v, @parentp().meta.info[k])).value
+                    _(@dinfo.fields).zip(E2.split_keys(ids)).each(([k, v]) => record[k] = E2.parse_entry(v, @parentp().meta.fields[k])).value
                     @invoke_decode [rec]
                 @parentp().search_field_change?(@decode_field)
 
@@ -675,7 +750,7 @@ angular.module('Engine2')
             else
                 decode_descriptions = (recs) => @decode = recs.map((fields) => @decode_description(fields)).join(' | ')
                 recs = recs.map (r) => if _.isArray(r) then E2.from_id(r, @meta) else r
-                if _(recs).every((r) => _(@meta.fields).every((f) -> r[f]?)) then decode_descriptions(recs) else
+                if _(recs).every((r) => _(@meta.field_list).every((f) -> r[f]?)) && !@meta.dynamic_meta then decode_descriptions(recs) else
                     @invoke(ids: [recs.map((r) => @meta.primary_fields.map (k) -> r[k])]).then => decode_descriptions(@entries)
 
         open: ->
@@ -694,29 +769,31 @@ angular.module('Engine2')
     typeahead: class TypeAheadAction extends DecodeAction
         initialize: ->
             super()
+            @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) => @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)
 
-            @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.info[fk])).value
-                @parentp().search_field_change?(@decode_field)
-
-            @scope().$watch "action.decode", (e) => if e?
-                @reset() if e.length == 0
+            @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
@@ -740,11 +817,12 @@ 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: (index) ->
-            @invoke_action('confirm_unlink', id: E2.id_for(@entries[index], @meta), parent_id: @query.parent_id)
+        item_menu_confirm_unlink: (args) ->
+            args.parent_id = @query.parent_id
+            @item_menu_confirm_unlink_super(args)
 
     star_to_many_bulk_unlink: class StarToManyBulkUnlinkAction extends Action
         invoke: ->
@@ -762,26 +840,81 @@ angular.module('Engine2')
         panel_menu_link: ->
             selection = _.keys(@selection)
             if selection.length > 0
-                @invoke_action('link', parent_id: @query.parent_id, ids: selection).then (act) =>
-                    unless @errors
-                        @parent().invoke()
-                        @panel_close()
+                @invoke_action('link', parent_id: @query.parent_id, ids: selection)
 
     star_to_many_field: class StarToManyField extends ListAction
         initialize: ->
             super()
             @query.parent_id = E2.id_for(@parent().record, @parent().meta)
-            links = @parent().record[@scope().$parent.f]
-            @links = links ? (linked: [], unlinked: [])
+            @changes = (@parent().record[@scope().$parent.f] ?= (link: [], unlink: [], create: [], modify: [], delete: []))
             @invoke()
 
         invoke: ->
-            @query.unlinked = [@links.unlinked]
-            @query.linked = [@links.linked]
+            @query.changes = @changes
             super()
 
-        sync_record: ->
-            @parent().record[@scope().$parent.f] = @links
+        entry_dropped: (moved_to) ->
+            pos_field = @meta.draggable.position_field
+            positions = @entries.map (e) -> e[pos_field]
+            super(moved_to, false)
+            _.each positions, (p, i) =>
+                if @entries[i][pos_field] != p
+                    if entry = @current_entry_is('create', @entries[i]) ? @current_entry_is('modify', @entries[i])
+                        entry[pos_field] = p
+                    else
+                        @changes.modify.push(@entries[i])
+                    @entries[i][pos_field] = p
+
+            @render_table() # @invoke()
+            true
+
+        current_entry_is: (mode, entry = @current_entry()) ->
+            key = E2.id_for(entry, @meta)
+            _.find(@changes[mode], (e) => E2.id_for(e, @meta) == key)
+
+    star_to_many_field_view: class StarToManyFieldView extends ViewAction
+        invoke: (args) ->
+            if entry = @parent().current_entry_is('create') ? @parent().current_entry_is('modify')
+                @meta.invokable = false
+                @record = entry
+            super(args)
+
+    star_to_many_field_modify: class StarToManyFieldModifyAction extends ModifyAction
+        invoke: (args) ->
+            if entry = @parent().current_entry_is('create') ? @parent().current_entry_is('modify')
+                @meta.invokable = false
+                @record = entry
+            super(args)
+
+    star_to_many_field_approve: class StarToManyFieldApprove extends Action
+        post_invoke: (args) ->
+            super(args)
+            unless @errors
+                pparent = @parent().parent()
+                if @parent() instanceof StarToManyFieldModifyAction
+                    if entry = pparent.current_entry_is('create') ? pparent.current_entry_is('modify')
+                        _.assign(entry, @parent().record)
+                    else
+                        pparent.changes.modify.push @parent().record
+                else # CreateAction
+                    _(@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
+                    pparent.changes.create.push @parent().record
+
+    star_to_many_field_delete: class StarToManyFieldDelete extends Action
+        invoke: (args) ->
+            pparent = @parent().parent()
+            if entry = pparent.current_entry_is('create')
+                _.remove(pparent.changes.create, entry)
+            else if entry = pparent.current_entry_is('modify')
+                _.remove(pparent.changes.modify, entry)
+                pparent.changes.delete.push args.id
+            else
+                pparent.changes.delete.push args.id
+            @meta.invokable = false
+            super(args)
 
     star_to_many_field_link_list: class StarToManyFieldLinkList extends ListAction
         initialize: ->
@@ -791,57 +924,50 @@ angular.module('Engine2')
             @selection = {}
 
         invoke: ->
-            @query.unlinked = [@parent().links.unlinked]
-            @query.linked = [@parent().links.linked]
+            @query.changes = @parent().changes
             super()
 
         panel_menu_link: ->
             if @selected_size() > 0
                 _.each @selection, (v, k) =>
                     id = k
-                    if _.includes(@parent().links.unlinked, id) then _.pull(@parent().links.unlinked, id) else @parent().links.linked.push id
+                    if _.includes(@parent().changes.unlink, id) then _.pull(@parent().changes.unlink, id) else @parent().changes.link.push id
                 @parent().invoke()
-                @parent().sync_record()
                 @panel_close()
 
     star_to_many_field_unlink: class StarToManyFieldUnlink extends Action
         invoke: (args) ->
             id = args.id
             pparent = @parent().parent()
-            if _.includes(pparent.links.linked, id) then _.pull(pparent.links.linked, id) else pparent.links.unlinked.push id
-            pparent.sync_record()
+            if _.includes(pparent.changes.link, id) then _.pull(pparent.changes.link, id) else pparent.changes.unlink.push id
+            @meta.invokable = false
+            super(args)
 
     file_store: class FileStoreAction extends Action
         initialize: ->
             super()
             @progress = 0
             id = E2.id_for(@parent().record, @parent().meta)
-            if id.length > 0
-                @invoke(owner: id).then => @sync_record()
-            else
-                @files = []
-                @sync_record()
-
-        sync_record: ->
-            @parent().record[@scope().f] = @files
+            files = @parent().record[@scope().f]
+            @invoke(owner: id).then =>
+                @parent().record[@scope().f] = if files? then files else @files
+                delete @files
 
         select: (files) ->
             _.each files, (file) =>
                 upload = $injector.get('Upload').upload url: "#{@action_info().action_resource}/upload", file: file
                 upload.progress (e) =>
-                    globals.action_pending = false
+                    @globals().action_pending = false
                     @progress = parseInt(100.0 * e.loaded / e.total)
                 upload.success (data, status, headers, config) =>
-                    @files.push mime: file.type, name: file.name, rackname: data.rackname, id: data.id
+                    @parent().record[@scope().f].push mime: file.type, name: file.name, rackname: data.rackname, id: data.id, new: true
                     @message = "Wysłano, #{file.name}"
-                    globals.action_pending = false
-            @sync_record()
+                    @globals().action_pending = false
 
         delete_file: (file) ->
             @scope().$broadcast 'confirm_delete',
                 confirm: =>
-                    @sync_record()
-                    file.deleted = true
+                    if file.new then _.pull(@parent().record[@scope().f], file) else file.deleted = true
                     @scope().$broadcast 'confirm_delete_close'
 
         show_file: (file) ->