Merge branch 'develop' into feat/xd-153

.env.example

@@ -20,6 +20,7 @@ DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:$
 
 # Frontend
 XD_API_URL=http://${BACKEND_HOST}:${BACKEND_PORT}
+SECRET_KEY=SecretKey
 
 # Swagger
 # Just the subpath of the URL where the Swagger UI will be available

.eslintrc.json

@@ -62,7 +62,11 @@
 							},
 							{
 								"sourceTag": "domain:facilities",
-								"onlyDependOnLibsWithTags": ["domain:facilities", "domain:common"]
+								"onlyDependOnLibsWithTags": [
+									"domain:facilities",
+									"domain:common",
+									"domain:cases"
+								]
 							},
 							{
 								"sourceTag": "domain:common",

.lintstagedrc.yml

@@ -1,5 +1,6 @@
+'*.{ts}':
+    - nx run-many --target lint
 '*.{json,md,yml}':
     - nx format:write --uncommitted
 '*.{scss,css}':
     - nx affected --target stylelint --fix
-    - nx format:write --uncommitted

apps/backend/src/app/config/classes/environment.class.ts

@@ -1,4 +1,4 @@
-import { IsDefined, IsNumber, IsString, IsUrl, MinLength } from 'class-validator';
+import { IsDefined, IsNumber, IsOptional, IsString, MinLength } from 'class-validator';
 
 /* Interfaces */
 import { IEnvironmentVariables } from '../interfaces/environment.interface';
@@ -95,10 +95,10 @@ export class EnvironmentVariables implements IEnvironmentVariables {
 	@MinLength(1)
 	INSIGHT_HUB_API_KEY?: string;
 
-    /**
-     * The URL of the Swagger UI
-     */
-    @IsDefined()
-    @IsString()
-    SWAGGER_URL_PATH: string;
+	/**
+	 * The URL of the Swagger UI
+	 */
+	@IsOptional()
+	@IsString()
+	SWAGGER_URL_PATH?: string;
 }

apps/backend/src/app/config/validation.ts

@@ -50,7 +50,7 @@ const generateConfig = (config: IEnvironmentVariables): BackendConfig =>
 			apiUrl: config.INSIGHT_HUB_API_URL,
 			apiKey: config.INSIGHT_HUB_API_KEY,
 		},
-        swagger: {
-            urlPath: config.SWAGGER_URL_PATH,
-        }
+		swagger: {
+			urlPath: config.SWAGGER_URL_PATH || 'swagger',
+		},
 	} as BackendConfig);

apps/frontend/Dockerfile

@@ -18,9 +18,11 @@ RUN pnpm install --frozen-lockfile
 FROM base as builder
 
 ARG XD_API_URL
+ARG XD_SECRET_KEY
 
 ENV NX_DEAMON="false"
 ENV XD_API_URL=$XD_API_URL
+ENV XD_SECRET_KEY=$XD_SECRET_KEY
 
 COPY --from=installer /usr/src/app/node_modules ./node_modules
 

apps/frontend/src/app/app.routes.ts

@@ -1,4 +1,5 @@
 import { Route } from '@angular/router';
+import { AuthenticationGuard } from 'common-frontend-models';
 
 import { HeaderComponent } from './components/header/header.component';
 
