fixed review integration: Basic review is working

src/app/layout/components/toolbar/toolbar.component.ts

@@ -13,7 +13,6 @@ import {
 } from 'noctua-form-base';
 
 import { NoctuaConfigService } from '@noctua/services/config.service';
-import { NoctuaFormService } from 'app/main/apps/noctua-annotation-review/services/noctua-form.service';
 
 @Component({
  selector: 'noctua-toolbar',
@@ -41,7 +40,7 @@ export class NoctuaToolbarComponent implements OnInit {
  private noctuaConfig: NoctuaConfigService,
  public noctuaUserService: NoctuaUserService,
  public noctuaAnnotonFormService: NoctuaAnnotonFormService,
- public noctuaFormService: NoctuaFormService,
+ //public noctuaFormService: NoctuaFormService,
  private translate: TranslateService
  ) {
  console.log(window.location)
@@ -99,19 +98,6 @@ export class NoctuaToolbarComponent implements OnInit {
  });
  }
 
- addAnnoton() {
- this.openAnnotonForm(location);
- }
-
- openCamForm() {
- // this.noctuaFormService.initializeForm();
- this.noctuaFormService.openRightDrawer(this.noctuaFormService.panel.camForm)
- }
-
- openAnnotonForm(location?) {
- this.noctuaAnnotonFormService.initializeForm();
- this.noctuaFormService.openRightDrawer(this.noctuaFormService.panel.annotonForm)
- }
 
  search(value): void {
  console.log(value);

src/app/main/apps/apps.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoctuaSharedModule } from '@noctua/shared.module';
-import { NoctuaFormModule } from './noctua-annotation-review/noctua-form.module'
+import { NoctuaFormModule } from './noctua-form/noctua-form.module'
 import { NoctuaReviewModule } from './noctua-review/noctua-review.module'
 
 

src/app/main/apps/noctua-review/noctua-review.component.html

@@ -1,27 +1,20 @@
 <div class="w-100-p h-100-p" fxLayout="row" fxLayoutAlign="start start">
  <div class="noc-sidemenu" fxLayout="column" fxLayoutAlign="start center">
- <button mat-icon-button class="noc-bb" (click)="toggleLeftDrawer(reviewService.leftPanel.search)"
- matTooltip="Search" [matTooltipPosition]="'after'" [matTooltipShowDelay]="1500">
+ <button mat-icon-button color="primary" class="noc-rounded-button"
+ (click)="toggleLeftDrawer(reviewService.leftPanel.search)" matTooltip="Search" [matTooltipPosition]="'after'"
+ [matTooltipShowDelay]="1500">
  <mat-icon> search </mat-icon>
  </button>
- <button mat-icon-button class="noc-bb" (click)="toggleLeftDrawer(reviewService.leftPanel.curator)"
- matTooltip="Search by curator" [matTooltipPosition]="'after'" [matTooltipShowDelay]="1000">
+ <button mat-icon-button color="primary" class="noc-rounded-button" (click)="
+ toggleLeftDrawer(reviewService.leftPanel.curator)" matTooltip="Search by curator" [matTooltipPosition]="'after'"
+ [matTooltipShowDelay]="1000">
  <mat-icon> group </mat-icon>
  </button>
- <button mat-icon-button class="noc-bb" (click)="toggleLeftDrawer(reviewService.leftPanel.species)"
- matTooltip="Search by species" [matTooltipPosition]="'after'" [matTooltipShowDelay]="1000">
+ <button mat-icon-button color="primary" class="noc-rounded-button" (click)="
+ toggleLeftDrawer(reviewService.leftPanel.species)" matTooltip="Search by species" [matTooltipPosition]="'after'"
+ [matTooltipShowDelay]="1000">
  <mat-icon> pets </mat-icon>
  </button>
- <button mat-button class="noc-bb" (click)="noctuaFormService.openMiddlePanel(noctuaFormService.panel.camDiagram)"
- matTooltip="Search" [matTooltipPosition]="'after'" [matTooltipShowDelay]="1500"
- [ngClass]="{'noc-active':noctuaFormService.selectedMiddlePanel.id===noctuaFormService.panel.camDiagram.id}">
- <mat-icon> scatter_plot </mat-icon>
- </button>
- <button mat-button class="noc-bb" (click)="noctuaFormService.openMiddlePanel(noctuaFormService.panel.camTable)"
- matTooltip="Search" [matTooltipPosition]="'after'" [matTooltipShowDelay]="1500"
- [ngClass]="{'noc-active':noctuaFormService.selectedMiddlePanel.id===noctuaFormService.panel.camTable.id}">
- <mat-icon> table_chart </mat-icon>
- </button>
  </div>
  <mat-drawer-container class="w-100-p h-100-p" fxLayout="row" fxLayoutAlign="start start" autosize>
  <mat-drawer #leftDrawer class="noc-left-drawer" fxFlex="200px" mode="side" position="start">
@@ -32,19 +25,18 @@
  </div>
  </mat-drawer>
  <mat-drawer-content class="noc-section-body w-100-p h-100-p" fxLayout="row" fxLayoutAlign="start">
- <!-- <div [ngSwitch]="noctuaFormService.selectedMiddlePanel.id" class="h-100-p w-100-p">
- <noc-cams-table *ngSwitchCase="noctuaFormService.panel.camsTable.id"></noc-cams-table>
- <noc-cam-diagram *ngSwitchCase="noctuaFormService.panel.camDiagram.id" [cam]="cam"></noc-cam-diagram>
- <noc-cam-table *ngSwitchCase="noctuaFormService.panel.camTable.id" [cam]="cam"></noc-cam-table>
- </div> -->
+ <noc-cams-table></noc-cams-table>
  </mat-drawer-content>
  <mat-drawer #rightDrawer class="noc-right-drawer" noctuaPerfectScrollbar mode="side" position="end">
  <div [ngSwitch]="noctuaFormService.selectedRightPanel.id" class="h-100-p">
-
- <!-- <noc-cam-row *ngSwitchCase="noctuaFormService.panel.camRow.id"> </noc-cam-row>
- <noc-cam-form [panelDrawer]='rightDrawer' *ngSwitchCase="noctuaFormService.panel.camForm.id"></noc-cam-form>
- <noc-cam-connector [panelDrawer]='rightDrawer' *ngSwitchCase="noctuaFormService.panel.connectorForm.id"></noc-cam-connector>
- -->
+ <noc-cam-form [panelDrawer]="rightDrawer" *ngSwitchCase="noctuaFormService.panel.camForm.id">
+ </noc-cam-form>
+ <noc-annoton-form [panelDrawer]="rightDrawer" *ngSwitchCase="noctuaFormService.panel.annotonForm.id">
+ </noc-annoton-form>
+ <noc-annoton-entity-form [panelDrawer]="rightDrawer"
+ *ngSwitchCase="noctuaFormService.panel.annotonEntityForm.id"></noc-annoton-entity-form>
+ <noc-annoton-connector [panelDrawer]="rightDrawer" *ngSwitchCase="noctuaFormService.panel.connectorForm.id">
+ </noc-annoton-connector>
  </div>
  </mat-drawer>
  </mat-drawer-container>

src/app/main/apps/noctua-review/noctua-review.component.ts

@@ -1,35 +1,32 @@
-import { Component, ElementRef, OnDestroy, OnInit, ViewEncapsulation, ViewChild } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, FormArray } from '@angular/forms';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { MatPaginator, MatSort, MatDrawer } from '@angular/material';
-import { DataSource } from '@angular/cdk/collections';
-import { merge, Observable, BehaviorSubject, fromEvent, Subject } from 'rxjs';
-import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators';
+import { MatDrawer } from '@angular/material';
+import { Subject } from 'rxjs';
 
