Browse Source

refactor(admin-ui): Re-arrange some types to prevent circular dependency

Michael Bromley 5 years ago
parent
commit
fbb3c5d9f1

+ 2 - 6
packages/admin-ui/src/lib/order/src/components/order-process-graph/order-process-graph.component.ts

@@ -12,16 +12,12 @@ import {
     ViewChildren,
 } from '@angular/core';
 import { OrderProcessState } from '@vendure/admin-ui/core';
-import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 
 import { NODE_HEIGHT } from './constants';
 import { OrderProcessNodeComponent } from './order-process-node.component';
-
-export type StateNode = {
-    name: string;
-    to: StateNode[];
-};
+import { StateNode } from './types';
 
 @Component({
     selector: 'vdr-order-process-graph',

+ 3 - 4
packages/admin-ui/src/lib/order/src/components/order-process-graph/order-process-node.component.ts

@@ -4,13 +4,12 @@ import {
     ElementRef,
     Input,
     OnChanges,
-    OnInit,
     SimpleChanges,
 } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 
 import { NODE_HEIGHT } from './constants';
-import { OrderProcessGraphComponent, StateNode } from './order-process-graph.component';
+import { StateNode } from './types';
 
 @Component({
     selector: 'vdr-order-process-node',
@@ -29,7 +28,7 @@ export class OrderProcessNodeComponent implements OnChanges {
     // i18n extractor from extracting a "Cancelled" key
     cancelledState = 'Cancelled';
 
-    constructor(private graph: OrderProcessGraphComponent, private elementRef: ElementRef<HTMLDivElement>) {}
+    constructor(private elementRef: ElementRef<HTMLDivElement>) {}
 
     ngOnChanges(changes: SimpleChanges) {
         this.isCancellable = !!this.node.to.find((s) => s.name === 'Cancelled');

+ 4 - 0
packages/admin-ui/src/lib/order/src/components/order-process-graph/types.ts

@@ -0,0 +1,4 @@
+export type StateNode = {
+    name: string;
+    to: StateNode[];
+};