@@ -7,26 +8,27 @@ export const APP_ROUTES: Route[] = [
 		path: '',
 		component: HeaderComponent,
 		data: {
-			breadcrumbs: {
-				label: 'Home',
-				url: '/',
-			},
+			breadcrumb: 'Home',
 			title: 'Home Page',
 			subtitle: '',
 		},
 		children: [
 			{
 				path: '',
+				canActivate: [AuthenticationGuard],
 				loadComponent: () =>
 					import('./pages/home/home.component').then((m) => m.HomeComponent),
 			},
+			{
+				path: 'home',
+				canActivate: [AuthenticationGuard],
+				redirectTo: '',
+			},
 			{
 				path: 'facilities',
+				canActivate: [AuthenticationGuard],
 				data: {
-					breadcrumbs: {
-						label: 'Facilities',
-						url: 'facilities',
-					},
+					breadcrumb: 'Facilities',
 					title: 'Facilities Dashboard',
 					subtitle: 'List of all Facilities',
 				},
@@ -35,11 +37,9 @@ export const APP_ROUTES: Route[] = [
 			},
 			{
 				path: 'cases',
+				canActivate: [AuthenticationGuard],
 				data: {
-					breadcrumbs: {
-						label: 'Cases',
-						url: 'cases',
-					},
+					breadcrumb: 'Cases',
 					title: 'Cases',
 					subtitle: '',
 				},
@@ -50,6 +50,7 @@ export const APP_ROUTES: Route[] = [
 	},
 	{
 		path: 'not-found',
+		canActivate: [AuthenticationGuard],
 		loadComponent: () =>
 			import('./pages/not-found/not-found.component').then((m) => m.NotFoundComponent),
 	},

apps/frontend/src/app/components/header/header.component.html

@@ -1,43 +1,48 @@
 <ix-application class="h-screen !z-0">
-	<ix-application-header name="Xcelerator Demo App">
-		<button class="placeholder-logo" slot="logo" [routerLink]="['/']">
-			<img
-				src="https://cdn.c2comms.cloud/images/logo-collection/2.1/sie-logo-white-rgb.svg"
-				class="h-5"
-				alt="Siemens logo"
-			/>
-		</button>
-		<ix-button class="mt-1" variant="secondary" ghost>
-			Powered by Siemens Xcelerator
-		</ix-button>
-		<ix-avatar username="John Doe" extra="Administrator"> </ix-avatar>
-	</ix-application-header>
+    <ix-application-header name="Xcelerator Demo App">
+        <button class="placeholder-logo" slot="logo" [routerLink]="['/']">
+            <img
+                [src]="lightMode() ?
+                    'https://cdn.c2comms.cloud/images/logo-collection/2.1/sie-logo-black-rgb.svg':
+                    'https://cdn.c2comms.cloud/images/logo-collection/2.1/sie-logo-white-rgb.svg'"
+                class="h-5"
+                alt="Siemens logo"
+            />
+        </button>
+        <ix-button class="mt-1" variant="secondary">
+            Powered by Siemens Xcelerator
+        </ix-button>
+        <ix-avatar [username]="userMail" extra="Administrator">
+            <ix-dropdown-item label="Logout" (click)="logout()"></ix-dropdown-item>
+        </ix-avatar>
+    </ix-application-header>
 
-	<ix-breadcrumb visibleItemCount="3" class="ml-8">
-		@for (breadcrumb of breadcrumbs(); track breadcrumb.url) {
-			<ix-breadcrumb-item
-				[routerLink]="[breadcrumb.url]"
-				[label]="breadcrumb.label"
-			></ix-breadcrumb-item>
-		}
-	</ix-breadcrumb>
+    <ix-breadcrumb visibleItemCount="3" class="ml-8">
+        @for (breadcrumb of breadcrumbs(); track breadcrumb; let i=$index; let length=$count) {
+            <ix-breadcrumb-item
+                [label]="breadcrumb"
+                [routerLink]="cutUrl(length - i - 1)"
+            ></ix-breadcrumb-item>
+        }
+    </ix-breadcrumb>
 
-	<ix-content-header
-		class="pl-4 pt-4"
-		[hasBackButton]="backButtonPresent()"
-		[headerTitle]="title()"
-		[headerSubtitle]="subtitle()"
-		(backButtonClick)="goBack()"
-	></ix-content-header>
+    @if (!isHomePage()){
+        <div class="absolute top-10 right-4 !z-[50] flex flex-row-reverse gap-x-4">
+            <ix-button icon="refresh" (click)="refresh()">Refresh</ix-button>
+        </div>
+    }
 
-	<ix-menu>
-		<ix-menu-item icon="building1" [routerLink]="['/facilities']">Facilities</ix-menu-item>
-		<ix-menu-item icon="tasks-open" [routerLink]="['/cases']">Cases</ix-menu-item>
+    <ix-menu>
+        <ix-menu-item icon="home" [routerLink]="['/']">Home</ix-menu-item>
+        <ix-menu-item icon="building1" [routerLink]="['/facilities']">Facilities</ix-menu-item>
+        <ix-menu-item icon="tasks-open" [routerLink]="['/cases']">Cases</ix-menu-item>
+        <ix-menu-item [icon]="lightMode() ? 'sun-filled' : 'sun'" slot="bottom" (click)="toggleMode()">toggle theme</ix-menu-item>
 
-		<ix-menu-about>
-			<app-legal-information></app-legal-information>
-		</ix-menu-about>
-	</ix-menu>
+        <ix-menu-about>
+            <app-legal-information></app-legal-information>
+        </ix-menu-about>
+    </ix-menu>
 
-	<router-outlet></router-outlet>
+
+    <router-outlet></router-outlet>
 </ix-application>

apps/frontend/src/app/components/header/header.component.spec.ts

@@ -2,19 +2,26 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, NavigationEnd, Router, RouterEvent } from '@angular/router';
 import { ReplaySubject } from 'rxjs';
 
-import { HeaderComponent, IBreadcrumbData } from './header.component';
+import { HeaderComponent } from './header.component';
 
 const HEADER_ROUTES = {
+	snapshot: {
+		firstChild: {
+			routeConfig: {
+				path: '',
+			},
+		},
+	},
 	root: {
 		snapshot: {
 			data: {
-				breadcrumbs: { label: 'Layer 1', url: '/layer1' } as IBreadcrumbData,
+				breadcrumb: 'Layer 1',
 			},
 		},
 		firstChild: {
 			snapshot: {
 				data: {
-					breadcrumbs: { label: 'Layer 2', url: '/layer2' } as IBreadcrumbData,
+					breadcrumb: 'Layer 2',
 				},
 			},
 		},
@@ -30,10 +37,11 @@ describe('HeaderComponent', () => {
 	beforeEach(async () => {
 		routerMock = {
 			events: eventsSubject.asObservable(),
+			url: '/Layer1/Layer2',
 		} as unknown as Router;
 
 		await TestBed.configureTestingModule({
-			imports: [ HeaderComponent ],
+			imports: [HeaderComponent],
 			providers: [
 				{
 					provide: ActivatedRoute,
@@ -71,8 +79,6 @@ describe('HeaderComponent', () => {
 		eventsSubject.next(new NavigationEnd(1, '', ''));
 
 		const breadcrumbs = component.breadcrumbs();
-		expect(breadcrumbs.length).toBe(2);
-		expect(breadcrumbs[0]).toEqual({ label: 'Layer 1', url: '/layer1' });
-		expect(breadcrumbs[1]).toEqual({ label: 'Layer 2', url: '/layer2' });
+		expect(breadcrumbs).toEqual(['Layer 1', 'Layer 2']);
 	});
 });