stepping though find scrolls to activity geneontology/noctua-annotati…

…on-review#30
geneontology · Dec 8, 2020 · 042220f · 042220f
1 parent 5b70950
commit 042220f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/src/@noctua.form/models/annoton/annoton.ts b/src/@noctua.form/models/annoton/annoton.ts
@@ -73,7 +73,7 @@ export class Annoton extends SaeGraph<AnnotonNode> {
 
   set id(id: string) {
     this._id = id;
-    this.displayId = NoctuaFormUtils.cleanID(id);
+    this.displayId = NoctuaFormUtils.cleanID(id) + 'annoton';
   }
 
   get annotonConnections() {

diff --git a/src/@noctua.form/models/annoton/cam.ts b/src/@noctua.form/models/annoton/cam.ts
@@ -222,6 +222,8 @@ export class Cam {
 
             if (node.term.uuid === term.uuid) {
               node.term.highlight = true;
+              node.term.annotonDisplayId = term.annotonDisplayId = annoton.displayId;
+
               self.matchedCount += 1;
               match = true;
             }

diff --git a/src/@noctua.form/models/annoton/entity.ts b/src/@noctua.form/models/annoton/entity.ts
@@ -7,24 +7,21 @@ export interface EntityBase {
 
 export class Entity implements EntityBase {
 
-  id: string;
-  label: string;
-  url: string;
-  modelId: string;
   classExpression: any;
   highlight: boolean;
   modified: boolean;
   termHistory: Entity[] = [];
   displayId: string;
+  annotonDisplayId: string;
 
   private _uuid: string;
 
-  constructor(_id: string, _label: string, _url?: string, _uuid?: string, _modelId?: string) {
-    this.id = _id;
-    this.label = _label;
-    this.url = _url;
-    this.uuid = _uuid;
-    this.modelId = _modelId;
+  constructor(public id: string,
+    public label: string,
+    public url?: string,
+    uuid?: string,
+    public modelId?: string) {
+    this.uuid = uuid;
   }
 
   static createEntity(value: Partial<EntityBase>) {

diff --git a/src/@noctua.search/services/noctua-review-search.service.ts b/src/@noctua.search/services/noctua-review-search.service.ts
@@ -120,13 +120,6 @@ export class NoctuaReviewSearchService {
         }
     }
 
-    scroll(id) {
-        const el = document.getElementById(id);
-        if (el) {
-            el.scrollIntoView();
-        }
-    }
-
     search(searchCriteria) {
         this.searchCriteria = new SearchCriteria();
 
@@ -151,7 +144,7 @@ export class NoctuaReviewSearchService {
         this.camsService.selectedNodeUuid = this.currentMatchedEnity.uuid;
         this.camsService.selectedCamUuid = this.currentMatchedEnity.modelId;
 
-        this.noctuaSearchMenuService.scrollTo('#' + this.currentMatchedEnity.displayId);
+        this.noctuaSearchMenuService.scrollTo('#' + this.currentMatchedEnity.annotonDisplayId);
 
         return this.currentMatchedEnity;
     }
@@ -169,7 +162,7 @@ export class NoctuaReviewSearchService {
         this.camsService.selectedNodeUuid = this.currentMatchedEnity.uuid;
         this.camsService.selectedCamUuid = this.currentMatchedEnity.modelId;
 
-        this.noctuaSearchMenuService.scrollTo('#' + this.currentMatchedEnity.displayId);
+        this.noctuaSearchMenuService.scrollTo('#' + this.currentMatchedEnity.annotonDisplayId);
         return this.currentMatchedEnity;
     }
 

diff --git a/src/app/main/apps/noctua-form/cam/cam-table/cam-table.component.html b/src/app/main/apps/noctua-form/cam/cam-table/cam-table.component.html
@@ -41,7 +41,7 @@ <h3>
           {{cam?.loading.message}}
         </h3>
       </div>
-      <div *ngFor="let annoton of cam.annotons" class="w-100-p"
+      <div *ngFor="let annoton of cam.annotons" [attr.id]="annoton.displayId" class="w-100-p"
         [ngClass]="{'noc-annoton-selected': annoton.id=== camService.annoton?.id}">
         <div class="noc-annoton-table-heading" fxLayout="row" fxLayoutAlign="start center">
           <div fxFlex="25px" (click)="$event.stopPropagation()">