WIP version to access an slapos master.

data/computer_overview.json

@@ -4,7 +4,7 @@
   "portal_type_fields": "computer_fieldlist",
   "initial_query": {"include_docs": true, "limit":[0,8]},
   "form": true,
-  "view": "FOO",
+  "view": "web_view",
   "property_dict": {
     "initial_query_url_identifier": "_id",
     "dynamic_children": [1],

data/computer_status.json

@@ -4,7 +4,7 @@
   "portal_type_fields": "computer_fieldlist",
   "initial_query": {"include_docs": true, "limit":[0,1]},
   "form": true,
-  "view": "FOO",
+  "view": "web_view",
   "property_dict": {
     "initial_query_url_identifier": "_id",
     "dynamic_children": [0],

data/network_assigned_computers.json

@@ -4,7 +4,7 @@
   "portal_type_fields": "computer_fieldlist",
   "initial_query": {"include_docs": true, "limit":[]},
   "form": true,
-  "view": "FOO",
+  "view": "web_view",
   "property_dict": {
     "no_items": {
       "message":"No servers associated with this network.",

data/network_overview.json

 {
-  "portal_type_source": "Network",
+  "portal_type_source": "Computer Network",
   "portal_type_title": "network",
   "portal_type_fields": "network_fieldlist",
   "initial_query": {"include_docs": true, "limit":[0,8]},

data/network_status.json

 {
-  "portal_type_source": "Network",
+  "portal_type_source": "Computer Network",
   "portal_type_title": "network",
   "portal_type_fields": "network_fieldlist",
   "initial_query": {"include_docs": true, "limit":[0,1]},
   "form": true,
-  "view": "FOO",
+  "view": "web_view",
   "property_dict": {
     "initial_query_url_identifier": "_id",
     "dynamic_children": [0],

data/service_instance_status.json

 {
-  "portal_type_source": "Service",
+  "portal_type_source": "Hosting Subscription",
   "portal_type_title": "service",
   "portal_type_fields": "service_fieldlist",
   "form": true,
-  "view": "FOO",
+  "view": "web_view",
   "property_dict": {
     "initial_query_url_identifier": "_id",
     "dynamic_children": [0],

data/service_overview.json

 {
-  "portal_type_source": "Service",
+  "portal_type_source": "Hosting Subscription",
   "portal_type_title": "service",
   "portal_type_fields": "service_fieldlist",
   "initial_query": {"include_docs": true, "limit":[0,16]},

data/service_statusbox.json

 {
-  "portal_type_source": "Service",
+  "portal_type_source": "Hosting Subscription",
   "portal_type_title": "service",
   "portal_type_fields": "service_fieldlist",
   "form": true,
-  "view": "FOO",
+  "view": "web_view",
   "property_dict": {
     "initial_query_url_identifier": "_id",
     "dynamic_children": [1],

index.html

@@ -21,6 +21,8 @@
     <script type="text/javascript" src="js/libs/jio/jio.js"></script>
     <script type="text/javascript" src="js/libs/jio/complex_queries.js"></script>
     <script type="text/javascript" src="js/libs/jio/localstorage.js"></script>
+    <script type="text/javascript" src="js/libs/uritemplate/uritemplate-min.js"></script>
+    <script type="text/javascript" src="js/libs/jio/hateoasstorage.js"></script>
 
     <!-- plugins -->
     <script type="text/javascript" src="js/plugins/validval/jquery.validVal.js"></script>

js/erp5_loader.js

@@ -1580,9 +1580,9 @@
         if (answer && (answer.data || answer.request_new)) {
           if (answer.request_new || answer.data.total_rows === 0) {
             data = {};
-            if (answer.request_new) {
-              data._id = util.uuid();
-            }
+//             if (answer.request_new) {
+//               data._id = util.uuid();
+//             }
           } else if (answer.data.total_rows > 1) {
             util.error("Fieldlist: More than 1 record");
           } else {
@@ -5322,7 +5322,7 @@
             if (!util.findKey(
               (query_object || {}), "query_list", "key", field_list[i])
             ) {
-              wrap += field_list[i] + ': "%' + value + '%" OR ';
+              wrap += field_list[i] + ': "' + value + '" OR ';
             }
           }
           obj.query += ' AND (' + wrap.slice(0, -4) + ')';
@@ -6164,8 +6164,6 @@
       })
         .then(app.checkAuth)
         .then(app.fetchFields)
-        .then(app.testDataSample)
-        .then(app.fetchDataSample)
         .then(app.store)
         .then(app.fetchDataTotal)
         .then(app.fetchDataQuery)
@@ -6281,7 +6279,7 @@
       convert = "values";
     }
 
-    return storage[parcel.storage][method || "allDocs"](parcel.query)
+    return storage[parcel.storage][method || "allDocs"](parcel.query, hacked_view)
       .then(function (response) {
         // TODO: best way?
         if (convert !== undefined && response.status === 200) {
@@ -7090,4 +7088,4 @@
       .fail(util.error);
   });
 
-}(window, document, jQuery));
\ No newline at end of file
+}(window, document, jQuery));

js/libs/jio/hateoasstorage.js

+/*
+ * Copyright 2013, Nexedi SA
+ * Released under the LGPL license.
+ * http://www.gnu.org/licenses/lgpl.html
+ */
+// JIO Hateoas Storage Description :
+// {
+//   type: "hateoas"
+//   url: {string}
+// }
+
+/*jslint nomen: true, unparam: true */
+/*global jIO, complex_queries, console, UriTemplate, FormData, RSVP */
+
+(function (jIO, complex_queries) {
+  "use strict";
+
+  function HateoasStorage(spec) {
+    if (typeof spec.url !== 'string' && !spec.url) {
+      throw new TypeError("Hateoas 'url' must be a string " +
+                          "which contains more than one character.");
+    }
+    this._url = spec.url;
+  }
+
+  HateoasStorage.prototype._getSiteDocument = function () {
+    return jIO.util.ajax({
+      "type": "GET",
+      "url": this._url
+    }).then(function (response) {
+      return JSON.parse(response.target.responseText);
+    });
+  };
+
+  HateoasStorage.prototype._get = function (param, options) {
+    return this._getSiteDocument()
+      .then(function (site_hal) {
+        return jIO.util.ajax({
+          "type": "GET",
+          "url": UriTemplate.parse(site_hal._links.traverse.href)
+                            .expand({
+              // XXX FIXME Compatibility with slapos site
+              relative_url: decodeURIComponent(param._id),
+              view: options._view
+            })
+        });
+      })
+      .then(function (response) {
+        var result = JSON.parse(response.target.responseText);
+        result._id = param._id;
+        return result;
+      });
+  };
+
+  HateoasStorage.prototype.get = function (command, param, options) {
+    this._get(param, options)
+      .then(function (response) {
+        command.success({"data": response});
+      })
+      .fail(function (error) {
+        console.error(error);
+        // XXX How to propagate the error
+        command.error(
+          "not_found",
+          "missing",
+          "Cannot find document"
+        );
+      });
+  };
+
+  HateoasStorage.prototype.post = function (command, metadata, options) {
+    return this._getSiteDocument()
+      .then(function (site_hal) {
+        var post_action = site_hal._actions.add,
+          data = new FormData(),
+          key;
+
+        for (key in metadata) {
+          if (metadata.hasOwnProperty(key)) {
+            // XXX Not a form dialog in this case but distant script
+            data.append(key, metadata[key]);
+          }
+        }
+        return jIO.util.ajax({
+          "type": post_action.method,
+          "url": post_action.href,
+          "data": data
+        });
+      }).then(function (doc) {
+        // XXX Really depend on server response...
+        var new_document_url = doc.target.getResponseHeader("Location");
+        return jIO.util.ajax({
+          "type": "GET",
+          "url": new_document_url
+        });
+      }).then(function (response) {
+        var doc_hal = JSON.parse(response.target.responseText);
+        if (doc_hal !== null) {
+          command.success({"id": encodeURIComponent(doc_hal._relative_url)});
+        } else {
+          command.error(
+            "not_found",
+            "missing",
+            "Cannot find document"
+          );
+        }
+      }, function (error) {
+        console.error(error);
+        command.error(
+          500,
+          "Too bad...",
+          "Unable to post doc"
+        );
+      });
+  };
+
+  HateoasStorage.prototype.put = function (command, metadata, options) {
+    return this._get(metadata, options)
+      .then(function (result) {
+        var put_action = result._embedded._view._actions.put,
+          renderer_form = result._embedded._view,
+          data = new FormData(),
+          key;
+        data.append("form_id", renderer_form.id);
+        for (key in metadata) {
+          if (metadata.hasOwnProperty(key)) {
+            if (key !== "_id") {
+              // Hardcoded my_ ERP5 behaviour
+              if (renderer_form.hasOwnProperty("my_" + key)) {
+                data.append(renderer_form["my_" + key].key, metadata[key]);
+              } else {
+                throw new Error("Can not save property " + key);
+              }
+            }
+          }
+        }
+        return jIO.util.ajax({
+          "type": put_action.method,
+          "url": put_action.href,
+          "data": data
+        });
+      })
+      .then(function (result) {
+        command.success(result);
+      })
+      .fail(function (error) {
+        console.error(error);
+        command.error(
+          "error",
+          "did not work as expected",
+          "Unable to call allDocs"
+        );
+      });
+
+  };
+
+  HateoasStorage.prototype.allDocs = function (command, param, options) {
+    return this._getSiteDocument()
+      .then(function (site_hal) {
+        return jIO.util.ajax({
+          "type": "GET",
+          "url": UriTemplate.parse(site_hal._links.raw_search.href)
+                            .expand({
+              query: options.query,
+              // XXX Force erp5 to return embedded document
+              select_list: options.select_list || ["title", "reference"],
+              limit: options.limit
+            })
+        });
+      })
+      .then(function (response) {
+        return JSON.parse(response.target.responseText);
+      })
+      .then(function (catalog_json) {
+        var data = catalog_json._embedded.contents,
+          count = data.length,
+          i,
+          item,
+          result = [],
+          promise_list = [result];
+        for (i = 0; i < count; i += 1) {
+          item = data[i];
+          // XXX FIXME Compatibility with slapos site
+          item._id = encodeURIComponent(item._relative_url);
+          result.push({
+            // XXX FIXME Compatibility with slapos site
+            id: encodeURIComponent(item._relative_url),
+            key: encodeURIComponent(item._relative_url),
+            doc: {},
+            value: item
+          });
+//           if (options.include_docs) {
+//             promise_list.push(RSVP.Queue().push(function () {
+//               return this._get({_id: item.name}, {_view: "View"});
+//             }).push
+//           }
+        }
+        return RSVP.all(promise_list);
+      })
+      .then(function (promise_list) {
+        var result = promise_list[0],
+          count = result.length;
+        command.success({"data": {"rows": result, "total_rows": count}});
+      })
+      .fail(function (error) {
+        console.error(error);
+        command.error(
+          "error",
+          "did not work as expected",
+          "Unable to call allDocs"
+        );
+      });
+
+  };
+
+  jIO.addStorage("hateoas", HateoasStorage);
+
+}(jIO, complex_queries));

js/libs/uritemplate/uritemplate-min.js

+!function(e){"use strict";function t(e){var n;if(null===e||void 0===e)return!1;if(r.isArray(e))return e.length>0;if("string"==typeof e||"number"==typeof e||"boolean"==typeof e)return!0;for(n in e)if(e.hasOwnProperty(n)&&t(e[n]))return!0;return!1}var n=function(){function e(e){this.options=e}return e.prototype.toString=function(){return JSON&&JSON.stringify?JSON.stringify(this.options):this.options},e}(),r=function(){function e(e){return"[object Array]"===Object.prototype.toString.apply(e)}function t(e){return"[object String]"===Object.prototype.toString.apply(e)}function n(e){return"[object Number]"===Object.prototype.toString.apply(e)}function r(e){return"[object Boolean]"===Object.prototype.toString.apply(e)}function i(e,t){var n,r="",i=!0;for(n=0;n<e.length;n+=1)i?i=!1:r+=t,r+=e[n];return r}function o(e,t){for(var n=[],r=0;r<e.length;r+=1)n.push(t(e[r]));return n}function s(e,t){for(var n=[],r=0;r<e.length;r+=1)t(e[r])&&n.push(e[r]);return n}function a(e){if("object"!=typeof e||null===e)return e;Object.freeze(e);var t,n;for(n in e)e.hasOwnProperty(n)&&(t=e[n],"object"==typeof t&&u(t));return e}function u(e){return"function"==typeof Object.freeze?a(e):e}return{isArray:e,isString:t,isNumber:n,isBoolean:r,join:i,map:o,filter:s,deepFreeze:u}}(),i=function(){function e(e){return e>="a"&&"z">=e||e>="A"&&"Z">=e}function t(e){return e>="0"&&"9">=e}function n(e){return t(e)||e>="a"&&"f">=e||e>="A"&&"F">=e}return{isAlpha:e,isDigit:t,isHexDigit:n}}(),o=function(){function e(e){var t,n,r="",i=s.encode(e);for(n=0;n<i.length;n+=1)t=i.charCodeAt(n),r+="%"+(16>t?"0":"")+t.toString(16).toUpperCase();return r}function t(e,t){return"%"===e.charAt(t)&&i.isHexDigit(e.charAt(t+1))&&i.isHexDigit(e.charAt(t+2))}function n(e,t){return parseInt(e.substr(t,2),16)}function r(e){if(!t(e,0))return!1;var r=n(e,1),i=s.numBytes(r);if(0===i)return!1;for(var o=1;i>o;o+=1)if(!t(e,3*o)||!s.isValidFollowingCharCode(n(e,3*o+1)))return!1;return!0}function o(e,r){var i=e.charAt(r);if(!t(e,r))return i;var o=n(e,r+1),a=s.numBytes(o);if(0===a)return i;for(var u=1;a>u;u+=1)if(!t(e,r+3*u)||!s.isValidFollowingCharCode(n(e,r+3*u+1)))return i;return e.substr(r,3*a)}var s={encode:function(e){return unescape(encodeURIComponent(e))},numBytes:function(e){return 127>=e?1:e>=194&&223>=e?2:e>=224&&239>=e?3:e>=240&&244>=e?4:0},isValidFollowingCharCode:function(e){return e>=128&&191>=e}};return{encodeCharacter:e,isPctEncoded:r,pctCharAt:o}}(),s=function(){function e(e){return i.isAlpha(e)||i.isDigit(e)||"_"===e||o.isPctEncoded(e)}function t(e){return i.isAlpha(e)||i.isDigit(e)||"-"===e||"."===e||"_"===e||"~"===e}function n(e){return":"===e||"/"===e||"?"===e||"#"===e||"["===e||"]"===e||"@"===e||"!"===e||"$"===e||"&"===e||"("===e||")"===e||"*"===e||"+"===e||","===e||";"===e||"="===e||"'"===e}return{isVarchar:e,isUnreserved:t,isReserved:n}}(),a=function(){function e(e,t){var n,r="",i="";for(("number"==typeof e||"boolean"==typeof e)&&(e=e.toString()),n=0;n<e.length;n+=i.length)i=e.charAt(n),r+=s.isUnreserved(i)||t&&s.isReserved(i)?i:o.encodeCharacter(i);return r}function t(t){return e(t,!0)}function n(e,t){var n=o.pctCharAt(e,t);return n.length>1?n:s.isReserved(n)||s.isUnreserved(n)?n:o.encodeCharacter(n)}function r(e){var t,n="",r="";for(t=0;t<e.length;t+=r.length)r=o.pctCharAt(e,t),n+=r.length>1?r:s.isReserved(r)||s.isUnreserved(r)?r:o.encodeCharacter(r);return n}return{encode:e,encodePassReserved:t,encodeLiteral:r,encodeLiteralCharacter:n}}(),u=function(){function e(e){t[e]={symbol:e,separator:"?"===e?"&":""===e||"+"===e||"#"===e?",":e,named:";"===e||"&"===e||"?"===e,ifEmpty:"&"===e||"?"===e?"=":"",first:"+"===e?"":e,encode:"+"===e||"#"===e?a.encodePassReserved:a.encode,toString:function(){return this.symbol}}}var t={};return e(""),e("+"),e("#"),e("."),e("/"),e(";"),e("?"),e("&"),{valueOf:function(e){return t[e]?t[e]:"=,!@|".indexOf(e)>=0?null:t[""]}}}(),p=function(){function e(e){this.literal=a.encodeLiteral(e)}return e.prototype.expand=function(){return this.literal},e.prototype.toString=e.prototype.expand,e}(),f=function(){function e(e){function t(){var t=e.substring(h,p);if(0===t.length)throw new n({expressionText:e,message:"a varname must be specified",position:p});c={varname:t,exploded:!1,maxLength:null},h=null}function r(){if(d===p)throw new n({expressionText:e,message:"after a ':' you have to specify the length",position:p});c.maxLength=parseInt(e.substring(d,p),10),d=null}var a,p,f=[],c=null,h=null,d=null,g="";for(a=function(t){var r=u.valueOf(t);if(null===r)throw new n({expressionText:e,message:"illegal use of reserved operator",position:p,operator:t});return r}(e.charAt(0)),p=a.symbol.length,h=p;p<e.length;p+=g.length){if(g=o.pctCharAt(e,p),null!==h){if("."===g){if(h===p)throw new n({expressionText:e,message:"a varname MUST NOT start with a dot",position:p});continue}if(s.isVarchar(g))continue;t()}if(null!==d){if(p===d&&"0"===g)throw new n({expressionText:e,message:"A :prefix must not start with digit 0",position:p});if(i.isDigit(g)){if(p-d>=4)throw new n({expressionText:e,message:"A :prefix must have max 4 digits",position:p});continue}r()}if(":"!==g)if("*"!==g){if(","!==g)throw new n({expressionText:e,message:"illegal character",character:g,position:p});f.push(c),c=null,h=p+1}else{if(null===c)throw new n({expressionText:e,message:"exploded without varspec",position:p});if(c.exploded)throw new n({expressionText:e,message:"exploded twice",position:p});if(c.maxLength)throw new n({expressionText:e,message:"an explode (*) MUST NOT follow to a prefix",position:p});c.exploded=!0}else{if(null!==c.maxLength)throw new n({expressionText:e,message:"only one :maxLength is allowed per varspec",position:p});if(c.exploded)throw new n({expressionText:e,message:"an exploeded varspec MUST NOT be varspeced",position:p});d=p+1}}return null!==h&&t(),null!==d&&r(),f.push(c),new l(e,a,f)}function t(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}function r(r){var i,o,s,a=[],u=null,f="",l=!0,h=0;for(i=0;i<r.length;i+=1)if(o=r.charAt(i),null===h){if(null===u)throw new Error("reached unreachable code");if("{"===o)throw new n({templateText:r,message:"brace already opened",position:i});if("}"===o){if(u+1===i)throw new n({templateText:r,message:"empty braces",position:u});try{s=e(r.substring(u+1,i))}catch(d){if(d.prototype===n.prototype)throw new n({templateText:r,message:d.options.message,position:u+d.options.position,details:d.options});throw d}a.push(s),0===s.operator.symbol.length?f+="([^/]+)":l=!1,u=null,h=i+1}}else{if("}"===o)throw new n({templateText:r,message:"unopened brace closed",position:i});"{"===o&&(i>h&&(s=new p(r.substring(h,i)),a.push(s),f+=t(s.literal)),h=null,u=i)}if(null!==u)throw new n({templateText:r,message:"unclosed brace",position:u});return h<r.length&&(s=new p(r.substring(h)),a.push(s),f+=t(s.literal)),l===!1&&(f=void 0),new c(r,a,f)}return r}(),l=function(){function e(e){return JSON&&JSON.stringify?JSON.stringify(e):e}function n(e){if(!t(e))return!0;if(r.isString(e))return""===e;if(r.isNumber(e)||r.isBoolean(e))return!1;if(r.isArray(e))return 0===e.length;for(var n in e)if(e.hasOwnProperty(n))return!1;return!0}function i(e){var t,n=[];for(t in e)e.hasOwnProperty(t)&&n.push({name:t,value:e[t]});return n}function o(e,t,n){this.templateText=e,this.operator=t,this.varspecs=n}function s(e,t,n){var r="";if(n=n.toString(),t.named){if(r+=a.encodeLiteral(e.varname),""===n)return r+=t.ifEmpty;r+="="}return null!==e.maxLength&&(n=n.substr(0,e.maxLength)),r+=t.encode(n)}function u(e){return t(e.value)}function p(e,o,s){var p=[],f="";if(o.named){if(f+=a.encodeLiteral(e.varname),n(s))return f+=o.ifEmpty;f+="="}return r.isArray(s)?(p=s,p=r.filter(p,t),p=r.map(p,o.encode),f+=r.join(p,",")):(p=i(s),p=r.filter(p,u),p=r.map(p,function(e){return o.encode(e.name)+","+o.encode(e.value)}),f+=r.join(p,",")),f}function f(e,o,s){var p=r.isArray(s),f=[];return p?(f=s,f=r.filter(f,t),f=r.map(f,function(t){var r=a.encodeLiteral(e.varname);return r+=n(t)?o.ifEmpty:"="+o.encode(t)})):(f=i(s),f=r.filter(f,u),f=r.map(f,function(e){var t=a.encodeLiteral(e.name);return t+=n(e.value)?o.ifEmpty:"="+o.encode(e.value)})),r.join(f,o.separator)}function l(e,n){var o=[],s="";return r.isArray(n)?(o=n,o=r.filter(o,t),o=r.map(o,e.encode),s+=r.join(o,e.separator)):(o=i(n),o=r.filter(o,function(e){return t(e.value)}),o=r.map(o,function(t){return e.encode(t.name)+"="+e.encode(t.value)}),s+=r.join(o,e.separator)),s}return o.prototype.toString=function(){return this.templateText},o.prototype.expand=function(i){var o,a,u,c,h=[],d=!1,g=this.operator;for(o=0;o<this.varspecs.length;o+=1)if(a=this.varspecs[o],u=i[a.varname],null!==u&&void 0!==u)if(a.exploded&&(d=!0),c=r.isArray(u),"string"==typeof u||"number"==typeof u||"boolean"==typeof u)h.push(s(a,g,u));else{if(a.maxLength&&t(u))throw new Error("Prefix modifiers are not applicable to variables that have composite values. You tried to expand "+this+" with "+e(u));a.exploded?t(u)&&(g.named?h.push(f(a,g,u)):h.push(l(g,u))):(g.named||!n(u))&&h.push(p(a,g,u))}return 0===h.length?"":g.first+r.join(h,g.separator)},o}(),c=function(){function e(e,t,n){this.templateText=e,this.expressions=t,void 0!==n&&(this.regexp=new RegExp("^"+n+"$")),r.deepFreeze(this)}return e.prototype.toString=function(){return this.templateText},e.prototype.expand=function(e){var t,n="";for(t=0;t<this.expressions.length;t+=1)n+=this.expressions[t].expand(e);return n},e.prototype.extract=function(e){var t,n,r,i,o=1,s=!0,a={};if(void 0!==this.regexp&&this.regexp.test(e)){for(i=this.regexp.exec(e),t=0;t<this.expressions.length;t+=1)n=this.expressions[t],void 0===n.literal&&(void 0!==n.operator&&0===n.operator.symbol.length&&1===n.varspecs.length?(r=n.varspecs[0],r.exploded===!1&&null===r.maxLength?-1===i[o].indexOf(",")?(a[r.varname]=decodeURIComponent(i[o]),o+=1):s=!1:s=!1):s=!1);if(s)return a}return!1},e.parse=f,e.UriTemplateError=n,e}();e(c)}(function(e){"use strict";"undefined"!=typeof module?module.exports=e:"function"==typeof define?define([],function(){return e}):"undefined"!=typeof window?window.UriTemplate=e:global.UriTemplate=e});
\ No newline at end of file