change icons

Author: vogievetsky

src/client/components/simple-table/simple-table.tsx

@@ -128,7 +128,7 @@ export class SimpleTable extends React.Component<SimpleTableProps, SimpleTableSt
 
   labelizer(column: SimpleTableColumn): (row: any) => any {
     if (typeof column.field === 'string') {
-      return (row: any) => row[column.field as string];
+      return (row: any) => '' + row[column.field as string];
     }
 
     return column.field as (row: any) => any;
@@ -141,7 +141,7 @@ export class SimpleTable extends React.Component<SimpleTableProps, SimpleTableSt
     for (let i = 0; i < columns.length; i++) {
       let col = columns[i];
 
-      let icon = col.cellIcon ? <SvgIcon svg={require(`../../icons/${col.cellIcon}.svg`)}/> : null;
+      let icon = col.cellIcon ? <SvgIcon svg={col.cellIcon}/> : null;
 
       items.push(<div
         className={classNames('cell', {'has-icon': !!col.cellIcon})}

src/client/icons/data.svg

@@ -103,7 +103,7 @@ export class Clusters extends React.Component<ClustersProps, ClustersState> {
     if (!newSettings.clusters.length) return this.renderEmpty();
 
     const columns: SimpleTableColumn[] = [
-      {label: 'Title', field: 'title', width: 200, cellIcon: 'full-cluster'},
+      {label: 'Title', field: 'title', width: 200, cellIcon: require(`../../../icons/full-cluster.svg`) },
       {label: 'Host', field: 'host', width: 200},
       {label: 'Type', field: 'type', width: 300}
     ];

src/client/icons/measure.svg

@@ -69,11 +69,11 @@ export interface Modal extends Nameable {
 
 export class DataCubeEdit extends React.Component<DataCubeEditProps, DataCubeEditState> {
   private tabs: Tab[] = [
-    { label: 'General', value: 'general', render: this.renderGeneral, icon: 'full-settings' },
-    { label: 'Data', value: 'data', render: this.renderData, icon: '' },
-    { label: 'Dimensions', value: 'dimensions', render: this.renderDimensions, icon: 'full-cube' },
-    { label: 'Measures', value: 'measures', render: this.renderMeasures, icon: 'measure' },
-    { label: 'Options', value: 'options', render: this.renderOptions, icon: '' }
+    { label: 'General', value: 'general', render: this.renderGeneral, icon: require(`../../../icons/full-settings.svg`) },
+    { label: 'Data', value: 'data', render: this.renderData, icon: require(`../../../icons/data.svg`) },
+    { label: 'Dimensions', value: 'dimensions', render: this.renderDimensions, icon: require(`../../../icons/full-cube.svg`) },
+    { label: 'Measures', value: 'measures', render: this.renderMeasures, icon: require(`../../../icons/measures.svg`) },
+    { label: 'Options', value: 'options', render: this.renderOptions, icon: require(`../../../icons/full-more.svg`) }
   ];
 
   private modals: Modal[] = [
@@ -125,7 +125,7 @@ export class DataCubeEdit extends React.Component<DataCubeEditProps, DataCubeEdi
         className={classNames({active: activeTab.value === tab.value})}
         title={tab.label}
         type="primary"
-        svg={tab.icon ? require(`../../../icons/${tab.icon}.svg`) : null}
+        svg={tab.icon}
         key={tab.value}
         onClick={this.selectTab.bind(this, tab)}
       />;

src/client/icons/measures.svg

@@ -103,7 +103,7 @@ export class DataCubes extends React.Component<DataCubesProps, DataCubesState> {
     if (!newSettings.dataCubes.length) return this.renderEmpty();
 
     const columns: SimpleTableColumn[] = [
-      {label: 'Name', field: 'title', width: 170, cellIcon: 'full-cube'},
+      {label: 'Name', field: 'title', width: 170, cellIcon: require(`../../../icons/full-cube.svg`) },
       {label: 'Source', field: 'source', width: 400},
       {label: 'Dimensions', field: (cube: DataCube) => cube.dimensions.size, width: 120},
       {label: 'Measures', field: (cube: DataCube) => cube.measures.size, width: 80}
@@ -125,7 +125,7 @@ export class DataCubes extends React.Component<DataCubesProps, DataCubesState> {
           rows={newSettings.dataCubes}
           actions={actions}
           onRowClick={this.editCube.bind(this)}
-        ></SimpleTable>
+        />
       </div>
     </div>;
   }

src/client/views/settings-view/clusters/clusters.tsx

@@ -81,10 +81,10 @@ export class DataTable extends React.Component<DataTableProps, DataTableState> {
       }
     })
       .then(
-        (dataset: Dataset) => {
+        (resp: any) => {
           if (!this.mounted) return;
           this.setState({
-            dataset,
+            dataset: Dataset.fromJS(resp.dataset),
             loading: false
           });
         },
@@ -159,7 +159,7 @@ export class DataTable extends React.Component<DataTableProps, DataTableState> {
       return {
         label: a.name,
         data: a,
-        field: name,
+        field: a.name,
         width: 170,
         render: this.renderHeader.bind(this, a, isPrimary)
       };

src/client/views/settings-view/data-cube-edit/data-cube-edit.tsx

@@ -609,6 +609,7 @@ export class DataCube implements Instance<DataCubeValue, DataCubeJS> {
       externalValue.rollup = this.rollup;
       externalValue.introspectionStrategy = cluster.getIntrospectionStrategy();
       externalValue.allowSelectQueries = true;
+      externalValue.allowEternity = !this.getPrimaryTimeAttribute();
 
       if (options.druidTimeAttributeName) {
         externalValue.timeAttribute = options.druidTimeAttributeName;

src/client/views/settings-view/data-cubes/data-cubes.tsx

@@ -15,7 +15,8 @@
  */
 
 import * as Q from 'q';
-import { $, Executor, basicExecutorFactory, find, Attributes, Dataset } from 'plywood';
+import { Timezone, day } from 'chronoshift';
+import { $, Executor, basicExecutorFactory, find, Attributes, Dataset, TimeRange } from 'plywood';
 import { Logger } from 'logger-tracker';
 import { TimeMonitor } from "../../../common/utils/time-monitor/time-monitor";
 import { AppSettings, Timekeeper, Cluster, DataCube } from '../../../common/models/index';
@@ -24,6 +25,11 @@ import { FileManager } from '../file-manager/file-manager';
 import { ClusterManager } from '../cluster-manager/cluster-manager';
 import { updater } from '../updater/updater';
 
+const LOTS_OF_TIME = TimeRange.fromJS({
+  start: new Date('1000-01-01Z'),
+  end: new Date('4000-01-01Z')
+});
+
 export interface SettingsManagerOptions {
   logger: Logger;
   verbose?: boolean;
@@ -376,7 +382,25 @@ export class SettingsManager {
         var clusterManager = this.getClusterManagerFor(clusterName);
         if (!clusterManager) throw new Error(`no cluster manager for ${clusterName}`);
         var context: any = { temp: dataCube.toExternal(clusterManager.cluster, clusterManager.requester) };
-        return $('temp').compute(context) as any;
+
+        var primaryTimeExpression = dataCube.getPrimaryTimeExpression();
+        if (primaryTimeExpression) {
+          return $('temp')
+            .filter(primaryTimeExpression.in(LOTS_OF_TIME))
+            .max(primaryTimeExpression)
+            .compute(context)
+            .then((maxTime: Date) => {
+              maxTime = new Date(maxTime);
+              if (isNaN(maxTime as any)) throw new Error('invalid maxTime');
+              var lastTwoWeeks = TimeRange.fromJS({
+                start: day.move(maxTime, Timezone.UTC, -14),
+                end: maxTime
+              });
+              return $('temp').filter(primaryTimeExpression.in(lastTwoWeeks)).limit(20).compute(context) as any;
+            });
+        } else {
+          return $('temp').limit(20).compute(context) as any;
+        }
       });
     }
   }