Skip to content

Commit d293713

Browse files
committed
Refactoring and removing unnecessary method
1 parent 2c48c6a commit d293713

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

src/app/core/default-pattern-renderer/default-pattern-renderer.component.ts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,6 @@ export class DefaultPatternRendererComponent implements AfterViewInit, OnDestroy
8585
}
8686
}
8787

88-
addContentInfoToPattern(edge: DirectedEdgeModel | UndirectedEdgeModel): Observable<DirectedEdgeModel | UndirectedEdgeModel> {
89-
const toPattern = edge instanceof DirectedEdgeModel ? edge.targetPatternId : edge.pattern2Id;
90-
return this.patternService.getPatternContentByPattern(this.patterns.find(it => it.id === toPattern)).pipe(
91-
map((patterncontent) => {
92-
// const targetPatternContent = patterncontent.content;
93-
// edge instanceof DirectedEdgeModel ? edge.content = targetPatternContent : edge.p2.content = targetPatternContent;
94-
return edge;
95-
}));
96-
}
97-
9888
getPatternData(): Observable<Pattern> {
9989
if (!this.patternLanguage) {
10090
console.log('tried to get patterns before the pattern language object with the url was instanciated');
@@ -125,8 +115,6 @@ export class DefaultPatternRendererComponent implements AfterViewInit, OnDestroy
125115
getPatternLanguageLinks(): Observable<any> {
126116
const $getDirectedEdges = this.getDirectedEdges();
127117
const $getUndirectedEdges = this.getUndirectedEdges();
128-
console.log($getDirectedEdges)
129-
console.log($getUndirectedEdges)
130118
return forkJoin([ $getDirectedEdges, $getUndirectedEdges ]).pipe(tap(() => this.isLoadingLinks = false));
131119
}
132120

@@ -168,7 +156,6 @@ export class DefaultPatternRendererComponent implements AfterViewInit, OnDestroy
168156
}
169157

170158
private getDirectedEdges(): Observable<Embedded<DirectedEdesResponse>> {
171-
console.log(this.pattern.id)
172159
if (!this.patternLanguage) {
173160
return EMPTY;
174161
}
@@ -230,8 +217,7 @@ export class DefaultPatternRendererComponent implements AfterViewInit, OnDestroy
230217
// get our individual pattern and the links in parallel
231218
switchMap(() => forkJoin([ this.fillPatternSectionData(), this.getPatternLanguageLinks() ])));
232219
}
233-
const dataSubscription = getPatternObservable.subscribe(() => dataObservable.subscribe(() =>
234-
this.cdr.detectChanges()));
220+
const dataSubscription = forkJoin([getPatternObservable, dataObservable]).subscribe(() => this.cdr.detectChanges());
235221
this.subscriptions.add(dataSubscription);
236222

237223

@@ -253,9 +239,6 @@ export class DefaultPatternRendererComponent implements AfterViewInit, OnDestroy
253239
{ data: { firstPattern: this.pattern, patterns: this.patterns } }
254240
);
255241
const dialogSubscription = dialogRef.afterClosed().pipe(
256-
switchMap(result => {
257-
return result ? this.addContentInfoToPattern(result) : EMPTY;
258-
}),
259242
switchMap((edge) => {
260243
return edge ? this.insertEdge(edge) : EMPTY;
261244
}))

0 commit comments

Comments
 (0)