-import { noctuaAnimations } from '@noctua/animations';
-import { NoctuaUtils } from '@noctua/utils/noctua-utils';
+import { noctuaAnimations } from './../../../../@noctua/animations';
 
-import { takeUntil, startWith } from 'rxjs/internal/operators';
-
-import "rxjs/add/operator/debounceTime";
-import "rxjs/add/operator/distinctUntilChanged";
-import { forEach } from '@angular/router/src/utils/collection';
-
-import { NoctuaFormConfigService } from 'noctua-form-base';
-import { NoctuaGraphService } from 'noctua-form-base';
-import { NoctuaLookupService } from 'noctua-form-base';
+import {
+ Cam,
+ Curator,
+ NoctuaUserService,
+ NoctuaFormConfigService,
+ NoctuaGraphService,
+ NoctuaAnnotonFormService,
+ CamService
+} from 'noctua-form-base';
 
+import { NoctuaFormService } from './../noctua-form/services/noctua-form.service';
+import { FormGroup } from '@angular/forms';
 
 import { ReviewService } from './services/review.service';
 import { ReviewDialogService } from './services/review-dialog.service';
-
-import { NoctuaFormService } from './services/noctua-form.service';
 import { NoctuaSearchService } from '@noctua.search/services/noctua-search.service';
