diff --git a/404.html b/404.html index 09efd4fac..87b19241f 100644 --- a/404.html +++ b/404.html @@ -6,8 +6,8 @@ - - + + diff --git a/docs/ccf-eui/components/AppComponent.html b/docs/ccf-eui/components/AppComponent.html index 27ca922e9..917e6a593 100644 --- a/docs/ccf-eui/components/AppComponent.html +++ b/docs/ccf-eui/components/AppComponent.html @@ -357,7 +357,7 @@

Constructor

-
Defined in projects/ccf-eui/src/app/app.component.ts:145
+
Defined in projects/ccf-eui/src/app/app.component.ts:143
@@ -585,8 +585,8 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:336
+
Defined in projects/ccf-eui/src/app/app.component.ts:334
@@ -624,8 +624,8 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:295
+
Defined in projects/ccf-eui/src/app/app.component.ts:293
@@ -694,8 +694,8 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:348
+
Defined in projects/ccf-eui/src/app/app.component.ts:346
@@ -761,8 +761,8 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:194
+
Defined in projects/ccf-eui/src/app/app.component.ts:192
@@ -798,8 +798,8 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:261
+
Defined in projects/ccf-eui/src/app/app.component.ts:259
@@ -887,8 +887,8 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:321
+
Defined in projects/ccf-eui/src/app/app.component.ts:319
@@ -961,8 +961,8 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:228
+
Defined in projects/ccf-eui/src/app/app.component.ts:226
@@ -1067,8 +1067,8 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:241
+
Defined in projects/ccf-eui/src/app/app.component.ts:239
@@ -1104,8 +1104,8 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:251
+
Defined in projects/ccf-eui/src/app/app.component.ts:249
@@ -1143,8 +1143,8 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:352
+
Defined in projects/ccf-eui/src/app/app.component.ts:350
@@ -1317,7 +1317,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:135
+
Defined in projects/ccf-eui/src/app/app.component.ts:133
@@ -1411,7 +1411,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:134
+
Defined in projects/ccf-eui/src/app/app.component.ts:132
@@ -1474,7 +1474,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:144
+
Defined in projects/ccf-eui/src/app/app.component.ts:142
@@ -1500,7 +1500,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:140
+
Defined in projects/ccf-eui/src/app/app.component.ts:138
@@ -1526,7 +1526,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:141
+
Defined in projects/ccf-eui/src/app/app.component.ts:139
@@ -1552,7 +1552,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:130
+
Defined in projects/ccf-eui/src/app/app.component.ts:128
@@ -1578,7 +1578,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:143
+
Defined in projects/ccf-eui/src/app/app.component.ts:141
@@ -1604,7 +1604,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:142
+
Defined in projects/ccf-eui/src/app/app.component.ts:140
@@ -1700,7 +1700,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:133
+
Defined in projects/ccf-eui/src/app/app.component.ts:131
@@ -1867,7 +1867,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:145
+
Defined in projects/ccf-eui/src/app/app.component.ts:143
@@ -1986,9 +1986,7 @@

- Default value : this.data.queryStatus$.pipe( - map(state => state === DataQueryState.Running) - ) + Default value : this.data.state$.pipe(map((state) => state?.status !== 'Ready')) @@ -2025,7 +2023,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:137
+
Defined in projects/ccf-eui/src/app/app.component.ts:135
@@ -2051,7 +2049,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:138
+
Defined in projects/ccf-eui/src/app/app.component.ts:136
@@ -2224,7 +2222,7 @@

-
Defined in projects/ccf-eui/src/app/app.component.ts:343
+
Defined in projects/ccf-eui/src/app/app.component.ts:341
@@ -2271,7 +2269,7 @@

import { ThemingService } from './core/services/theming/theming.service'; import { actionAsFn } from './core/store/action-as-fn'; import { DataStateSelectors } from './core/store/data/data.selectors'; -import { DataQueryState, DataState } from './core/store/data/data.state'; +import { DataState } from './core/store/data/data.state'; import { ListResultsState } from './core/store/list-results/list-results.state'; import { SceneState } from './core/store/scene/scene.state'; import { @@ -2371,9 +2369,7 @@

} /** Emits true whenever the overlay spinner should activate. */ - readonly spinnerActive$ = this.data.queryStatus$.pipe( - map(state => state === DataQueryState.Running) - ); + readonly spinnerActive$ = this.data.state$.pipe(map((state) => state?.status !== 'Ready')); readonly loadingMessage$ = this.data.state$.pipe(map(x => x?.statusMessage)); diff --git a/docs/ccf-eui/components/OntologyTreeComponent.html b/docs/ccf-eui/components/OntologyTreeComponent.html index c94c39b06..87ce5850f 100644 --- a/docs/ccf-eui/components/OntologyTreeComponent.html +++ b/docs/ccf-eui/components/OntologyTreeComponent.html @@ -189,9 +189,6 @@

