Merge branch 'staging' into production

MPDL · Apr 15, 2024 · 79548e4 · 79548e4
2 parents 1485c43 + 61ec0c7
commit 79548e4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/web/src/service_event/event_buffer_data.ts b/web/src/service_event/event_buffer_data.ts
@@ -62,21 +62,42 @@ export class EventBufferData {
     private generateSingleCircleSubTitle(titleInput: string, serviceEvent: ServiceEvent) : string{
         let title = titleInput;
         let eventCirclesNumber = this.eventCirclesArray.length;
+        let isPlural: boolean = eventCirclesNumber > 1
         if(serviceEvent === ServiceEvent.keeper_file_edit || serviceEvent === ServiceEvent.keeper_file_create) {
-            title = title + ' [' + eventCirclesNumber + ' files]'
+            if(isPlural) {
+                title = title + ' [' + eventCirclesNumber + ' files]'
+            } else {
+                title = title + ' [' + eventCirclesNumber + ' file]'
+            }
         }
         if(serviceEvent === ServiceEvent.keeper_new_library) {
-            title = title + ' [' + eventCirclesNumber + ' libraries]'
+            if(isPlural) {
+                title = title + ' [' + eventCirclesNumber + ' libraries]'
+            } else {
+                title = title + ' [' + eventCirclesNumber + ' library]'
+            }
         }
         if(serviceEvent === ServiceEvent.minerva_public_message || serviceEvent === ServiceEvent.minerva_direct_message
             || serviceEvent === ServiceEvent.minerva_private_message || serviceEvent === ServiceEvent.minerva_group_message) {
-            title = title + ' [' + eventCirclesNumber + ' messages]'
+            if(isPlural) {
+                title = title + ' [' + eventCirclesNumber + ' messages]'
+            } else {
+                title = title + ' [' + eventCirclesNumber + ' message]'
+            }
         }
         if(serviceEvent === ServiceEvent.bloxberg_confirmed_transaction) {
-            title = title + ' [' + eventCirclesNumber + ' transactions]'
+            if(isPlural) {
+                title = title + ' [' + eventCirclesNumber + ' transactions]'
+            } else {
+                title = title + ' [' + eventCirclesNumber + ' transaction]'
+            }
         }
         if(serviceEvent === ServiceEvent.bloxberg_block) {
-            title = title + ' [' + eventCirclesNumber + ' blocks]'
+            if(isPlural) {
+                title = title + ' [' + eventCirclesNumber + ' blocks]'
+            } else {
+                title = title + ' [' + eventCirclesNumber + ' block]'
+            }
         }
 
         return title;

diff --git a/web/src/theme/visualisationDirector.ts b/web/src/theme/visualisationDirector.ts
@@ -63,11 +63,14 @@ export class VisualisationDirector {
     getNextVisualisation(): Visualisation{
         let vis: Visualisation = this.current_visualisation
         if(this.settings_data.mixed) {
-            if(vis === Visualisation.listenTo){
-                vis = Visualisation.geo
-            } else {
-                vis = Visualisation.listenTo
-            }
+            vis = Visualisation.listenTo
+
+            // temporarily disabled (requested from feedback)
+            // if(vis === Visualisation.listenTo){
+            //     vis = Visualisation.geo
+            // } else {
+            //     vis = Visualisation.listenTo
+            // }
         }
         return vis
     }