Added back in Bazel tests for gui2-fw-lib and gui2-topo-lib
Also used a named path in typescript for gui2-fw-lib
Change-Id: I7233565e53b9b86e1766228ecc96b21ea6f7499d
diff --git a/apps/faultmanagement/fm-gui2-lib/.gitignore b/apps/faultmanagement/fm-gui2-lib/.gitignore
deleted file mode 100644
index ceeedea..0000000
--- a/apps/faultmanagement/fm-gui2-lib/.gitignore
+++ /dev/null
@@ -1,42 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-/dist
-/tmp
-/out-tsc
-
-# dependencies
-/node_modules
-
-# IDEs and editors
-/.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-# misc
-/.sass-cache
-/connect.lock
-/coverage
-/libpeerconnection.log
-npm-debug.log
-yarn-error.log
-testem.log
-/typings
-
-# System Files
-.DS_Store
-Thumbs.db
-
-# ONOS temp CSS files
-/projects/fm-gui2-lib/fw
diff --git a/apps/faultmanagement/fm-gui2-lib/BUILD.bazel b/apps/faultmanagement/fm-gui2-lib/BUILD.bazel
index 4288f9d..6696777 100644
--- a/apps/faultmanagement/fm-gui2-lib/BUILD.bazel
+++ b/apps/faultmanagement/fm-gui2-lib/BUILD.bazel
@@ -32,6 +32,7 @@
"**/*.css",
"**/*.html",
]),
+ tsconfig = "//web/gui2:tsconfig.json",
deps = [
"//web/gui2-fw-lib",
"@npm//@angular/animations",
diff --git a/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.spec.ts b/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.spec.ts
index 004617e..928c81e 100644
--- a/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.spec.ts
+++ b/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.spec.ts
@@ -23,7 +23,7 @@
LogService,
WebSocketService,
IconComponent
-} from '../../../../../web/gui2-fw-lib/public_api';
+} from 'gui2-fw-lib/public_api';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { DebugElement } from '@angular/core';
diff --git a/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.ts b/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.ts
index bcbb704..6300683 100644
--- a/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.ts
+++ b/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.ts
@@ -21,7 +21,7 @@
LogService,
DetailsPanelBaseImpl,
WebSocketService,
-} from '../../../../../web/gui2-fw-lib/public_api';
+} from 'gui2-fw-lib/public_api';
/**
* ONOS GUI -- Alarm Details Component extends TableBaseImpl
diff --git a/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.spec.ts b/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.spec.ts
index ba36a98..5d95f04 100644
--- a/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.spec.ts
+++ b/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.spec.ts
@@ -25,7 +25,7 @@
IconComponent,
LogService,
TableFilterPipe, LoadingComponent,
-} from '../../../../../web/gui2-fw-lib/public_api';
+} from 'gui2-fw-lib/public_api';
import { of } from 'rxjs';
import { } from 'jasmine';
diff --git a/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.ts b/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.ts
index 9d50e11..7298cd2 100644
--- a/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.ts
+++ b/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.ts
@@ -20,7 +20,7 @@
LogService,
WebSocketService,
SortDir, TableBaseImpl, TableResponse
-} from '../../../../../web/gui2-fw-lib/public_api';
+} from 'gui2-fw-lib/public_api';
/**
* Model of the response from the WebSocket
diff --git a/apps/faultmanagement/fm-gui2-lib/lib/fm-gui2-lib.module.ts b/apps/faultmanagement/fm-gui2-lib/lib/fm-gui2-lib.module.ts
index 85e09b6..d94f108 100644
--- a/apps/faultmanagement/fm-gui2-lib/lib/fm-gui2-lib.module.ts
+++ b/apps/faultmanagement/fm-gui2-lib/lib/fm-gui2-lib.module.ts
@@ -19,7 +19,7 @@
import {RouterModule} from '@angular/router';
import {
Gui2FwLibModule,
-} from '../../../../web/gui2-fw-lib/public_api';
+} from 'gui2-fw-lib/public_api';
import {AlarmTableComponent} from './alarmtable/alarmtable.component';
import {AlarmDetailsComponent} from './alarmdetails/alarmdetails.component';
diff --git a/apps/roadm/web/roadm-gui/.gitignore b/apps/roadm/web/roadm-gui/.gitignore
deleted file mode 100644
index 0d18a95..0000000
--- a/apps/roadm/web/roadm-gui/.gitignore
+++ /dev/null
@@ -1,43 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-/dist
-/tmp
-/out-tsc
-
-# dependencies
-/node_modules
-/node
-/etc
-
-# IDEs and editors
-/.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-# misc
-/.sass-cache
-/connect.lock
-/coverage
-/libpeerconnection.log
-npm-debug.log
-yarn-error.log
-testem.log
-/typings
-
-# System Files
-.DS_Store
-Thumbs.db
-
-*.tgz
diff --git a/apps/roadm/web/roadm-gui/BUILD.bazel b/apps/roadm/web/roadm-gui/BUILD.bazel
index 1dc27b3..dd6bd33 100644
--- a/apps/roadm/web/roadm-gui/BUILD.bazel
+++ b/apps/roadm/web/roadm-gui/BUILD.bazel
@@ -32,6 +32,7 @@
"**/*.css",
"**/*.html",
]),
+ tsconfig = "//web/gui2:tsconfig.json",
deps = [
"//web/gui2-fw-lib",
"@npm//@angular/animations",
diff --git a/apps/roadm/web/roadm-gui/lib/port/port.component.ts b/apps/roadm/web/roadm-gui/lib/port/port.component.ts
index 24913ab..51547b3 100644
--- a/apps/roadm/web/roadm-gui/lib/port/port.component.ts
+++ b/apps/roadm/web/roadm-gui/lib/port/port.component.ts
@@ -21,7 +21,7 @@
WebSocketService,
IconService,
SortDir, TableBaseImpl, TableResponse
-} from '../../../../../../web/gui2-fw-lib/public_api';
+} from 'gui2-fw-lib/public_api';
import { ActivatedRoute } from '@angular/router';
import {FormGroup, FormControl} from '@angular/forms';
diff --git a/apps/roadm/web/roadm-gui/lib/roadm-gui-lib.module.ts b/apps/roadm/web/roadm-gui/lib/roadm-gui-lib.module.ts
index 7a75fde..e9f2d91 100644
--- a/apps/roadm/web/roadm-gui/lib/roadm-gui-lib.module.ts
+++ b/apps/roadm/web/roadm-gui/lib/roadm-gui-lib.module.ts
@@ -17,7 +17,7 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {RouterModule} from '@angular/router';
-import { Gui2FwLibModule } from '../../../../../web/gui2-fw-lib/public_api';
+import { Gui2FwLibModule } from 'gui2-fw-lib/public_api';
import { RoadmDeviceComponent } from './roadm/roadm.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RoadmPortComponent } from './port/port.component';
diff --git a/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.disabled.spec.ts b/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.disabled.spec.ts
index 63a51d1..43b4f9e 100644
--- a/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.disabled.spec.ts
+++ b/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.disabled.spec.ts
@@ -25,7 +25,7 @@
IconService,
LogService,
Gui2FwLibModule,
-} from '../../../../../../web/gui2-fw-lib/public_api';
+} from 'gui2-fw-lib/public_api';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {FormsModule} from '@angular/forms';
import {RouterTestingModule} from '@angular/router/testing';
diff --git a/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.ts b/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.ts
index 13e05dc..112dd1b 100644
--- a/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.ts
+++ b/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.ts
@@ -20,7 +20,7 @@
LogService,
WebSocketService,
SortDir, TableBaseImpl, TableResponse
-} from '../../../../../../web/gui2-fw-lib/public_api';
+} from 'gui2-fw-lib/public_api';
import { ActivatedRoute, Router } from '@angular/router';