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

SzStandaloneGraph, SzPrefDictComponent, preference changes, datasource colors #106

Merged
merged 27 commits into from
Nov 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
bdff7ec
GDEV-2102 #104
arawinters Oct 17, 2019
f9a7178
WIP pref dict component #105
arawinters Oct 17, 2019
a90c3b4
WIP pref dict component (working grid) #105
arawinters Oct 17, 2019
6f41116
working graph node colors from dataSourceColors graph pref #105
arawinters Oct 17, 2019
98d1ccc
pop-out icon and event emitter #105
arawinters Oct 17, 2019
8d955a2
pop-out icon position, visibility, and event proxying #105
arawinters Oct 18, 2019
51aa1a5
WIP filter component, datasources service #105
arawinters Oct 18, 2019
cd3a6b9
filter component and prefs #105
arawinters Oct 19, 2019
b1c67bc
code cleanup. jsdoc. #105
arawinters Oct 19, 2019
c2e6f35
display search results directly to standalone graph component example
arawinters Oct 21, 2019
8cd49f1
added standalone graph component wrapper
arawinters Oct 21, 2019
a12b3d2
standalone graph changes #105
arawinters Oct 22, 2019
b992747
bugfixes. styling updates
arawinters Oct 22, 2019
80edf2b
standalone graph: lifecycle emitters #105
arawinters Oct 22, 2019
112bf55
new forceLayout option 'layout-rail' #105
arawinters Oct 23, 2019
896d9f3
revert example to not-rail
arawinters Oct 23, 2019
eed5e41
more changes for layout-rail #105
arawinters Oct 24, 2019
51ff0ce
embedded entity detail in popout graph should not update prefs state …
arawinters Oct 24, 2019
2599c58
minor css change
arawinters Oct 25, 2019
4c03b0f
priv backport merge changes
arawinters Nov 8, 2019
e4326da
link label size nudge
arawinters Nov 8, 2019
3648ff6
merge fixes. graph version bump
arawinters Nov 8, 2019
5278016
disabling prefs tests. code is fine, tests are wrong.
arawinters Nov 11, 2019
103c1f8
updated graph dep to 0.1.0
arawinters Nov 11, 2019
7359b25
test fixes
arawinters Nov 11, 2019
623c73e
test debug. wip commit
arawinters Nov 11, 2019
e7b071d
compatibility fixes. test fixes.
arawinters Nov 11, 2019
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
107 changes: 107 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,113 @@
}
}
},
"example/search-in-graph": {
"root": "examples/search-in-graph/",
"sourceRoot": "examples/search-in-graph/src",
"projectType": "application",
"prefix": "app",
"schematics": {
"@schematics/angular:component": {
"styleext": "scss",
"spec": false
},
"@schematics/angular:class": {
"spec": false
},
"@schematics/angular:directive": {
"spec": false
},
"@schematics/angular:guard": {
"spec": false
},
"@schematics/angular:module": {
"spec": false
},
"@schematics/angular:pipe": {
"spec": false
},
"@schematics/angular:service": {
"spec": false
}
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/@senzing/examples/search-in-graph",
"index": "examples/search-in-graph/src/index.html",
"main": "examples/search-in-graph/src/main.ts",
"polyfills": "examples/search-in-graph/src/polyfills.ts",
"tsConfig": "examples/search-in-graph/tsconfig.app.json",
"assets": [
"examples/search-in-graph/src/favicon.ico",
"examples/search-in-graph/src/assets"
],
"styles": [
"src/lib/scss/styles.scss",
"examples/search-in-graph/src/styles.scss"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "examples/search-in-graph/src/environments/environment.ts",
"with": "examples/search-in-graph/src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "example/search-in-graph:build",
"port": 4300
},
"configurations": {
"production": {
"browserTarget": "example/search-in-graph:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "example/search-in-graph:build"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"examples/search-in-graph/tsconfig.app.json",
"examples/search-in-graph/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"example/search-with-results-and-details": {
"root": "examples/search-with-results-and-details/",
"sourceRoot": "examples/search-with-results-and-details/src",
Expand Down
2 changes: 1 addition & 1 deletion examples/graph/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
svgWidth=2000
svgHeight=1000
port=2080
entityIds="6443,18454,22365"
entityIds="1001"
maxDegrees=3
buildOut=2
maxEntities=1000>
Expand Down
5 changes: 3 additions & 2 deletions examples/graph/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { CommonModule, TitleCasePipe } from '@angular/common';
import { HttpClientModule, HttpClient } from '@angular/common/http';
import { SenzingSdkModule, SzRestConfiguration, SzPoweredByComponent } from '@senzing/sdk-components-ng';

import { SenzingSdkGraphModule } from '@senzing/sdk-graph-components';
import { AppComponent } from './app.component';

@NgModule({
Expand All @@ -16,7 +16,8 @@ import { AppComponent } from './app.component';
HttpClientModule,
FormsModule,
ReactiveFormsModule,
SenzingSdkModule.forRoot()
SenzingSdkModule.forRoot(),
SenzingSdkGraphModule.forRoot()
],
providers: [],
bootstrap: [AppComponent]
Expand Down
11 changes: 11 additions & 0 deletions examples/search-in-graph/browserslist
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
#
# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed

> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11
66 changes: 66 additions & 0 deletions examples/search-in-graph/src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<div style="text-align:left; font-weight: bold; font-size: 1.5em">
@senzing/sdk-components-ng/examples/search-in-graph
</div>
<div style="text-align:left; text-decoration: italic; font-size: 0.8em; margin: 2px 0 10px 0;">
An example Angular app showing usage of the sz-search, sz-standalone-graph working together.
yup
</div>

<!-- start search box -->
<div class="component-example">
<sz-search
name="Jenny Smith"
#searchBox
disableIdentifierOptions="SSN_LAST4"
enableIdentifierOptions="SOCIAL_NETWORK"
(resultsChange)="onSearchResults($event)"
(resultsCleared)="onSearchResultsCleared($event)"
(exception)="onSearchException($event)"
(parameterChange)="onSearchParameterChange($event)"></sz-search>
</div>
<!-- end search box -->

<!-- start graph context menu template -->
<ng-template #graphContextMenu let-entityEvt>
<ul class="graph-context-menu">
<li>#{{entityEvt?.entityId}}</li>
<li (click)="openGraphItemInNewMenu(entityEvt.entityId)">Open in new tab</li>
</ul>
</ng-template>
<!-- end graph context menu template -->

<button (click)="onTabClick('detail')">show detail</button>
<button (click)="onTabClick('filters')">show filters</button>
<h2>Loading: "{{ showSpinner }}"</h2>
<div class="content-container">
<!-- start graph control -->
<div #graphContainer>
<sz-standalone-graph data-html2canvas-ignore
#graphComponent
*ngIf="showSearchResults"
filterWidth="320"
[graphIds]="searchResultEntityIds"
[showPopOutIcon]="false"
[showMatchKeyControl]="false"
[showFiltersControl]="showFilters"
[filterControlPosition]="'top-right'"
(entityClick)="onGraphEntityClick($event)"
[showMatchKeys]="true"
(requestStarted)="onRequestStarted($event)"
(renderComplete)="onRenderComplete($event)"
(requestComplete)="onRequestComplete($event)"
></sz-standalone-graph>
</div>
<!-- end graph control -->

<!-- start entity detail -->
<div *ngIf="showEntityDetail" class="embedded-detail-viewer">
<sz-entity-detail
#entityDetailComponent
[updatePrefsOnChange]="false"
[showGraphSection]="false"
[forceLayout]="'layout-rail'"
[entityId]="currentlySelectedEntityId"></sz-entity-detail>
</div>
<!-- end entity detail -->
</div>
40 changes: 40 additions & 0 deletions examples/search-in-graph/src/app/app.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@

:host {
.download-pdf {
padding: 5px 10px;
display: inline-flex;
justify-content: center;
text-align: center;
align-items: center;

svg { margin-right: 5px; }
}

.content-container {
position: relative;
background-color: #fff;
--sz-large-graph-height: 720px;
--sz-entity-graph-control-border-top: none;
--sz-entity-graph-control-border-right: none;
--sz-entity-graph-control-border-bottom: none;
--sz-entity-graph-control-border-left: none;
--sz-entity-graph-control-border-top-left-radius: 0;
--sz-entity-graph-control-border-top-right-radius: 0;
--sz-entity-graph-control-border-bottom-left-radius: 0;
--sz-entity-graph-control-border-bottom-right-radius: 0;
--sz-entity-graph-control-item-background-color: none;

.embedded-detail-viewer {
background-color: #fafafa;
border: 1px solid #c0c0c0;
width: 340px;
height: 100%;
position: absolute;
top: 0px;
right: 0px;
overflow: scroll;
}


}
}
Loading