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.

Sign up for GitHub

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

#270 match key token filters limited to 1 degree #271

Merged
merged 3 commits into from
Apr 21, 2022
Merged

#270 match key token filters limited to 1 degree #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
727a748
#270 match key token filters limited to 1 degree
arawinters Apr 19, 2022
88bc2e4
#272 plus sdk-components-ng beta bump
arawinters Apr 21, 2022
aa44743
#273 UI fix
arawinters Apr 21, 2022
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
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"@fontsource/material-icons": "^4.5.1",
"@fontsource/roboto": "^4.5.1",
"@senzing/rest-api-client-ng": "^4.0.0",
"@senzing/sdk-components-ng": "^4.0.0-beta.7",
"@senzing/sdk-graph-components": "^4.1.0-beta.1",
"@senzing/sdk-components-ng": "^4.0.0-beta.9",
"@senzing/sdk-graph-components": "^4.1.0-beta.2",
"@types/d3": "^5.7.1",
"@types/socket.io-client": "^3.0.0",
"acorn": "^8.6.0",
Expand Down
1 change: 1 addition & 0 deletions src/app/detail/detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ export class DetailComponent implements OnInit {
}
onGraphPopout(event) {
console.log('on graph popout: ', event);
if(window && window.scroll){ window.scroll(0,0); console.log('on popout scrolled'); }
this.router.navigate(['graph/' + this.entityId]);
}
}
2 changes: 2 additions & 0 deletions src/app/graph/graph.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
[showMatchKeyFilters]="false"
[showMatchKeyTokens]="_showMatchKeyTokensInFilter"
[showMatchKeyTokenFilters]="true"
[showCoreMatchKeyTokenChips]="true"
[showExtraneousMatchKeyTokenChips]="false"
(optionChanged)="onFilterOptionChange($event)"
></sz-entity-detail-graph-filter>
<!-- end filters control -->
Expand Down
6 changes: 6 additions & 0 deletions src/app/graph/graph.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,11 @@ export class GraphComponent implements OnInit, AfterViewInit, OnDestroy {

/** proxy handler for when prefs have changed externally */
private onPrefsChange(prefs: any) {
/*
There is a race condition being caused by this block executing before a similar block
inside of the SzGraph component in @senzing/sdk-components-ng
(see https://github.com/Senzing/entity-search-web-app/issues/272)

console.log('GraphComponent.onPrefsChange(): ', prefs, this.prefs.graph);
this._showMatchKeys = prefs.showMatchKeys;
this.maxDegrees = prefs.maxDegreesOfSeparation;
Expand All @@ -600,5 +605,6 @@ export class GraphComponent implements OnInit, AfterViewInit, OnDestroy {

// update view manually (for web components redraw reliability)
this.cd.detectChanges();
*/
}
}