Skip to content

Commit

Permalink
Merge pull request #63 from senzingiris/issue62.awinters.1
Browse files Browse the repository at this point in the history
Removal/Refactoring for splitting out graph components
  • Loading branch information
arawinters authored Jul 11, 2019
2 parents 31b0ab0 + d03dd73 commit b471ac4
Show file tree
Hide file tree
Showing 48 changed files with 639 additions and 122 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ And that's it! At least for the quickstart. There are a ton more options for run
The SenzingSDKModule accepts a factory method that returns an instance of the
[SzRestConfiguration](https://senzing.github.io/rest-api-client-ng/classes/Configuration.html) class. By adding a factory like the following to the forRoot method, you can change services configuration to point to non-default values.

The following tells any components to turn on CORS functionality and make all api requests to localhost port 2080 (i.e.: http://localhost:2080/).
The following tells any components to turn on CORS functionality and make all api requests to localhost port 8080 (i.e.: http://localhost:8080/).

```typescript
import { BrowserModule } from '@angular/platform-browser';
Expand All @@ -180,7 +180,7 @@ import { AppComponent } from './app.component';
// for AOT compilation
export function SzRestConfigurationFactory() {
return new SzRestConfiguration({
basePath: 'http://localhost:2080',
basePath: 'http://localhost:8080',
withCredentials: true
});
}
Expand Down Expand Up @@ -233,7 +233,7 @@ Occasionally something does go wrong (I know, I know right?). Here are some comm
passing in an instance of <a href="https://senzing.github.io/rest-api-client-ng/classes/Configuration.html">SzRestConfiguration</a> to the <a href="https://senzing.github.io/sdk-components-ng/modules/SenzingSdkModule.html">SenzingSdkModule.forRoot method</a>.
<br/><br/>
Double check and make sure you can connect to your rest server via
<code>curl -i http://localhost:2080/heartbeat</code>
<code>curl -i http://localhost:8080/heartbeat</code>
</td>
<td style="padding: 10px 5px;">
The api is trying to hit the rest server without an appropriate basepath or the hostname.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"timestamp": "2019-03-20T17:30:07.167Z"
},
"links": {
"self": "http://localhost:2080/entity-paths?from=914082&to=179726&maxDegrees=3&forbidAvoided=true&withRaw=true"
"self": "http://localhost:8080/entity-paths?from=914082&to=179726&maxDegrees=3&forbidAvoided=true&withRaw=true"
},
"rawData": {
"ENTITY_PATHS": [
Expand Down
2 changes: 1 addition & 1 deletion docs/components/SzConfigurationAboutComponent.html
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ <h3 id="inputs">
<script src="../js/libs/deep-iterator.js"></script>
<script>
var COMPONENT_TEMPLATE = '<div><div class="sz-configuration-about"> <div class="header"> <div class="column">Property Name</div> <div class="column">Property Value</div> </div> <div *ngFor=" let propObj of this.apiProperties" class="row"> <div class="column cell">{{propObj[\'key\']}}</div> <div class="column cell">{{propObj[\'value\']}}</div> </div></div></div>'
var COMPONENTS = [{'name': 'SzConfigurationAboutComponent', 'selector': 'sz-configuration-about'},{'name': 'SzConfigurationComponent', 'selector': 'sz-configuration'},{'name': 'SzEntityDetailComponent', 'selector': 'sz-entity-detail'},{'name': 'SzPoweredByComponent', 'selector': 'sz-powered-by'},{'name': 'SzRelationshipNetworkComponent', 'selector': 'sz-relationship-network'},{'name': 'SzRelationshipNetworkInputComponent', 'selector': 'sz-relationship-network-input'},{'name': 'SzRelationshipNetworkLookupComponent', 'selector': 'sz-relationship-network-lookup'},{'name': 'SzRelationshipNetworkUploadComponent', 'selector': 'sz-relationship-network-upload'},{'name': 'SzRelationshipPathComponent', 'selector': 'sz-relationship-path'},{'name': 'SzSearchComponent', 'selector': 'sz-search'},{'name': 'SzSearchResultsComponent', 'selector': 'sz-search-results'}];
var COMPONENTS = [{'name': 'SzConfigurationAboutComponent', 'selector': 'sz-configuration-about'},{'name': 'SzConfigurationComponent', 'selector': 'sz-configuration'},{'name': 'SzEntityDetailComponent', 'selector': 'sz-entity-detail'},{'name': 'SzPoweredByComponent', 'selector': 'sz-powered-by'},{'name': 'SzSearchComponent', 'selector': 'sz-search'},{'name': 'SzSearchResultsComponent', 'selector': 'sz-search-results'}];
var DIRECTIVES = [];
var ACTUAL_COMPONENT = {'name': 'SzConfigurationAboutComponent'};
</script>
Expand Down
2 changes: 1 addition & 1 deletion docs/components/SzConfigurationComponent.html
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ <h3 id="accessors">
<script src="../js/libs/deep-iterator.js"></script>
<script>
var COMPONENT_TEMPLATE = '<div></div>'
var COMPONENTS = [{'name': 'SzConfigurationAboutComponent', 'selector': 'sz-configuration-about'},{'name': 'SzConfigurationComponent', 'selector': 'sz-configuration'},{'name': 'SzEntityDetailComponent', 'selector': 'sz-entity-detail'},{'name': 'SzPoweredByComponent', 'selector': 'sz-powered-by'},{'name': 'SzRelationshipNetworkComponent', 'selector': 'sz-relationship-network'},{'name': 'SzRelationshipNetworkInputComponent', 'selector': 'sz-relationship-network-input'},{'name': 'SzRelationshipNetworkLookupComponent', 'selector': 'sz-relationship-network-lookup'},{'name': 'SzRelationshipNetworkUploadComponent', 'selector': 'sz-relationship-network-upload'},{'name': 'SzRelationshipPathComponent', 'selector': 'sz-relationship-path'},{'name': 'SzSearchComponent', 'selector': 'sz-search'},{'name': 'SzSearchResultsComponent', 'selector': 'sz-search-results'}];
var COMPONENTS = [{'name': 'SzConfigurationAboutComponent', 'selector': 'sz-configuration-about'},{'name': 'SzConfigurationComponent', 'selector': 'sz-configuration'},{'name': 'SzEntityDetailComponent', 'selector': 'sz-entity-detail'},{'name': 'SzPoweredByComponent', 'selector': 'sz-powered-by'},{'name': 'SzSearchComponent', 'selector': 'sz-search'},{'name': 'SzSearchResultsComponent', 'selector': 'sz-search-results'}];
var DIRECTIVES = [];
var ACTUAL_COMPONENT = {'name': 'SzConfigurationComponent'};
</script>
Expand Down
89 changes: 78 additions & 11 deletions docs/components/SzEntityDetailComponent.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ <h6><b>Properties</b></h6>
<span class="modifier">Public</span>
<a href="#entity">entity</a>
</li>
<li>
<a href="#nativeElementRef">nativeElementRef</a>
</li>
</ul>
</td>
</tr>
Expand Down Expand Up @@ -222,6 +225,9 @@ <h6><b>Accessors</b></h6>
<tr>
<td class="col-md-4">
<ul class="index-list">
<li>
<a href="#nativeElement">nativeElement</a>
</li>
<li>
<a href="#entityData">entityData</a>
</li>
Expand Down Expand Up @@ -748,6 +754,50 @@ <h3 id="inputs">
</tr>


</tbody>
</table>
<table class="table table-sm table-bordered">
<tbody>
<tr>
<td class="col-md-4">
<a name="nativeElementRef"></a>
<span class="name">
<b>
nativeElementRef
</b>
<a href="#nativeElementRef"><span class="icon ion-ios-link"></span></a>
</span>
</td>
</tr>
<tr>
<td class="col-md-4">
<code>nativeElementRef: <code><a href="https://angular.io/api/core/ElementRef" target="_blank" >ElementRef</a></code>
</code>
</td>
</tr>
<tr>
<td class="col-md-4">
<i>Type : </i> <code><a href="https://angular.io/api/core/ElementRef" target="_blank" >ElementRef</a></code>

</td>
</tr>
<tr>
<td class="col-md-4">
<b>Decorators : </b>
<br />
<code>
@ViewChild(&#x27;nativeElementRef&#x27;)<br />
</code>
</td>
</tr>

<tr>
<td class="col-md-4">
<div class="io-description"><p>used for print and pdf support, allows fetching DOM HTMLElement </p>
</div>
</td>
</tr>

</tbody>
</table>
</section>
Expand All @@ -756,6 +806,23 @@ <h3 id="inputs">
<h3 id="accessors">
Accessors
</h3>
<table class="table table-sm table-bordered">
<tbody>
<tr>
<td class="col-md-4">
<a name="nativeElement"></a>
<span class="name"><b>nativeElement</b><a href="#nativeElement"><span class="icon ion-ios-link"></span></a></span>
</td>
</tr>

<tr>
<td class="col-md-4">
<span class="accessor"><b>get</b><code>nativeElement()</code></span>
</td>
</tr>

</tbody>
</table>
<table class="table table-sm table-bordered">
<tbody>
<tr>
Expand Down Expand Up @@ -1144,17 +1211,17 @@ <h3 id="accessors">
<div class="tab-pane fade " id="c-templateData">
<pre class="line-numbers"><code class="language-html">
&lt;!-- @senzing/sdk/entity/detail/sz-entity-detail --&gt;
&lt;div&gt;
&lt;div #nativeElementRef&gt;
&lt;sz-entity-detail-header
[entity]&#x3D;&quot;entity&quot;&gt;
&lt;/sz-entity-detail-header&gt;

&lt;sz-entity-detail-graph
&lt;sz-entity-detail-graph data-html2canvas-ignore
*ngIf&#x3D;&quot;graphData &amp;&amp; this._showGraphSection&quot;
[data]&#x3D;&quot;graphData&quot;
&gt;&lt;/sz-entity-detail-graph&gt;

&lt;sz-entity-details-section
&lt;sz-entity-details-section class&#x3D;&quot;details-section datasources&quot;
*ngIf&#x3D;&quot;entity?.resolvedEntity?.records?.length&quot;
[sectionData]&#x3D;&quot;entity?.resolvedEntity?.records&quot;
[sectionTitle]&#x3D;&quot;&#x27;Matched Records&#x27;&quot;
Expand All @@ -1163,23 +1230,23 @@ <h3 id="accessors">
(entityRecordClick)&#x3D;&quot;onEntityRecordClick($event)&quot;&gt;
&lt;/sz-entity-details-section&gt;

&lt;sz-entity-details-section
*ngIf&#x3D;&quot;this.possibleMatches?.length&quot;
[sectionData]&#x3D;&quot;this.possibleMatches&quot;
&lt;sz-entity-details-section class&#x3D;&quot;details-section possible&quot;
*ngIf&#x3D;&quot;this._possibleMatches?.length&quot;
[sectionData]&#x3D;&quot;this._possibleMatches&quot;
[sectionTitle]&#x3D;&quot;&#x27;Possible Matches&#x27;&quot;
sectionId&#x3D;&quot;detail-section-2&quot;
[sectionCount]&#x3D;&quot;this.possibleMatches?.length&quot;
[sectionCount]&#x3D;&quot;this._possibleMatches?.length&quot;
(entityRecordClick)&#x3D;&quot;onEntityRecordClick($event)&quot;&gt;
&lt;/sz-entity-details-section&gt;
&lt;sz-entity-details-section
&lt;sz-entity-details-section class&#x3D;&quot;details-section discovered&quot;
*ngIf&#x3D;&quot;this._discoveredRelationships?.length&quot;
[sectionData]&#x3D;&quot;this._discoveredRelationships&quot;
[sectionTitle]&#x3D;&quot;&#x27;Possible Relationships&#x27;&quot;
sectionId&#x3D;&quot;detail-section-3&quot;
[sectionCount]&#x3D;&quot;this._discoveredRelationships?.length&quot;
(entityRecordClick)&#x3D;&quot;onEntityRecordClick($event)&quot;&gt;
&lt;/sz-entity-details-section&gt;
&lt;sz-entity-details-section
&lt;sz-entity-details-section class&#x3D;&quot;details-section disclosed&quot;
*ngIf&#x3D;&quot;this._disclosedRelationships?.length&quot;
[sectionData]&#x3D;&quot;this._disclosedRelationships&quot;
[sectionTitle]&#x3D;&quot;&#x27;Disclosed Relationships&#x27;&quot;
Expand Down Expand Up @@ -1215,8 +1282,8 @@ <h3 id="accessors">
<script src="../js/libs/htmlparser.js"></script>
<script src="../js/libs/deep-iterator.js"></script>
<script>
var COMPONENT_TEMPLATE = '<div><!-- @senzing/sdk/entity/detail/sz-entity-detail --><div> <sz-entity-detail-header [entity]="entity"> </sz-entity-detail-header> <sz-entity-detail-graph *ngIf="graphData && this._showGraphSection" [data]="graphData" ></sz-entity-detail-graph> <sz-entity-details-section *ngIf="entity?.resolvedEntity?.records?.length" [sectionData]="entity?.resolvedEntity?.records" [sectionTitle]="\'Matched Records\'" sectionId="detail-section-1" [sectionCount]="entity?.resolvedEntity?.records?.length" (entityRecordClick)="onEntityRecordClick($event)"> </sz-entity-details-section> <sz-entity-details-section *ngIf="this.possibleMatches?.length" [sectionData]="this.possibleMatches" [sectionTitle]="\'Possible Matches\'" sectionId="detail-section-2" [sectionCount]="this.possibleMatches?.length" (entityRecordClick)="onEntityRecordClick($event)"> </sz-entity-details-section> <sz-entity-details-section *ngIf="this._discoveredRelationships?.length" [sectionData]="this._discoveredRelationships" [sectionTitle]="\'Possible Relationships\'" sectionId="detail-section-3" [sectionCount]="this._discoveredRelationships?.length" (entityRecordClick)="onEntityRecordClick($event)"> </sz-entity-details-section> <sz-entity-details-section *ngIf="this._disclosedRelationships?.length" [sectionData]="this._disclosedRelationships" [sectionTitle]="\'Disclosed Relationships\'" sectionId="detail-section-4" [sectionCount]="this._disclosedRelationships?.length" (entityRecordClick)="onEntityRecordClick($event)"> </sz-entity-details-section></div></div>'
var COMPONENTS = [{'name': 'SzConfigurationAboutComponent', 'selector': 'sz-configuration-about'},{'name': 'SzConfigurationComponent', 'selector': 'sz-configuration'},{'name': 'SzEntityDetailComponent', 'selector': 'sz-entity-detail'},{'name': 'SzPoweredByComponent', 'selector': 'sz-powered-by'},{'name': 'SzRelationshipNetworkComponent', 'selector': 'sz-relationship-network'},{'name': 'SzRelationshipNetworkInputComponent', 'selector': 'sz-relationship-network-input'},{'name': 'SzRelationshipNetworkLookupComponent', 'selector': 'sz-relationship-network-lookup'},{'name': 'SzRelationshipNetworkUploadComponent', 'selector': 'sz-relationship-network-upload'},{'name': 'SzRelationshipPathComponent', 'selector': 'sz-relationship-path'},{'name': 'SzSearchComponent', 'selector': 'sz-search'},{'name': 'SzSearchResultsComponent', 'selector': 'sz-search-results'}];
var COMPONENT_TEMPLATE = '<div><!-- @senzing/sdk/entity/detail/sz-entity-detail --><div #nativeElementRef> <sz-entity-detail-header [entity]="entity"> </sz-entity-detail-header> <sz-entity-detail-graph data-html2canvas-ignore *ngIf="graphData && this._showGraphSection" [data]="graphData" ></sz-entity-detail-graph> <sz-entity-details-section class="details-section datasources" *ngIf="entity?.resolvedEntity?.records?.length" [sectionData]="entity?.resolvedEntity?.records" [sectionTitle]="\'Matched Records\'" sectionId="detail-section-1" [sectionCount]="entity?.resolvedEntity?.records?.length" (entityRecordClick)="onEntityRecordClick($event)"> </sz-entity-details-section> <sz-entity-details-section class="details-section possible" *ngIf="this._possibleMatches?.length" [sectionData]="this._possibleMatches" [sectionTitle]="\'Possible Matches\'" sectionId="detail-section-2" [sectionCount]="this._possibleMatches?.length" (entityRecordClick)="onEntityRecordClick($event)"> </sz-entity-details-section> <sz-entity-details-section class="details-section discovered" *ngIf="this._discoveredRelationships?.length" [sectionData]="this._discoveredRelationships" [sectionTitle]="\'Possible Relationships\'" sectionId="detail-section-3" [sectionCount]="this._discoveredRelationships?.length" (entityRecordClick)="onEntityRecordClick($event)"> </sz-entity-details-section> <sz-entity-details-section class="details-section disclosed" *ngIf="this._disclosedRelationships?.length" [sectionData]="this._disclosedRelationships" [sectionTitle]="\'Disclosed Relationships\'" sectionId="detail-section-4" [sectionCount]="this._disclosedRelationships?.length" (entityRecordClick)="onEntityRecordClick($event)"> </sz-entity-details-section></div></div>'
var COMPONENTS = [{'name': 'SzConfigurationAboutComponent', 'selector': 'sz-configuration-about'},{'name': 'SzConfigurationComponent', 'selector': 'sz-configuration'},{'name': 'SzEntityDetailComponent', 'selector': 'sz-entity-detail'},{'name': 'SzPoweredByComponent', 'selector': 'sz-powered-by'},{'name': 'SzSearchComponent', 'selector': 'sz-search'},{'name': 'SzSearchResultsComponent', 'selector': 'sz-search-results'}];
var DIRECTIVES = [];
var ACTUAL_COMPONENT = {'name': 'SzEntityDetailComponent'};
</script>
Expand Down
Loading

0 comments on commit b471ac4

Please sign in to comment.