New Release

CHANGELOG.md

@@ -8,6 +8,31 @@
 
 ### Fixed
 
+## v1.7.0
+
+### Added
+
+- Assets können nun als Favoriten markiert und wiedergefunden werden
+- Ein disclaimer wird auf der Startseite angezeigt
+- Assets können gelöscht werden
+
+### Changed
+
+- Verweise sind nur noch zu Assets in derselben Workgroups möglich
+- Die Hintergrundkarte kann weiter herausgezoomt werden
+
+### Fixed
+
+## v1.6.0
+
+### Added
+
+### Changed
+
+### Fixed
+
+- Asset Detailansicht bleibt nicht mehr bestehen nach einem Suchreset
+
 ## v1.5.0
 
 ### Added

apps/client-asset-sg/project.json

@@ -43,14 +43,6 @@
             }
           ]
         },
-        "int": {
-          "fileReplacements": [
-            {
-              "replace": "apps/client-asset-sg/src/environments/environment.ts",
-              "with": "apps/client-asset-sg/src/environments/environment.int.ts"
-            }
-          ]
-        },
         "development": {
           "buildOptimizer": false,
           "optimization": false,
@@ -68,9 +60,6 @@
         "production": {
           "buildTarget": "client-asset-sg:build:production"
         },
-        "int": {
-          "buildTarget": "client-asset-sg:build:int"
-        },
         "development": {
           "buildTarget": "client-asset-sg:build:development"
         }

apps/client-asset-sg/src/app/app.component.ts

@@ -1,12 +1,20 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, inject } from '@angular/core';
-import { AuthService, AuthState, ErrorService } from '@asset-sg/auth';
-import { AppPortalService, appSharedStateActions, setCssCustomProperties } from '@asset-sg/client-shared';
+import {
+  AppPortalService,
+  appSharedStateActions,
+  AuthService,
+  AuthState,
+  ConfigService,
+  ErrorService,
+  setCssCustomProperties,
+} from '@asset-sg/client-shared';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { Store } from '@ngrx/store';
 import { WINDOW } from 'ngx-window-token';
 import { debounceTime, fromEvent, startWith, switchMap } from 'rxjs';
 import { assert } from 'tsafe';
+import { environment } from '../environments/environment';
 import { AppState } from './state/app-state';
 
 const fullHdWidth = 1920;
@@ -25,8 +33,10 @@ export class AppComponent {
   readonly errorService = inject(ErrorService);
   readonly authService = inject(AuthService);
   private readonly store = inject(Store<AppState>);
+  private readonly configService = inject(ConfigService);
 
   constructor() {
+    this.configService.setHideDisclaimer(environment.hideDisclaimer);
     this._httpClient
       .get<Record<string, unknown>>('api/oauth-config/config')
       .pipe(switchMap(async (config) => await this.authService.initialize(config)))

apps/client-asset-sg/src/app/app.module.ts

@@ -5,24 +5,28 @@ import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import locale_deCH from '@angular/common/locales/de-CH';
 import { inject, NgModule } from '@angular/core';
 import { MatButton } from '@angular/material/button';
+import { MatDialogActions, MatDialogContent } from '@angular/material/dialog';
+import { MatDivider } from '@angular/material/divider';
 import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
 import { MatMenu, MatMenuTrigger } from '@angular/material/menu';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatTooltip } from '@angular/material/tooltip';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule } from '@angular/router';
-import { AuthInterceptor, AuthModule, ErrorService } from '@asset-sg/auth';
 import {
   AdminOnlyDirective,
   AlertModule,
   AnchorComponent,
   assetsPageMatcher,
+  AuthModule,
   ButtonComponent,
   CanCreateDirective,
   CURRENT_LANG,
   currentLangFactory,
+  ErrorService,
   icons,
+  LanguageSelectorComponent,
   TranslateTsLoader,
 } from '@asset-sg/client-shared';
 import { storeLogger } from '@asset-sg/core';
@@ -36,13 +40,13 @@ import { LetModule } from '@rx-angular/template/let';
 import { PushModule } from '@rx-angular/template/push';
 
 import { environment } from '../environments/environment';
