Added native Bazel build to GUI2. Reduced a lot of the unused Angular CLI structures
Reviewers should look at the changes in WORKSPACE, BUILD, BUILD.bazel, README.md files
This is only possible now as rules_nodejs went to 1.0.0 on December 20
gui2 has now been made the entry point (rather than gui2-fw-lib)
No tests or linting are functional yet for Typescript
Each NgModule now has its own BUILD.bazel file with ng_module
gui2-fw-lib is all one module and has been refactored to simplify the directory structure
gui2-topo-lib is also all one module - its directory structure has had 3 layers removed
The big bash script in web/gui2/BUILD has been removed - all is done through ng_module rules
in web/gui2/src/main/webapp/BUILD.bazel and web/gui2/src/main/webapp/app/BUILD.bazel
Change-Id: Ifcfcc23a87be39fe6d6c8324046cc8ebadb90551
diff --git a/web/gui2/src/main/webapp/app/view/cluster/BUILD.bazel b/web/gui2/src/main/webapp/app/view/cluster/BUILD.bazel
new file mode 100644
index 0000000..5401cad
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/cluster/BUILD.bazel
@@ -0,0 +1,47 @@
+"""
+ Copyright 2020-present Open Networking Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+"""
+
+package(default_visibility = ["//:__subpackages__"])
+
+load("@npm_angular_bazel//:index.bzl", "ng_module")
+
+ng_module(
+ name = "gui2-view-cluster",
+ srcs = glob(
+ include = [
+ "**/*.ts",
+ ],
+ exclude = [
+ "**/*.spec.ts",
+ ],
+ ),
+ assets = glob([
+ "**/*.css",
+ "**/*.html",
+ ]),
+ module_name = "gui2-view-cluster",
+ deps = [
+ "//web/gui2-fw-lib",
+ "@npm//@angular/animations",
+ "@npm//@angular/core",
+ "@npm//@angular/forms",
+ "@npm//@angular/platform-browser-dynamic",
+ "@npm//@angular/router",
+ "@npm//@types",
+ "@npm//d3",
+ "@npm//rxjs",
+ ],
+)
diff --git a/web/gui2/src/main/webapp/app/view/cluster/cluster-details.directive.ts b/web/gui2/src/main/webapp/app/view/cluster/cluster-details.directive.ts
index 81f2f78..4ddcb02 100644
--- a/web/gui2/src/main/webapp/app/view/cluster/cluster-details.directive.ts
+++ b/web/gui2/src/main/webapp/app/view/cluster/cluster-details.directive.ts
@@ -23,7 +23,7 @@
LionService,
PanelService,
WebSocketService
-} from 'gui2-fw-lib';
+} from '../../../../../../../gui2-fw-lib/public_api';
import * as d3 from 'd3';
import {HostListener} from '@angular/core';
diff --git a/web/gui2/src/main/webapp/app/view/cluster/cluster-routing.module.ts b/web/gui2/src/main/webapp/app/view/cluster/cluster-routing.module.ts
deleted file mode 100644
index 1dd26b5..0000000
--- a/web/gui2/src/main/webapp/app/view/cluster/cluster-routing.module.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2018-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import {ClusterComponent} from './cluster/cluster.component';
-
-const clusterRoutes: Routes = [
- {
- path: '',
- component: ClusterComponent
- }
-];
-
-/**
- * ONOS GUI -- Cluster Tabular View Feature Routing Module - allows it to be lazy loaded
- *
- * See https://angular.io/guide/lazy-loading-ngmodules
- */
-@NgModule({
- imports: [RouterModule.forChild(clusterRoutes)],
- exports: [RouterModule]
-})
-export class ClusterRoutingModule { }
diff --git a/web/gui2/src/main/webapp/app/view/cluster/cluster.module.ts b/web/gui2/src/main/webapp/app/view/cluster/cluster.module.ts
index 2ffb801..50db1da 100644
--- a/web/gui2/src/main/webapp/app/view/cluster/cluster.module.ts
+++ b/web/gui2/src/main/webapp/app/view/cluster/cluster.module.ts
@@ -15,16 +15,17 @@
*/
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { Gui2FwLibModule } from 'gui2-fw-lib';
+import { Gui2FwLibModule } from '../../../../../../../gui2-fw-lib/public_api';
import { ClusterComponent } from './cluster/cluster.component';
-import { ClusterRoutingModule } from './cluster-routing.module';
import { ClusterDetailsDirective } from './cluster-details.directive';
+import {RouterModule} from '@angular/router';
@NgModule({
imports: [
CommonModule,
Gui2FwLibModule,
- ClusterRoutingModule
+ RouterModule,
+ RouterModule.forChild([{path: '', component: ClusterComponent}]),
],
declarations: [ClusterComponent, ClusterDetailsDirective]
})
diff --git a/web/gui2/src/main/webapp/app/view/cluster/cluster/cluster.component.ts b/web/gui2/src/main/webapp/app/view/cluster/cluster/cluster.component.ts
index ee74446..a4d43b1 100644
--- a/web/gui2/src/main/webapp/app/view/cluster/cluster/cluster.component.ts
+++ b/web/gui2/src/main/webapp/app/view/cluster/cluster/cluster.component.ts
@@ -20,7 +20,7 @@
WebSocketService,
LionService,
SortDir, TableBaseImpl, TableResponse
-} from 'gui2-fw-lib';
+} from '../../../../../../../../gui2-fw-lib/public_api';
/**
* Model of the response from WebSocket
@@ -49,7 +49,9 @@
@Component({
selector: 'onos-cluster',
templateUrl: './cluster.component.html',
- styleUrls: ['./cluster.component.css', './cluster.theme.css', '../../../fw/widget/table.css', '../../../fw/widget/table.theme.css']
+ styleUrls: ['./cluster.component.css', './cluster.theme.css',
+ '../../../../../../../../gui2-fw-lib/lib/widget/table.css',
+ '../../../../../../../../gui2-fw-lib/lib/widget/table.theme.css']
})
export class ClusterComponent extends TableBaseImpl implements OnInit, OnDestroy {