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

Node dist vis integration #798

Open
wants to merge 3 commits into
base: cde-mvp2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/cde-ui/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"projectType": "application",
"prefix": "cde",
"sourceRoot": "apps/cde-ui/src",
"tags": ["app", "cde"],
"tags": ["type:app", "project:cde"],
"targets": {
"build": {
"executor": "@nx/angular:application",
Expand Down
6 changes: 3 additions & 3 deletions apps/cde-ui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"include": [],
"references": [
{
"path": "./tsconfig.app.json"
"path": "./tsconfig.editor.json"
},
{
"path": "./tsconfig.spec.json"
"path": "./tsconfig.app.json"
},
{
"path": "./tsconfig.editor.json"
"path": "./tsconfig.spec.json"
}
],
"extends": "../../tsconfig.base.json",
Expand Down
3 changes: 2 additions & 1 deletion libs/cde-visualization/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"@angular/platform-browser": "18.2.1",
"@angular/cdk": "18.2.1",
"@angular/material": "18.2.1",
"@hra-ui/common": "0.0.1"
"@hra-ui/common": "0.0.1",
"@hra-ui/node-dist-vis": "0.0.1"
},
"dependencies": {},
"sideEffects": [
Expand Down
16 changes: 3 additions & 13 deletions libs/cde-visualization/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,10 @@
"tags": ["type:lib", "project:cde", "webcomponent"],
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
"outputs": ["{options.outputPath}"],
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"options": {
"outputPath": "dist/libs/cde-visualization",
"index": "libs/cde-visualization/src/index.html",
"main": "libs/cde-visualization/src/index.ts",
"polyfills": ["zone.js"],
"tsConfig": "libs/cde-visualization/tsconfig.app.json",
"inlineStyleLanguage": "scss",
"styles": ["libs/cde-visualization/src/styles.scss"],
"stylePreprocessorOptions": {
"includePaths": ["node_modules/", "libs/design-system/styles"]
},
"scripts": []
"project": "libs/cde-visualization/ng-package.json"
},
"configurations": {
"production": {
Expand Down
5 changes: 1 addition & 4 deletions libs/cde-visualization/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,11 @@ export * from './lib/shared/tooltip-position';
export * from './lib/services/data/color-map-loader.service';

/** Type for CdeVisualizationElement instance */
export type CdeVisualizationElement = InstanceType<CdeVisualizationElementConstructor>;
export type CdeVisualizationElement = InstanceType<Awaited<typeof CdeVisualizationElement>>;

/** Input properties for CdeVisualizationComponent */
export type CdeVisualizationElementProps = InputProps<CdeVisualizationComponent>;

/** Constructor type for CdeVisualizationElement */
export type CdeVisualizationElementConstructor = Awaited<typeof CdeVisualizationElement>;

/** Custom element definition for CdeVisualizationComponent */
export const CdeVisualizationElement = createCustomElement('cde-visualization', CdeVisualizationComponent, {
providers: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
</div>

<div class="metadata">
<cde-metadata [metadata]="mergedMetadata()"></cde-metadata>
<cde-metadata [metadata]="metadataView()"></cde-metadata>
<cde-cell-types
[(cellTypes)]="cellTypes"
[(cellTypesSelection)]="cellTypesSelection"
[selectedCellType]="selectedNodeTargetValue()"
[selectedCellType]="nodeTargetSelector()"
(downloadColorMap)="downloadColorMap()"
(downloadNodes)="downloadNodes()"
(downloadEdges)="downloadEdges()"
Expand All @@ -25,20 +25,16 @@
<div class="visualizations">
<div class="top">
<cde-node-dist-visualization
[nodes]="loadedNodes()"
[nodeTargetKey]="nodeTypeKey()"
[nodeTargetValue]="selectedNodeTargetValue()"
[edges]="loadedEdges()"
[nodes]="nodesView()"
[edges]="edgesView()"
[maxEdgeDistance]="maxEdgeDistance()"
[colorMap]="cellTypesAsColorMap()"
[colorMapKey]="colorMapTypeKey()"
[colorMapValueKey]="colorMapValueKey()"
[cellTypesSelection]="cellTypesSelection()"
(nodeClick)="nodeClick.emit($event)"
(nodeHover)="nodeHover.emit($event)"
(edgesChange)="edges.set($event)"
#visualization
></cde-node-dist-visualization>
<!-- (edgesChange)="edges.set($event)" -->

<cde-violin [colors]="filteredColors()" [data]="filteredDistances()" #violin></cde-violin>
</div>
Expand All @@ -47,7 +43,7 @@
[colors]="filteredColors()"
[data]="filteredDistances()"
[filteredCellTypes]="filteredCellTypes()"
[selectedCellType]="selectedNodeTargetValue()"
[selectedCellType]="nodeTargetSelector()"
(updateColor)="updateColor($event.entry, $event.color)"
#histogram
></cde-histogram>
Expand Down
Loading
Loading