bump dev

.github/workflows/build-deploy-gmr-master.yml

@@ -18,6 +18,15 @@ jobs:
                   node-version: 20
                   cache: "npm"
 
+            - name: Update environment file
+              run: |
+                sed -i 's+'production'+${{secrets.GMR_PRODUCTION}}+g' src/environments/environment.prod.ts
+                sed -i "s+'publictest'+${{secrets.GMR_PUBLICTEST}}+g" src/environments/environment.prod.ts
+                sed -i "s+'appTitle'+${{secrets.GMR_APPTITLE}}+g" src/environments/environment.prod.ts
+                sed -i "s+'apiUrl'+${{secrets.GMR_APIURL}}+g" src/environments/environment.prod.ts
+                sed -i "s+'wsHost'+${{secrets.GMR_WSHOST}}+g" src/environments/environment.prod.ts
+                sed -i "s+'wsAppKey'+${{secrets.GMR_WSAPPKEY}}+g" src/environments/environment.prod.ts
+
             - name: Install dependencies
               run: npm ci
 

.github/workflows/build-deploy-mkj-master.yml

@@ -20,12 +20,12 @@ jobs:
 
             - name: Update environment file
               run: |
-                sed -i 's+'production'+${{secrets.TEST_PRODUCTION}}+g' src/environments/environment.prod.ts
-                sed -i "s+'publictest'+${{secrets.TEST_PUBLICTEST}}+g" src/environments/environment.prod.ts
-                sed -i "s+'appTitle'+${{secrets.TEST_APPTITLE}}+g" src/environments/environment.prod.ts
-                sed -i "s+'apiUrl'+${{secrets.TEST_APIURL}}+g" src/environments/environment.prod.ts
-                sed -i "s+'wsHost'+${{secrets.TEST_WSHOST}}+g" src/environments/environment.prod.ts
-                sed -i "s+'wsAppKey'+${{secrets.TEST_WSAPPKEY}}+g" src/environments/environment.prod.ts
+                sed -i 's+'production'+${{secrets.MKJ_PRODUCTION}}+g' src/environments/environment.prod.ts
+                sed -i "s+'publictest'+${{secrets.MKJ_PUBLICTEST}}+g" src/environments/environment.prod.ts
+                sed -i "s+'appTitle'+${{secrets.MKJ_APPTITLE}}+g" src/environments/environment.prod.ts
+                sed -i "s+'apiUrl'+${{secrets.MKJ_APIURL}}+g" src/environments/environment.prod.ts
+                sed -i "s+'wsHost'+${{secrets.MKJ_WSHOST}}+g" src/environments/environment.prod.ts
+                sed -i "s+'wsAppKey'+${{secrets.MKJ_WSAPPKEY}}+g" src/environments/environment.prod.ts
 
             - name: Install dependencies
               run: npm ci

src/app/models/User-Notifications.ts

@@ -13,5 +13,6 @@ export interface UserNotification<T = any> {
 export enum UserNotificationType {
   TerminCreated = 'App\\Notifications\\TerminCreatedNotification',
   TerminUpdated = 'App\\Notifications\\TerminUpdatedNotification',
+  TestSocket = 'App\\Notifications\\TestSocket',
   SwUpdate = 'SwUpdate',
 }

src/app/services/user-notification.service.ts

@@ -65,7 +65,8 @@ export class UserNotificationService {
   }
 
   private markAsRead(notification: UserNotification): void {
-    if (notification.id === UserNotificationType.SwUpdate) {
+    console.log(notification);
+    if (notification.type === UserNotificationType.SwUpdate || notification.type === UserNotificationType.TestSocket) {
       this.removeNotification(notification);
       return;
     }

src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.html

@@ -1,9 +1,10 @@
 <i
   pBadge
   class="pi pi-bell text-2xl cursor-pointer"
+  severity="warning"
   [value]="this.menuItems.length"
-  [severity]="this.menuItems.length === 0 ? 'danger' : 'info'"
   [class.p-disabled]="this.menuItems.length === 0"
+  [class.hide-badge]="this.menuItems.length === 0"
   (click)="this.menuItems.length ? notificationmenu.toggle($event) : null"
 ></i>
 

src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.scss

@@ -0,0 +1,5 @@
+.hide-badge ::ng-deep {
+  .p-badge {
+    opacity: 0;
+  }
+}

src/app/utilities/mkj-user-notifications/mkj-user-notifications.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnDestroy } from '@angular/core';
+import { ChangeDetectorRef, Component, OnDestroy } from '@angular/core';
 import { MenuItem } from 'primeng/api';
 import { UserNotificationService } from 'src/app/services/user-notification.service';
 import { SubSink } from 'subsink';
@@ -13,10 +13,14 @@ export class MkjUserNotificationsComponent implements OnDestroy {
 
   private _subs = new SubSink();
 
-  constructor(private userNotificationsService: UserNotificationService) {
+  constructor(
+    private userNotificationsService: UserNotificationService,
+    cd: ChangeDetectorRef
+  ) {
     this._subs.add(
       this.userNotificationsService.userNotifications.subscribe((notifications) => {
         this.menuItems = notifications;
+        cd.markForCheck();
       })
     );
   }

src/configurations/changeLogVersion.ts

@@ -8,7 +8,7 @@ export interface MkjAppChangeLog {
 
 export const MkjAppChangeLog: MkjAppChangeLog[] = [
   {
-    date: '30.03.2024',
+    date: '27.03.2024',
     version: '0.9.8 - BETA',
     changes: {
       Benachrichtigungen: 'Implementierung von Echtzeit-Benachrichtigungen.',

src/environments/environment.ts

@@ -4,7 +4,7 @@
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 
 export const environment = {
-  production: true,
+  production: false,
   publictest: true,
   appTitle: 'mkjLOCAL',
   apiUrl: 'http://localhost:8000/api/',