reset the number display for changes after undo geneontology/noctua-a…

…nnotation-review#30
geneontology · Jan 11, 2021 · 4af1549 · 4af1549
1 parent 11de0b8
commit 4af1549
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 13 deletions.
diff --git a/src/@noctua.form/services/cam.service.ts b/src/@noctua.form/services/cam.service.ts
@@ -167,12 +167,6 @@ export class CamService {
     return self._noctuaGraphService.diffModel(cam);
   }
 
-  storedModel(cam: Cam) {
-    const self = this;
-
-    return self._noctuaGraphService.storedModel(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
@@ -242,7 +242,7 @@ export class CamsService {
   }
 
   resetCam(cam: Cam) {
-    return this._noctuaGraphService.resetModel(cam);
+    return forkJoin([this._noctuaGraphService.resetModel(cam)]);
   }
 
   resetCams() {

diff --git a/src/@noctua.search/components/art-basket/art-basket.component.ts b/src/@noctua.search/components/art-basket/art-basket.component.ts
@@ -138,9 +138,9 @@ export class ArtBasketComponent implements OnInit, OnDestroy {
       if (cams) {
         self.camsService.loadCams();
         self.noctuaReviewSearchService.onReplaceChanged.next(true);
+        self.camsService.reviewChanges();
       }
     });
-    self.camsService.reviewChanges();
   }
 
   resetCams() {
@@ -150,9 +150,9 @@ export class ArtBasketComponent implements OnInit, OnDestroy {
       if (cams) {
         self.camsService.loadCams();
         self.noctuaReviewSearchService.onReplaceChanged.next(true);
+        self.camsService.reviewChanges();
       }
     });
-    self.camsService.reviewChanges();
   }
 
   reviewChanges() {

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
@@ -157,9 +157,6 @@ export class CamTableComponent implements OnInit, OnDestroy {
   resetModel(cam: Cam) {
     this.camService.resetModel(cam);
   }
-  storedModel(cam: Cam) {
-    this.camService.storedModel(cam);
-  }
 
   displayErrors() {
     const errors = this.cam.getViolationDisplayErrors();

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -11,7 +11,7 @@ declare var global_golr_server: any;
 declare var global_workbenches_universal: any;
 declare var global_workbenches_model: any;
 
-const baristaLocation = typeof global_barista_location !== 'undefined' ? global_barista_location : 'http://localhost:3400';
+const baristaLocation = typeof global_barista_location !== 'undefined' ? global_barista_location : 'http://barista-dev.berkeleybop.org';//'http://localhost:3400';
 const minervaDefinitionName = typeof global_minerva_definition_name !== 'undefined' ? global_minerva_definition_name : 'minerva_public_dev';
 const golrNeoServer = typeof global_golr_neo_server !== 'undefined'
   ? global_golr_neo_server