Removed HTMLSCFormatter, caused sorting/greying to persist across hiding and the refresh button.

Author: jerrywu64

esp/esp/program/modules/handlers/schedulingcheckmodule.py

@@ -47,68 +47,6 @@ def format_table(self, l, options={}, help_text=""):
     def format_list(self, l, options={}, help_text=""):
         return l
 
-class HTMLSCFormatter: # This might be dead, but idk maybe someone still wants it
-    #requires: d, a two level dictionary where the the first set of
-    #   keys are the headings expected on the side of the table, and
-    #   the second set are the headings expected on the top of the table
-    def format_table(self, d, options={}, help_text=""):
-        if isinstance(d, list):
-            return self._format_list_table(d, options['headings'], help_text=help_text)
-        else:
-            return self._format_dict_table(d, options['headings'], help_text=help_text)
-
-    def format_list(self, l, help_text=""):
-        output = self._table_start(help_text)
-        for row in l:
-            output += self._table_row([row])
-        output += "</table>"
-        return output
-
-    def _table_start(self, help_text=""):
-        output = ''
-        if help_text:
-             output += '<div class="help-text">%s</div>' % help_text
-        output += '<table cellpadding=10>'
-        return output
-
-    def _table_headings(self, headings):
-        #column headings
-        next_row = ""
-        for h in headings:
-            next_row = next_row + "<th><div style=\"cursor: pointer;\">" + str(h) + "</div></th>"
-        next_row = next_row + "</tr></thread>"
-        return next_row
-
-    def _table_row(self, row):
-        next_row = ""
-        for r in row:
-            #displaying lists is sometimes borked.  This makes it not borked
-            if isinstance(r, list):
-                r = [str(i) for i in r]
-            next_row += "<td>" + str(r) + "</td>"
-        next_row += "</tr>"
-        return next_row
-        
-    def _format_list_table(self, d, headings, help_text=""):
-        output = self._table_start(help_text)
-        output = output + self._table_headings(headings)
-        for row in d:
-            ordered_row = [row[h] for h in headings]
-            output = output + self._table_row(ordered_row) 
-        output = output + "</table>"
-        return output
-
-    def _format_dict_table(self, d, headings, help_text=""):
-        headings = [""] + headings[:]
-        output = self._table_start(help_text)
-        output = output + self._table_headings(headings)
-
-        for key, row in sorted(d.iteritems()):
-            ordered_row = [row[h] for h in headings if h]
-            output = output + self._table_row([key] + ordered_row)
-        output += "</table>"
-        return output
-
 # Builds JSON output for an object with attributes help_text, headings, and body.
 class JSONFormatter:
     #requires: d, a two level dictionary where the the first set of

esp/public/media/scripts/program/modules/scheduling_checks.jsx

@@ -16,6 +16,15 @@ var SchedulingCheckList = React.createClass({
  *
  * This might or might not be loaded yet; clicking the heading will load the
  * data from the server and expand it.
+ * 
+ * There is supposedly a functionality in which clicking on a table row will cause it
+ * to be greyed out, however whether this actually happens depends on your
+ * scheduling_checks.css (clicking could possibly do nothing, or possibly
+ * do other things).
+ *
+ * Likewise, clicking on a table header will sort by that column. You can also
+ * add formatting in scheduling_checks.css so that the selected header will
+ * look different, e.g. be colored differently.
  */
 var SchedulingCheck = React.createClass({
   propTypes: {
@@ -28,6 +37,10 @@ var SchedulingCheck = React.createClass({
       open: false,
       failed: false,
       timestamp: "never",
+      tableState: {
+        greyed: {},
+        sort: -1          
+      }
     };
   },
 
@@ -86,7 +99,7 @@ var SchedulingCheck = React.createClass({
         var settings = {
           header: false
         };
-        table = <SelectTable rows = {data.body} settings = {settings} />;
+      table = <SelectTable rows = {data.body} settings = {settings} saveState = {this.state.tableState} />;
       } else {
         var columns = [];
         for (i = 0; i < data.headings.length; i++) {
@@ -96,7 +109,10 @@ var SchedulingCheck = React.createClass({
             columns[i] = {key: String(i), label: " "};
           }
         }
-        table = <SelectTable rows = {data.body} columns = {columns} />;
+        var settings = {
+          header: true
+        };
+        table = <SelectTable rows = {data.body} columns = {columns} settings = {settings} saveState = {this.state.tableState} />;
       }
       body = <div>
         <div className="placeholder">
@@ -135,19 +151,11 @@ var RefreshButton = React.createClass({
 
 
 // Modified from react-json-table example code.
+// Required props: rows, saveState (with sort and greyed attributes), settings (with header attribute)
 var SelectTable = React.createClass({
   getInitialState: function(){
     // We will store the sorted column and whether each row is greyed out
-    var temp = new Array();
-    for (i = 0; i < this.props.rows.length; i++) {
-        temp[this.props.rows[i]] = false;
-    }
-    if (this.props.settings == undefined) {
-        this.props.settings = {
-          header: true
-        };
-    }
-    return {sort: -1, greyed : temp};
+    return {sort: this.props.saveState.sort, greyed : this.props.saveState.greyed};
   },  
   render: function(){
     var me = this,
@@ -198,11 +206,13 @@ var SelectTable = React.createClass({
   },
 
   onClickHeader: function( e, column ){
+    this.props.saveState.sort = column;
     this.setState( {sort: column} );
   },
 
   onClickRow: function( e, item ){
     this.state.greyed[item] = !this.state.greyed[item];
+    this.props.saveState.greyed[item] = this.state.greyed[item];
     this.setState(); // so that it actually updates
   }
 });