API calls to fetch druid cluster & data cubes.

config-examples.yaml

@@ -150,3 +150,8 @@ dataCubes:
         title: Unique Users
         formula: $main.countDistinct($user)
 
+settingsLocation:
+  location: file
+  format: 'json'
+  uri: 'temp.json'
+  writable: true

package.json

@@ -41,7 +41,7 @@
     "node-spawn-server": "1.0.1",
     "nopt": "3.0.6",
     "numeral": "1.5.3",
-    "plywood": "0.12.3",
+    "plywood": "^0.12.5",
     "plywood-druid-requester": "1.5.4",
     "plywood-mysql-requester": "1.3.1",
     "plywood-postgres-requester": "0.9.1",

src/client/applications/swiv-application/collection-view-delegate/collection-view-delegate.tsx

@@ -89,7 +89,7 @@ export class CollectionViewDelegate {
     const collectionURL = `#collection/${collection.name}`;
     const oldIndex = collection.tiles.indexOf(tile);
 
-    const newCollection = collection.deleteTile(tile);
+    const newCollection = collection.deleteTile(tile.name);
     const newSettings = appSettings.addOrUpdateCollection(newCollection);
 
     const undo = () => this.addTile(newCollection, tile, oldIndex);
@@ -175,7 +175,7 @@ export class CollectionViewDelegate {
       this.save(this.getSettings().addCollectionAt(collection, oldIndex));
     };
 
-    return this.save(appSettings.deleteCollection(collection)).then( () => {
+    return this.save(appSettings.deleteCollection(collection.name)).then( () => {
       window.location.hash = `#/home`;
       Notifier.success('Collection removed', {label: STRINGS.undo, callback: undo});
     });

src/client/applications/swiv-application/swiv-application.tsx

@@ -24,6 +24,7 @@ import { findByName } from 'plywood';
 import { replaceHash } from '../../utils/url/url';
 import { DataCube, AppSettings, User, Collection, CollectionTile, Essence, Timekeeper, ViewSupervisor } from '../../../common/models/index';
 import { STRINGS } from '../../config/constants';
+import { MANIFESTS } from '../../../common/manifests/index';
 
 import { createFunctionSlot, FunctionSlot } from '../../utils/function-slot/function-slot';
 import { Ajax } from '../../utils/ajax/ajax';
@@ -159,7 +160,17 @@ export class SwivApplication extends React.Component<SwivApplicationProps, SwivA
       return appSettings.getVersion();
     };
     Ajax.onUpdate = () => {
-      console.log('UPDATE!!');
+      Ajax.query({ method: "GET", url: 'client-settings' })
+        .then(
+          (resp) => {
+            //if (!this.mounted) return; // ToDo: this
+            this.setState({
+              appSettings: AppSettings.fromJS(resp.clientSettings, { visualizations: MANIFESTS })
+            });
+          },
+          (e: Error) => {
+          }
+        );
     };
 
     require.ensure(['clipboard'], (require) => {
@@ -212,6 +223,10 @@ export class SwivApplication extends React.Component<SwivApplicationProps, SwivA
       drawerOpen: false
     };
 
+    if (viewType === COLLECTION) {
+      newState.cubeViewSupervisor = null;
+    }
+
     if (this.viewTypeNeedsAnItem(viewType)) {
       let items = viewType === CUBE ? dataCubes : collections;
       let item = this.getSelectedItemFromHash(items, hash, viewType);
@@ -468,8 +483,7 @@ export class SwivApplication extends React.Component<SwivApplicationProps, SwivA
 
   deleteDataCube(dataCube: DataCube) {
     const appSettings = this.state.appSettings as AppSettings;
-
-    this.saveDataCubes(appSettings.deleteDataCube(dataCube));
+    this.saveDataCubes(appSettings.deleteDataCube(dataCube.name));
   }
 
 

src/client/components/dimension-tile/dimension-tile.tsx

@@ -29,6 +29,7 @@ import { Clicker, Essence, Timekeeper, VisStrategy, Dimension, SortOn, SplitComb
   granularityToString, getDefaultGranularityForKind, getGranularities } from '../../../common/models/index';
 
 import { setDragGhost, classNames } from '../../utils/dom/dom';
+import { QueryRunner } from '../../utils/query-runner/query-runner';
 import { DragManager } from '../../utils/drag-manager/drag-manager';
 import { STRINGS, getLocale } from '../../config/constants';
 import { PIN_TITLE_HEIGHT, PIN_ITEM_HEIGHT, PIN_PADDING_BOTTOM, MAX_SEARCH_LENGTH, SEARCH_WAIT } from '../../config/constants';
@@ -101,7 +102,7 @@ export class DimensionTile extends React.Component<DimensionTileProps, Dimension
 
     var filter = essence.getEffectiveFilter(timekeeper);
     // don't remove filter if time
-    if (unfolded && dimension !== essence.getTimeDimension()) {
+    if (unfolded && dataCube.isMandatoryFilter(dimension.expression)) {
       filter = filter.remove(dimension.expression);
     }
 
@@ -156,7 +157,7 @@ export class DimensionTile extends React.Component<DimensionTileProps, Dimension
       loading: true,
       fetchQueued: false
     });
-    dataCube.executor(query, { timezone: essence.timezone })
+    QueryRunner.fetch(dataCube, query, essence.timezone)
       .then(
         (dataset: Dataset) => {
           if (!this.mounted) return;
@@ -323,7 +324,7 @@ export class DimensionTile extends React.Component<DimensionTileProps, Dimension
       return {
         selected: filterMode === value,
         onSelect: this.changeFilterMode.bind(this, value),
-        displayValue: STRINGS[value],
+        displayValue: (STRINGS as any)[value],
         keyString: value
       };
     });

src/client/components/filter-tile/filter-tile.tsx

@@ -301,10 +301,10 @@ export class FilterTile extends React.Component<FilterTileProps, FilterTileState
     if (dimension) {
       var dragPosition = this.calculateDragPosition(e);
 
-      var tryingToReplaceTime = false;
+      var tryingToReplaceMandatory = false;
       if (dragPosition.replace !== null) {
         var targetClause = filter.clauses.get(dragPosition.replace);
-        tryingToReplaceTime = targetClause && targetClause.expression.equals(dataCube.timeAttribute);
+        tryingToReplaceMandatory = targetClause && dataCube.isMandatoryFilter(targetClause.expression);
       }
 
       var existingClause = filter.clauseForExpression(dimension.expression);
@@ -333,7 +333,7 @@ export class FilterTile extends React.Component<FilterTileProps, FilterTileState
         }
 
       } else {
-        if (dragPosition && !tryingToReplaceTime) {
+        if (dragPosition && !tryingToReplaceMandatory) {
           this.addDummy(dimension, dragPosition);
         }
 
@@ -434,7 +434,7 @@ export class FilterTile extends React.Component<FilterTileProps, FilterTileState
   renderRemoveButton(itemBlank: ItemBlank) {
     var { essence } = this.props;
     var dataCube = essence.dataCube;
-    if (itemBlank.dimension.expression.equals(dataCube.timeAttribute)) return null;
+    if (dataCube.isMandatoryFilter(itemBlank.dimension.expression)) return null;
     return <div className="remove" onClick={this.removeFilter.bind(this, itemBlank)}>
       <SvgIcon svg={require('../../icons/x.svg')}/>
     </div>;

src/client/components/hiluk-menu/hiluk-menu.tsx

@@ -76,7 +76,7 @@ export class HilukMenu extends React.Component<HilukMenuProps, HilukMenuState> {
     const { dataCube, splits } = essence;
     if (!getDownloadableDataset) return;
 
-    const filters = essence.getEffectiveFilter(timekeeper).getFileString(dataCube.timeAttribute);
+    const filters = essence.getEffectiveFilter(timekeeper).getFileString(dataCube.getPrimaryTimeExpression());
     var splitsString = splits.toArray().map((split) => {
       var dimension = split.getDimension(dataCube.dimensions);
       if (!dimension) return '';

src/client/components/index.ts

@@ -48,6 +48,7 @@ export * from './immutable-input/immutable-input';
 export * from './immutable-list/immutable-list';
 export * from './line-chart-axis/line-chart-axis';
 export * from './loader/loader';
+export * from './loading-bar/loading-bar';
 export * from './manual-fallback/manual-fallback';
 export * from './measures-tile/measures-tile';
 export * from './modal/modal';

src/client/components/loading-bar/loading-bar.mocha.tsx

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015-2016 Imply Data, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { expect } from 'chai';
+import * as sinon from 'sinon';
+import * as React from 'react';
+import * as TestUtils from 'react-addons-test-utils';
+import { $, Expression } from 'plywood';
+
+import { DataCubeMock, EssenceMock } from '../../../common/models/mocks';
+
+import { findDOMNode } from '../../utils/test-utils/index';
+
+import { LoadingBar } from './loading-bar';
+
+describe('LoadingBar', () => {
+  it('adds the correct class', () => {
+    var renderedComponent = TestUtils.renderIntoDocument(
+      <LoadingBar
+
+      />
+    );
+
+    expect(TestUtils.isCompositeComponent(renderedComponent), 'should be composite').to.equal(true);
+    expect((findDOMNode(renderedComponent) as any).className, 'should contain class').to.contain('loading-bar');
+  });
+
+});