You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/08/24 20:02:03 UTC
[incubator-streampipes] branch dev updated: [STREAMPIPES-206]
Optimize module imports
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 4364b6d [STREAMPIPES-206] Optimize module imports
4364b6d is described below
commit 4364b6de4e551d88fc5d9303eaab624b88aca3b5
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Aug 24 22:01:49 2020 +0200
[STREAMPIPES-206] Optimize module imports
---
ui/deployment/appng5.module.mst | 10 +----
ui/src/app/connect/connect.module.ts | 5 ---
ui/src/app/core-ui/core-ui.module.ts | 56 ++++++++++++------------
ui/src/app/dashboard/dashboard.module.ts | 2 -
ui/src/app/data-explorer/data-explorer.module.ts | 2 -
ui/src/app/editor/editor.module.ts | 2 -
ui/src/app/login/login.module.ts | 1 -
ui/src/app/services/services.module.ts | 35 ++-------------
8 files changed, 33 insertions(+), 80 deletions(-)
diff --git a/ui/deployment/appng5.module.mst b/ui/deployment/appng5.module.mst
index 6367397..0d3494e 100644
--- a/ui/deployment/appng5.module.mst
+++ b/ui/deployment/appng5.module.mst
@@ -32,9 +32,7 @@ import { CoreModule } from './core/core.module';
import { LoginModule } from './login/login.module';
import { HomeModule } from './home/home.module';
import { InfoModule } from './info/info.module';
-import { AppAssetMonitoringModule } from "./app-asset-monitoring/app-asset-monitoring.module";
import { PipelineDetailsModule } from './pipeline-details/pipeline-details.module';
-import { AppTransportMonitoringModule } from "./app-transport-monitoring/app-transport-monitoring.module";
import { NotificationCountService } from "./services/notification-count-service";
import { AuthService } from "./services/auth.service";
import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client';
@@ -50,12 +48,11 @@ import { {{{ng5_moduleName}}} } from '{{{path}}}';
import { ConsoleLogService } from './shared/logger/log.service';
import { Logger } from './shared/logger/default-log.service';
-import { AppContainerModule } from './app-container/app-container.module';
import { NotificationModule } from './notifications/notifications.module';
import { AppComponent } from './app.component';
import { AppRoutingModule } from './app-routing.module';
-
+import { PlatformServicesModule } from "./platform-services/platform.module";
import { ServicesModule } from "./services/services.module";
import * as $ from 'jquery';
@@ -78,12 +75,9 @@ import * as $ from 'jquery';
LoginModule,
LoadingBarHttpClientModule,
HomeModule,
- ConfigurationModule,
InfoModule,
- AppAssetMonitoringModule,
- AppTransportMonitoringModule,
- AppContainerModule,
NotificationModule,
+ PlatformServicesModule,
PipelineDetailsModule,
ServicesModule,
{{#modulesActive}}
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index ff2e1d8..853b263 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -78,7 +78,6 @@ import {CoreUiModule} from "../core-ui/core-ui.module";
@NgModule({
imports: [
- BrowserModule,
CoreUiModule,
FormsModule,
ReactiveFormsModule,
@@ -92,7 +91,6 @@ import {CoreUiModule} from "../core-ui/core-ui.module";
MatInputModule,
MatFormFieldModule,
MatSliderModule,
- PlatformServicesModule,
TreeModule.forRoot(),
],
exports: [
@@ -125,7 +123,6 @@ import {CoreUiModule} from "../core-ui/core-ui.module";
],
providers: [
RestService,
-
ConnectService,
DataTypesService,
TransformationRuleService,
@@ -135,9 +132,7 @@ import {CoreUiModule} from "../core-ui/core-ui.module";
UnitProviderService,
TimestampPipe,
FileRestService,
- PropertySelectorService,
xsService,
- TourProviderService
],
entryComponents: [ConnectComponent, AdapterStartedDialog, AdapterExportDialog, AdapterUploadDialog, EditEventPropertyComponent],
})
diff --git a/ui/src/app/core-ui/core-ui.module.ts b/ui/src/app/core-ui/core-ui.module.ts
index 82bcb4b..4dc50f3 100644
--- a/ui/src/app/core-ui/core-ui.module.ts
+++ b/ui/src/app/core-ui/core-ui.module.ts
@@ -16,36 +16,35 @@
*
*/
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { FlexLayoutModule } from '@angular/flex-layout';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {FlexLayoutModule} from '@angular/flex-layout';
-import { CdkTableModule } from '@angular/cdk/table';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatNativeDateModule } from '@angular/material/core';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { CustomMaterialModule } from '../CustomMaterial/custom-material.module';
+import {CdkTableModule} from '@angular/cdk/table';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {MatNativeDateModule} from '@angular/material/core';
+import {MatDatepickerModule} from '@angular/material/datepicker';
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {MatSnackBarModule} from '@angular/material/snack-bar';
+import {CustomMaterialModule} from '../CustomMaterial/custom-material.module';
-// import * as PlotlyJS from 'plotly.js/dist/plotly.js';
-import { MatChipsModule } from '@angular/material/chips';
-import { MatSliderModule } from '@angular/material/slider';
-import { PlotlyViaWindowModule } from 'angular-plotly.js';
-import { ImageAnnotationsComponent } from './image/components/image-annotations/image-annotations.component';
-import { ImageBarComponent } from './image/components/image-bar/image-bar.component';
-import { ImageContainerComponent } from './image/components/image-container/image-container.component';
-import { ImageLabelsComponent } from './image/components/image-labels/image-labels.component';
-import { ImageCategorizeComponent } from './image/image-categorize/image-categorize.component';
-import { ImageLabelingComponent } from './image/image-labeling/image-labeling.component';
-import { ImageViewerComponent } from './image/image-viewer/image-viewer.component';
-import { ImageComponent } from './image/image.component';
-import { BrushLabelingService } from './image/services/BrushLabeling.service';
-import { ColorService } from './image/services/color.service';
-import { PolygonLabelingService } from './image/services/PolygonLabeling.service';
-import { ReactLabelingService } from './image/services/ReactLabeling.service';
-import { CocoFormatService } from "./image/services/CocoFormat.service";
-import { LabelingModeService } from "./image/services/LabelingMode.service";
+import {MatChipsModule} from '@angular/material/chips';
+import {MatSliderModule} from '@angular/material/slider';
+import {PlotlyViaWindowModule} from 'angular-plotly.js';
+import {ImageAnnotationsComponent} from './image/components/image-annotations/image-annotations.component';
+import {ImageBarComponent} from './image/components/image-bar/image-bar.component';
+import {ImageContainerComponent} from './image/components/image-container/image-container.component';
+import {ImageLabelsComponent} from './image/components/image-labels/image-labels.component';
+import {ImageCategorizeComponent} from './image/image-categorize/image-categorize.component';
+import {ImageLabelingComponent} from './image/image-labeling/image-labeling.component';
+import {ImageViewerComponent} from './image/image-viewer/image-viewer.component';
+import {ImageComponent} from './image/image.component';
+import {BrushLabelingService} from './image/services/BrushLabeling.service';
+import {ColorService} from './image/services/color.service';
+import {PolygonLabelingService} from './image/services/PolygonLabeling.service';
+import {ReactLabelingService} from './image/services/ReactLabeling.service';
+import {CocoFormatService} from "./image/services/CocoFormat.service";
+import {LabelingModeService} from "./image/services/LabelingMode.service";
import {StandardDialogComponent} from "./dialog/standard-dialog/standard-dialog.component";
import {PanelDialogComponent} from "./dialog/panel-dialog/panel-dialog.component";
import {DialogService} from "./dialog/base-dialog/base-dialog.service";
@@ -73,7 +72,6 @@ import {DisplayRecommendedPipe} from "./static-properties/filter/display-recomme
import {ColorPickerModule} from "ngx-color-picker";
import {QuillModule} from "ngx-quill";
import {CodemirrorModule} from "@ctrl/ngx-codemirror";
-// PlotlyViaCDNModule.plotlyjs = PlotlyJS;
@NgModule({
imports: [
diff --git a/ui/src/app/dashboard/dashboard.module.ts b/ui/src/app/dashboard/dashboard.module.ts
index 7c8ea1a..e06def9 100644
--- a/ui/src/app/dashboard/dashboard.module.ts
+++ b/ui/src/app/dashboard/dashboard.module.ts
@@ -29,7 +29,6 @@ import {FormsModule} from "@angular/forms";
import {ColorPickerModule} from "ngx-color-picker";
import {AddVisualizationDialogComponent} from "./dialogs/add-widget/add-visualization-dialog.component";
import {MatGridListModule} from "@angular/material/grid-list";
-import {ElementIconText} from "../services/get-element-icon-text.service";
import {DashboardService} from "./services/dashboard.service";
import {NumberWidgetComponent} from "./components/widgets/number/number-widget.component";
import {streamPipesStompConfig} from "./services/websocket.config";
@@ -97,7 +96,6 @@ import {CoreUiModule} from "../core-ui/core-ui.module";
ResizeService,
RefreshDashboardService,
SemanticTypeUtilsService,
- ElementIconText,
{
provide: InjectableRxStompConfig,
useValue: streamPipesStompConfig
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts b/ui/src/app/data-explorer/data-explorer.module.ts
index f49940e..91b87f2 100644
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -44,7 +44,6 @@ import {SharedDatalakeRestService} from '../core-services/shared/shared-dashboar
import {CoreUiModule} from '../core-ui/core-ui.module';
import {LabelingToolModule} from '../core-ui/linechart/labeling-tool/labeling-tool.module';
import {CustomMaterialModule} from '../CustomMaterial/custom-material.module';
-import {ElementIconText} from '../services/get-element-icon-text.service';
import {DataDownloadDialog} from './components/datadownloadDialog/dataDownload.dialog';
import {DataExplorerDashboardGridComponent} from './components/grid/data-explorer-dashboard-grid.component';
import {DataExplorerDashboardOverviewComponent} from './components/overview/data-explorer-dashboard-overview.component';
@@ -141,7 +140,6 @@ export const MY_NATIVE_FORMATS = {
ResizeService,
RefreshDashboardService,
SemanticTypeUtilsService,
- ElementIconText,
{
provide: OWL_DATE_TIME_FORMATS, useValue: MY_NATIVE_FORMATS
}
diff --git a/ui/src/app/editor/editor.module.ts b/ui/src/app/editor/editor.module.ts
index 9d4ed0e..31e65f4 100644
--- a/ui/src/app/editor/editor.module.ts
+++ b/ui/src/app/editor/editor.module.ts
@@ -23,7 +23,6 @@ import {GridsterModule} from 'angular-gridster2';
import {MatTabsModule} from "@angular/material/tabs";
import {CustomMaterialModule} from "../CustomMaterial/custom-material.module";
import {FormsModule, ReactiveFormsModule} from "@angular/forms";
-import {ElementIconText} from "../services/get-element-icon-text.service";
import {SemanticTypeUtilsService} from '../core-services/semantic-type/semantic-type-utils.service';
import {EditorComponent} from "./editor.component";
import {EditorService} from "./services/editor.service";
@@ -109,7 +108,6 @@ import {UserDefinedOutputStrategyComponent} from "./components/output-strategy/u
PipelinePositioningService,
PipelineValidationService,
PipelineElementRecommendationService,
- ElementIconText,
ImageChecker,
SafeCss
],
diff --git a/ui/src/app/login/login.module.ts b/ui/src/app/login/login.module.ts
index dbc6a0b..3d90278 100644
--- a/ui/src/app/login/login.module.ts
+++ b/ui/src/app/login/login.module.ts
@@ -62,7 +62,6 @@ import {RestApi} from "../services/rest-api.service";
providers: [
LoginService,
AuthStatusService,
- RestApi
],
entryComponents: [
LoginComponent,
diff --git a/ui/src/app/services/services.module.ts b/ui/src/app/services/services.module.ts
index b1b658c..1413a40 100644
--- a/ui/src/app/services/services.module.ts
+++ b/ui/src/app/services/services.module.ts
@@ -16,43 +16,14 @@
*
*/
-
-// export default angular.module('sp.services', [spConstants])
-// .service('ImageChecker', ImageChecker)
-// .service('AuthService', downgradeInjectable(AuthService))
-// .service('ElementIconText', ElementIconText)
-// .service('InitTooltips', InitTooltips)
-// .service('RestApi', RestApi)
-// .service('AuthStatusService', downgradeInjectable(AuthStatusService))
-// .service('ObjectProvider', ObjectProvider)
-// .service('DomainProperties', DomainProperties)
-// //.service('JsplumbBridge', downgradeInjectable(JsplumbBridge))
-// //.service('JsplumbService', downgradeInjectable(JsplumbService))
-// //.service('PipelinePositioningService', downgradeInjectable(PipelinePositioningService))
-// //.service('PipelineEditorService', PipelineEditorService)
-// .service('DialogBuilder', DialogBuilder)
-// .service('MeasurementUnitsService', MeasurementUnits)
-// .service('DeploymentService', DeploymentService)
-// .service('JsplumbConfigService', JsplumbConfigService)
-// .service('PipelineElementIconService', PipelineElementIconService)
-// .service('RouteTransitionInterceptorService', RouteTransitionInterceptorService)
-// .service('ShepherdService', ShepherdService)
-// .service('TourProviderService', TourProviderService)
-// .service('PropertySelectorService', PropertySelectorService)
-// .service('NotificationCountService', downgradeInjectable(NotificationCountService))
-// .constant('createPipelineTourConstants', CreatePipelineTour)
-// .constant('dashboardTourConstants', DashboardTour)
-// .constant('adapterTourConstants', AdapterTour)
-// .constant('adapterTour2Constants', AdapterTour2)
-// .constant('adapterTour3Constants', AdapterTour3)
-// .name;
-
import {NgModule} from "@angular/core";
import {RestApi} from "./rest-api.service";
import {AuthService} from "./auth.service";
import {ShepherdService} from "./tour/shepherd.service";
import {TourProviderService} from "./tour/tour-provider.service";
import {NotificationCountService} from "./notification-count-service";
+import {PropertySelectorService} from "./property-selector.service";
+import {ElementIconText} from "./get-element-icon-text.service";
@NgModule({
imports: [],
@@ -60,9 +31,11 @@ import {NotificationCountService} from "./notification-count-service";
providers: [
RestApi,
AuthService,
+ ElementIconText,
ShepherdService,
TourProviderService,
NotificationCountService,
+ PropertySelectorService,
],
entryComponents: []
})