-
 import { adminGuard } from './app-guards';
 import { AppComponent } from './app.component';
 import { AppBarComponent, MenuBarComponent, NotFoundComponent, RedirectToLangComponent } from './components';
 import { MenuBarItemComponent } from './components/menu-bar-item/menu-bar-item.component';
 import { SplashScreenComponent } from './components/splash-screen/splash-screen.component';
 import { appTranslations } from './i18n';
+import { HttpInterceptor } from './services/http.interceptor';
 import { AppSharedStateEffects } from './state';
 import { appSharedStateReducer } from './state/app-shared.reducer';
 
@@ -61,6 +65,7 @@ registerLocaleData(locale_deCH, 'de-CH');
   imports: [
     CommonModule,
     BrowserModule,
+    AuthModule,
     BrowserAnimationsModule,
     HttpClientModule,
     RouterModule.forRoot([
@@ -120,11 +125,15 @@ registerLocaleData(locale_deCH, 'de-CH');
     MatButton,
     MatMenuTrigger,
     MatMenu,
+    LanguageSelectorComponent,
+    MatDivider,
+    MatDialogContent,
+    MatDialogActions,
   ],
   providers: [
     provideSvgIcons(icons),
     ErrorService,
-    { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },
+    { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptor, multi: true },
     { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { appearance: 'fill', floatLabel: 'auto' } },
     { provide: CURRENT_LANG, useFactory: currentLangFactory },
   ],

apps/client-asset-sg/src/app/components/app-bar/app-bar.component.html

@@ -5,31 +5,7 @@
 <div class="spacer"></div>
 <span class="version">{{ version }}</span>
 
-<button mat-button type="button" class="language" [matMenuTriggerFor]="languageMenu" *rxLet="currentLang$; let lang">
-  {{ lang.lang }}
-
-  <svg-icon key="arrow-down" class="open" />
-  <svg-icon key="arrow-up" class="close" />
-</button>
-<mat-menu #languageMenu="matMenu" backdropClass="languages">
-  <ng-container *rxLet="languages$; let languages">
-    @for (language of languages; track language.lang) {
-    <a
-      asset-sg-reset
-      [routerLink]="language.params"
-      [queryParams]="language.queryParams"
-      [class.is-active]="language.isActive"
-    >
-      <span class="icon">
-        <svg-icon key="checkmark" />
-      </span>
-      <span class="name">
-        {{ language.lang }}
-      </span>
-    </a>
-    }
-  </ng-container>
-</mat-menu>
+<asset-sg-language-selector />
 
 <ng-container *ngIf="(isAnonymous$ | async) === false">
   <button mat-button type="button" class="profile" [matMenuTriggerFor]="profileMenu">

apps/client-asset-sg/src/app/components/app-bar/app-bar.component.scss

@@ -22,91 +22,6 @@ a.logo {
   color: #828e9a;
 }
 
-button.language {
-  text-transform: uppercase;
-  width: 69px;
-  height: 36px;
-  padding: 8px 12px;
-  border-radius: 4px;
-  color: #337083;
-  transition: 150ms ease-in;
-  transition-property: color, background-color;
-
-  & > ::ng-deep .mdc-button__label {
-    width: 100%;
-    height: 100%;
-
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0;
-  }
-
-  &:hover,
-  &[aria-expanded="true"] {
-    background-color: #adc6cd;
-    color: #2f4356;
-  }
-
-  svg-icon {
-    display: flex;
-    align-items: center;
-    width: 20px;
-    height: 20px;
-  }
-
-  svg-icon.close {
-    display: none;
-  }
-
-  &[aria-expanded="true"] svg-icon {
-    &.open {
-      display: none;
-    }
-    &.close {
-      display: flex;
-    }
-  }
-}
-
-::ng-deep .languages + * .mat-mdc-menu-panel {
-  text-transform: uppercase;
-  min-width: 85px;
-  max-width: 85px;
-
-  & > .mat-mdc-menu-content {
-    display: flex;
-    flex-direction: column;
-    padding: 0;
-  }
-
-  a {
-    color: #1c2834;
-    text-decoration: none;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 8px 12px;
-    transition: color 150ms ease-in;
-  }
-  a:hover {
-    background-color: #dfe4e9;
-  }
-
-  a > span.name {
-    flex-basis: 30%;
-  }
-
-  a > span.icon {
-    flex-grow: 1;
-    display: flex;
-    justify-content: flex-start;
-  }
-  a:not(.is-active) > span.icon {
-    visibility: hidden;
-  }
-}
-
 button.profile {
   background-color: #295969;
   color: white;

apps/client-asset-sg/src/app/components/app-bar/app-bar.component.ts

@@ -10,17 +10,12 @@ import {
   Output,
   ViewChild,
 } from '@angular/core';
-import { NavigationEnd, Router } from '@angular/router';
-import { AuthService } from '@asset-sg/auth';
-import { appSharedStateActions, fromAppShared, supportedLangs } from '@asset-sg/client-shared';
-import { isNotNull, isTruthy } from '@asset-sg/core';
-import { Lang } from '@asset-sg/shared';
+import { Router } from '@angular/router';
+import { appSharedStateActions, AuthService, fromAppShared } from '@asset-sg/client-shared';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { Store } from '@ngrx/store';
-import { flow, pipe } from 'fp-ts/function';
 import * as O from 'fp-ts/Option';
-import queryString from 'query-string';
-import { debounceTime, EMPTY, filter, map, Observable, startWith, Subject, switchMap } from 'rxjs';
+import { EMPTY, filter, map, Observable, Subject, switchMap } from 'rxjs';
 import { AppState } from '../../state/app-state';
 import { Version } from './version';
 
@@ -49,40 +44,6 @@ export class AppBarComponent implements OnInit {
 
   public readonly user$ = this.authService.getUserProfile$();
 
-  public readonly currentLang$ = this.router.events.pipe(
-    filter((e): e is NavigationEnd => e instanceof NavigationEnd),
-    map((e) => e.urlAfterRedirects),
-    startWith(this.router.url),
-    map(
-      flow(
-        (url) => O.of(url.match('^/(\\w\\w)(.*)$')),
-        O.filter(isTruthy),
-        O.bindTo('match'),
-        O.bind('lang', ({ match }) => pipe(Lang.decode(match[1]), O.fromEither)),
-        O.bind('parsed', ({ match }) => O.of(queryString.parseUrl(match[2]))),
-        O.map(({ parsed, lang }) => ({
-          lang,
-          path: parsed.url,
-          queryParams: parsed.query,
-        }))
-      )
-    ),
-    map((it) => O.toNullable(it)),
-    filter(isNotNull)
-  );
-
-  public readonly languages$ = this.currentLang$.pipe(
-    debounceTime(0),
-    map((currentLang) =>
-      supportedLangs.map((lang) => ({
-        isActive: lang === currentLang.lang,
-        lang: lang.toUpperCase(),
-        params: [`/${lang}${currentLang.path}`],
-        queryParams: currentLang.queryParams,
-      }))
-    )
-  );
-
   private readonly _ngOnInit$ = new Subject<void>();
 
   constructor(private readonly router: Router, private readonly httpClient: HttpClient) {

apps/client-asset-sg/src/app/components/menu-bar/menu-bar.component.html

@@ -5,12 +5,23 @@
       asset-sg-menu-bar-item
       icon="assets"
       [link]="isActive ? null : [translateService.currentLang]"
-      [isActive]="isActive && ((isFiltersOpen$ | async) ?? false)"
+      [isActive]="isActive"
       (click)="isActive ? toggleAssetDrawer() : null"
     >
       menuBar.filters
     </li>
-    <li *ngIf="userExists$ | async" asset-sg-menu-bar-item icon="favourite" disabled>menuBar.favourites</li>
+    @if (userExists$ | async) {
+    <li
+      *rxLet="activeItem === 'favorites'; let isActive"
+      asset-sg-menu-bar-item
+      icon="favorite"
+      [link]="isActive ? null : [translateService.currentLang, 'favorites']"
+      [isActive]="isActive"
+      (click)="isActive ? toggleAssetDrawer() : null"
+    >
+      menuBar.favourites
+    </li>
+    }
     <li
       *canCreate="AssetEditPolicy"
       asset-sg-menu-bar-item