chore: prepare release

CHANGELOG.md

@@ -18,12 +18,26 @@ the detailed section referring to by linking pull requests or issues.
 
 #### Minor
 
-- Broker UI: Added query params for the connector endpoints filter
-
 #### Patch
 
 #### Deployment Migration Notes
 
+## [v2.5.0] - 2024-02-28
+
+### Overview
+
+Enable better integration of Broker UI and Authority Portal
+
+### Detailed Changes
+
+#### Minor
+
+- Broker UI: Added query params for the connector endpoints filter
+
+#### Deployment Migration Notes
+
+_No special deployment migration steps required_
+
 ## [v2.4.0] 2024-02-14
 
 ### Overview

src/app/routes/broker-ui/catalog-page/catalog-page/catalog-page.component.ts

@@ -15,7 +15,6 @@ import {
 } from '../../../../component-library/catalog/view-selection/view-mode-enum';
 import {BrokerServerApiService} from '../../../../core/services/api/broker-server-api.service';
 import {FilterBoxItem} from '../filter-box/filter-box-item';
-import {FilterBoxModel} from '../filter-box/filter-box-model';
 import {FilterBoxVisibleState} from '../filter-box/filter-box-visible-state';
 import {CatalogActiveFilterPill} from '../state/catalog-active-filter-pill';
 import {CatalogPage} from '../state/catalog-page-actions';
@@ -57,13 +56,25 @@ export class CatalogPageComponent implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit(): void {
-    this.store.dispatch(CatalogPage.Reset);
-    this.setConnectorEndpointFiltersFromQueryParamsOnce();
+    this.initializePage();
     this.startListeningToStore();
     this.startEmittingSearchText();
     this.startEmittingSortBy();
   }
 
+  private initializePage() {
+    const endpoints = this.parseConnectorEndpoints(
+      this.route.snapshot.queryParams,
+    );
+    this.store.dispatch(new CatalogPage.Reset(endpoints));
+
+    if (endpoints.length) {
+      this.expandedFilterId = 'connectorEndpoint';
+      // remove query params from url
+      this.router.navigate([]);
+    }
+  }
+
   private startListeningToStore() {
     this.store
       .select<CatalogPageStateModel>(CatalogPageState)
@@ -103,24 +114,6 @@ export class CatalogPageComponent implements OnInit, OnDestroy {
       });
   }
 
-  private setConnectorEndpointFiltersFromQueryParamsOnce() {
-    const connectorEndpoints = this.parseConnectorEndpoints(
-      this.route.snapshot.queryParams,
-    );
-    if (!connectorEndpoints?.length) {
-      return;
-    }
-
-    this.store.dispatch(
-      new CatalogPage.AddFilterBox(
-        this.buildConnectorEndpointFilterBoxModel(connectorEndpoints),
-      ),
-    );
-    this.expandedFilterId = 'connectorEndpoint';
-    // remove query params from url
-    this.router.navigate([]);
-  }
-
   private parseConnectorEndpoints(params: Params): string[] {
     if (!('connectorEndpoint' in params)) {
       return [];
@@ -129,23 +122,6 @@ export class CatalogPageComponent implements OnInit, OnDestroy {
     return Array.isArray(endpoints) ? [...new Set(endpoints)] : [endpoints];
   }
 
-  private buildConnectorEndpointFilterBoxModel(
-    endpoints: string[],
-  ): FilterBoxModel {
-    const items: FilterBoxItem[] = endpoints.map((x) => ({
-      type: 'ITEM',
-      id: x,
-      label: x,
-    }));
-    return {
-      id: 'connectorEndpoint',
-      title: 'Connector',
-      selectedItems: items,
-      availableItems: items,
-      searchText: '',
-    };
-  }
-
   onDataOfferClick(dataOffer: CatalogDataOfferMapped) {
     const data =
       this.assetDetailDialogDataService.brokerDataOfferDetails(dataOffer);

src/app/routes/broker-ui/catalog-page/state/catalog-page-actions.ts

@@ -8,6 +8,8 @@ export namespace CatalogPage {
 
   export class Reset {
     static readonly type = `[${tag}] Reset`;
+
+    constructor(public initialConnectorEndpoints?: string[]) {}
   }
 
   export class NeedFetch {

src/app/routes/broker-ui/catalog-page/state/catalog-page-state.ts

@@ -43,10 +43,17 @@ export class CatalogPageState implements OnDestroy {
   }
 
   @Action(CatalogPage.Reset)
-  onReset(ctx: Ctx) {
+  onReset(ctx: Ctx, action: CatalogPage.Reset) {
     let state = ctx.getState();
     state.fetchSubscription?.unsubscribe();
     state = DEFAULT_CATALOG_PAGE_STATE_MODEL;
+    if (action.initialConnectorEndpoints?.length) {
+      state = this._addFilterBoxes(state, [
+        this._buildConnectorEndpointFilterBoxModel(
+          action.initialConnectorEndpoints,
+        ),
+      ]);
+    }
     ctx.setState(state);
     ctx.dispatch(CatalogPage.NeedFetch);
   }
@@ -102,25 +109,6 @@ export class CatalogPageState implements OnDestroy {
     ctx.dispatch(CatalogPage.NeedFetch);
   }
 
-  @Action(CatalogPage.AddFilterBox)
-  onAddFilterBox(ctx: Ctx, action: CatalogPage.AddFilterBox) {
-    const state = ctx.getState();
-    if (action.filterBox.id in state.filters) {
-      return;
-    }
-    ctx.setState(
-      this._recalculateActiveFilterItems({
-        ...state,
-        filters: {
-          ...state.filters,
-          [action.filterBox.id]: FilterBoxVisibleState.buildVisibleState(
-            action.filterBox,
-          ),
-        },
-      }),
-    );
-  }
-
   @Action(CatalogPage.UpdateFilterSelectedItems)
   onUpdateFilterSelectedItems(
     ctx: Ctx,
@@ -176,6 +164,40 @@ export class CatalogPageState implements OnDestroy {
     }
   }
 
+  private _buildConnectorEndpointFilterBoxModel(
+    endpoints: string[],
+  ): FilterBoxModel {
+    const items: FilterBoxItem[] = endpoints.map((x) => ({
+      type: 'ITEM',
+      id: x,
+      label: x,
+    }));
+    return {
+      id: 'connectorEndpoint',
+      title: 'Connector',
+      selectedItems: items,
+      availableItems: items,
+      searchText: '',
+    };
+  }
+
+  private _addFilterBoxes(
+    state: CatalogPageStateModel,
+    filterBoxes: FilterBoxModel[],
+  ): CatalogPageStateModel {
+    return this._recalculateActiveFilterItems({
+      ...state,
+      filters: {
+        ...state.filters,
+        ...associateAsObj(
+          filterBoxes,
+          (x) => x.id,
+          (x) => FilterBoxVisibleState.buildVisibleState(x),
+        ),
+      },
+    });
+  }
+
   private _resetPage(state: CatalogPageStateModel): CatalogPageStateModel {
     return {...state, pageZeroBased: 0, paginationDisabled: true};
   }