This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 8d6f35e630 refactor(#4236): move shared enums and guards into core
domains (#4237)
8d6f35e630 is described below
commit 8d6f35e630416d5516ce0467c7b2e7fe81ecbd9a
Author: Philipp Zehnder <[email protected]>
AuthorDate: Thu Mar 12 10:56:13 2026 +0100
refactor(#4236): move shared enums and guards into core domains (#4237)
---
ui/cypress/support/builder/UserBuilder.ts | 2 +-
ui/cypress/support/model/User.ts | 2 +-
ui/cypress/support/utils/UserUtils.ts | 2 +-
.../pipeline/multiUser/pipelineMultiUserSupport.ts | 2 +-
.../tests/userManagement/addUserAdmin.smoke.spec.ts | 2 +-
.../userManagement/testAddAssetOnResourceCreation.ts | 2 +-
.../tests/userManagement/testGroupManagement.spec.ts | 2 +-
.../tests/userManagement/testUserRoleAssets.spec.ts | 2 +-
.../tests/userManagement/testUserRoleCharts.spec.ts | 2 +-
.../tests/userManagement/testUserRoleConnect.spec.ts | 2 +-
.../tests/userManagement/testUserRoleDashboard.spec.ts | 2 +-
.../tests/userManagement/testUserRoleDataset.spec.ts | 2 +-
.../tests/userManagement/testUserRolePipeline.spec.ts | 2 +-
.../userManagement/testVariousUserRoles.smoke.spec.ts | 2 +-
ui/deployment/app.routes.mst | 18 +++++++++---------
ui/deployment/base-navigation.component.mst | 6 +++---
ui/deployment/home.service.mst | 6 +++---
ui/src/app/assets/assets.routes.ts | 4 ++--
.../asset-link-table/asset-link-table.component.ts | 2 +-
.../asset-overview/asset-overview.component.ts | 2 +-
.../chart-container/chart-container.component.ts | 2 +-
.../chart-overview/chart-overview.component.ts | 2 +-
.../components/chart-view/chart-view.component.ts | 2 +-
.../chart-view/toolbar/chart-view-toolbar.component.ts | 2 +-
.../general-configuration.component.ts | 2 +-
.../edit-user-dialog/edit-user-dialog.component.ts | 2 +-
.../sites-configuration.component.ts | 2 +-
.../start-adapter-configuration.component.ts | 2 +-
.../auth/guards}/auth.can-activate-children.guard.ts | 2 +-
.../auth/guards}/auth.can-activate.guard.ts | 2 +-
.../auth/guards/page-auth.can-activate.guard.ts} | 2 +-
.../app/{_enums => core/auth}/user-privilege.enum.ts | 0
ui/src/app/{_enums => core/auth}/user-role.enum.ts | 0
.../app/{_enums => core/navigation}/page-name.enum.ts | 0
.../guards}/already-configured.can-activate.guard.ts | 2 +-
.../guards}/base-configured.can-activate.guard.ts | 2 +-
.../setup/guards}/configured.can-activate.guard.ts | 2 +-
.../guards}/registration-allowed.can-activate.guard.ts | 2 +-
.../restore-password-allowed.can-activate.guard.ts | 2 +-
.../setup/guards}/terms.can-activate-children.guard.ts | 2 +-
.../overview/dashboard-overview.component.ts | 2 +-
.../chart-selection/chart-selection.component.ts | 2 +-
.../components/panel/dashboard-panel.component.ts | 2 +-
.../edit-dashboard/edit-dashboard-dialog.component.ts | 2 +-
.../datalake-configuration.component.ts | 4 ++--
.../save-pipeline-settings.component.ts | 2 +-
ui/src/app/home/components/status.component.ts | 2 +-
ui/src/app/home/home.component.ts | 2 +-
ui/src/app/home/models/home.model.ts | 2 +-
.../app/pipeline-details/pipeline-details.component.ts | 2 +-
.../pipeline-overview/pipeline-overview.component.ts | 2 +-
ui/src/app/pipelines/pipelines.component.ts | 4 ++--
52 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/ui/cypress/support/builder/UserBuilder.ts
b/ui/cypress/support/builder/UserBuilder.ts
index a897a788a1..118cf6cf24 100644
--- a/ui/cypress/support/builder/UserBuilder.ts
+++ b/ui/cypress/support/builder/UserBuilder.ts
@@ -17,7 +17,7 @@
*/
import { User } from '../model/User';
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
export class UserBuilder {
user: User;
diff --git a/ui/cypress/support/model/User.ts b/ui/cypress/support/model/User.ts
index 891ed1e46e..18c6accaf6 100644
--- a/ui/cypress/support/model/User.ts
+++ b/ui/cypress/support/model/User.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
export class User {
email: string;
diff --git a/ui/cypress/support/utils/UserUtils.ts
b/ui/cypress/support/utils/UserUtils.ts
index 39784bbd81..189a331f01 100644
--- a/ui/cypress/support/utils/UserUtils.ts
+++ b/ui/cypress/support/utils/UserUtils.ts
@@ -18,7 +18,7 @@
import { User } from '../model/User';
import { UserBuilder } from '../builder/UserBuilder';
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserBtns } from './user/UserBtns';
import { ConfigurationBtns } from './configuration/ConfigurationBtns';
import { SharedBtns } from './shared/SharedBtns';
diff --git a/ui/cypress/tests/pipeline/multiUser/pipelineMultiUserSupport.ts
b/ui/cypress/tests/pipeline/multiUser/pipelineMultiUserSupport.ts
index 31f61716e4..4235b2699b 100644
--- a/ui/cypress/tests/pipeline/multiUser/pipelineMultiUserSupport.ts
+++ b/ui/cypress/tests/pipeline/multiUser/pipelineMultiUserSupport.ts
@@ -17,7 +17,7 @@
*/
import { UserUtils } from '../../../support/utils/UserUtils';
-import { UserRole } from '../../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../../src/app/core/auth/user-role.enum';
import { PipelineUtils } from '../../../support/utils/pipeline/PipelineUtils';
describe('Test Pipeline Multi User support', () => {
diff --git a/ui/cypress/tests/userManagement/addUserAdmin.smoke.spec.ts
b/ui/cypress/tests/userManagement/addUserAdmin.smoke.spec.ts
index 91d5c788e2..03e605b6f4 100644
--- a/ui/cypress/tests/userManagement/addUserAdmin.smoke.spec.ts
+++ b/ui/cypress/tests/userManagement/addUserAdmin.smoke.spec.ts
@@ -17,7 +17,7 @@
*/
import { UserBuilder } from '../../support/builder/UserBuilder';
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserUtils } from '../../support/utils/UserUtils';
describe('Test User Management', () => {
diff --git a/ui/cypress/tests/userManagement/testAddAssetOnResourceCreation.ts
b/ui/cypress/tests/userManagement/testAddAssetOnResourceCreation.ts
index ca025ecf3d..78e7be9a02 100644
--- a/ui/cypress/tests/userManagement/testAddAssetOnResourceCreation.ts
+++ b/ui/cypress/tests/userManagement/testAddAssetOnResourceCreation.ts
@@ -16,7 +16,7 @@
*
*/
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserUtils } from '../../support/utils/UserUtils';
import { ConnectUtils } from '../../support/utils/connect/ConnectUtils';
import { PipelineUtils } from '../../support/utils/pipeline/PipelineUtils';
diff --git a/ui/cypress/tests/userManagement/testGroupManagement.spec.ts
b/ui/cypress/tests/userManagement/testGroupManagement.spec.ts
index 3534a06120..cf9bd244f3 100644
--- a/ui/cypress/tests/userManagement/testGroupManagement.spec.ts
+++ b/ui/cypress/tests/userManagement/testGroupManagement.spec.ts
@@ -17,7 +17,7 @@
*/
import { UserBuilder } from '../../support/builder/UserBuilder';
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserUtils } from '../../support/utils/UserUtils';
import { ConnectUtils } from '../../support/utils/connect/ConnectUtils';
import { PipelineUtils } from '../../support/utils/pipeline/PipelineUtils';
diff --git a/ui/cypress/tests/userManagement/testUserRoleAssets.spec.ts
b/ui/cypress/tests/userManagement/testUserRoleAssets.spec.ts
index 7435fd872c..f30bc938b0 100644
--- a/ui/cypress/tests/userManagement/testUserRoleAssets.spec.ts
+++ b/ui/cypress/tests/userManagement/testUserRoleAssets.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserUtils } from '../../support/utils/UserUtils';
import { User } from '../../support/model/User';
import { AssetUtils } from '../../support/utils/asset/AssetUtils';
diff --git a/ui/cypress/tests/userManagement/testUserRoleCharts.spec.ts
b/ui/cypress/tests/userManagement/testUserRoleCharts.spec.ts
index b9c829e470..c97cec161a 100644
--- a/ui/cypress/tests/userManagement/testUserRoleCharts.spec.ts
+++ b/ui/cypress/tests/userManagement/testUserRoleCharts.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserUtils } from '../../support/utils/UserUtils';
import { ConnectUtils } from '../../support/utils/connect/ConnectUtils';
import { User } from '../../support/model/User';
diff --git a/ui/cypress/tests/userManagement/testUserRoleConnect.spec.ts
b/ui/cypress/tests/userManagement/testUserRoleConnect.spec.ts
index c3b5d585b3..3aa67fa277 100644
--- a/ui/cypress/tests/userManagement/testUserRoleConnect.spec.ts
+++ b/ui/cypress/tests/userManagement/testUserRoleConnect.spec.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserUtils } from '../../support/utils/UserUtils';
import { ConnectUtils } from '../../support/utils/connect/ConnectUtils';
import { PermissionUtils } from '../../support/utils/user/PermissionUtils';
diff --git a/ui/cypress/tests/userManagement/testUserRoleDashboard.spec.ts
b/ui/cypress/tests/userManagement/testUserRoleDashboard.spec.ts
index a30181341e..1c904cab62 100644
--- a/ui/cypress/tests/userManagement/testUserRoleDashboard.spec.ts
+++ b/ui/cypress/tests/userManagement/testUserRoleDashboard.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserUtils } from '../../support/utils/UserUtils';
import { ConnectUtils } from '../../support/utils/connect/ConnectUtils';
import { User } from '../../support/model/User';
diff --git a/ui/cypress/tests/userManagement/testUserRoleDataset.spec.ts
b/ui/cypress/tests/userManagement/testUserRoleDataset.spec.ts
index 7dc8933f49..a3aa42126f 100644
--- a/ui/cypress/tests/userManagement/testUserRoleDataset.spec.ts
+++ b/ui/cypress/tests/userManagement/testUserRoleDataset.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserUtils } from '../../support/utils/UserUtils';
import { ConnectUtils } from '../../support/utils/connect/ConnectUtils';
import { User } from '../../support/model/User';
diff --git a/ui/cypress/tests/userManagement/testUserRolePipeline.spec.ts
b/ui/cypress/tests/userManagement/testUserRolePipeline.spec.ts
index be104523d0..8581d8c5db 100644
--- a/ui/cypress/tests/userManagement/testUserRolePipeline.spec.ts
+++ b/ui/cypress/tests/userManagement/testUserRolePipeline.spec.ts
@@ -16,7 +16,7 @@
*
*/
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserUtils } from '../../support/utils/UserUtils';
import { ConnectUtils } from '../../support/utils/connect/ConnectUtils';
import { PipelineUtils } from '../../support/utils/pipeline/PipelineUtils';
diff --git a/ui/cypress/tests/userManagement/testVariousUserRoles.smoke.spec.ts
b/ui/cypress/tests/userManagement/testVariousUserRoles.smoke.spec.ts
index e88e762a63..d343fd533f 100644
--- a/ui/cypress/tests/userManagement/testVariousUserRoles.smoke.spec.ts
+++ b/ui/cypress/tests/userManagement/testVariousUserRoles.smoke.spec.ts
@@ -17,7 +17,7 @@
*/
import { UserBuilder } from '../../support/builder/UserBuilder';
-import { UserRole } from '../../../src/app/_enums/user-role.enum';
+import { UserRole } from '../../../src/app/core/auth/user-role.enum';
import { UserUtils } from '../../support/utils/UserUtils';
import { NavigationUtils } from
'../../support/utils/navigation/NavigationUtils';
diff --git a/ui/deployment/app.routes.mst b/ui/deployment/app.routes.mst
index fcedf987fa..9e7e8c4c7f 100644
--- a/ui/deployment/app.routes.mst
+++ b/ui/deployment/app.routes.mst
@@ -18,25 +18,25 @@
import {LoginComponent} from "./login/components/login/login.component";
import {StreampipesComponent} from
"./core/components/streampipes/streampipes.component";
-import {AuthCanActivateChildrenGuard} from
"./_guards/auth.can-activate-children.guard";
-import {ConfiguredCanActivateGuard} from
"./_guards/configured.can-activate.guard";
+import {AuthCanActivateChildrenGuard} from
"./core/auth/guards/auth.can-activate-children.guard";
+import {ConfiguredCanActivateGuard} from
"./core/setup/guards/configured.can-activate.guard";
import {StartupComponent} from "./login/components/startup/startup.component";
import {InfoComponent} from "./info/info.component";
import {NotificationsComponent} from "./notifications/notifications.component";
import {ProfileComponent} from "./profile/profile.component";
import {ApidocsComponent} from "./apidocs/apidocs.component";
-import { PageName } from './_enums/page-name.enum';
-import { PageAuthGuard } from './_guards/page-auth.can-active.guard';
+import { PageName } from './core/navigation/page-name.enum';
+import { PageAuthGuard } from
'./core/auth/guards/page-auth.can-activate.guard';
import { RegisterComponent } from
'./login/components/register/register.component';
import { RestorePasswordComponent } from
'./login/components/restore-password/restore-password.component';
-import { RegistrationAllowedCanActivateGuard } from
'./_guards/registration-allowed.can-activate.guard';
-import { RestorePasswordAllowedCanActivateGuard } from
'./_guards/restore-password-allowed.can-activate.guard';
+import { RegistrationAllowedCanActivateGuard } from
'./core/setup/guards/registration-allowed.can-activate.guard';
+import { RestorePasswordAllowedCanActivateGuard } from
'./core/setup/guards/restore-password-allowed.can-activate.guard';
import { SetNewPasswordComponent } from
'./login/components/set-new-password/set-new-password.component';
import { ActivateAccountComponent } from
'./login/components/activate-account/activate-account.component';
-import { UserPrivilege } from './_enums/user-privilege.enum';
+import { UserPrivilege } from './core/auth/user-privilege.enum';
import { TermsComponent } from './login/components/terms/terms.component';
-import { AuthCanActivateGuard } from './_guards/auth.can-activate.guard';
-import { TermsCanActivateChildrenGuard } from
'./_guards/terms.can-activate-children.guard';
+import { AuthCanActivateGuard } from
'./core/auth/guards/auth.can-activate.guard';
+import { TermsCanActivateChildrenGuard } from
'./core/setup/guards/terms.can-activate-children.guard';
import { Routes } from '@angular/router';
diff --git a/ui/deployment/base-navigation.component.mst
b/ui/deployment/base-navigation.component.mst
index fb15028120..bd9fca0589 100644
--- a/ui/deployment/base-navigation.component.mst
+++ b/ui/deployment/base-navigation.component.mst
@@ -18,12 +18,12 @@
import { NavigationEnd, Router } from '@angular/router';
-import { PageName } from '../../_enums/page-name.enum';
+import { PageName } from '../navigation/page-name.enum';
import { AuthService } from '../../services/auth.service';
import { CurrentUserService } from '@streampipes/shared-ui';
import { AppConstants } from '../../services/app.constants';
-import { UserPrivilege } from '../../_enums/user-privilege.enum';
-import { UserRole } from '../../_enums/user-role.enum';
+import { UserPrivilege } from '../auth/user-privilege.enum';
+import { UserRole } from '../auth/user-role.enum';
import { inject } from '@angular/core';
import { CollapseService } from '../collapse.service';
diff --git a/ui/deployment/home.service.mst b/ui/deployment/home.service.mst
index 54b71fa1a9..71fd0d88dd 100644
--- a/ui/deployment/home.service.mst
+++ b/ui/deployment/home.service.mst
@@ -17,7 +17,7 @@
*/
import { Injectable } from '@angular/core';
-import { PageName } from '../_enums/page-name.enum';
+import { PageName } from '../core/navigation/page-name.enum';
import { AuthService } from '../services/auth.service';
import { ServiceLink } from './models/home.model';
import {
@@ -27,8 +27,8 @@ import {
PipelineElementService,
PipelineService
} from '@streampipes/platform-services';
-import { UserPrivilege } from '../_enums/user-privilege.enum';
-import { UserRole } from '../_enums/user-role.enum';
+import { UserPrivilege } from '../core/auth/user-privilege.enum';
+import { UserRole } from '../core/auth/user-role.enum';
@Injectable({providedIn: 'root'})
export class HomeService {
diff --git a/ui/src/app/assets/assets.routes.ts
b/ui/src/app/assets/assets.routes.ts
index 3137910105..34f0e5173a 100644
--- a/ui/src/app/assets/assets.routes.ts
+++ b/ui/src/app/assets/assets.routes.ts
@@ -20,8 +20,8 @@ import { Routes } from '@angular/router';
import { SpAssetOverviewComponent } from
'./components/asset-overview/asset-overview.component';
import { SpViewAssetComponent } from
'./components/asset-details/view-asset/view-asset.component';
import { SpAssetDetailsComponent } from
'./components/asset-details/edit-asset/asset-details.component';
-import { UserPrivilege } from '../_enums/user-privilege.enum';
-import { PageAuthGuard } from '../_guards/page-auth.can-active.guard';
+import { UserPrivilege } from '../core/auth/user-privilege.enum';
+import { PageAuthGuard } from
'../core/auth/guards/page-auth.can-activate.guard';
export const ASSET_ROUTES: Routes = [
{
diff --git
a/ui/src/app/assets/components/asset-details/view-asset/view-asset-links/asset-link-table/asset-link-table.component.ts
b/ui/src/app/assets/components/asset-details/view-asset/view-asset-links/asset-link-table/asset-link-table.component.ts
index e25c4e4c58..f6900cf02d 100644
---
a/ui/src/app/assets/components/asset-details/view-asset/view-asset-links/asset-link-table/asset-link-table.component.ts
+++
b/ui/src/app/assets/components/asset-details/view-asset/view-asset-links/asset-link-table/asset-link-table.component.ts
@@ -56,7 +56,7 @@ import {
import { TranslatePipe, TranslateService } from '@ngx-translate/core';
import { Router } from '@angular/router';
import { AuthService } from '../../../../../../services/auth.service';
-import { UserRole } from '../../../../../../_enums/user-role.enum';
+import { UserRole } from '../../../../../../core/auth/user-role.enum';
import { Subscription } from 'rxjs';
import {
FlexDirective,
diff --git
a/ui/src/app/assets/components/asset-overview/asset-overview.component.ts
b/ui/src/app/assets/components/asset-overview/asset-overview.component.ts
index bb75619bed..22a1323bb8 100644
--- a/ui/src/app/assets/components/asset-overview/asset-overview.component.ts
+++ b/ui/src/app/assets/components/asset-overview/asset-overview.component.ts
@@ -46,7 +46,7 @@ import { SpAssetRoutes } from '../../assets.breadcrumb';
import { Router } from '@angular/router';
import { SpCreateAssetDialogComponent } from
'../../dialog/create-asset/create-asset-dialog.component';
import { IdGeneratorService } from
'../../../core-services/id-generator/id-generator.service';
-import { UserPrivilege } from '../../../_enums/user-privilege.enum';
+import { UserPrivilege } from '../../../core/auth/user-privilege.enum';
import { MatDialog } from '@angular/material/dialog';
import { Subscription } from 'rxjs';
import { TranslatePipe, TranslateService } from '@ngx-translate/core';
diff --git
a/ui/src/app/chart-shared/components/chart-container/chart-container.component.ts
b/ui/src/app/chart-shared/components/chart-container/chart-container.component.ts
index a9f4384877..9cdbd8e479 100644
---
a/ui/src/app/chart-shared/components/chart-container/chart-container.component.ts
+++
b/ui/src/app/chart-shared/components/chart-container/chart-container.component.ts
@@ -48,7 +48,7 @@ import { ChartRegistry } from
'../../registry/chart-registry.service';
import { ChartDirective } from './chart.directive';
import { ChartTypeService } from '../../services/chart-type.service';
import { AuthService } from '../../../services/auth.service';
-import { UserPrivilege } from '../../../_enums/user-privilege.enum';
+import { UserPrivilege } from '../../../core/auth/user-privilege.enum';
import {
CurrentUserService,
NameChangeService,
diff --git
a/ui/src/app/chart/components/chart-overview/chart-overview.component.ts
b/ui/src/app/chart/components/chart-overview/chart-overview.component.ts
index a4773406af..68b0b3ccae 100644
--- a/ui/src/app/chart/components/chart-overview/chart-overview.component.ts
+++ b/ui/src/app/chart/components/chart-overview/chart-overview.component.ts
@@ -26,7 +26,7 @@ import { AuthService } from '../../../services/auth.service';
import { SpChartRoutes } from '../../chart.breadcrumb';
import { ChartRoutingService } from
'../../../chart-shared/services/chart-routing.service';
import { ChartOverviewTableComponent } from
'./chart-overview-table/chart-overview-table.component';
-import { UserPrivilege } from '../../../_enums/user-privilege.enum';
+import { UserPrivilege } from '../../../core/auth/user-privilege.enum';
import { Subscription } from 'rxjs';
import {
FlexDirective,
diff --git a/ui/src/app/chart/components/chart-view/chart-view.component.ts
b/ui/src/app/chart/components/chart-view/chart-view.component.ts
index 08f897d66b..937d43fccf 100644
--- a/ui/src/app/chart/components/chart-view/chart-view.component.ts
+++ b/ui/src/app/chart/components/chart-view/chart-view.component.ts
@@ -62,7 +62,7 @@ import { TranslatePipe, TranslateService } from
'@ngx-translate/core';
import { ResizeEchartsService } from
'../../../chart-shared/services/resize-echarts.service';
import { AssetDialogComponent } from '../../dialog/asset-dialog.component';
import { AuthService } from '../../../services/auth.service';
-import { UserRole } from '../../../_enums/user-role.enum';
+import { UserRole } from '../../../core/auth/user-role.enum';
import { ChartFieldProviderService } from
'../../../chart-shared/services/chart-field-provider.service';
import { Tuple2 } from '../../../core-model/base/Tuple2';
import {
diff --git
a/ui/src/app/chart/components/chart-view/toolbar/chart-view-toolbar.component.ts
b/ui/src/app/chart/components/chart-view/toolbar/chart-view-toolbar.component.ts
index a2cfabfb97..cd2a9068c7 100644
---
a/ui/src/app/chart/components/chart-view/toolbar/chart-view-toolbar.component.ts
+++
b/ui/src/app/chart/components/chart-view/toolbar/chart-view-toolbar.component.ts
@@ -33,7 +33,7 @@ import {
CurrentUserService,
TimeRangeSelectorComponent,
} from '@streampipes/shared-ui';
-import { UserRole } from '../../../../_enums/user-role.enum';
+import { UserRole } from '../../../../core/auth/user-role.enum';
import {
FlexDirective,
LayoutAlignDirective,
diff --git
a/ui/src/app/configuration/general-configuration/general-configuration.component.ts
b/ui/src/app/configuration/general-configuration/general-configuration.component.ts
index dbbd9be1ff..714c5b4c84 100644
---
a/ui/src/app/configuration/general-configuration/general-configuration.component.ts
+++
b/ui/src/app/configuration/general-configuration/general-configuration.component.ts
@@ -34,7 +34,7 @@ import {
} from '@streampipes/platform-services';
import { Observable, zip } from 'rxjs';
import { AvailableRolesService } from '../../services/available-roles.service';
-import { UserRole } from '../../_enums/user-role.enum';
+import { UserRole } from '../../core/auth/user-role.enum';
import { AppConstants } from '../../services/app.constants';
import { SpConfigurationTabsService } from '../configuration-tabs.service';
import {
diff --git
a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts
b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts
index ab4d34aba1..7fab1f3791 100644
---
a/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts
+++
b/ui/src/app/configuration/security-configuration/edit-user-dialog/edit-user-dialog.component.ts
@@ -44,7 +44,7 @@ import {
ValidatorFn,
Validators,
} from '@angular/forms';
-import { UserRole } from '../../../_enums/user-role.enum';
+import { UserRole } from '../../../core/auth/user-role.enum';
import { MatCheckbox, MatCheckboxChange } from '@angular/material/checkbox';
import { AvailableRolesService } from
'../../../services/available-roles.service';
import { AuthService } from '../../../services/auth.service';
diff --git
a/ui/src/app/configuration/sites-configuration/sites-configuration.component.ts
b/ui/src/app/configuration/sites-configuration/sites-configuration.component.ts
index ef76c95699..9b24367608 100644
---
a/ui/src/app/configuration/sites-configuration/sites-configuration.component.ts
+++
b/ui/src/app/configuration/sites-configuration/sites-configuration.component.ts
@@ -29,7 +29,7 @@ import {
SpNavigationItem,
} from '@streampipes/shared-ui';
import { SpConfigurationRoutes } from '../configuration.breadcrumb';
-import { UserRole } from '../../_enums/user-role.enum';
+import { UserRole } from '../../core/auth/user-role.enum';
import { LayoutDirective } from '@ngbracket/ngx-layout/flex';
import { LocationFeaturesConfigurationComponent } from
'./location-features-configuration/location-features-configuration.component';
import { SiteAreaConfigurationComponent } from
'./site-area-configuration/site-area-configuration.component';
diff --git
a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
index 24baa90c2f..d0219bd64b 100644
---
a/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
+++
b/ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/start-adapter-configuration.component.ts
@@ -53,7 +53,7 @@ import { ShepherdService } from
'../../../../services/tour/shepherd.service';
import { TimestampPipe } from '../../../filter/timestamp.pipe';
import { ValidateName } from
'../../../../core-ui/static-properties/input.validator';
import { TranslatePipe, TranslateService } from '@ngx-translate/core';
-import { UserRole } from '../../../../_enums/user-role.enum';
+import { UserRole } from '../../../../core/auth/user-role.enum';
import {
FlexDirective,
LayoutAlignDirective,
diff --git a/ui/src/app/_guards/auth.can-activate-children.guard.ts
b/ui/src/app/core/auth/guards/auth.can-activate-children.guard.ts
similarity index 95%
rename from ui/src/app/_guards/auth.can-activate-children.guard.ts
rename to ui/src/app/core/auth/guards/auth.can-activate-children.guard.ts
index 16bad5377e..a9440317a4 100644
--- a/ui/src/app/_guards/auth.can-activate-children.guard.ts
+++ b/ui/src/app/core/auth/guards/auth.can-activate-children.guard.ts
@@ -24,7 +24,7 @@ import {
MaybeAsync,
RouterStateSnapshot,
} from '@angular/router';
-import { AuthService } from '../services/auth.service';
+import { AuthService } from '../../../services/auth.service';
@Injectable({ providedIn: 'root' })
export class AuthCanActivateChildrenGuard implements CanActivateChild {
diff --git a/ui/src/app/_guards/auth.can-activate.guard.ts
b/ui/src/app/core/auth/guards/auth.can-activate.guard.ts
similarity index 95%
rename from ui/src/app/_guards/auth.can-activate.guard.ts
rename to ui/src/app/core/auth/guards/auth.can-activate.guard.ts
index bca529dbdc..6a556fab1a 100644
--- a/ui/src/app/_guards/auth.can-activate.guard.ts
+++ b/ui/src/app/core/auth/guards/auth.can-activate.guard.ts
@@ -17,7 +17,7 @@
*/
import { inject, Injectable } from '@angular/core';
-import { AuthService } from '../services/auth.service';
+import { AuthService } from '../../../services/auth.service';
import {
ActivatedRouteSnapshot,
CanActivate,
diff --git a/ui/src/app/_guards/page-auth.can-active.guard.ts
b/ui/src/app/core/auth/guards/page-auth.can-activate.guard.ts
similarity index 96%
rename from ui/src/app/_guards/page-auth.can-active.guard.ts
rename to ui/src/app/core/auth/guards/page-auth.can-activate.guard.ts
index d22d4c14a9..93f14bb7f1 100644
--- a/ui/src/app/_guards/page-auth.can-active.guard.ts
+++ b/ui/src/app/core/auth/guards/page-auth.can-activate.guard.ts
@@ -24,7 +24,7 @@ import {
MaybeAsync,
RouterStateSnapshot,
} from '@angular/router';
-import { AuthService } from '../services/auth.service';
+import { AuthService } from '../../../services/auth.service';
import { Injectable } from '@angular/core';
@Injectable({ providedIn: 'root' })
diff --git a/ui/src/app/_enums/user-privilege.enum.ts
b/ui/src/app/core/auth/user-privilege.enum.ts
similarity index 100%
rename from ui/src/app/_enums/user-privilege.enum.ts
rename to ui/src/app/core/auth/user-privilege.enum.ts
diff --git a/ui/src/app/_enums/user-role.enum.ts
b/ui/src/app/core/auth/user-role.enum.ts
similarity index 100%
rename from ui/src/app/_enums/user-role.enum.ts
rename to ui/src/app/core/auth/user-role.enum.ts
diff --git a/ui/src/app/_enums/page-name.enum.ts
b/ui/src/app/core/navigation/page-name.enum.ts
similarity index 100%
rename from ui/src/app/_enums/page-name.enum.ts
rename to ui/src/app/core/navigation/page-name.enum.ts
diff --git a/ui/src/app/_guards/already-configured.can-activate.guard.ts
b/ui/src/app/core/setup/guards/already-configured.can-activate.guard.ts
similarity index 95%
rename from ui/src/app/_guards/already-configured.can-activate.guard.ts
rename to ui/src/app/core/setup/guards/already-configured.can-activate.guard.ts
index c5b9af6594..e48e9facea 100644
--- a/ui/src/app/_guards/already-configured.can-activate.guard.ts
+++ b/ui/src/app/core/setup/guards/already-configured.can-activate.guard.ts
@@ -18,7 +18,7 @@
import { Injectable } from '@angular/core';
import { Router, UrlTree } from '@angular/router';
-import { AuthService } from '../services/auth.service';
+import { AuthService } from '../../../services/auth.service';
import { BaseConfiguredCanActivateGuard } from
'./base-configured.can-activate.guard';
@Injectable({ providedIn: 'root' })
diff --git a/ui/src/app/_guards/base-configured.can-activate.guard.ts
b/ui/src/app/core/setup/guards/base-configured.can-activate.guard.ts
similarity index 97%
rename from ui/src/app/_guards/base-configured.can-activate.guard.ts
rename to ui/src/app/core/setup/guards/base-configured.can-activate.guard.ts
index 79576b3187..2705a65728 100644
--- a/ui/src/app/_guards/base-configured.can-activate.guard.ts
+++ b/ui/src/app/core/setup/guards/base-configured.can-activate.guard.ts
@@ -24,7 +24,7 @@ import {
UrlTree,
} from '@angular/router';
import { Observable } from 'rxjs';
-import { AuthService } from '../services/auth.service';
+import { AuthService } from '../../../services/auth.service';
export abstract class BaseConfiguredCanActivateGuard implements CanActivate {
constructor(
diff --git a/ui/src/app/_guards/configured.can-activate.guard.ts
b/ui/src/app/core/setup/guards/configured.can-activate.guard.ts
similarity index 95%
rename from ui/src/app/_guards/configured.can-activate.guard.ts
rename to ui/src/app/core/setup/guards/configured.can-activate.guard.ts
index 7434a4756b..341a37b9c8 100644
--- a/ui/src/app/_guards/configured.can-activate.guard.ts
+++ b/ui/src/app/core/setup/guards/configured.can-activate.guard.ts
@@ -18,7 +18,7 @@
import { Injectable } from '@angular/core';
import { Router, UrlTree } from '@angular/router';
-import { AuthService } from '../services/auth.service';
+import { AuthService } from '../../../services/auth.service';
import { BaseConfiguredCanActivateGuard } from
'./base-configured.can-activate.guard';
@Injectable({ providedIn: 'root' })
diff --git a/ui/src/app/_guards/registration-allowed.can-activate.guard.ts
b/ui/src/app/core/setup/guards/registration-allowed.can-activate.guard.ts
similarity index 96%
rename from ui/src/app/_guards/registration-allowed.can-activate.guard.ts
rename to
ui/src/app/core/setup/guards/registration-allowed.can-activate.guard.ts
index e85e6fb612..62e64b0fe7 100644
--- a/ui/src/app/_guards/registration-allowed.can-activate.guard.ts
+++ b/ui/src/app/core/setup/guards/registration-allowed.can-activate.guard.ts
@@ -23,7 +23,7 @@ import {
RouterStateSnapshot,
UrlTree,
} from '@angular/router';
-import { LoginService } from '../login/services/login.service';
+import { LoginService } from '../../../login/services/login.service';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
diff --git a/ui/src/app/_guards/restore-password-allowed.can-activate.guard.ts
b/ui/src/app/core/setup/guards/restore-password-allowed.can-activate.guard.ts
similarity index 96%
rename from ui/src/app/_guards/restore-password-allowed.can-activate.guard.ts
rename to
ui/src/app/core/setup/guards/restore-password-allowed.can-activate.guard.ts
index cb03d6023d..1240e471ab 100644
--- a/ui/src/app/_guards/restore-password-allowed.can-activate.guard.ts
+++
b/ui/src/app/core/setup/guards/restore-password-allowed.can-activate.guard.ts
@@ -23,7 +23,7 @@ import {
RouterStateSnapshot,
UrlTree,
} from '@angular/router';
-import { LoginService } from '../login/services/login.service';
+import { LoginService } from '../../../login/services/login.service';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
diff --git a/ui/src/app/_guards/terms.can-activate-children.guard.ts
b/ui/src/app/core/setup/guards/terms.can-activate-children.guard.ts
similarity index 96%
rename from ui/src/app/_guards/terms.can-activate-children.guard.ts
rename to ui/src/app/core/setup/guards/terms.can-activate-children.guard.ts
index efbdd17799..7eaf577d50 100644
--- a/ui/src/app/_guards/terms.can-activate-children.guard.ts
+++ b/ui/src/app/core/setup/guards/terms.can-activate-children.guard.ts
@@ -26,7 +26,7 @@ import {
RouterStateSnapshot,
} from '@angular/router';
import { CurrentUserService } from '@streampipes/shared-ui';
-import { LoginService } from '../login/services/login.service';
+import { LoginService } from '../../../login/services/login.service';
import { of, take } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
diff --git
a/ui/src/app/dashboard/components/overview/dashboard-overview.component.ts
b/ui/src/app/dashboard/components/overview/dashboard-overview.component.ts
index f84a0cc44d..9c54b4f110 100644
--- a/ui/src/app/dashboard/components/overview/dashboard-overview.component.ts
+++ b/ui/src/app/dashboard/components/overview/dashboard-overview.component.ts
@@ -24,7 +24,7 @@ import {
SpBreadcrumbService,
} from '@streampipes/shared-ui';
import { AuthService } from '../../../services/auth.service';
-import { UserPrivilege } from '../../../_enums/user-privilege.enum';
+import { UserPrivilege } from '../../../core/auth/user-privilege.enum';
import { SpDashboardRoutes } from '../../dashboard.breadcrumb';
import { Dashboard } from '@streampipes/platform-services';
import { DataExplorerDashboardService } from
'../../../dashboard-shared/services/dashboard.service';
diff --git
a/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts
b/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts
index c53cfb6950..ae71d2ae69 100644
---
a/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts
+++
b/ui/src/app/dashboard/components/panel/chart-selection-panel/chart-selection/chart-selection.component.ts
@@ -23,7 +23,7 @@ import {
} from '@streampipes/platform-services';
import { Router } from '@angular/router';
import { AuthService } from '../../../../../services/auth.service';
-import { UserPrivilege } from '../../../../../_enums/user-privilege.enum';
+import { UserPrivilege } from '../../../../../core/auth/user-privilege.enum';
import {
FlexDirective,
LayoutAlignDirective,
diff --git a/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
b/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
index 566e662497..812959d7a3 100644
--- a/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
+++ b/ui/src/app/dashboard/components/panel/dashboard-panel.component.ts
@@ -30,7 +30,7 @@ import {
TimeSettings,
} from '@streampipes/platform-services';
import { AuthService } from '../../../services/auth.service';
-import { UserPrivilege } from '../../../_enums/user-privilege.enum';
+import { UserPrivilege } from '../../../core/auth/user-privilege.enum';
import {
ActivatedRoute,
ActivatedRouteSnapshot,
diff --git
a/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts
b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts
index d8ca72160a..6c70ec2954 100644
---
a/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts
+++
b/ui/src/app/dashboard/dialogs/edit-dashboard/edit-dashboard-dialog.component.ts
@@ -38,7 +38,7 @@ import {
DialogRef,
FormFieldComponent,
} from '@streampipes/shared-ui';
-import { UserRole } from '../../../_enums/user-role.enum';
+import { UserRole } from '../../../core/auth/user-role.enum';
import { MatError, MatFormField } from '@angular/material/form-field';
import { MatInput } from '@angular/material/input';
import { FormsModule } from '@angular/forms';
diff --git
a/ui/src/app/dataset/components/datalake-configuration/datalake-configuration.component.ts
b/ui/src/app/dataset/components/datalake-configuration/datalake-configuration.component.ts
index cc1c1ba795..8e8e8b61b0 100644
---
a/ui/src/app/dataset/components/datalake-configuration/datalake-configuration.component.ts
+++
b/ui/src/app/dataset/components/datalake-configuration/datalake-configuration.component.ts
@@ -71,8 +71,8 @@ import { DeleteExportProviderComponent } from
'../../dialog/delete-export-provid
import { TranslatePipe, TranslateService } from '@ngx-translate/core';
import { ExportProviderConnectionTestComponent } from
'../../dialog/export-provider-connection-test/export-provider-connection-test.component';
import { DataRetentionLogDialogComponent } from
'../../dialog/data-retention-log-dialog/data-retention-log-dialog.component';
-import { UserPrivilege } from '../../../_enums/user-privilege.enum';
-import { UserRole } from '../../../_enums/user-role.enum';
+import { UserPrivilege } from '../../../core/auth/user-privilege.enum';
+import { UserRole } from '../../../core/auth/user-role.enum';
import {
FlexDirective,
FlexOrderDirective,
diff --git
a/ui/src/app/editor/dialog/save-pipeline/save-pipeline-settings/save-pipeline-settings.component.ts
b/ui/src/app/editor/dialog/save-pipeline/save-pipeline-settings/save-pipeline-settings.component.ts
index ed333fe0f6..2b82cb626c 100644
---
a/ui/src/app/editor/dialog/save-pipeline/save-pipeline-settings/save-pipeline-settings.component.ts
+++
b/ui/src/app/editor/dialog/save-pipeline/save-pipeline-settings/save-pipeline-settings.component.ts
@@ -47,7 +47,7 @@ import {
FormFieldComponent,
SplitSectionComponent,
} from '@streampipes/shared-ui';
-import { UserRole } from '../../../../_enums/user-role.enum';
+import { UserRole } from '../../../../core/auth/user-role.enum';
import { FlexDirective, LayoutDirective } from '@ngbracket/ngx-layout/flex';
import { MatError, MatFormField } from '@angular/material/form-field';
import { MatInput } from '@angular/material/input';
diff --git a/ui/src/app/home/components/status.component.ts
b/ui/src/app/home/components/status.component.ts
index db1703d9d1..58872ec0cf 100644
--- a/ui/src/app/home/components/status.component.ts
+++ b/ui/src/app/home/components/status.component.ts
@@ -20,7 +20,7 @@ import { Component, HostBinding, inject, Input, OnInit } from
'@angular/core';
import { Router } from '@angular/router';
import { AssetLinkType, UserInfo } from '@streampipes/platform-services';
import { StatusBox } from '../models/home.model';
-import { UserRole } from '../../_enums/user-role.enum';
+import { UserRole } from '../../core/auth/user-role.enum';
import { zip } from 'rxjs';
import { TranslatePipe } from '@ngx-translate/core';
diff --git a/ui/src/app/home/home.component.ts
b/ui/src/app/home/home.component.ts
index 006f3fddce..5a625422db 100644
--- a/ui/src/app/home/home.component.ts
+++ b/ui/src/app/home/home.component.ts
@@ -30,7 +30,7 @@ import {
SpBreadcrumbService,
SplitSectionComponent,
} from '@streampipes/shared-ui';
-import { UserRole } from '../_enums/user-role.enum';
+import { UserRole } from '../core/auth/user-role.enum';
import { MissingElementsForTutorialComponent } from
'../editor/dialog/missing-elements-for-tutorial/missing-elements-for-tutorial.component';
import { WelcomeTourComponent } from
'./dialog/welcome-tour/welcome-tour.component';
import { ShepherdService } from '../services/tour/shepherd.service';
diff --git a/ui/src/app/home/models/home.model.ts
b/ui/src/app/home/models/home.model.ts
index e69951af74..979032ec40 100644
--- a/ui/src/app/home/models/home.model.ts
+++ b/ui/src/app/home/models/home.model.ts
@@ -17,7 +17,7 @@
*/
import { Observable } from 'rxjs';
-import { PageName } from '../../_enums/page-name.enum';
+import { PageName } from '../../core/navigation/page-name.enum';
export interface StatusBox {
link: string[];
diff --git a/ui/src/app/pipeline-details/pipeline-details.component.ts
b/ui/src/app/pipeline-details/pipeline-details.component.ts
index 822e38d1e8..2419c8e5bb 100644
--- a/ui/src/app/pipeline-details/pipeline-details.component.ts
+++ b/ui/src/app/pipeline-details/pipeline-details.component.ts
@@ -36,7 +36,7 @@ import {
SpBreadcrumbService,
} from '@streampipes/shared-ui';
import { SpPipelineRoutes } from '../pipelines/pipelines.breadcrumb';
-import { UserPrivilege } from '../_enums/user-privilege.enum';
+import { UserPrivilege } from '../core/auth/user-privilege.enum';
import { forkJoin, interval, Observable, of, Subscription } from 'rxjs';
import { catchError, filter, map, switchMap } from 'rxjs/operators';
import { PipelinePreviewComponent } from
'./components/preview/pipeline-preview.component';
diff --git
a/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.ts
b/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.ts
index e37e1a43ab..be16fc2814 100644
---
a/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.ts
+++
b/ui/src/app/pipelines/components/pipeline-overview/pipeline-overview.component.ts
@@ -39,7 +39,7 @@ import {
} from '@angular/material/table';
import { MatSort, MatSortHeader } from '@angular/material/sort';
import { AuthService } from '../../../services/auth.service';
-import { UserPrivilege } from '../../../_enums/user-privilege.enum';
+import { UserPrivilege } from '../../../core/auth/user-privilege.enum';
import {
CurrentUserService,
DialogRef,
diff --git a/ui/src/app/pipelines/pipelines.component.ts
b/ui/src/app/pipelines/pipelines.component.ts
index 8409e1fef9..71cf62a2f9 100644
--- a/ui/src/app/pipelines/pipelines.component.ts
+++ b/ui/src/app/pipelines/pipelines.component.ts
@@ -36,9 +36,9 @@ import {
import { StartAllPipelinesDialogComponent } from
'./dialog/start-all-pipelines/start-all-pipelines-dialog.component';
import { Router } from '@angular/router';
import { AuthService } from '../services/auth.service';
-import { UserPrivilege } from '../_enums/user-privilege.enum';
+import { UserPrivilege } from '../core/auth/user-privilege.enum';
import { SpPipelineRoutes } from './pipelines.breadcrumb';
-import { UserRole } from '../_enums/user-role.enum';
+import { UserRole } from '../core/auth/user-role.enum';
import { ShepherdService } from '../services/tour/shepherd.service';
import { Subscription } from 'rxjs';
import {
