Releases/1.8.3

src/app/app.component.ts

@@ -154,12 +154,12 @@ export class AppComponent implements OnInit, OnDestroy {
         { duration: 10000 },
       );
       // Logging the state in dev mode
-      sub = this.ngrxStore
-        .pipe(map((store: StoreState) => store.Reducer))
-        .subscribe((state) => {
-          console.log(state);
-        });
-      this.subscriptions$.push(sub);
+      // sub = this.ngrxStore
+      //   .pipe(map((store: StoreState) => store.Reducer))
+      //   .subscribe((state) => {
+      //     console.log(state);
+      //   });
+      // this.subscriptions$.push(sub);
     } else {
       this.title = `MobSOS Evaluation Center v${environment.version}`;
     }

src/app/components/query-visualization/query-visualization/query-visualization.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { ChartType } from 'angular-google-charts';
 import { combineLatest } from 'rxjs';

src/app/components/success-modeling/success-model/success-dimension/success-factor/edit-measure-dialog/edit-measure-dialog.component.ts

@@ -349,58 +349,12 @@ export class EditMeasureDialogComponent implements OnInit {
     );
   }
 
-  // onKpiOperandChange(operandName: string, index: number): void {
-  //   (
-  //     this.data.measure.visualization as KpiVisualization
-  //   ).operationsElements[index] = new KpiVisualizationOperand(
-  //     operandName,
-  //     index,
-  //   );
-  // }
-
-  // onKpiOperatorChange(operatorName: string, index: number): void {
-  //   (
-  //     this.data.measure.visualization as KpiVisualization
-  //   ).operationsElements[index] = new KpiVisualizationOperator(
-  //     operatorName,
-  //     index,
-  //   );
-  //   this.formVisualizationParameters.push(new FormControl(''));
-  // }
-
-  // onAddOperationClicked(): void {
-  //   this.formVisualizationParameters.push(new FormControl(''));
-
-  //   if (this.formVisualizationParameters.controls.length === 1) {
-  //     this.formVisualizationParameters.push(new FormControl(''));
-  //   }
-  // }
-
-  // onRemoveOperationClicked(): void {
-  //   const kpiVisualization = this.data.measure
-  //     .visualization as KpiVisualization;
-  //   if (kpiVisualization.operationsElements.length >= 3) {
-  //     kpiVisualization.operationsElements.pop();
-  //     kpiVisualization.operationsElements.pop();
-  //   }
-
-  //   if (this.formVisualizationParameters.controls.length > 2) {
-  //     this.formVisualizationParameters.removeAt(
-  //       this.formVisualizationParameters.length - 1,
-  //     );
-  //     this.formVisualizationParameters.removeAt(
-  //       this.formVisualizationParameters.length - 1,
-  //     );
-  //   }
-  // }
-
   onQueryChanged(i: number): void {
     const sql = this.formQueries.controls[i].get('sql')
       .value as string;
     this.ngrxStore.dispatch(
       fetchVisualizationData({
         query: sql,
-        queryParams: this.getParamsForQuery(sql),
       }),
     );
   }

src/app/services/store/store.actions.ts

