improved event handling for sets
[myslice.git] / manifoldapi / static / js / manifold.js
index 48e80a6..b0dab42 100644 (file)
@@ -52,7 +52,7 @@ var CLEAR_RECORDS  = 8;
 var FIELD_STATE_CHANGED = 9;
 
 var IN_PROGRESS    = 101;
-var DONE           = 102;
+var DONE           = 102; //XXX Should be harmonized with query state
 
 /* Update requests related to subqueries */
 
@@ -1080,7 +1080,6 @@ var manifold = {
 
         var update_query_ext = query_ext.update_query_ext;
 
-        console.log("Update case not handled yet!");
         if (!update_query_ext)
             return;
 
@@ -1176,21 +1175,6 @@ var manifold = {
      * previous 'process_get_query_records' function.
      */
     process_update_query_records: function(query, records) {
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
-        // XXX XXX XXX XXX
         // First issue: we request everything, and not only what we modify, so will will have to ignore some fields
         var query_uuid        = query.query_uuid;
         var query_ext         = manifold.query_store.find_analyzed_query_ext(query_uuid);
@@ -1304,17 +1288,17 @@ var manifold = {
                     $.each(added_keys, function(i, key) {
                         if ($.inArray(key, result_keys) == -1) {
                             data = {
-                                request: FIELD_REQUEST_ADD,
-                                key   : field,
-                                value : key,
-                                status: FIELD_REQUEST_FAILURE,
+                                state: STATE_SET,
+                                key  : field,
+                                op   : STATE_SET_IN_FAILURE,
+                                value: key
                             }
                         } else {
                             data = {
-                                request: FIELD_REQUEST_ADD,
-                                key   : field,
-                                value : key,
-                                status: FIELD_REQUEST_SUCCESS,
+                                state: STATE_SET,
+                                key  : field,
+                                op   : STATE_SET_IN_SUCCESS,
+                                value: key
                             }
                         }
                         manifold.raise_record_event(query_uuid, FIELD_STATE_CHANGED, data);
@@ -1322,17 +1306,17 @@ var manifold = {
                     $.each(removed_keys, function(i, key) {
                         if ($.inArray(key, result_keys) == -1) {
                             data = {
-                                request: FIELD_REQUEST_REMOVE,
-                                key   : field,
-                                value : key,
-                                status: FIELD_REQUEST_SUCCESS,
+                                state: STATE_SET,
+                                key  : field,
+                                op   : STATE_SET_OUT_SUCCESS,
+                                value: key
                             }
                         } else {
                             data = {
-                                request: FIELD_REQUEST_REMOVE,
-                                key   : field,
-                                value : key,
-                                status: FIELD_REQUEST_FAILURE,
+                                state: STATE_SET,
+                                key  : field,
+                                op   : STATE_SET_OUT_FAILURE,
+                                value: key
                             }
                         }
                         manifold.raise_record_event(query_uuid, FIELD_STATE_CHANGED, data);
@@ -1345,6 +1329,13 @@ var manifold = {
         
         // XXX Now we need to adapt 'update' and 'update_orig' queries as if we had done a get
         this.setup_update_query(query, records);
+
+        var query_ext = manifold.query_store.find_query_ext(query.query_uuid);
+        query_ext.query_state = QUERY_STATE_DONE;
+
+        // Send DONE message to plugins
+        manifold.raise_record_event(query.query_uuid, DONE);
+
     },
 
     process_query_records: function(query, records) {
@@ -1458,7 +1449,7 @@ var manifold = {
     /**
      * Event handler helpers
      */
-    _get_next_state_add: function(prev_state, event_type)
+    _get_next_state_add: function(prev_state)
     {
         switch (prev_state) {
             case STATE_SET_OUT:
@@ -1481,7 +1472,7 @@ var manifold = {
         return new_state;
     },
 
-    _get_next_state_remove: function(prev_state, event_type)
+    _get_next_state_remove: function(prev_state)
     {
         switch (prev_state) {
             case STATE_SET_IN:
@@ -1570,8 +1561,8 @@ var manifold = {
                     manifold.query_store.set_record_state(query.query_uuid, resource_key, STATE_WARNINGS, warnings);
                 }
 
-                manifold.query_store.recount(query.query_uuid); 
-                manifold.query_store.recount(lease_query.query_uuid); 
+                /* This was redundant */
+                // manifold.query_store.recount(query.query_uuid); 
 
                 // Signal the change to plugins (even if the constraint does not apply, so that the plugin can display a checkmark)
                 data = {
@@ -1606,7 +1597,6 @@ var manifold = {
                     
                 }
 
-                manifold.query_store.recount(query.query_uuid); 
                 manifold.query_store.recount(resource_query.query_uuid); 
 
                 // Signal the change to plugins (even if the constraint does not apply, so that the plugin can display a checkmark)
@@ -1687,94 +1677,63 @@ var manifold = {
                         break;
 
                     case STATE_SET:
+                        var prev_state, new_state;
+                        var main_query, record, new_data, path;
+        
+                        // We only track state in the analyzed query
+                        prev_state = manifold.query_store.get_record_state(query_uuid, data.value, STATE_SET);
+                        if (prev_state === null)
+                            prev_state = STATE_SET_OUT;
+                        new_state = this._get_next_state_add(prev_state);
 
                         switch(data.op) {
                             case STATE_SET_ADD:
-                                if (!data.key) {
-                                    var prev_state, new_state;
-                                    var main_query, record, new_data;
-                    
-                                    prev_state = manifold.query_store.get_record_state(query_uuid, data.value, STATE_SET);
-                                    if (prev_state === null)
-                                        prev_state = STATE_SET_OUT;
-                                    new_state = this._get_next_state_add(prev_state, data.state);
-                    
-                                    /* data.value containts the resource key */
-                                    manifold.query_store.add_record(query_uuid, data.value, new_state);
-                                    record = manifold.query_store.get_record(query_uuid, data.value);
-                                    this._enforce_constraints(query_ext, record, data.value, STATE_SET_ADD);
-                    
-                                    /* Inform the parent query: important for update */
-                                    new_data = {
-                                        state : STATE_SET,
-                                        key   : this._get_query_path(query_ext),
-                                        op    : STATE_SET_IN_PENDING,
-                                        value : data.value,
-                                    };
-                                    main_query = query_ext.main_query_ext.query;
-                                    this.raise_event(main_query.query_uuid, FIELD_STATE_CHANGED, new_data);
-                    
-                                    /*
-                                     * Propagate the event to other plugins subscribed to the query
-                                     */
-                                    manifold.raise_query_event(query_uuid, event_type, data);
-                                } else {
-                                    // mainquery: proceed to update
-
-                                    //if ($.inArray(data.value, update_query_orig.params[data.key]) != -1)
-                                    //    value.request = FIELD_REQUEST_ADD_RESET;
-
-                                    if (update_query.params[data.key] === undefined)
-                                        update_query.params[data.key] = Array();
-                                    update_query.params[data.key].push(data.value);
-                                }
+                                /* data.value containts the resource key */
+                                manifold.query_store.add_record(query_uuid, data.value, new_state);
+                                record = manifold.query_store.get_record(query_uuid, data.value);
+                                this._enforce_constraints(query_ext, record, data.value, STATE_SET_ADD);
+                
+                                /* Process update query in parent */
+                                path =  this._get_query_path(query_ext);
+                                if (update_query.params[path] === undefined)
+                                    update_query.params[path] = Array();
+                                update_query.params[path].push(data.value);
+
                                 break;
 
                             case STATE_SET_REMOVE:
-                                if (!data.key) {
-                                    var prev_state, new_state;
-                                    var main_query, record, new_data;
-                    
-                                    prev_state = manifold.query_store.get_record_state(query_uuid, data.value, STATE_SET);
-                                    if (prev_state === null)
-                                        prev_state = STATE_SET_OUT;
-                                    new_state = this._get_next_state_remove(prev_state, data.state);
+                                /* data.value contains the resource key */
+                                manifold.query_store.remove_record(query_uuid, data.value, new_state);
+                                record = manifold.query_store.get_record(query_uuid, data.value);
+                                this._enforce_constraints(query_ext, record, data.value, STATE_SET_REMOVE);
                     
-                                    /* data.value contains the resource key */
-                                    manifold.query_store.remove_record(query_uuid, data.value, new_state);
-                                    record = manifold.query_store.get_record(query_uuid, data.value);
-                                    this._enforce_constraints(query_ext, record, data.value, STATE_SET_REMOVE);
-                    
-                                    /* Inform the parent query: important for update */
-                                    new_data = {
-                                        state : STATE_SET,
-                                        key   : this._get_query_path(query_ext),
-                                        op    : STATE_SET_OUT_PENDING,
-                                        value : data.value,
-                                    };
-                                    main_query = query_ext.main_query_ext.query;
-                                    this.raise_event(main_query.query_uuid, FIELD_STATE_CHANGED, new_data);
-                    
-                                    /* Propagate the event to other plugins subscribed to the query */
-                                    manifold.raise_query_event(query_uuid, event_type, data);
-                    
-                                } else {
-                                    // main query: proceed to update
-
-                                    //if ($.inArray(data.value, update_query_orig.params[data.key]) == -1)
-                                    //    value.request = FIELD_REQUEST_REMOVE_RESET;
-
-                                    var arr = update_query.params[data.key];
-                                    arr = $.grep(arr, function(x) { return x != data.value; });
-                                    if (update_query.params[data.key] === undefined)
-                                        update_query.params[data.key] = Array();
-                                    update_query.params[data.key] = arr;
-                                }
+                                /* Process update query in parent */
+                                path =  this._get_query_path(query_ext);
+                                arr = update_query.params[data.key];
+                                arr = $.grep(arr, function(x) { return x != data.value; });
+                                if (update_query.params[path] === undefined)
+                                    update_query.params[path] = Array();
+                                update_query.params[path] = arr;
                                 break;
                         }
+
+                        /* Inform the parent query: important for update */
+                        new_data = {
+                            state : STATE_SET,
+                            key   : path,
+                            op    : new_state,
+                            value : data.value,
+                        };
+                        main_query = query_ext.main_query_ext.query;
+                        manifold.raise_record_event(main_query.query_uuid, event_type, new_data);
+                        /* Propagate the event to other plugins subscribed to the query */
+                        manifold.query_store.recount(query_uuid);
+                        new_data.key = ''
+                        manifold.raise_record_event(query_uuid, event_type, new_data);
+
                         break;
                 }
-
+/*
                 // 3. Inform others about the change
                 // a) the main query...
                 manifold.raise_record_event(query_uuid, event_type, data);
@@ -1795,9 +1754,8 @@ var manifold = {
                     });
                     data.key = value_key;
                 }
-
-                manifold.query_store.recount(cur_query.query_uuid);
                 manifold.raise_record_event(cur_query.query_uuid, event_type, data);
+*/
 
                 break;