Added instructions and tests
Change-Id: I18e491c4a0c188866dcad1f9db52c4f781054e62
diff --git a/views/ngXosViews/UITutorial/src/js/responseHandler.js b/views/ngXosViews/UITutorial/src/js/responseHandler.js
index 801129e..e343dda 100644
--- a/views/ngXosViews/UITutorial/src/js/responseHandler.js
+++ b/views/ngXosViews/UITutorial/src/js/responseHandler.js
@@ -1,27 +1,47 @@
(function () {
'use strict';
angular.module('xos.UITutorial')
- .service('ResponseHandler', function(){
- this.parse = (res, done) => {
- var compiled = _.template('<div><pre><%- JSON.stringify(val,null,1) %></div></pre>');
- var compiledArray = _.template('<% _.forEach(valueArr, function(item) { %><div><pre><%- JSON.stringify(item) %></pre></div><%}); %>');
- var resFunc = function (res) {
- let retVar;
- let exclude = ['deleted','enabled','enacted','exposed_ports','lazy_blocked','created','validators','controllers','backend_status','backend_register','policed','no_policy','write_protect','no_sync','updated'];
- if(_.isArray(res)) {
- retVar = [];
- retVar = _.map(res, (o)=> {
- return _.omit(o, exclude);
- });
- retVar = compiledArray({'valueArr':retVar});
- }
- else{
- retVar = _.omit(res,exclude);
- retVar = compiled({'val':retVar} );
- }
- return retVar;
+ .service('ResponseHandler', function(TemplateHandler){
+
+ const exclude = [
+ 'deleted',
+ 'enabled',
+ 'enacted',
+ 'exposed_ports',
+ 'lazy_blocked',
+ 'created',
+ 'validators',
+ 'controllers',
+ 'backend_status',
+ 'backend_register',
+ 'policed',
+ 'no_policy',
+ 'write_protect',
+ 'no_sync',
+ 'updated'
+ ];
+
+ this.parseObject = (obj, comma = '') => {
+ obj = _.omit(obj, exclude);
+ return TemplateHandler.jsonObject({'obj': obj, comma: comma});
+ };
+
+ this.parseCollection = (array) => {
+ array = array.map((o, i) => `${this.parseObject(o, i === (array.length - 1) ? '':',')}`);
+ return TemplateHandler.jsonCollection({'collection': array});
+ };
+
+ this.parse = (res, jsCode, done) => {
+ if(_.isArray(res)) {
+ res = this.parseCollection(res);
}
- done( resFunc(res));
+ else{
+ res = this.parseObject(res);
+ }
+ done(TemplateHandler.resourcesResponse({
+ jsCode: jsCode,
+ res: res
+ }));
};
});
})();
\ No newline at end of file