fix after replace and replace all logistics geneontology/noctua-annot…

…ation-review#30
geneontology · Jan 14, 2021 · a2da659 · a2da659
1 parent b165ea7
commit a2da659
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 62 deletions.
diff --git a/src/@noctua.form/models/annoton/annoton-node.ts b/src/@noctua.form/models/annoton/annoton-node.ts
@@ -95,6 +95,9 @@ export class AnnotonNode implements AnnotonNodeDisplay {
 
   private _id: string;
 
+  //For Save 
+  pendingChangeEntity: Entity;
+
   constructor(annotonNode?: Partial<AnnotonNodeDisplay>) {
     if (annotonNode) {
       this.overrideValues(annotonNode);

diff --git a/src/@noctua.form/models/annoton/cam.ts b/src/@noctua.form/models/annoton/cam.ts
@@ -282,18 +282,16 @@ export class Cam {
     }
   }
 
-  replace(findEntities: Entity[], replaceWith: Entity) {
+  addPendingChanges(findEntities: Entity[], replaceWith: Entity) {
     const self = this;
 
     each(self._annotons, (annoton: Annoton) => {
       each(annoton.nodes, (node: AnnotonNode) => {
         // node.term.highlight = false;
         each(findEntities, (entity: Entity) => {
           if (node.term.uuid === entity.uuid) {
-            node.term.termHistory.push(new Entity(node.term.id, node.term.label));
-            node.term.modified = true;
-            node.term.id = replaceWith.id;
-            node.term.label = replaceWith.label;
+            node.pendingChangeEntity = new Entity(replaceWith.id, replaceWith.label);
+            node.pendingChangeEntity.uuid = node.term.uuid;
           }
         });
       });

diff --git a/src/@noctua.form/services/cam.service.ts b/src/@noctua.form/services/cam.service.ts
@@ -161,12 +161,6 @@ export class CamService {
     return result;
   }
 
-  diffModel(cam: Cam) {
-    const self = this;
-
-    return self._noctuaGraphService.diffModel(cam);
-  }
-
   resetModel(cam: Cam) {
     const self = this;
 

diff --git a/src/@noctua.form/services/cams.service.ts b/src/@noctua.form/services/cams.service.ts
@@ -128,7 +128,7 @@ export class CamsService {
     return this.httpClient
       .get(url)
       .pipe(
-        map(res => this.populateStoredModel(cam, res)),
+        map(res => self.populateStoredModel(cam, res)),
         finalize(() => {
         })
       );
@@ -183,7 +183,7 @@ export class CamsService {
     each(groupedEntities, (values: Entity[], key) => {
       const cam: Cam = find(this.cams, { id: key });
       if (cam) {
-        cam.replace(entities, replaceWithTerm);
+        cam.addPendingChanges(entities, replaceWithTerm);
         cams.push(cam)
       }
     });

diff --git a/src/@noctua.form/services/graph.service.ts b/src/@noctua.form/services/graph.service.ts
@@ -536,16 +536,6 @@ export class NoctuaGraphService {
     return connectorAnnotons;
   }
 
-  graphToAnnotonDFSError(annoton, annotonNode) {
-    const self = this;
-    const edge = annoton.getEdges(annotonNode.id);
-
-    each(edge.nodes, function (node) {
-      node.object.status = 2;
-      self.graphToAnnotonDFSError(annoton, node.object);
-    });
-  }
-
   evidenceUseGroups(reqs, evidence: Evidence) {
     const self = this;
     const assignedBy = evidence.assignedBy;
@@ -575,16 +565,6 @@ export class NoctuaGraphService {
     return cam.manager.request_with(reqs);
   }
 
-  diffModel(cam: Cam) {
-    const self = this;
-    const reqs = new minerva_requests.request_set(self.noctuaUserService.baristaToken, cam.id);
-    const req = new minerva_requests.request('model', 'diff');
-    req.model(cam.id);
-    reqs.add(req, 'query');
-
-    return cam.artManager.request_with(reqs);
-  }
-
   storeModel(cam: Cam) {
     const self = this;
     const reqs = new minerva_requests.request_set(self.noctuaUserService.baristaToken, cam.id);
@@ -597,16 +577,6 @@ export class NoctuaGraphService {
     return cam.manager.request_with(reqs);
   }
 
-  storedModel(cam: Cam) {
-    const self = this;
-    const reqs = new minerva_requests.request_set(self.noctuaUserService.baristaToken, cam.id);
-    const req = new minerva_requests.request('model', 'get-stored-model');
-    req.model(cam.id);
-    reqs.add(req, 'query');
-
-    return cam.artManager.request_with(reqs);
-  }
-
   saveCamAnnotations(cam: Cam, annotations) {
     const self = this;
 
@@ -935,16 +905,16 @@ export class NoctuaGraphService {
   }
 
   bulkEditIndividual(reqs, cam: Cam, node: AnnotonNode) {
-    if (node.hasValue() && node.term.modified) {
+    if (node.hasValue() && node.pendingChangeEntity) {
       reqs.remove_type_from_individual(
         node.classExpression,
         node.uuid,
         cam.id,
       );
 
       reqs.add_type_to_individual(
-        class_expression.cls(node.getTerm().id),
-        node.uuid,
+        class_expression.cls(node.pendingChangeEntity.id),
+        node.pendingChangeEntity.uuid,
         cam.id,
       );
     }

diff --git a/src/@noctua.search/services/noctua-search.service.ts b/src/@noctua.search/services/noctua-search.service.ts
@@ -23,6 +23,7 @@ import { CamPage } from './../models/cam-page';
 import { SearchHistory } from './../models/search-history';
 import { NoctuaDataService } from '@noctua.common/services/noctua-data.service';
 import { NoctuaSearchMenuService } from './search-menu.service';
+import { MiddlePanel } from '../models/menu-panels';
 
 declare const require: any;
 
@@ -102,7 +103,9 @@ export class NoctuaSearchService {
                 this.onCamsPageChanged.next(this.camPage);
             });
 
-            this.noctuaSearchMenuService.resetResults();
+            if (this.noctuaSearchMenuService.selectedMiddlePanel === MiddlePanel.cams) {
+                this.noctuaSearchMenuService.resetResults();
+            }
         });
     }
 

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
@@ -14,15 +14,12 @@
       </mat-chip>
     </div>
     <span fxFlex></span>
-    <button mat-button class="" color="primary" (click)="resetModel(cam)">
+    <!-- <button mat-button class="" color="primary" (click)="resetModel(cam)">
       Reset Me
     </button>
     <button mat-button class="" color="primary" (click)="storedModel(cam)">
       Stored
-    </button>
-    <button mat-button class="" color="primary" (click)="diffModel(cam)">
-      Diff
-    </button>
+    </button> -->
     <button mat-icon-button class="" fxFlex="40px" color="primary" [matMenuTriggerFor]="activityOptionMenu">
       <mat-icon>more_vert</mat-icon>
     </button>

diff --git a/src/app/main/apps/noctua-form/cam/cam-table/cam-table.component.ts b/src/app/main/apps/noctua-form/cam/cam-table/cam-table.component.ts
@@ -150,9 +150,6 @@ export class CamTableComponent implements OnInit, OnDestroy {
     }
   }
 
-  diffModel(cam: Cam) {
-    this.camService.diffModel(cam);
-  }
 
   resetModel(cam: Cam) {
     this.camService.resetModel(cam);

diff --git a/src/app/main/apps/noctua-search/noctua-search.component.ts b/src/app/main/apps/noctua-search/noctua-search.component.ts
@@ -144,16 +144,9 @@ export class NoctuaSearchComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   loadCam(modelId) {
-    const self = this;
-
     this.cam = this.camService.getCam(modelId);
   }
 
-  edit() {
-    // this.loadModel(this.selectCam)
-    // this.openRightDrawer(RightPanel.camForm);
-  }
-
   openLeftDrawer(panel) {
     this.noctuaSearchMenuService.selectLeftPanel(panel);
     this.noctuaSearchMenuService.openLeftDrawer();