From 7b5a9afe936960ebeb3cc7c87bf21dd06bc195b7 Mon Sep 17 00:00:00 2001 From: tmushayahama Date: Tue, 12 Jul 2022 16:54:17 -0700 Subject: [PATCH 1/4] Added build --- .../data/obsolete.js | 0 .../models/menu-panels.ts | 0 .../services/doctor-menu.service.ts | 1 - .../services/noctua-doctor.service.ts | 0 src/@noctua.form/services/cam.service.ts | 1 - src/@noctua.form/services/graph.service.ts | 14 +++---- ...itorService.ts => graph-editor-service.ts} | 0 .../components/footer/footer.component.html | 2 +- .../noctua-doctor/noctua-doctor.component.ts | 2 +- .../add-evidence/add-evidence.component.html | 25 ++++++------- .../confirm-copy-model.component.html | 26 ++++++------- .../search-database.component.scss | 17 +++------ .../cam-graph/cam-graph.component.ts | 2 +- .../cam-graph/services/cam-graph.service.ts | 2 +- .../cams/cams-table/cams-table.component.html | 35 ++++++++---------- .../cams/cams-table/cams-table.component.ts | 1 - src/assets/icons/pathway.png | Bin 0 -> 3463 bytes .../public/assets/icons/pathway.png | Bin 0 -> 3463 bytes .../noctua-landing-page/public/inject.tmpl | 3 +- ...b03e6ecdb9.js => main.792c2c4a3cb3b99c.js} | 2 +- .../public/main.a46881e902de9b936ec3.js | 1 - .../polyfills-es5.8261e3d05744cd70e101.js | 1 - 22 files changed, 57 insertions(+), 78 deletions(-) rename src/{@noctua-doctor => @noctua.doctor}/data/obsolete.js (100%) rename src/{@noctua-doctor => @noctua.doctor}/models/menu-panels.ts (100%) rename src/{@noctua-doctor => @noctua.doctor}/services/doctor-menu.service.ts (95%) rename src/{@noctua-doctor => @noctua.doctor}/services/noctua-doctor.service.ts (100%) rename src/@noctua.graph/services/{graphEditorService.ts => graph-editor-service.ts} (100%) create mode 100644 src/assets/icons/pathway.png create mode 100644 workbenches/noctua-landing-page/public/assets/icons/pathway.png rename workbenches/noctua-landing-page/public/{main.4be18bb03e6ecdb9.js => main.792c2c4a3cb3b99c.js} (55%) delete mode 100644 workbenches/noctua-landing-page/public/main.a46881e902de9b936ec3.js delete mode 100644 workbenches/noctua-landing-page/public/polyfills-es5.8261e3d05744cd70e101.js diff --git a/src/@noctua-doctor/data/obsolete.js b/src/@noctua.doctor/data/obsolete.js similarity index 100% rename from src/@noctua-doctor/data/obsolete.js rename to src/@noctua.doctor/data/obsolete.js diff --git a/src/@noctua-doctor/models/menu-panels.ts b/src/@noctua.doctor/models/menu-panels.ts similarity index 100% rename from src/@noctua-doctor/models/menu-panels.ts rename to src/@noctua.doctor/models/menu-panels.ts diff --git a/src/@noctua-doctor/services/doctor-menu.service.ts b/src/@noctua.doctor/services/doctor-menu.service.ts similarity index 95% rename from src/@noctua-doctor/services/doctor-menu.service.ts rename to src/@noctua.doctor/services/doctor-menu.service.ts index 07a6ec2..675823a 100644 --- a/src/@noctua-doctor/services/doctor-menu.service.ts +++ b/src/@noctua.doctor/services/doctor-menu.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; import { MatDrawer } from '@angular/material/sidenav'; -import { NoctuaPerfectScrollbarDirective } from '@noctua/directives/noctua-perfect-scrollbar/noctua-perfect-scrollbar.directive'; import { PerfectScrollbarDirective } from 'ngx-perfect-scrollbar'; import { LeftPanel, MiddlePanel, RightPanel } from './../models/menu-panels'; diff --git a/src/@noctua-doctor/services/noctua-doctor.service.ts b/src/@noctua.doctor/services/noctua-doctor.service.ts similarity index 100% rename from src/@noctua-doctor/services/noctua-doctor.service.ts rename to src/@noctua.doctor/services/noctua-doctor.service.ts diff --git a/src/@noctua.form/services/cam.service.ts b/src/@noctua.form/services/cam.service.ts index 02c06bd..a1a2ccb 100644 --- a/src/@noctua.form/services/cam.service.ts +++ b/src/@noctua.form/services/cam.service.ts @@ -57,7 +57,6 @@ export class CamService { private curieService: CurieService) { this.onCamChanged = new BehaviorSubject(null); - this.curieUtil = this.curieService.getCurieUtil(); this.camFormGroup = new BehaviorSubject(null); this.camFormGroup$ = this.camFormGroup.asObservable(); diff --git a/src/@noctua.form/services/graph.service.ts b/src/@noctua.form/services/graph.service.ts index 6a91336..d456bbb 100644 --- a/src/@noctua.form/services/graph.service.ts +++ b/src/@noctua.form/services/graph.service.ts @@ -25,10 +25,11 @@ import { Article } from './../models/article'; import { Contributor, equalContributor } from '../models/contributor'; import * as moment from 'moment'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; +import { graph as bbopGraph } from 'bbop-graph-noctua'; declare const require: any; -const model = require('bbop-graph-noctua'); +//const model = require('bbop-graph-noctua'); const barista_client = require('bbop-client-barista'); const amigo = require('amigo2'); const barista_response = require('bbop-response-barista'); @@ -158,10 +159,9 @@ export class NoctuaGraphService { getMetadata(responseData) { const self = this; - const noctua_graph = model.graph; const cam = new Cam() - cam.graph = new noctua_graph(); + cam.graph = new bbopGraph(); cam.graph.load_data_basic(responseData); cam.id = responseData.id; @@ -197,18 +197,17 @@ export class NoctuaGraphService { rebuild(cam: Cam, response) { const self = this; - const noctua_graph = model.graph; // cam.loading.status = true; // cam.loading.message = 'Loading Model Entities Metadata...'; if (cam.graph) { - const inGraph = new noctua_graph(); + const inGraph = new bbopGraph(); inGraph.load_data_basic(response.data()); cam.graph.merge_special(inGraph); } else { - cam.graph = new noctua_graph(); + cam.graph = new bbopGraph(); cam.graph.load_data_basic(response.data()); } @@ -265,9 +264,8 @@ export class NoctuaGraphService { rebuildFromStoredApi(cam: Cam, activeModel) { const self = this; - const noctua_graph = model.graph; - cam.graph = new noctua_graph(); + cam.graph = new bbopGraph(); cam.graph.load_data_basic(activeModel); cam.id = activeModel.id; diff --git a/src/@noctua.graph/services/graphEditorService.ts b/src/@noctua.graph/services/graph-editor-service.ts similarity index 100% rename from src/@noctua.graph/services/graphEditorService.ts rename to src/@noctua.graph/services/graph-editor-service.ts diff --git a/src/app/layout/components/footer/footer.component.html b/src/app/layout/components/footer/footer.component.html index 99e09fd..d1c5ebc 100644 --- a/src/app/layout/components/footer/footer.component.html +++ b/src/app/layout/components/footer/footer.component.html @@ -13,7 +13,7 @@
- Copyright © 1999-2022 + Copyright © 1999-2020 Member of the Open Biological Ontologies Foundry diff --git a/src/app/main/apps/noctua-doctor/noctua-doctor.component.ts b/src/app/main/apps/noctua-doctor/noctua-doctor.component.ts index 3722ce1..2d4f7a9 100644 --- a/src/app/main/apps/noctua-doctor/noctua-doctor.component.ts +++ b/src/app/main/apps/noctua-doctor/noctua-doctor.component.ts @@ -23,7 +23,7 @@ import { ArtBasket } from '@noctua.search/models/art-basket'; import { NoctuaReviewSearchService } from '@noctua.search/services/noctua-review-search.service'; import { NgScrollbar } from 'ngx-scrollbar'; import { PerfectScrollbarDirective } from 'ngx-perfect-scrollbar'; -import { NoctuaDoctorMenuService } from '@noctua-doctor/services/doctor-menu.service'; +import { NoctuaDoctorMenuService } from '@noctua.doctor/services/doctor-menu.service'; import { WorkbenchId } from '@noctua.common/models/workench-id'; @Component({ diff --git a/src/app/main/apps/noctua-form/dialogs/add-evidence/add-evidence.component.html b/src/app/main/apps/noctua-form/dialogs/add-evidence/add-evidence.component.html index 7499153..d8b1995 100644 --- a/src/app/main/apps/noctua-form/dialogs/add-evidence/add-evidence.component.html +++ b/src/app/main/apps/noctua-form/dialogs/add-evidence/add-evidence.component.html @@ -1,15 +1,14 @@ -
- - - - Add Evidence - - - - -
+
+
+ + Add Evidence + + + +
+
@@ -82,7 +81,7 @@
-
+