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 2022/05/26 21:11:46 UTC
[incubator-streampipes] 02/03: [STREAMPIPES-537] Support lazy import in prebuild script
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-537-NEW
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 8863835f41dbaffd1c60778f3c7b2a813874aa08
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu May 26 22:55:49 2022 +0200
[STREAMPIPES-537] Support lazy import in prebuild script
---
ui/deployment/app-routing.module.mst | 17 ++++++++---------
ui/deployment/appng5.module.mst | 4 ----
ui/deployment/modules.yml | 18 +++++++++---------
ui/deployment/prebuild.js | 6 +++---
ui/src/app/data-explorer/data-explorer.component.ts | 14 ++++++--------
5 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/ui/deployment/app-routing.module.mst b/ui/deployment/app-routing.module.mst
index 44d5a500b..29e46bcf0 100644
--- a/ui/deployment/app-routing.module.mst
+++ b/ui/deployment/app-routing.module.mst
@@ -42,9 +42,9 @@ import { SetNewPasswordComponent } from './login/components/set-new-password/set
import { ActivateAccountComponent } from './login/components/activate-account/activate-account.component';
{{#modulesActive}}
-{{#ng5}}
+{{#componentImport}}
import { {{{ng5_component}}} } from '{{{ng5_componentPath}}}';
-{{/ng5}}
+{{/componentImport}}
{{/modulesActive}}
const routes: Routes = [
@@ -60,15 +60,14 @@ const routes: Routes = [
{ path: '', component: StreampipesComponent, children: [
{ path: '', component: HomeComponent, canActivate: [ConfiguredCanActivateGuard] },
{{#modulesActive}}
- {{#ng5}}
+ {{#componentImport}}
{ path: '{{{link}}}', component: {{{ng5_component}}}, data: { authPageNames: [{{{pageNames}}}]}},
- {{/ng5}}
- {{/modulesActive}
+ {{/componentImport}}
+ {{^componentImport}}
+ { path: '', data: { authPageNames: [{{{pageNames}}}]}, loadChildren: () => import('{{{path}}}').then(m => m.{{{ng5_moduleName}}})},
+ {{/componentImport}}
+ {{/modulesActive}}
- { path: '', data: { authPageNames: [PageName.SETTINGS]}, loadChildren: () => import('./add/add.module').then(m => m.AddModule)},
- { path: '', data: { authPageNames: [PageName.SETTINGS]}, loadChildren: () => import('./files/files.module').then(m => m.FilesModule)},
- { path: '', data: { authPageNames: [PageName.SETTINGS]}, loadChildren: () => import('./configuration/configuration.module').then(m => m.ConfigurationModule)},
-
{ path: 'notifications', component: NotificationsComponent },
{ path: 'info', component: InfoComponent },
{ path: 'pipeline-details', component: PipelineDetailsComponent },
diff --git a/ui/deployment/appng5.module.mst b/ui/deployment/appng5.module.mst
index f0d247149..d2352e3a9 100644
--- a/ui/deployment/appng5.module.mst
+++ b/ui/deployment/appng5.module.mst
@@ -39,9 +39,7 @@ import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client';
import { LOADING_BAR_CONFIG } from '@ngx-loading-bar/core';
{{#modulesActive}}
-{{#ng5}}
import { {{{ng5_moduleName}}} } from '{{{path}}}';
-{{/ng5}}
{{/modulesActive}}
import { NotificationModule } from './notifications/notifications.module';
@@ -80,9 +78,7 @@ import * as $ from 'jquery';
ServicesModule,
ProfileModule,
{{#modulesActive}}
- {{#ng5}}
{{{ng5_moduleName}}},
- {{/ng5}}
{{/modulesActive}}
],
providers: [
diff --git a/ui/deployment/modules.yml b/ui/deployment/modules.yml
index 313d04224..67c0c9a55 100644
--- a/ui/deployment/modules.yml
+++ b/ui/deployment/modules.yml
@@ -14,7 +14,7 @@
# limitations under the License.
spEditor:
- ng5: True
+ componentImport: True
ng5_moduleName: 'EditorModule'
ng5_component: 'EditorComponent'
ng5_componentPath: './editor/editor.component'
@@ -28,7 +28,7 @@ spEditor:
admin: false
pageNames: 'PageName.PIPELINE_EDITOR'
spConnect:
- ng5: True
+ componentImport: True
ng5_moduleName: 'ConnectModule'
ng5_component: 'ConnectComponent'
ng5_componentPath: './connect/connect.component'
@@ -42,7 +42,7 @@ spConnect:
admin: False
pageNames: 'PageName.CONNECT'
spPipelines:
- ng5: True
+ componentImport: True
ng5_moduleName: 'PipelinesModule'
ng5_component: 'PipelinesComponent'
ng5_componentPath: './pipelines/pipelines.component'
@@ -56,7 +56,7 @@ spPipelines:
admin: False
pageNames: 'PageName.PIPELINE_OVERVIEW'
spAdd:
- ng5: True
+ componentImport: False
ng5_moduleName: 'AddModule'
ng5_component: 'AddComponent'
ng5_componentPath: './add/add.component'
@@ -70,7 +70,7 @@ spAdd:
admin: True
pageNames: 'PageName.INSTALL_PIPELINE_ELEMENTS'
spConfiguration:
- ng5: True
+ componentImport: False
ng5_moduleName: 'ConfigurationModule'
ng5_component: 'GeneralConfigurationComponent'
ng5_componentPath: './configuration/general-configuration/general-configuration.component'
@@ -84,7 +84,7 @@ spConfiguration:
pageNames: 'PageName.SETTINGS'
admin: True
spAppOverview:
- ng5: True
+ componentImport: True
ng5_moduleName: 'AppOverviewModule'
ng5_component: 'AppOverviewComponent'
ng5_componentPath: './app-overview/app-overview.component'
@@ -98,7 +98,7 @@ spAppOverview:
admin: false
pageNames: 'PageName.APPS'
spDashboard:
- ng5: True
+ componentImport: True
ng5_moduleName: 'DashboardModule'
ng5_component: 'DashboardComponent'
ng5_componentPath: './dashboard/dashboard.component'
@@ -112,7 +112,7 @@ spDashboard:
admin: false
pageNames: 'PageName.DASHBOARD'
spDataExplorer:
- ng5: True
+ componentImport: False
ng5_moduleName: 'DataExplorerModule'
ng5_component: 'DataExplorerComponent'
ng5_componentPath: './data-explorer/data-explorer.component'
@@ -126,7 +126,7 @@ spDataExplorer:
admin: false
pageNames: 'PageName.DATA_EXPLORER'
spFiles:
- ng5: True
+ componentImport: False
ng5_moduleName: 'FilesModule'
ng5_component: 'FilesComponent'
ng5_componentPath: './files/files.component'
diff --git a/ui/deployment/prebuild.js b/ui/deployment/prebuild.js
index 6947f123d..dc165ee04 100644
--- a/ui/deployment/prebuild.js
+++ b/ui/deployment/prebuild.js
@@ -62,7 +62,7 @@ let modulesActive = {modulesActive: []};
for (let module of config.modules) {
modulesActive['modulesActive'].push({
module: module,
- ng5: modules[module]['ng5'],
+ componentImport: modules[module]['componentImport'],
ng1_templateUrl: modules[module]['ng1_templateUrl'],
ng5_moduleName: modules[module]['ng5_moduleName'],
ng5_component: modules[module]['ng5_component'],
@@ -77,13 +77,13 @@ for (let module of config.modules) {
description: modules[module]['description'],
homeImage: modules[module]['homeImage']
});
- console.log('Active Angular ' + (modules[module]['ng5']===true?5:1) + ' Module: ' + module);
+ console.log('Active Angular Module: ' + module);
}
// Create necessary JavaScript-Files from Template and move to respective Directory
fs.writeFileSync('src/app/appng5.module.ts', mustache.render(fs.readFileSync('deployment/appng5.module.mst', 'utf8').toString(), modulesActive));
fs.writeFileSync('src/app/home/home.service.ts', mustache.render(fs.readFileSync('deployment/home.service.mst', 'utf8').toString(), modulesActive));
-// fs.writeFileSync('src/app/app-routing.module.ts', mustache.render(fs.readFileSync('deployment/app-routing.module.mst', 'utf8').toString(), modulesActive));
+fs.writeFileSync('src/app/app-routing.module.ts', mustache.render(fs.readFileSync('deployment/app-routing.module.mst', 'utf8').toString(), modulesActive));
fs.writeFileSync('src/app/core/components/base-navigation.component.ts', mustache.render(fs.readFileSync('deployment/base-navigation.component.mst', 'utf8').toString(), modulesActive));
fs.writeFileSync('src/scss/sp/sp-theme.scss', fs.readFileSync('deployment/sp-theme.scss'));
fs.writeFileSync('src/app/services/app.constants.ts', fs.readFileSync('deployment/app-constants.ts', 'utf8'));
diff --git a/ui/src/app/data-explorer/data-explorer.component.ts b/ui/src/app/data-explorer/data-explorer.component.ts
index 7a30b5a3f..c6cb9b9d2 100644
--- a/ui/src/app/data-explorer/data-explorer.component.ts
+++ b/ui/src/app/data-explorer/data-explorer.component.ts
@@ -17,10 +17,9 @@
*/
import { Component, OnInit, ViewChild } from '@angular/core';
-import { DataViewDataExplorerService, Dashboard } from '@streampipes/platform-services';
+import { Dashboard, DataViewDataExplorerService } from '@streampipes/platform-services';
import { RefreshDashboardService } from './services/refresh-dashboard.service';
import { DataExplorerDashboardPanelComponent } from './components/panel/data-explorer-dashboard-panel.component';
-import { Tuple2 } from '../core-model/base/Tuple2';
import { ActivatedRoute } from '@angular/router';
import { AuthService } from '../services/auth.service';
import { UserPrivilege } from '../_enums/user-privilege.enum';
@@ -59,7 +58,11 @@ export class DataExplorerComponent implements OnInit {
this.hasDataExplorerDeletePrivileges = this.authService.hasRole(UserPrivilege.PRIVILEGE_DELETE_DATA_EXPLORER_VIEW);
});
this.route.queryParams.subscribe(params => {
- this.routeParams = { startTime: params['startTime'], endTime: params['endTime'], dashboardId: params['dashboardId'] };
+ this.routeParams = {
+ startTime: params['startTime'],
+ endTime: params['endTime'],
+ dashboardId: params['dashboardId']
+ };
this.getDashboards();
});
this.refreshDashboardService.refreshSubject.subscribe(currentDashboardId => {
@@ -126,9 +129,4 @@ export class DataExplorerComponent implements OnInit {
this.dashboardsLoaded = true;
});
}
-
-
- // resetDashboardChanges() {
- // this.getDashboards(this.selectedDataViewDashboard._id);
- // }
}