@@ -125,7 +125,7 @@ export const fetchServices = createAction(HttpActions.FETCH_SERVICES);
 export const fetchGroups = createAction(HttpActions.FETCH_GROUPS);
 export const fetchVisualizationData = createAction(
   HttpActions.FETCH_VISUALIZATION_DATA,
-  props<{ query: string; queryParams: string[]; cache?: boolean }>(),
+  props<{ query: string; cache?: boolean }>(),
 );
 export const fetchMessageDescriptions = createAction(
   HttpActions.FETCH_SERVICE_MESSAGE_DESCRIPTIONS,
@@ -408,7 +408,7 @@ export const setUserName = createAction(
 );
 export const refreshVisualization = createAction(
   HttpActions.REFRESH_VISUALIZATION,
-  props<{ query: string; queryParams?: string[] }>(),
+  props<{ query: string }>(),
 );
 export const resetFetchDate = createAction(
   StateActions.RESET_FETCH_DATE,

src/app/services/store/store.effects.ts

@@ -23,7 +23,10 @@ import {
 import { environment } from 'src/environments/environment';
 import { GroupMember } from '../../models/community.model';
 import { Questionnaire } from '../../models/questionnaire.model';
-import { ServiceMessageDescriptions } from '../../models/service.model';
+import {
+  ServiceInformation,
+  ServiceMessageDescriptions,
+} from '../../models/service.model';
 import { Survey } from '../../models/survey.model';
 
 import { VisualizationData } from '../../models/visualization.model';
@@ -497,10 +500,13 @@ export class StateEffects {
   fetchVisualizationData$ = createEffect(() =>
     this.actions$.pipe(
       ofType(Action.fetchVisualizationData),
-      withLatestFrom(this.ngrxStore.select(VISUALIZATION_DATA)),
-      mergeMap(([props, data]) => {
-        const query = props.query;
-        const queryParams = props.queryParams;
+      withLatestFrom(
+        this.ngrxStore.select(VISUALIZATION_DATA),
+        this.ngrxStore.select(SELECTED_SERVICE),
+      ),
+      mergeMap(([props, data, service]) => {
+        const query = applyVariableReplacements(props.query, service);
+        const queryParams = getParamsForQuery(props.query, service);
         const dataForQuery = data[query];
         if (!query) {
           return of(Action.failure({ reason: 'No query provided' }));
@@ -575,11 +581,11 @@ export class StateEffects {
         this.ngrxStore.dispatch(resetFetchDate({ query }));
       }),
       delay(100),
-      mergeMap(({ query, queryParams }) =>
+      mergeMap(({ query }) =>
         of(
           Action.fetchVisualizationData({
             query,
-            queryParams,
+
             cache: false,
           }),
         ),
@@ -1116,3 +1122,71 @@ function handleResponse(response: any, query: string) {
     ),
   }); // should not be reached
 }
+
+function applyVariableReplacements(
+  query: string,
+  service: ServiceInformation,
+): string {
+  if (query?.includes('$SERVICES$')) {
+    let servicesString = '(';
+    const services = [];
+
+    if (!service?.mobsosIDs) {
+      console.error('Service agent id cannot be null');
+      return query;
+    }
+    for (const mobsosID of Object.keys(service.mobsosIDs)) {
+      services.push(`"${mobsosID}"`);
+    }
+    servicesString += services.join(',') + ')';
+    return query?.replace('$SERVICES$', servicesString);
+  } else if (query?.includes('$SERVICE$')) {
+    if (!(Object.keys(service.mobsosIDs).length > 0)) {
+      console.error('Service agent id cannot be null');
+      return query;
+    }
+    // for now we use the id which has the greatest registrationTime as this is the agent ID
+    // of the most recent service agent started in las2peer
+    const maxIndex = Object.values(service.mobsosIDs).reduce(
+      (max, time, index) => {
+        return time > max ? index : max;
+      },
+      0,
+    );
+
+    return query?.replace(
+      '$SERVICE$',
+      ` ${Object.keys(service.mobsosIDs)[maxIndex]} `,
+    );
+  } else return query;
+}
+
+function getParamsForQuery(
+  query: string,
+  service: ServiceInformation,
+): string[] {
+  if (!(service?.mobsosIDs?.length > 0)) {
+    // just for robustness
+    // should not be called when there are no service IDs stored in MobSOS anyway
+    return [];
+  }
+  const serviceRegex = /\$SERVICE\$/g;
+  const matches = query?.match(serviceRegex);
+  const params = [];
+  if (matches) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    for (const match of matches) {
+      // for now we use the id which has the greatest registrationTime as this is the agent ID
+      // of the most recent service agent started in las2peer
+      const maxIndex = Object.values(service.mobsosIDs).reduce(
+        (max, time, index) => {
+          return time > max ? index : max;
+        },
+        0,
+      );
+
+      params.push(Object.keys(service.mobsosIDs)[maxIndex]);
+    }
+  }
+  return params as string[];
+}

src/app/shared/sql-table/sql-table.component.ts

@@ -73,21 +73,15 @@ export class SqlTableComponent
 
   ngOnInit() {
     const storeData$ = this.query$.pipe(
-      map((query) => {
-        const qParams = this.getParamsForQuery(query);
-        query = this.applyVariableReplacements(query);
-        query =
-          SqlTableComponent.applyCompatibilityFixForVisualizationService(
-            query,
-          );
-        return [query, qParams] as [string, string[]];
-      }),
-      tap(([query, queryParams]) =>
-        this.ngrxStore.dispatch(
-          fetchVisualizationData({ query, queryParams }),
+      map((query) =>
+        SqlTableComponent.applyCompatibilityFixForVisualizationService(
+          query,
         ),
       ),
-      switchMap(([query]) =>
+      tap((query) =>
+        this.ngrxStore.dispatch(fetchVisualizationData({ query })),
+      ),
+      switchMap((query) =>
         this.ngrxStore.select(
           VISUALIZATION_DATA_FOR_QUERY({ queryString: query }),
         ),

src/app/shared/visualizations/chart-visualization/chart-visualization.component.ts

@@ -105,15 +105,7 @@ export class ChartVisualizerComponent
 
     // gets the query string from the measure and applies variable replacements
     this.query$ = this.measure$.pipe(
-      withLatestFrom(this.service$),
-      map(([measure, service]) =>
-        applyCompatibilityFixForVisualizationService(
-          super.applyVariableReplacements(
-            measure.queries[0].sql,
-            service,
-          ),
-        ),
-      ),
+      map((measure) => measure.queries[0].sql),
       filter((query) => !!query),
       distinctUntilChanged(),
       shareReplay(1),
@@ -162,21 +154,12 @@ export class ChartVisualizerComponent
       }),
     );
 
-    sub = this.measure$
-      .pipe(withLatestFrom(this.service$))
-      .subscribe(([measure, service]) => {
-        let query = measure.queries[0].sql;
-        const cache = !this.measure?.tags.includes('generated'); // dont cache results for generated measures
-        const queryParams = super.getParamsForQuery(query);
-        query = this.applyVariableReplacements(query, service);
-        query = applyCompatibilityFixForVisualizationService(query);
-        super.fetchVisualizationData(
-          query,
-          queryParams,
-          this.ngrxStore,
-          cache,
-        );
-      });
+    sub = this.measure$.subscribe((measure) => {
+      let query = measure.queries[0].sql;
+      const cache = !this.measure?.tags.includes('generated'); // dont cache results for generated measures
+      query = applyCompatibilityFixForVisualizationService(query);
+      super.fetchVisualizationData(query, this.ngrxStore, cache);
+    });
     this.subscriptions$.push(sub);
 
     sub = this.data$
@@ -219,7 +202,6 @@ export class ChartVisualizerComponent
     this.ngrxStore.dispatch(
       refreshVisualization({
         query,
-        queryParams: super.getParamsForQuery(query),
       }),
     );
     this.chartData = null;

src/app/shared/visualizations/kpi-visualization/kpi-visualization.component.ts

@@ -91,12 +91,9 @@ export class KpiVisualizationComponent
       withLatestFrom(this.service$),
       map(([measure, service]) =>
         // apply replacement for each query
-        measure.queries.map((query) => {
-          let q = query.sql;
-          q = this.applyVariableReplacements(q, service);
-          q = applyCompatibilityFixForVisualizationService(q);
-          return q;
-        }),
+        measure.queries.map((query) =>
+          applyCompatibilityFixForVisualizationService(query.sql),
+        ),
       ),
       shareReplay(1),
       distinctUntilChanged(),
@@ -176,7 +173,6 @@ export class KpiVisualizationComponent
       this.ngrxStore.dispatch(
         refreshVisualization({
           query,
-          queryParams: super.getParamsForQuery(query),
         }),
       );
     });
@@ -186,12 +182,7 @@ export class KpiVisualizationComponent
     this.isLoading.emit(true);
     const sub = qs$.subscribe((queries) => {
       queries.forEach((query) => {
-        const queryParams = super.getParamsForQuery(query);
-        super.fetchVisualizationData(
-          query,
-          queryParams,
-          this.ngrxStore,
-        );
+        super.fetchVisualizationData(query, this.ngrxStore);
       });
     });
     this.subscriptions$.push(sub);

src/app/shared/visualizations/value-visualization/value-visualization.component.ts

@@ -93,10 +93,8 @@ export class ValueVisualizationComponent
 
     // gets the query string from the measure and applies variable replacements
     this.query$ = this.measure$.pipe(
-      withLatestFrom(this.service$),
-      map(([measure, service]) => {
+      map((measure) => {
         let query = measure.queries[0].sql;
-        query = super.applyVariableReplacements(query, service);
         query = applyCompatibilityFixForVisualizationService(query);
         return query;
       }),
@@ -153,7 +151,7 @@ export class ValueVisualizationComponent
       const query = applyCompatibilityFixForVisualizationService(
         measure.queries[0].sql,
       );
-      super.fetchVisualizationData(query, [], this.ngrxStore);
+      super.fetchVisualizationData(query, this.ngrxStore);
     });
     this.subscriptions$.push(sub);
   }
@@ -162,7 +160,6 @@ export class ValueVisualizationComponent
     this.ngrxStore.dispatch(
       refreshVisualization({
         query,
-        queryParams: super.getParamsForQuery(query),
       }),
     );
   }