engine2 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6174073612b4abd1d1a7c2fefbbf071874c2c566
-  data.tar.gz: 081dee914669d77bb0a9e32d13c219612aa79d75
+  metadata.gz: 61ac9190b96b7053391913f8121f1df0bc1967c0
+  data.tar.gz: b532a2ca2828607b2068450761cc55a77d43f597
 SHA512:
-  metadata.gz: 5631fd58edca95f2c3966ccc240a29b0089c78e7a80b9d3a7e5e239e2a001e0a02f7baa9ed6cdff6a0d98f061022f02d0768282513b457bf6e9fd180c8adf96e
-  data.tar.gz: bcc3a19a71996a4c2e8f5f2d511354dc1085de8bdd5eacce667cbe1f24a91587dee04892fb22d51276f7a152a4b21c72681e90f379731ad2f1d546f9c5940294
+  metadata.gz: 3afb80475e3f7cad3bed23163f0b03f1d54d9268a46749c5e7d9dbc5aa77cbb0859b83592094e50b8178492ff3656a98eb31123be8f56a99962bac033dc20d1a
+  data.tar.gz: a7d20b040fd8a85373a9328508710064fa403103b2c661d2d2d71eaec148910397e2d2ddcffb0aea6712eab3bb3bf49943f496e87bd413997d6e25e1d2586bed

data/Rakefile

@@ -10,7 +10,7 @@ task :compile_slim do
         end
     end
 
-    open("app/engine2templates.js", "wb") << <<-EOF
+    open("app/templates.js", "wb") << <<-EOF
 angular.module('Engine2').run(['$templateCache', function($templateCache) {
 #{slims.join("\n")}
 }]);

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,12 @@ angular.module('Engine2')
                     @meta.panel.modal_action = false
                     @meta.panel.footer = true unless @meta.panel.footer == false
 
+            @websocket_connect() if @meta.websocket
             @initialize()
 
         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 +68,22 @@ 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)
+                    @globals().modal().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))
-
-            globals.action_pending = if @meta.panel then @ else @parent()
-
-            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 +91,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)
 
@@ -130,26 +108,44 @@ angular.module('Engine2')
         pre_invoke: ->
         post_invoke: ->
 
-        invoke: (args) ->
-            @pre_invoke(args)
-            _.merge(args ?= {}, @meta.arguments) if @meta.arguments
-            @perform_invoke(args).then =>
-                @post_invoke(args)
+        invoke: (params) ->
+            params ?= {}
+            @globals().action_pending = if @meta.panel then @ else @parent()
+            @pre_invoke(params)
+            _.merge(params, @meta.arguments) if @meta.arguments
+
+            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))
+
+            get_invoke.then (response) =>
+                @arguments = _.keys(response.data)
+                E2.merge(@, 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(prnt, response.data)
+
+                @post_invoke(params)
                 @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
-                @
+                    @scope().$on "$destroy", => @destroyed = true
+                    $timeout (=> @invoke(params)), @meta.repeat unless @destroyed
+                    delete @meta.repeat
 
-        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}"
+                @globals().action_pending = false
+                promise
+            ,
+            (err) =>
+                @globals().action_pending = false
+                @handle_error(err, info, @element())
 
         panel_render: ->
             if @meta.panel.modal_action
@@ -161,13 +157,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 +186,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 +197,39 @@ angular.module('Engine2')
         panel_menu_cancel: ->
             @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_method_exec = ws_meta.execute?[method]
+                if ws_method_impl || ws_method_exec
+                    ws_method = (evt) =>
+                        is_message = method == 'message'
+                        if is_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)
+                                @process_meta()
+                        else msg = evt
+                        ws_method_impl.bind(@)(msg, ws, evt) if ws_method_impl
+                        @scope().$eval(ws_method_exec) if ws_method_exec
+
+                    ws["on#{_.capitalize(method)}"](ws_method)
+
+            @web_socket = -> ws
+            @scope().$on "$destroy", -> ws.close()
+
     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 +240,7 @@ angular.module('Engine2')
             super()
             @tree = actions: [name: 'api', number: 0, access: true]
             @invoke_action('models')
+            @invoke_action('environment')
 
         open: (stack, node, collapsed, expand) ->
             tree = @tree
@@ -253,64 +277,65 @@ 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())
                     @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}}' href-attr='ui-sref' 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
                     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('')
 
     list: class ListAction extends Action
@@ -322,7 +347,6 @@ angular.module('Engine2')
 
             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()
 
         destroy: ->
             @save_state()
@@ -351,7 +375,7 @@ angular.module('Engine2')
             @scope().$broadcast '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)
 
@@ -469,7 +493,6 @@ angular.module('Engine2')
                     @panel_shown()
 
             @["panel_menu_#{@default_action_name}"] = -> @panel_menu_default_action()
-            @scope().$on "return_pressed", (e) => @panel_menu_default_action()
 
         post_invoke: (args) ->
             super()
@@ -505,9 +528,8 @@ angular.module('Engine2')
                         @alert = @errors if (!field || !@meta.info[field] || @meta.info[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
 
@@ -533,30 +555,31 @@ angular.module('Engine2')
                         act.meta.info.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) ->
@@ -578,10 +601,7 @@ angular.module('Engine2')
     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: ->
@@ -606,8 +626,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()
@@ -675,7 +694,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.fields).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: ->
@@ -743,8 +762,9 @@ angular.module('Engine2')
             @query.parent_id = @parent().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 +782,63 @@ 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
+        current_entry_is: (mode) ->
+            key = E2.id_for(@current_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(5)
+                    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 +848,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) ->