Release v0.0.2

.circleci/config.yml

@@ -7,17 +7,17 @@ aliases:
   # https://github.com/CircleCI-Public/circleci-dockerfiles/tree/master/node/images
   - &use_docker_node
     docker:
-      - image: circleci/node:13.4.0-stretch
+      - image: circleci/node:13.5.0-stretch
 
   - &use_docker_node_browsers
     docker:
-      - image: circleci/node:13.4.0-stretch-browsers
+      - image: circleci/node:13.5.0-stretch-browsers
 
   # https://github.com/cypress-io/cypress-docker-images/tree/master/included
   - &use_docker_cypress_included
     docker:
       # 3.8.0 fails with `Error: write EPIPE` when running `benchmark`!?
-      - image: cypress/included:3.7.0
+      - image: cypress/included:3.8.2
 
   - &workspace ~/talus
 

.nxignore

@@ -0,0 +1,2 @@
+# Hack for getting benchmark app (generated with ng g @nrwl/node:application) through linting
+/apps/benchmark

apps/benchmark/src/app/vdb/grid.benchmark.ts

@@ -46,7 +46,7 @@ suite('[Grid] setValue()', () => {
     for (let x = 0; x < i; x++) {
       for (let y = 0; y < i; y++) {
         for (let z = 0; z < i; z++) {
-          accessor.setValue([x, y, z], i);
+          accessor.setValueOn([x, y, z], i);
         }
       }
     }

apps/benchmark/src/app/vdb/node-to-mesh.benchmark.ts

@@ -0,0 +1,34 @@
+import { benchmark, suite } from '../../main';
+
+suite('[NodeToMesh] array.push()', () => {
+  benchmark('multiple small push', () => {
+    const positions: number[] = [];
+
+    positions.push(1);
+    positions.push(2);
+    positions.push(3);
+    positions.push(4);
+    positions.push(5);
+    positions.push(6);
+    positions.push(7);
+    positions.push(8);
+    positions.push(9);
+    positions.push(10);
+    positions.push(11);
+    positions.push(12);
+    positions.push(13);
+    positions.push(14);
+    positions.push(15);
+    positions.push(16);
+    positions.push(17);
+    positions.push(18);
+    positions.push(19);
+    positions.push(20);
+  });
+
+  benchmark('single big push', () => {
+    const positions: number[] = [];
+
+    positions.push(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20);
+  });
+});

apps/benchmark/src/main.ts

@@ -86,7 +86,9 @@ function convertToTestSuite(suiteName: string, currentSuite: Benchmark.Suite): T
 }
 
 function sumUpTotalTime(): void {
-  report.time = report.suites.map(s => s.time).reduce((previous, current) => previous + current, 0);
+  report.time = report.suites
+    .map(s => s.time)
+    .reduce((previous, current) => (previous && current ? previous + current : 0), 0);
 }
 
 function everySuiteFinished(): boolean {

apps/benchmark/tslint.json

@@ -1 +1,4 @@
-{ "extends": "../../tslint.json", "rules": [] }
+{
+  "extends": "../../tslint.json",
+  "rules": {}
+}

apps/frontend/src/app/app.actions.ts

@@ -1,6 +1,6 @@
 import { createAction } from '@ngrx/store';
 
-const actionTypePrefix = '[App]';
+const actionTypePrefix = '[app]';
 
 export const wentOnline = createAction(`${actionTypePrefix} Went online`);
 export const wentOffline = createAction(`${actionTypePrefix} Went offline`);

apps/frontend/src/app/app.component.scss

@@ -0,0 +1,11 @@
+:host {
+  display: flex;
+  flex-flow: column;
+  height: 100%;
+}
+
+main {
+  flex-grow: 1;
+  // https://stackoverflow.com/a/38383437
+  min-height: 0;
+}

apps/frontend/src/app/app.component.spec.ts

@@ -2,9 +2,16 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { async, TestBed } from '@angular/core/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { SceneViewerTestModule, SidenavShellModule } from '@talus/ui';
+import { UiSceneViewerTestModule, UiSidenavShellModule } from '@talus/ui';
 import { AppComponent } from './app.component';
 
+@Component({
+  selector: 'fe-menu-bar-container',
+  template: '',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class MenuBarContainerStubComponent {}
+
 @Component({
   selector: 'fe-scene-viewer-container',
   template: '',
@@ -22,12 +29,17 @@ class ToolsPanelStubComponent {}
 describe('AppComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [AppComponent, SceneViewerContainerStubComponent, ToolsPanelStubComponent],
+      declarations: [
+        AppComponent,
+        MenuBarContainerStubComponent,
+        SceneViewerContainerStubComponent,
+        ToolsPanelStubComponent,
+      ],
       imports: [
         BrowserAnimationsModule,
         RouterTestingModule,
-        SidenavShellModule,
-        SceneViewerTestModule,
+        UiSceneViewerTestModule,
+        UiSidenavShellModule,
       ],
     }).compileComponents();
   }));

apps/frontend/src/app/app.component.ts

@@ -3,21 +3,30 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
 @Component({
   selector: 'fe-root',
   template: `
-    <ui-sidenav-shell>
-      <ui-sidenav-shell-left>
-        <fe-tools-panel></fe-tools-panel>
-      </ui-sidenav-shell-left>
+    <header>
+      <fe-menu-bar-container></fe-menu-bar-container>
+    </header>
 
-      <ui-sidenav-shell-right>
-        Right
-      </ui-sidenav-shell-right>
+    <main>
+      <ui-sidenav-shell>
+        <ui-sidenav-shell-left>
+          <fe-tools-panel></fe-tools-panel>
+        </ui-sidenav-shell-left>
 
-      <ui-sidenav-shell-content>
-        <fe-scene-viewer-container></fe-scene-viewer-container>
-      </ui-sidenav-shell-content>
-    </ui-sidenav-shell>
+        <ui-sidenav-shell-right>
+          Right
+        </ui-sidenav-shell-right>
+
+        <ui-sidenav-shell-content>
+          <fe-scene-viewer-container></fe-scene-viewer-container>
+        </ui-sidenav-shell-content>
+      </ui-sidenav-shell>
+    </main>
+
+    <!--<ui-status-bar></ui-status-bar>-->
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
+  styleUrls: ['./app.component.scss'],
 })
 export class AppComponent {
   title = 'frontend';

apps/frontend/src/app/app.module.ts

@@ -4,12 +4,14 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule } from '@angular/router';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
-import { SidenavShellModule } from '@talus/ui';
+import { UiSidenavShellModule } from '@talus/ui';
 import { AppComponent } from './app.component';
 import { AppEffects } from './app.effects';
 import { metaReducers, ROOT_REDUCERS } from './app.reducer';
+import { MenuBarContainerModule } from './menu-bar-container/menu-bar-container.module';
 import { SceneViewerContainerModule } from './scene-viewer-container';
 import { ToolsPanelModule } from './tools-panel/tools-panel.module';
+import { UndoRedoModule } from './undo-redo/undo-redo.module';
 
 @NgModule({
   declarations: [AppComponent],
@@ -35,9 +37,11 @@ import { ToolsPanelModule } from './tools-panel/tools-panel.module';
       },
     }),
 
+    MenuBarContainerModule,
     SceneViewerContainerModule,
-    SidenavShellModule,
+    UiSidenavShellModule,
     ToolsPanelModule,
+    UndoRedoModule,
   ],
   providers: [],
   bootstrap: [AppComponent],

apps/frontend/src/app/app.reducer.ts

@@ -10,8 +10,10 @@ import {
 import { environment } from '../environments/environment';
 import * as fromSceneViewerContainer from './scene-viewer-container/scene-viewer-container.reducer';
 import * as fromToolsPanel from './tools-panel/tools-panel.reducer';
+import * as fromUndoRedo from './undo-redo/undo-redo.reducer';
 
 export interface State {
+  [fromUndoRedo.featureKey]: fromUndoRedo.State;
   [fromToolsPanel.featureKey]: fromToolsPanel.State;
   [fromSceneViewerContainer.featureKey]: fromSceneViewerContainer.State;
 }
@@ -27,8 +29,9 @@ export const ROOT_REDUCERS = new InjectionToken<ActionReducerMap<State, Action>>
   'Root reducers token',
   {
     factory: () => ({
-      [fromToolsPanel.featureKey]: fromToolsPanel.reducer,
       [fromSceneViewerContainer.featureKey]: fromSceneViewerContainer.reducer,
+      [fromToolsPanel.featureKey]: fromToolsPanel.reducer,
+      [fromUndoRedo.featureKey]: fromUndoRedo.reducer,
     }),
   },
 );
@@ -78,3 +81,30 @@ export const selectSelectedToolId = createSelector(
   selectToolsPanelState,
   fromToolsPanel.selectSelectedToolId,
 );
+
+/**
+ * UndoRedo reducers
+ */
+export const selectUndoRedoState = createFeatureSelector<State, fromUndoRedo.State>(
+  fromUndoRedo.featureKey,
+);
+
+export const selectCurrentUndoStartAction = createSelector(
+  selectUndoRedoState,
+  fromUndoRedo.selectCurrentUndoStartAction,
+);
+
+export const selectCurrentRedoStartAction = createSelector(
+  selectUndoRedoState,
+  fromUndoRedo.selectCurrentRedoStartAction,
+);
+
+export const selectCurrentUndoEndAction = createSelector(
+  selectUndoRedoState,
+  fromUndoRedo.selectCurrentUndoEndAction,
+);
+
+export const selectCurrentRedoEndAction = createSelector(
+  selectUndoRedoState,
+  fromUndoRedo.selectCurrentRedoEndAction,
+);

apps/frontend/src/app/menu-bar-container/menu-bar-container.actions.ts

@@ -0,0 +1,6 @@
+import { createAction } from '@ngrx/store';
+
+const actionTypePrefix = `[menuBarContainer]`;
+
+export const undo = createAction(`${actionTypePrefix} Undo`);
+export const redo = createAction(`${actionTypePrefix} Redo`);

apps/frontend/src/app/menu-bar-container/menu-bar-container.component.spec.ts

@@ -0,0 +1,53 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { Store, StoreModule } from '@ngrx/store';
+import { MockStore } from '@ngrx/store/testing';
+import { ROOT_REDUCERS, State } from '../app.reducer';
+import { undo } from './menu-bar-container.actions';
+import { MenuBarContainerComponent } from './menu-bar-container.component';
+import { MenuBarContainerModule } from './menu-bar-container.module';
+
+describe('MenuBarComponent', () => {
+  let component: MenuBarContainerComponent;
+  let fixture: ComponentFixture<MenuBarContainerComponent>;
+
+  let store: MockStore<State>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [],
+      imports: [
+        MenuBarContainerModule,
+        StoreModule.forRoot(ROOT_REDUCERS, {
+          runtimeChecks: {
+            strictStateImmutability: true,
+            strictActionImmutability: true,
+            strictStateSerializability: true,
+            strictActionSerializability: true,
+          },
+        }),
+      ],
+    }).compileComponents();
+
+    store = TestBed.get<Store<State>>(Store);
+  }));
+
+  beforeEach(() => {
+    spyOn(store, 'dispatch');
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MenuBarContainerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should dispatch action', () => {
+    component.onMenuItemClick(undo());
+
+    expect(store.dispatch).toHaveBeenCalledWith(undo());
+  });
+});

apps/frontend/src/app/menu-bar-container/menu-bar-container.component.ts

@@ -0,0 +1,40 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { Action, Store } from '@ngrx/store';
+import { UiMenuBarConfig } from '@talus/ui';
+import * as fromApp from '../app.reducer';
+import { redo, undo } from './menu-bar-container.actions';
+
+@Component({
+  selector: 'fe-menu-bar-container',
+  template: `
+    <ui-menu-bar (menuItemClick)="onMenuItemClick($event)" [menuConfig]="menuConfig"></ui-menu-bar>
+  `,
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class MenuBarContainerComponent {
+  menuConfig: UiMenuBarConfig<Action> = {
+    menus: [
+      {
+        label: 'Edit',
+        menuItems: [
+          {
+            icon: 'undo',
+            label: 'Undo',
+            value: undo(),
+          },
+          {
+            icon: 'redo',
+            label: 'Redo',
+            value: redo(),
+          },
+        ],
+      },
+    ],
+  };
+
+  constructor(private store: Store<fromApp.State>) {}
+
+  onMenuItemClick(action: Action): void {
+    this.store.dispatch(action);
+  }
+}

apps/frontend/src/app/menu-bar-container/menu-bar-container.module.ts

@@ -0,0 +1,10 @@
+import { NgModule } from '@angular/core';
+import { UiMenuBarModule } from '@talus/ui';
+import { MenuBarContainerComponent } from './menu-bar-container.component';
+
+@NgModule({
+  declarations: [MenuBarContainerComponent],
+  imports: [UiMenuBarModule],
+  exports: [MenuBarContainerComponent],
+})
+export class MenuBarContainerModule {}