@mwater/visualization 5.0.0 → 5.0.1

package/src/widgets/charts/table/TableChart.ts

@@ -217,7 +217,7 @@ export default class TableChart extends Chart {
     const totalColumns: string[] = []
 
     // For each column
-    for (let colNum = 0 ; colNum < design.columns.length ; colNum++) {
+    for (let colNum = 0; colNum < design.columns.length; colNum++) {
       column = design.columns[colNum]
 
       const exprType = exprUtils.getExprType(column.textAxis?.expr ?? null)
@@ -242,7 +242,7 @@ export default class TableChart extends Chart {
         alias: `c${colNum}`
       })
 
-      if(exprType === 'number' && column.summarize) {
+      if (exprType === 'number' && column.summarize) {
         totalColumns.push(`c${colNum}`)
       }
 
@@ -275,9 +275,9 @@ export default class TableChart extends Chart {
       }
     }
 
-    for (let colNum = 0 ; colNum < design.columns.length ; colNum++) {
+    for (let colNum = 0; colNum < design.columns.length; colNum++) {
       column = design.columns[colNum]
-      if(!column.backgroundColorAxis) continue
+      if (!column.backgroundColorAxis) continue
 
       query.selects.push({
         type: "select",
@@ -320,27 +320,37 @@ export default class TableChart extends Chart {
     const summaryQuery: JsonQLSelectQuery = {
       type: "query",
       selects: design.columns.map((c: any, i) => {
-        if(totalColumns.includes(`c${i}`))
+        if (totalColumns.includes(`c${i}`))
           return { type: "select", expr: { type: "op", op: c.summaryType ?? 'sum', exprs: [{ type: "field", tableAlias: "t", column: `c${i}` }] }, alias: `c${i}` }
-        else 
-          return { type: 'select', expr: {type: 'literal', value: null} , alias: `c${i}` }
+        else
+          return { type: 'select', expr: { type: 'literal', value: null }, alias: `c${i}` }
       }),
       from: { type: "subquery", query, alias: "t" },
     }
-
-    return dataSource.performQuery(query, (error: any, data: any) => {
-      if(totalColumns.length > 0) 
+    // Query for the data in question. 
+    dataSource.performQuery(query, (error: any, data: any) => {
+      if (error) {
+        callback(error)
+      }
+      else if (totalColumns.length > 0) {
+        // Query for the summaries
         dataSource.performQuery(summaryQuery, (error: any, summary: any) => {
-          callback(error, { main: data, summary: summary[0] })
+          if (error) {
+            callback(error)
+          }
+          else {
+            callback(error, { main: data, summary: summary[0] })
+          }
         })
-      else 
-      callback(error, { main: data})
+      }
+      else
+        callback(error, { main: data })
     })
   }
 
   // Create a view element for the chart
   // Options include:
-  //   schema: schema to use
+  // p  schema: schema to use
   //   dataSource: dataSource to use
   //   design: design of the chart
   //   data: results from queries

package/src/widgets/charts/table/TableChartViewComponent.ts

@@ -8,12 +8,12 @@ import AxisBuilder from "../../../axes/AxisBuilder"
 import { DataSource, ExprUtils, Schema } from "@mwater/expressions"
 import { formatValue } from "../../../valueFormatter"
 import { Image } from "@mwater/forms/lib/RotationAwareImageComponent"
-import { TableChartColumn } from "./TableChart"
+import { TableChartColumn, TableChartDesign } from "./TableChart"
 import Color from "color"
 
 export interface TableChartViewComponentProps {
   /** Design of chart */
-  design: any
+  design: TableChartDesign
   /** Data that the table has requested */
   data: any
   /** Schema to use */
@@ -249,7 +249,12 @@ class TableContentsComponent extends React.Component<TableContentsComponentProps
       } else {
         // Parse if should be JSON
         if (["image", "imagelist", "geometry", "text[]"].includes(exprType || "") && _.isString(value)) {
-          value = JSON.parse(value)
+          try { 
+            value = JSON.parse(value)
+          } catch (e) {
+            // Ignore as can happen when re-arranging columns
+            value = null
+          }
         }
 
         if (column.backgroundColorAxis && row[`bc${columnIndex}`] != null) {
@@ -272,10 +277,10 @@ class TableContentsComponent extends React.Component<TableContentsComponentProps
             node = exprUtils.stringifyExprLiteral(column.textAxis?.expr, value, this.context.locale)
             break
           case "date":
-            node = moment(value, "YYYY-MM-DD").format("ll")
+            node = formatValue(exprType, value, column.format)
             break
           case "datetime":
-            node = moment(value, moment.ISO_8601).format("lll")
+            node = formatValue(exprType, value, column.format)
             break
           case "image":
             node = this.renderImage(value.id)

package/stories/dashboards.js

@@ -155,9 +155,9 @@ class DashboardPopupTest extends React.Component {
 }
 
 
-const ModalWindowComponent = require('react-library/lib/ModalWindowComponent');
-const ui = require('react-library/lib/bootstrap');
-const update = require('react-library/lib/update');
+const ModalWindowComponent = require("@mwater/react-library/lib/ModalWindowComponent");
+const ui = require("@mwater/react-library/lib/bootstrap");
+const update = require("@mwater/react-library/lib/update");
 
 class DashboardPopupComponent extends React.Component {
   static initClass() {