Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(frontend): undo when cancel drawing a line #47

Merged
merged 3 commits into from
Apr 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export const finishLine = createAction(
`${actionTypePrefix} Finish line`,
props<{ voxelChanges: VoxelChange[] }>(),
);
export const cancelLine = createAction(`${actionTypePrefix} Cancel line`);
export const addFirstLineChange = createAction(
`${actionTypePrefix} Add first line change`,
props<VoxelChange>(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,8 @@ export class SceneViewerContainerEffects {
}),
tap(([_action, state]) => {
// remove old line
state.selectedLineChanges.map(change =>
change.oldValue === this.gridService.background
? this.gridService.removeVoxel(change.xyz)
: this.gridService.setVoxel(change.xyz, change.oldValue),
state.selectedLineChanges.forEach(change =>
this.gridService.setVoxel(change.xyz, change.oldValue),
);
}),
map(([action, state]) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import * as menuBarContainerActions from '../menu-bar-container/menu-bar-contain
import { VoxelChange } from './grid.service';
import {
addFirstLineChange,
cancelLine,
finishLine,
setLineChanges,
startLine,
Expand Down Expand Up @@ -48,6 +49,7 @@ export const reducer = createReducer<State>(
},
),
on(
cancelLine,
finishLine,
(state): State => {
return {
Expand Down
8 changes: 7 additions & 1 deletion apps/frontend/src/app/tools-panel/tools-panel.actions.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import { createAction, props } from '@ngrx/store';
import { Tool } from '@talus/model';

export const selectTool = createAction('[toolsPanel] Select tool', props<{ id: Tool }>());
const actionTypePrefix = `[toolsPanel]`;

export const selectTool = createAction(`${actionTypePrefix} Select tool`, props<{ id: Tool }>());

export const removeSelectionLinePreview = createAction(
`${actionTypePrefix} Remove selection line preview`,
);
28 changes: 15 additions & 13 deletions apps/frontend/src/app/tools-panel/tools-panel.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { StoreModule } from '@ngrx/store';
import { ROOT_REDUCERS } from '../app.reducer';
import { provideMockActions } from '@ngrx/effects/testing';
import { Action } from '@ngrx/store';
import { provideMockStore } from '@ngrx/store/testing';
import { UiToolbarModule } from '@talus/ui';
import { Observable, of } from 'rxjs';
import { default as fromApp } from '../app.reducer';
import { initialMockState } from '../testing';
import { ToolsPanelComponent } from './tools-panel.component';
import { ToolsPanelModule } from './tools-panel.module';

describe('ToolsPanelComponent', () => {
let component: ToolsPanelComponent;
let fixture: ComponentFixture<ToolsPanelComponent>;

const actions$: Observable<Action> = of();

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [],
imports: [
ToolsPanelModule,
StoreModule.forRoot(ROOT_REDUCERS, {
runtimeChecks: {
strictStateImmutability: true,
strictActionImmutability: true,
strictStateSerializability: true,
strictActionSerializability: true,
},
declarations: [ToolsPanelComponent],
imports: [UiToolbarModule],
providers: [
provideMockStore<fromApp.State>({
initialState: initialMockState,
}),
provideMockActions(() => actions$),
],
}).compileComponents();
}));
Expand Down
39 changes: 39 additions & 0 deletions apps/frontend/src/app/tools-panel/tools-panel.effects.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { Injectable } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { select, Store } from '@ngrx/store';
import { filter, map, switchMap, withLatestFrom } from 'rxjs/operators';
import * as fromApp from '../app.reducer';
import { GridService } from '../scene-viewer-container/grid.service';
import { cancelLine, voxelsSet } from '../scene-viewer-container/scene-viewer-container.actions';
import { removeSelectionLinePreview, selectTool } from './tools-panel.actions';

@Injectable()
export class ToolsPanelEffects {
constructor(
private actions$: Actions,
private gridService: GridService,
private store: Store<fromApp.State>,
) {}

selectTool$ = createEffect(() =>
this.actions$.pipe(
ofType(selectTool),
withLatestFrom(this.store.pipe(select(fromApp.selectSceneViewerContainerState))),
filter(([_action, state]) => Boolean(state.selectedLineStartCoord)),
map(() => removeSelectionLinePreview()),
),
);

removeSelectionLinePreview$ = createEffect(() =>
this.actions$.pipe(
ofType(removeSelectionLinePreview),
withLatestFrom(this.store.pipe(select(fromApp.selectSceneViewerContainerState))),
map(([_action, state]) =>
state.selectedLineChanges.map(change =>
this.gridService.setVoxel(change.xyz, change.oldValue),
),
),
switchMap(voxelChanges => [voxelsSet({ voxelChanges }), cancelLine()]),
),
);
}
6 changes: 5 additions & 1 deletion apps/frontend/src/app/tools-panel/tools-panel.module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { EffectsModule } from '@ngrx/effects';
import { UiToolbarModule } from '@talus/ui';
import { GridService } from '../scene-viewer-container/grid.service';
import { ToolsPanelComponent } from './tools-panel.component';
import { ToolsPanelEffects } from './tools-panel.effects';

@NgModule({
declarations: [ToolsPanelComponent],
imports: [CommonModule, UiToolbarModule],
imports: [CommonModule, EffectsModule.forFeature([ToolsPanelEffects]), UiToolbarModule],
providers: [GridService],
exports: [ToolsPanelComponent],
})
export class ToolsPanelModule {}