This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch
2337-cant-access-connect-with-user-role-connect-admin
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/2337-cant-access-connect-with-user-role-connect-admin by this push:
new 162d9f3fcc fix(#2337): Change routing from to app-routing.module
162d9f3fcc is described below
commit 162d9f3fcca5963ae59da011bf5a0f15bd004e07
Author: Philipp Zehnder <[email protected]>
AuthorDate: Fri Mar 15 09:56:00 2024 +0100
fix(#2337): Change routing from to app-routing.module
---
.../streampipes/ps/PipelineElementTemplateResource.java | 2 +-
ui/deployment/app-routing.module.mst | 2 +-
ui/src/app/add/add.module.ts | 2 +-
ui/src/app/app-overview/app-overview.module.ts | 2 +-
ui/src/app/assets/assets.module.ts | 2 +-
ui/src/app/configuration/configuration.module.ts | 2 +-
.../existing-adapters/existing-adapters.component.ts | 2 +-
ui/src/app/connect/connect.module.ts | 8 ++------
ui/src/app/core-ui/core-ui.module.ts | 11 +++++++++++
.../app/{editor/dialog => core-ui}/help/help.component.html | 0
.../app/{editor/dialog => core-ui}/help/help.component.scss | 2 +-
ui/src/app/{editor/dialog => core-ui}/help/help.component.ts | 9 +--------
.../pipeline-element-documentation.component.html | 0
.../pipeline-element-documentation.component.scss | 0
.../pipeline-element-documentation.component.ts | 0
.../pipeline-element-runtime-info.component.html | 0
.../pipeline-element-runtime-info.component.scss | 0
.../pipeline-element-runtime-info.component.ts | 2 +-
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 | 9 ---------
ui/src/app/editor/services/editor.service.ts | 2 +-
ui/src/app/files/files.module.ts | 2 +-
ui/src/app/pipelines/pipelines.module.ts | 2 +-
24 files changed, 28 insertions(+), 37 deletions(-)
diff --git
a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/PipelineElementTemplateResource.java
b/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/PipelineElementTemplateResource.java
index 1b9e52c854..8a70fcf9d0 100644
---
a/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/PipelineElementTemplateResource.java
+++
b/streampipes-platform-services/src/main/java/org/apache/streampipes/ps/PipelineElementTemplateResource.java
@@ -164,7 +164,7 @@ public class PipelineElementTemplateResource extends
AbstractRestResource {
@Parameter(
description = "Overwrite the name and description of the pipeline
element"
+ "with the labels given in the pipeline element template")
- @RequestParam("overwriteNames") String overwriteNameAndDescription,
+ @RequestParam(value = "overwriteNames", defaultValue = "false", required
= false)String overwriteNameAndDescription,
@RequestBody(description = "The data sink invocation that should be
configured with the template contents",
content = @Content(schema = @Schema(implementation =
DataSinkInvocation.class)))
diff --git a/ui/deployment/app-routing.module.mst
b/ui/deployment/app-routing.module.mst
index 093d7a5153..8b02986f2e 100644
--- a/ui/deployment/app-routing.module.mst
+++ b/ui/deployment/app-routing.module.mst
@@ -63,7 +63,7 @@ const routes: Routes = [
{ path: '{{{link}}}', component: {{{ng5_component}}}, data: {
authPageNames: [{{{pageNames}}}]}},
{{/componentImport}}
{{^componentImport}}
- { path: '', data: { authPageNames: [{{{pageNames}}}]}, loadChildren: ()
=> import('{{{path}}}').then(m => m.{{{ng5_moduleName}}})},
+ { path: '{{{link}}}', data: { authPageNames: [{{{pageNames}}}]},
loadChildren: () => import('{{{path}}}').then(m => m.{{{ng5_moduleName}}})},
{{/componentImport}}
{{/modulesActive}}
diff --git a/ui/src/app/add/add.module.ts b/ui/src/app/add/add.module.ts
index 4ec4b3cede..edcc92a1f4 100644
--- a/ui/src/app/add/add.module.ts
+++ b/ui/src/app/add/add.module.ts
@@ -47,7 +47,7 @@ import { SharedUiModule } from
'../../../projects/streampipes/shared-ui/src/lib/
MatProgressSpinnerModule,
RouterModule.forChild([
{
- path: 'add',
+ path: '',
children: [
{
path: '',
diff --git a/ui/src/app/app-overview/app-overview.module.ts
b/ui/src/app/app-overview/app-overview.module.ts
index 8be703b01c..37cd31ba84 100644
--- a/ui/src/app/app-overview/app-overview.module.ts
+++ b/ui/src/app/app-overview/app-overview.module.ts
@@ -45,7 +45,7 @@ import { SharedUiModule } from '@streampipes/shared-ui';
SharedUiModule,
RouterModule.forChild([
{
- path: 'apps',
+ path: '',
children: [
{ path: '', component: AppOverviewComponent },
...(AvailableAppsService.apps.map(app => {
diff --git a/ui/src/app/assets/assets.module.ts
b/ui/src/app/assets/assets.module.ts
index b3804affa2..dac8bb2412 100644
--- a/ui/src/app/assets/assets.module.ts
+++ b/ui/src/app/assets/assets.module.ts
@@ -65,7 +65,7 @@ import { SpManageAssetLinksDialogComponent } from
'./dialog/manage-asset-links/m
PlatformServicesModule,
RouterModule.forChild([
{
- path: 'assets',
+ path: '',
children: [
{
path: '',
diff --git a/ui/src/app/configuration/configuration.module.ts
b/ui/src/app/configuration/configuration.module.ts
index 05efe24c59..98a2989906 100644
--- a/ui/src/app/configuration/configuration.module.ts
+++ b/ui/src/app/configuration/configuration.module.ts
@@ -88,7 +88,7 @@ import { CodemirrorModule } from '@ctrl/ngx-codemirror';
PlatformServicesModule,
RouterModule.forChild([
{
- path: 'configuration',
+ path: '',
children: [
{
path: '',
diff --git
a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
index c10f7729f0..99022ad582 100644
---
a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
+++
b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
@@ -40,7 +40,6 @@ import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { ObjectPermissionDialogComponent } from
'../../../core-ui/object-permission-dialog/object-permission-dialog.component';
import { UserRole } from '../../../_enums/user-role.enum';
-import { HelpComponent } from '../../../editor/dialog/help/help.component';
import { Router } from '@angular/router';
import { AdapterFilterSettingsModel } from
'../../model/adapter-filter-settings.model';
import { AdapterFilterPipe } from '../../filter/adapter-filter.pipe';
@@ -48,6 +47,7 @@ import { SpConnectRoutes } from '../../connect.routes';
import { Subscription, zip } from 'rxjs';
import { RestApi } from '../../../services/rest-api.service';
import { ShepherdService } from '../../../services/tour/shepherd.service';
+import { HelpComponent } from '../../../core-ui/help/help.component';
@Component({
selector: 'sp-existing-adapters',
diff --git a/ui/src/app/connect/connect.module.ts
b/ui/src/app/connect/connect.module.ts
index 22202016e7..828f03cfa9 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -50,7 +50,6 @@ import { EditDataTypeComponent } from
'./dialog/edit-event-property/components/e
import { EditTimestampPropertyComponent } from
'./dialog/edit-event-property/components/edit-value-transformation/edit-timestamp-property/edit-timestamp-property.component';
import { EditUnitTransformationComponent } from
'./dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component';
import { EditEventPropertyComponent } from
'./dialog/edit-event-property/edit-event-property.component';
-import { PipelineElementRuntimeInfoComponent } from
'./components/runtime-info/pipeline-element-runtime-info.component';
import { EventPropertyRowComponent } from
'./components/adapter-configuration/schema-editor/event-property-row/event-property-row.component';
import { EventSchemaPreviewComponent } from
'./components/adapter-configuration/schema-editor/event-schema-preview/event-schema-preview.component';
import { CoreUiModule } from '../core-ui/core-ui.module';
@@ -107,16 +106,14 @@ import { MatDividerModule } from
'@angular/material/divider';
MatSliderModule,
MatSnackBarModule,
PlatformServicesModule,
- CoreUiModule,
TreeModule,
RouterModule.forChild([
{
- path: 'connect',
+ path: '',
children: [
{
path: '',
component: ExistingAdaptersComponent,
- pathMatch: 'full',
},
{
path: 'create',
@@ -147,7 +144,7 @@ import { MatDividerModule } from
'@angular/material/divider';
]),
SharedUiModule,
],
- exports: [PipelineElementRuntimeInfoComponent, ErrorMessageComponent],
+ exports: [ErrorMessageComponent],
declarations: [
AdapterConfigurationHeaderComponent,
AdapterConfigurationComponent,
@@ -169,7 +166,6 @@ import { MatDividerModule } from
'@angular/material/divider';
AdapterFilterPipe,
JsonPrettyPrintPipe,
AdapterConfigurationComponent,
- PipelineElementRuntimeInfoComponent,
TimestampPipe,
EditCorrectionValueComponent,
AdapterConfigurationComponent,
diff --git a/ui/src/app/core-ui/core-ui.module.ts
b/ui/src/app/core-ui/core-ui.module.ts
index 724e6d808f..df1787ba2e 100644
--- a/ui/src/app/core-ui/core-ui.module.ts
+++ b/ui/src/app/core-ui/core-ui.module.ts
@@ -76,6 +76,10 @@ import { StatusWidgetComponent } from
'./status/status-widget.component';
import { SpSimpleMetricsComponent } from
'./monitoring/simple-metrics/simple-metrics.component';
import { SpSimpleLogsComponent } from
'./monitoring/simple-logs/simple-logs.component';
import { DateInputComponent } from './date-input/date-input.component';
+import { HelpComponent } from './help/help.component';
+import { PipelineElementRuntimeInfoComponent } from
'./pipeline-element-runtime-info/pipeline-element-runtime-info.component';
+import { PipelineElementDocumentationComponent } from
'./pipeline-element-documentation/pipeline-element-documentation.component';
+import { MarkdownModule } from 'ngx-markdown';
@NgModule({
imports: [
@@ -103,6 +107,7 @@ import { DateInputComponent } from
'./date-input/date-input.component';
OverlayModule,
QuillModule.forRoot(),
MatTreeModule,
+ MarkdownModule.forRoot(),
],
declarations: [
DataDownloadDialogComponent,
@@ -111,6 +116,9 @@ import { DateInputComponent } from
'./date-input/date-input.component';
ObjectPermissionDialogComponent,
PipelineElementTemplateConfigComponent,
PipelineElementTemplatePipe,
+ PipelineElementRuntimeInfoComponent,
+ PipelineElementDocumentationComponent,
+ HelpComponent,
StaticAnyInputComponent,
StaticPropertyComponent,
StaticFreeInputComponent,
@@ -149,6 +157,9 @@ import { DateInputComponent } from
'./date-input/date-input.component';
DataDownloadDialogComponent,
DateInputComponent,
PipelineElementTemplateConfigComponent,
+ PipelineElementRuntimeInfoComponent,
+ PipelineElementDocumentationComponent,
+ HelpComponent,
StaticAnyInputComponent,
StaticPropertyComponent,
StaticFreeInputComponent,
diff --git a/ui/src/app/editor/dialog/help/help.component.html
b/ui/src/app/core-ui/help/help.component.html
similarity index 100%
rename from ui/src/app/editor/dialog/help/help.component.html
rename to ui/src/app/core-ui/help/help.component.html
diff --git a/ui/src/app/editor/dialog/help/help.component.scss
b/ui/src/app/core-ui/help/help.component.scss
similarity index 95%
rename from ui/src/app/editor/dialog/help/help.component.scss
rename to ui/src/app/core-ui/help/help.component.scss
index 3e7522f22d..c95de1b0e5 100644
--- a/ui/src/app/editor/dialog/help/help.component.scss
+++ b/ui/src/app/core-ui/help/help.component.scss
@@ -16,7 +16,7 @@
*
*/
-@import '../../../../scss/sp/sp-dialog.scss';
+@import '../../../scss/sp/sp-dialog.scss';
.preview-row,
.preview-table {
diff --git a/ui/src/app/editor/dialog/help/help.component.ts
b/ui/src/app/core-ui/help/help.component.ts
similarity index 89%
rename from ui/src/app/editor/dialog/help/help.component.ts
rename to ui/src/app/core-ui/help/help.component.ts
index c713ad4362..5b7ff21d04 100644
--- a/ui/src/app/editor/dialog/help/help.component.ts
+++ b/ui/src/app/core-ui/help/help.component.ts
@@ -17,13 +17,12 @@
*/
import { Component, Input, OnInit } from '@angular/core';
-import { PipelineElementUnion } from '../../model/editor.model';
import {
PipelineElementService,
SpDataStream,
} from '@streampipes/platform-services';
import { DialogRef } from '@streampipes/shared-ui';
-import { PipelineElementTypeUtils } from '../../utils/editor.utils';
+import { PipelineElementUnion } from '../../editor/model/editor.model';
@Component({
selector: 'sp-pipeline-element-help',
@@ -107,10 +106,4 @@ export class HelpComponent implements OnInit {
this.dialogRef.close();
});
}
-
- filterTab(tab) {
- const type = PipelineElementTypeUtils.fromType(this.pipelineElement);
- const cssShortHand = PipelineElementTypeUtils.toCssShortHand(type);
- return tab.targets.indexOf(cssShortHand) !== -1;
- }
}
diff --git
a/ui/src/app/editor/components/pipeline-element-documentation/pipeline-element-documentation.component.html
b/ui/src/app/core-ui/pipeline-element-documentation/pipeline-element-documentation.component.html
similarity index 100%
rename from
ui/src/app/editor/components/pipeline-element-documentation/pipeline-element-documentation.component.html
rename to
ui/src/app/core-ui/pipeline-element-documentation/pipeline-element-documentation.component.html
diff --git
a/ui/src/app/editor/components/pipeline-element-documentation/pipeline-element-documentation.component.scss
b/ui/src/app/core-ui/pipeline-element-documentation/pipeline-element-documentation.component.scss
similarity index 100%
rename from
ui/src/app/editor/components/pipeline-element-documentation/pipeline-element-documentation.component.scss
rename to
ui/src/app/core-ui/pipeline-element-documentation/pipeline-element-documentation.component.scss
diff --git
a/ui/src/app/editor/components/pipeline-element-documentation/pipeline-element-documentation.component.ts
b/ui/src/app/core-ui/pipeline-element-documentation/pipeline-element-documentation.component.ts
similarity index 100%
rename from
ui/src/app/editor/components/pipeline-element-documentation/pipeline-element-documentation.component.ts
rename to
ui/src/app/core-ui/pipeline-element-documentation/pipeline-element-documentation.component.ts
diff --git
a/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.html
b/ui/src/app/core-ui/pipeline-element-runtime-info/pipeline-element-runtime-info.component.html
similarity index 100%
rename from
ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.html
rename to
ui/src/app/core-ui/pipeline-element-runtime-info/pipeline-element-runtime-info.component.html
diff --git
a/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.scss
b/ui/src/app/core-ui/pipeline-element-runtime-info/pipeline-element-runtime-info.component.scss
similarity index 100%
rename from
ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.scss
rename to
ui/src/app/core-ui/pipeline-element-runtime-info/pipeline-element-runtime-info.component.scss
diff --git
a/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts
b/ui/src/app/core-ui/pipeline-element-runtime-info/pipeline-element-runtime-info.component.ts
similarity index 98%
rename from
ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts
rename to
ui/src/app/core-ui/pipeline-element-runtime-info/pipeline-element-runtime-info.component.ts
index 01e07422b0..db068fd067 100644
---
a/ui/src/app/connect/components/runtime-info/pipeline-element-runtime-info.component.ts
+++
b/ui/src/app/core-ui/pipeline-element-runtime-info/pipeline-element-runtime-info.component.ts
@@ -21,7 +21,7 @@ import {
EventPropertyUnion,
SpDataStream,
} from '@streampipes/platform-services';
-import { RestService } from '../../services/rest.service';
+import { RestService } from '../../connect/services/rest.service';
@Component({
selector: 'sp-pipeline-element-runtime-info',
diff --git a/ui/src/app/dashboard/dashboard.module.ts
b/ui/src/app/dashboard/dashboard.module.ts
index 24d969b4b1..c2648a5f96 100644
--- a/ui/src/app/dashboard/dashboard.module.ts
+++ b/ui/src/app/dashboard/dashboard.module.ts
@@ -89,7 +89,7 @@ import { DashboardPanelCanDeactivateGuard } from
'./dashboard.can-deactivate.gua
SharedUiModule,
RouterModule.forChild([
{
- path: 'dashboard',
+ path: '',
children: [
{
path: '',
diff --git a/ui/src/app/data-explorer/data-explorer.module.ts
b/ui/src/app/data-explorer/data-explorer.module.ts
index 1f459b0a28..4f19079e8d 100644
--- a/ui/src/app/data-explorer/data-explorer.module.ts
+++ b/ui/src/app/data-explorer/data-explorer.module.ts
@@ -116,7 +116,7 @@ import { SpVisualizationConfigOuterComponent } from
'./components/widgets/utils/
NgxEchartsModule.forChild(),
RouterModule.forChild([
{
- path: 'dataexplorer',
+ path: '',
children: [
{
path: '',
diff --git a/ui/src/app/editor/editor.module.ts
b/ui/src/app/editor/editor.module.ts
index 104da07dcd..afcc37f430 100644
--- a/ui/src/app/editor/editor.module.ts
+++ b/ui/src/app/editor/editor.module.ts
@@ -37,8 +37,6 @@ import { SavePipelineComponent } from
'./dialog/save-pipeline/save-pipeline.comp
import { PipelineElementRecommendationComponent } from
'./components/pipeline-element-recommendation/pipeline-element-recommendation.component';
import { CompatibleElementsComponent } from
'./dialog/compatible-elements/compatible-elements.component';
import { MatListModule } from '@angular/material/list';
-import { HelpComponent } from './dialog/help/help.component';
-import { PipelineElementDocumentationComponent } from
'./components/pipeline-element-documentation/pipeline-element-documentation.component';
import { SafeCss } from './utils/style-sanitizer';
import { MatchingErrorComponent } from
'./dialog/matching-error/matching-error.component';
import { MissingElementsForTutorialComponent } from
'./dialog/missing-elements-for-tutorial/missing-elements-for-tutorial.component';
@@ -46,7 +44,6 @@ import { OutputStrategyComponent } from
'./components/output-strategy/output-str
import { CustomOutputStrategyComponent } from
'./components/output-strategy/custom-output/custom-output-strategy.component';
import { PropertySelectionComponent } from
'./components/output-strategy/property-selection/property-selection.component';
import { UserDefinedOutputStrategyComponent } from
'./components/output-strategy/user-defined-output/user-defined-output.component';
-import { ConnectModule } from '../connect/connect.module';
import { EnabledPipelineElementFilter } from
'./filter/enabled-pipeline-element.filter';
import { PipelineElementPreviewComponent } from
'./components/pipeline-element-preview/pipeline-element-preview.component';
import { PipelineElementDiscoveryComponent } from
'./dialog/pipeline-element-discovery/pipeline-element-discovery.component';
@@ -55,16 +52,13 @@ import { PipelineElementIconStandRowComponent } from
'./components/pipeline-elem
import { PipelineElementTypeFilterPipe } from
'./services/pipeline-element-type-filter.pipe';
import { PipelineElementNameFilterPipe } from
'./services/pipeline-element-name-filter.pipe';
import { PipelineElementGroupFilterPipe } from
'./services/pipeline-element-group-filter.pipe';
-import { MarkdownModule } from 'ngx-markdown';
@NgModule({
imports: [
CoreUiModule,
CommonModule,
- ConnectModule,
MatTabsModule,
MatListModule,
- FlexLayoutModule,
GridsterModule,
FlexLayoutModule,
CustomMaterialModule,
@@ -72,7 +66,6 @@ import { MarkdownModule } from 'ngx-markdown';
MatProgressSpinnerModule,
ReactiveFormsModule,
PlatformServicesModule,
- MarkdownModule.forRoot(),
],
declarations: [
CompatibleElementsComponent,
@@ -80,7 +73,6 @@ import { MarkdownModule } from 'ngx-markdown';
CustomOutputStrategyComponent,
EditorComponent,
EnabledPipelineElementFilter,
- HelpComponent,
MatchingErrorComponent,
MissingElementsForTutorialComponent,
OutputStrategyComponent,
@@ -88,7 +80,6 @@ import { MarkdownModule } from 'ngx-markdown';
PipelineAssemblyComponent,
PipelineElementComponent,
PipelineElementDiscoveryComponent,
- PipelineElementDocumentationComponent,
PipelineElementIconStandComponent,
PipelineElementIconStandRowComponent,
PipelineElementGroupFilterPipe,
diff --git a/ui/src/app/editor/services/editor.service.ts
b/ui/src/app/editor/services/editor.service.ts
index f14a81f938..a07f6bbee9 100644
--- a/ui/src/app/editor/services/editor.service.ts
+++ b/ui/src/app/editor/services/editor.service.ts
@@ -37,9 +37,9 @@ import {
PipelineElementUnion,
} from '../model/editor.model';
import { DialogService, PanelType } from '@streampipes/shared-ui';
-import { HelpComponent } from '../dialog/help/help.component';
import { map } from 'rxjs/operators';
import { NGX_LOADING_BAR_IGNORED } from '@ngx-loading-bar/http-client';
+import { HelpComponent } from '../../core-ui/help/help.component';
@Injectable({ providedIn: 'root' })
export class EditorService {
diff --git a/ui/src/app/files/files.module.ts b/ui/src/app/files/files.module.ts
index a93ce71716..20794c27cb 100644
--- a/ui/src/app/files/files.module.ts
+++ b/ui/src/app/files/files.module.ts
@@ -69,7 +69,7 @@ import { MatDialogModule } from '@angular/material/dialog';
SharedUiModule,
RouterModule.forChild([
{
- path: 'files',
+ path: '',
children: [
{
path: '',
diff --git a/ui/src/app/pipelines/pipelines.module.ts
b/ui/src/app/pipelines/pipelines.module.ts
index 79b34d02b4..c59ec1bc24 100644
--- a/ui/src/app/pipelines/pipelines.module.ts
+++ b/ui/src/app/pipelines/pipelines.module.ts
@@ -70,7 +70,7 @@ import { SpFunctionsLogsComponent } from
'./components/functions-overview/functi
SharedUiModule,
RouterModule.forChild([
{
- path: 'pipelines',
+ path: '',
children: [
{
path: '',