feat/AB#88032_ABC-disable-cross-page-filtering-in-the-app-builder-as-well

apps/back-office/src/app/app-preview/pages/dashboard/dashboard.component.ts

@@ -70,6 +70,7 @@ export class DashboardComponent
     this.route.params.pipe(takeUntil(this.destroy$)).subscribe((params) => {
       this.loading = true;
       this.id = params.id;
+      this.dashboardService.currentDashboardId = this.id;
       this.apollo
         .query<DashboardQueryResponse>({
           query: GET_DASHBOARD_BY_ID,

apps/back-office/src/app/application/application.component.ts

@@ -7,6 +7,7 @@ import {
   ApplicationService,
   ConfirmService,
   UnsubscribeComponent,
+  ContextService,
 } from '@oort-front/shared';
 import get from 'lodash/get';
 import { takeUntil, map } from 'rxjs/operators';
@@ -49,13 +50,15 @@ export class ApplicationComponent
    * @param router Angular router
    * @param translate Angular translate service
    * @param confirmService Shared confirmation service
+   * @param contextService ContextService
    */
   constructor(
     private applicationService: ApplicationService,
     public route: ActivatedRoute,
     private router: Router,
     private translate: TranslateService,
-    private confirmService: ConfirmService
+    private confirmService: ConfirmService,
+    private contextService: ContextService
   ) {
     super();
     this.largeDevice = window.innerWidth > 1024;
@@ -270,12 +273,16 @@ export class ApplicationComponent
       return dialogRef.closed.pipe(
         map((confirm) => {
           if (confirm) {
+            // Clear any context filter history from current application
+            this.contextService.filterHistory.clear();
             return true;
           }
           return false;
         })
       );
     }
+    // Clear any context filter history from current application
+    this.contextService.filterHistory.clear();
     return true;
   }
 

apps/back-office/src/app/dashboard/pages/dashboard/dashboard.component.ts

@@ -249,6 +249,7 @@ export class DashboardComponent
       .then(({ data }) => {
         if (data.dashboard) {
           this.id = data.dashboard.id || id;
+          this.dashboardService.currentDashboardId = this.id;
           this.dashboard = data.dashboard;
           this.gridOptions = {
             ...omit(this.gridOptions, ['gridType', 'minimumHeight']), // Prevent issue when gridType or minimumHeight was not set

libs/shared/src/lib/components/dashboard-filter/dashboard-filter.component.ts

@@ -326,9 +326,7 @@ export class DashboardFilterComponent
     const currentSurveyQuestions = this.survey.getAllQuestions();
     const nextFilterValue: any = surveyData;
     // Don't merge current context filter values to the filter if survey has init and it's used in web component
-    if (
-      !(this.surveyInit && this.contextService.shadowDomService.isShadowRoot)
-    ) {
+    if (!this.surveyInit) {
       const currentFilterValue = this.contextService.filter.value;
       const filterKeys = Object.keys(currentFilterValue);
       filterKeys

libs/shared/src/lib/services/context/context.service.ts

@@ -12,8 +12,6 @@ import {
   get,
   isEqual,
   isObject,
-  forEach,
-  set,
   has,
   isArray,
   every,
@@ -38,6 +36,7 @@ import { ApplicationService } from '../application/application.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RecordQueryResponse } from '../../models/record.model';
 import { GET_RECORD_BY_ID } from './graphql/queries';
+import { DashboardService } from '../dashboard/dashboard.service';
 
 /**
  * Dashboard context service
@@ -55,7 +54,7 @@ export class ContextService {
     dashboardId: string;
   } | null>(null);
   /** To keep the history of previous dashboard filter values */
-  public filterValues = new BehaviorSubject<any>(null);
+  public filterHistory = new Map();
   /** Is filter opened */
   public filterOpened = new BehaviorSubject<boolean>(false);
   /** Should skip filter, used by the web widgets app, so when a page is redrawn, emit a value */
@@ -112,11 +111,6 @@ export class ContextService {
     return this.filterPosition.asObservable();
   }
 
-  /** @returns filterValues value as observable */
-  get filterValues$() {
-    return this.filterValues.asObservable();
-  }
-
   /** @returns filterOpened value as observable */
   get filterOpened$() {
     return this.filterOpened.asObservable();
@@ -146,6 +140,7 @@ export class ContextService {
    * @param applicationService Shared application service
    * @param router Angular router
    * @param {ShadowDomService} shadowDomService Shadow dom service containing the current DOM host
+   * @param dashboardService Shared dashboard service
    */
   constructor(
     private dialog: Dialog,
@@ -155,7 +150,8 @@ export class ContextService {
     private formBuilderService: FormBuilderService,
     private applicationService: ApplicationService,
     private router: Router,
-    public shadowDomService: ShadowDomService
+    public shadowDomService: ShadowDomService,
+    private dashboardService: DashboardService
   ) {
     this.filterPosition$.subscribe(
       (value: { position: FilterPosition; dashboardId: string } | null) => {
@@ -426,20 +422,30 @@ export class ContextService {
    */
   public initSurvey(structure: any): SurveyModel {
     const survey = this.formBuilderService.createSurvey(structure);
-    // set each question value manually otherwise the defaultValueExpression is not loaded
+
     if (!this.shadowDomService.isShadowRoot) {
-      forEach(this.filterValues.getValue(), (value, key) => {
-        if (survey.getQuestionByName(key)) {
-          survey.getQuestionByName(key).value = value;
-        }
-      });
+      if (this.filterHistory.has(this.dashboardService.currentDashboardId)) {
+        const previousSurveyValue = this.filterHistory.get(
+          this.dashboardService.currentDashboardId
+        );
+        survey.data = previousSurveyValue;
+      } else {
+        this.filterHistory.set(this.dashboardService.currentDashboardId, {
+          ...survey.data,
+        });
+      }
     }
-
     // prevent the default value from being applied when a question has been intentionally cleared
     const handleValueChanged = (sender: any, options: any) => {
-      const history = this.filterValues.getValue() ?? {};
-      set(history, options.name, options.value);
-      this.filterValues.next(history);
+      if (this.filterHistory.has(this.dashboardService.currentDashboardId)) {
+        const previousSurveyValue = this.filterHistory.get(
+          this.dashboardService.currentDashboardId
+        );
+        this.filterHistory.set(this.dashboardService.currentDashboardId, {
+          ...previousSurveyValue,
+          [options.name]: options.value,
+        });
+      }
     };
 
     survey.onValueChanged.add(handleValueChanged);

libs/shared/src/lib/services/dashboard/dashboard.service.ts

@@ -31,6 +31,8 @@ export class DashboardService {
   public widgets: BehaviorSubject<any[]> = new BehaviorSubject<any[]>([]);
   /** Observable of current loaded dashboard widgets */
   public widgets$ = this.widgets.asObservable();
+  /** Current dashboard id in the view */
+  public currentDashboardId = '';
 
   /** @returns To listen when dashboard widgets that can be hidden refreshes its contents */
   get widgetContentRefreshed$(): Observable<any> {