Properties
Readonly flattener -
  • - highlightedNode -
  • Readonly indent @@ -220,9 +217,6 @@
    Methods
  • getCountLabel
    • -
  • - getLeftIndent -
  • getNodeLabel
    • @@ -235,12 +229,6 @@
    Methods
  • isSelected
    • -
  • - mouseOut -
    • -
  • - mouseOver -
  • ngOnChanges
    • @@ -250,9 +238,6 @@
    Methods
  • onScroll
    • -
  • - resetNode -
  • select
    • @@ -262,12 +247,6 @@
    Methods
  • toggleSelection
    • -
  • - toggleVisibility -
    • -
  • - updateOpacity -
    • @@ -821,8 +800,8 @@

    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:260
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:256
    @@ -930,8 +909,8 @@

    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:311
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:307
    @@ -985,81 +964,6 @@

    - - - - - - - - - - - - - - - - - - - -
    - - - getLeftIndent - - -
    -getLeftIndent(level: number) -
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:433
    -
    -

    Used to properly set the position of the slider popup on the ontology tree

    -
    - -
    - Parameters : - - - - - - - - - - - - - - - - - - - - - -
    NameTypeOptionalDescription
    level - number - - No - -

    Current level of a node in the ontology tree

    - -
    -
    -
    - Returns : string - -
    -
    -

    left indent value

    - -
    -
    @@ -1080,8 +984,8 @@

    @@ -1155,8 +1059,8 @@

    @@ -1258,8 +1162,8 @@

    @@ -1325,8 +1229,8 @@

    @@ -1381,114 +1285,6 @@

    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:320
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:316
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:302
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:298
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:451
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:386
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:330
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:326
    - - - - - - - - - - - - - - - - - - - -
    - - - mouseOut - - -
    -mouseOut() -
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:388
    -
    -

    Deselects the highlighted node on mouse out

    -
    - -
    - Returns : void - -
    -
    - - - - - - - - - - - - - - - - - - - -
    - - - mouseOver - - -
    -mouseOver(node: FlatNode) -
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:381
    -
    -

    Sets the current highlighted node to the moused over node (reveals opacity slider)

    -
    - -
    - Parameters : - - - - - - - - - - - - - - - - - - - -
    NameTypeOptional
    node - FlatNode - - No -
    -
    -
    - Returns : void - -
    -
    - -
    -
    @@ -1509,8 +1305,8 @@

    @@ -1576,8 +1372,8 @@

    @@ -1615,8 +1411,8 @@

    @@ -1669,80 +1465,6 @@

    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:223
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:219
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:217
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:213
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:442
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:377
    - - - - - - - - - - - - - - - - - - - -
    - - - resetNode - - -
    -resetNode(node: FlatNode) -
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:409
    -
    -

    Resets node to default opacity and visibility

    -
    - -
    - Parameters : - - - - - - - - - - - - - - - - - - - - - -
    NameTypeOptionalDescription
    node - FlatNode - - No - -

    The node to be reset

    - -
    -
    -
    - Returns : void - -
    -
    - -
    -
    @@ -1763,8 +1485,8 @@

    @@ -1881,8 +1603,8 @@

    @@ -1948,8 +1670,8 @@

    @@ -1995,170 +1717,6 @@

    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:341
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:337
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:239
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:235
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:455
    +
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:390
    - - - - - - - - - - - - - - - - - - - -
    - - - toggleVisibility - - -
    -toggleVisibility(node: FlatNode) -
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:421
    -
    -

    Toggles visibility of a node

    -
    - -
    - Parameters : - - - - - - - - - - - - - - - - - - - - - -
    NameTypeOptionalDescription
    node - FlatNode - - No - -

    The node to be toggled

    - -
    -
    -
    - Returns : void - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - -
    - - - updateOpacity - - -
    -updateOpacity(node: FlatNode, value: number | undefined) -
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:398
    -
    -

    Sets the opacity of a node

    -
    - -
    - Parameters : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    NameTypeOptionalDescription
    node - FlatNode - - No - -

    The node to be updated

    - -
    value - number | undefined - - No - -

    Opacity value

    - -
    -
    -
    - Returns : void - -
    -
    - -
    -
    @@ -2461,32 +2019,6 @@

    - - - - - - - - - - - - - - -
    - - - highlightedNode - - -
    - Type : FlatNode | undefined - -
    -
    Defined in projects/ccf-eui/src/app/modules/ontology-exploration/ontology-tree/ontology-tree.component.ts:210
    -
    @@ -3101,10 +2633,6 @@

    */ selectedNodes: FlatNode[] = []; - highlightedNode: FlatNode | undefined; - - - /** * Expand the body node when the component is initialized. */ @@ -3267,67 +2795,6 @@

    } } - /** - * Sets the current highlighted node to the moused over node (reveals opacity slider) - * - * @param node - */ - mouseOver(node: FlatNode): void { - this.highlightedNode = node; - } - - /** - * Deselects the highlighted node on mouse out - */ - mouseOut(): void { - this.highlightedNode = undefined; - } - - /** - * Sets the opacity of a node - * - * @param node The node to be updated - * @param value Opacity value - */ - updateOpacity(node: FlatNode, value: number | undefined): void { - node.opacity = value; - this.ga.event('opacity_update', 'ontology_tree', node.label, value); - this.nodeChanged.emit(node); - } - - /** - * Resets node to default opacity and visibility - * - * @param node The node to be reset - */ - resetNode(node: FlatNode): void { - node.opacity = 20; - node.visible = true; - this.ga.event('node_reset', 'ontology_tree', node.label); - this.nodeChanged.emit(node); - } - - /** - * Toggles visibility of a node - * - * @param node The node to be toggled - */ - toggleVisibility(node: FlatNode): void { - node.visible = node.visible === true ? false : true; - this.ga.event('visibility_update', 'ontology_tree', node.label, +node.visible); - this.nodeChanged.emit(node); - } - - /** - * Used to properly set the position of the slider popup on the ontology tree - * - * @param level Current level of a node in the ontology tree - * @returns left indent value - */ - getLeftIndent(level: number): string { - return `${level * -1.5}rem`; - } - /** * Handles the scroll event to detect when scroll is at the bottom. * @@ -3361,7 +2828,7 @@

    <!-- Templates with common structures for inner and leaf nodes --> <ng-template #selectableRegion let-node="node"> - <div class="text" [class.hidden]="node.label === highlightedNode?.label" + <div class="text" [class.filtered-out]="!occurenceData[node.original.id] && !!termData[node.original.id]" [class.unavailable]="!termData[node.original.id]" [class.selected]="isSelected(node)" (click)="select($event.ctrlKey, node, true, !isSelected(node))">{{ getNodeLabel(node.label) }}</div> @@ -3369,20 +2836,7 @@

    <!-- Leaf node template --> <mat-tree-node *matTreeNodeDef="let node" class="node leaf-node block" matTreeNodePadding - [matTreeNodePaddingIndent]="indent" (mouseleave)="mouseOut(); slider1.reset()"> - - <div [style.display]="node.opacity !== -1 ? 'none' : 'block'"> - <mat-icon class="icon opacity" [style.left]="getLeftIndent(node.level)" [class.fade]="node.visible !== true" - (mouseenter)="mouseOver(node)" svgIcon="app:opacity"></mat-icon> - <div class="slider" [style.left]="getLeftIndent(node.level)" - [class.hidden]="node.label !== highlightedNode?.label"> - <ccf-opacity-slider #slider1 [visible]="node.visible" [opacity]="node.opacity" - (opacityChange)="updateOpacity(node, $event)" (opacityReset)="resetNode(node)" - (visibilityToggle)="toggleVisibility(node)"> - </ccf-opacity-slider> - </div> - </div> - + [matTreeNodePaddingIndent]="indent"> <!-- Disabled button used to add equal amount of space as an inner node's button --> <div class="non-expandable"></div> <div class="node-container"> @@ -3398,21 +2852,9 @@

    <!-- Inner node template --> <mat-tree-node *matTreeNodeDef="let node; when: isInnerNode" class="node inner-node block" matTreeNodePadding - [matTreeNodePaddingIndent]="indent" (mouseleave)="mouseOut(); slider2.reset()"> - - <div [style.display]="node.opacity !== -1 ? 'none' : 'block'"> - <mat-icon class="icon opacity" [style.left]="getLeftIndent(node.level)" [class.fade]="node.visible !== true" - (mouseenter)="mouseOver(node)" svgIcon="app:opacity"></mat-icon> - <div class="slider" [style.left]="getLeftIndent(node.level)" - [class.hidden]="node.label !== highlightedNode?.label"> - <ccf-opacity-slider #slider2 [visible]="node.visible" [opacity]="node.opacity" - (opacityChange)="updateOpacity(node, $event)" (opacityReset)="resetNode(node)" - (visibilityToggle)="toggleVisibility(node)"> - </ccf-opacity-slider> - </div> - </div> + [matTreeNodePaddingIndent]="indent"> <div class="node-container"> - <button class="toggle" [class.hidden]="node.label === highlightedNode?.label" mat-icon-button matTreeNodeToggle + <button class="toggle" mat-icon-button matTreeNodeToggle attr.aria-label="Toggle {{ node.label }}"> <mat-icon class="icon font-icon"> {{ control.isExpanded(node) ? 'expand_less' : 'expand_more' }} @@ -3610,7 +3052,7 @@