convert to collection-table (wip)

rngadam · rngadam · commit 45aa257bb291 · 2016-09-06T11:34:24.000+08:00
diff --git a/app/client/templates/admin.html b/app/client/templates/admin.html
@@ -25,41 +25,23 @@
         <a class="ui button" id="flushdb" href="#">FlushDB</a>
     </div>
 </template>
+
+<template name="admin_error_button">
+    <button id="errorButton" class="button item" value={{orgLog._id}}>Show Error</button>
+</template>
+
+<template name="admin_success_status">
+    {{#if isSuccess orgLog.statusCode}}
+    <div class="ui label">
+        <i class="big green checkmark icon"></i> {{orgLog.statusCode}}
+    </div>
+    {{else}}
+    <div class="ui label">
+        <i class="big red minus icon"></i> {{orgLog.statusCode}}
+    </div>
+    {{/if}}
+</template>
+
 <template name="admin_organisations">
-    <div class="ui raised segment">
-        <table class="ui fixed celled padded table">
-            <thead>
-                <tr>
-                    <th class="fixed">Success</th>
-                    <th>Url</th>
-                    <th>Last Success</th>
-                    <th>Error</th>
-                </tr>
-            </thead>
-            <tbody>
-                {{#each orgLog in orgLogs}}
-                <tr class="{{#unless isSucces orgLog.statusCode}} warning {{/unless}}">
-                    <td>
-                        {{#if isSucces orgLog.statusCode}}
-                        <div class="ui label">
-                            <i class="big green checkmark icon"></i> {{orgLog.statusCode}}
-                        </div>
-                        {{else}}
-                        <div class="ui label">
-                            <i class="big red minus icon"></i> {{orgLog.statusCode}}
-                        </div>
-                        {{/if}}
-                    </td>
-                    <td> {{orgLog.url}} </td>
-                    <td> {{orgLog.lastSuccess}} </td>
-                    <td>
-                        {{#unless isSucces orgLog.statusCode}}
-                            <button id="errorButton" class="button item" value={{orgLog._id}}>Show Error</button>
-                        {{/unless}}
-                    </td>
-                </tr>
-                {{/each}}
-            </tbody>
-        </table>
-        </div>
+    {{> collectionTable collection=orgLogs class="table table-bordered table-hover" settings=settings }}
 </template>
diff --git a/app/client/templates/admin.js b/app/client/templates/admin.js
@@ -56,6 +56,27 @@ Template.admin_users.helpers({
 });
 
 Template.admin_organisations.helpers({
+    isSuccess: function(statusCode) {
+        return 200 == statusCode;
+    },
+
+    settings: function() {
+        return {
+            onDelete: function(params) {
+                Meteor.call('users.remove', params.ids);
+            },
+            collection: App.Collections.orgLogs,
+            rowsPerPage: 10,
+            showFilter: true,
+            fields: [
+                { key: 'orgLog.statusCode', label: 'Success', tmpl: Template.admin_success_status },
+                { key: 'orgLog.lastSuccess', label: 'Last success' },
+                { key: 'orgLog.url', label: 'URL' },
+                { key: 'orgLog.statusCode', label: 'status code' },
+                { key: 'orgLog.error', label: 'Error', tmpl: Template.error_view },
+            ]
+        };
+    },
     orgLogs: function() {
         return App.Collections.OrgLogs.find({}).fetch();
     }
diff --git a/app/lib/collections/OrgLogs.js b/app/lib/collections/OrgLogs.js
@@ -1 +1,31 @@
-App.Collections.OrgLogs = new Mongo.Collection('orgLogs');
+var OrgLogsSchema = new SimpleSchema({
+  statusCode: {
+    type: Number,
+    optional: true
+  },
+  url: {
+    type: String,
+    optional: true
+  },
+  error: {
+    type: Object,
+    optional: true
+  },
+  lastSuccess: {
+    type: Date,
+    optional: true
+  },
+  data: {
+    type: Object,
+    optional: true
+  },
+  errorMessage: {
+    type: Object,
+    optional: true,
+    defaultValue: {}
+  }
+});
+
+App.Collections.OrgLogs = new Mongo.Collection('orgLogs');
+
+App.Collections.OrgLogs.attachSchema(OrgLogsSchema);
diff --git a/app/server/init.js b/app/server/init.js
@@ -22,7 +22,14 @@ function initOrgs() {
                 // Meteor.defer = Meteor.setTimeout(x, 0)
                 var url = directory.data[k];
 
-                var newLog = { 'statusCode': 200, 'url': url, 'data': {}, 'errorMessage': undefined, 'lastSuccess': undefined };
+                var newLog = { 
+                    'statusCode': 200, 
+                    'url': url, 
+                    'data': null, 
+                    'errorMessage': {}, 
+                    'lastSuccess': null 
+                };
+
                 try {
                     var result = Meteor.http.call("GET", url);
                     newLog.data = JSON.parse(result.content);
@@ -41,7 +48,13 @@ function initOrgs() {
                 if (!oldLog) {
                     App.Collections.OrgLogs.insert(newLog);
                 } else {
-                    var toUpdate = { 'statusCode': newLog.statusCode, 'errorMessage': newLog.errorMessage };
+                    var toUpdate = { 
+                        'statusCode': newLog.statusCode, 
+                        'errorMessage': newLog.errorMessage
+                    };
+                    if(newLog.data instanceof Object) {
+                        toUpdate.data = newLog.data;
+                    }
                     if(newLog.statusCode == 200){
                         toUpdate.lastSuccess = new Date();
                     }