-import { CamService } from 'noctua-form-base'
+
 
 import { SparqlService } from '@noctua.sparql/services/sparql/sparql.service';
+import { takeUntil } from 'rxjs/operators';
+
 
-import { Cam } from 'noctua-form-base';
 
 @Component({
  selector: 'app-noctua-review',
@@ -46,7 +43,10 @@ export class NoctuaReviewComponent implements OnInit, OnDestroy {
  @ViewChild('rightDrawer')
  rightDrawer: MatDrawer;
 
- cam: Cam;
+
+ public cam: Cam;
+ public user: Curator;
+ searchResults = [];
  modelId: string = '';
  baristaToken: string = '';
  searchCriteria: any = {};
@@ -62,16 +62,17 @@ export class NoctuaReviewComponent implements OnInit, OnDestroy {
  detail: {}
  }
  cams: any[] = [];
- searchResults = [];
 
  private unsubscribeAll: Subject<any>;
 
  constructor(private route: ActivatedRoute,
  private camService: CamService,
+ public noctuaUserService: NoctuaUserService,
  public noctuaFormConfigService: NoctuaFormConfigService,
+ public noctuaAnnotonFormService: NoctuaAnnotonFormService,
  private noctuaSearchService: NoctuaSearchService,
  public noctuaFormService: NoctuaFormService,
- private noctuaLookupService: NoctuaLookupService,
+ // private noctuaLookupService: NoctuaLookupService,
  private noctuaGraphService: NoctuaGraphService,
  private sparqlService: SparqlService,
  public reviewService: ReviewService,
@@ -87,8 +88,8 @@ export class NoctuaReviewComponent implements OnInit, OnDestroy {
  .subscribe(params => {
  this.modelId = params['model_id'] || null;
  this.baristaToken = params['barista_token'] || null;
-
  this.noctuaGraphService.baristaToken = this.baristaToken;
+ this.getUserInfo();
  this.loadCams();
  });
 
@@ -97,9 +98,27 @@ export class NoctuaReviewComponent implements OnInit, OnDestroy {
  // });
  }
 
+ getUserInfo() {
+ const self = this;
+
+ this.noctuaUserService.getUser().subscribe((response) => {
+ if (response) {
+ this.user = new Curator()
+ this.user.name = response.nickname;
+ this.user.groups = response.groups;
+ // user.manager.use_groups([self.userInfo.selectedGroup.id]);
+ this.noctuaUserService.user = this.user;
+ this.noctuaUserService.onUserChanged.next(this.user);
+ }
+ });
+ }
+
  ngOnInit(): void {
  this.reviewService.setLeftDrawer(this.leftDrawer);
- this.reviewService.setRightDrawer(this.rightDrawer);
+ // this.reviewService.setRightDrawer(this.rightDrawer);
+ this.noctuaFormService.setRightDrawer(this.rightDrawer);
+
+ console.log()
 
  this.sparqlService.getCamsByCurator('http:https://orcid.org/0000-0002-1706-4196').subscribe((response: any) => {
  this.cams = this.sparqlService.cams = response;

src/app/main/apps/noctua-review/noctua-review.module.ts

@@ -4,6 +4,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { NoctuaReviewComponent } from './noctua-review.component';
 import { NoctuaSharedModule } from '@noctua/shared.module';
 import { ContextMenuModule } from 'ngx-contextmenu';
+import { NoctuaFormModule } from './../noctua-form/noctua-form.module'
 
 import { CamService } from 'noctua-form-base';
 import { CamsTableComponent } from './cams/cams-table/cams-table.component';
@@ -26,7 +27,7 @@ const routes = [
  CommonModule,
  RouterModule.forChild(routes),
  ContextMenuModule.forRoot(),
-
+ NoctuaFormModule
  ],
  providers: [
  //NoctuaFormGridService,

src/app/main/apps/noctua-review/search/review-search/review-search.component.ts

@@ -65,7 +65,7 @@ export class ReviewSearchComponent implements OnInit, OnDestroy {
  });
 
  this.sparqlService.getAllGroups().subscribe((response: any) => {
- this.searchFormData['providedBy'].searchResults = response;
+ // this.searchFormData['providedBy'].searchResults = response;
  });
 
  }