Merge branch 'feat/AB#80876-add-geographic-context-in-page' of github.com-relief:ReliefApplications/ems-frontend into feat/AB#80877_add_logic_to_create_edit_load_page_with_geographic_context

Author: unai-reliefapp

CHANGELOG.md

@@ -1,3 +1,23 @@
+# [2.2.0-alpha.3](https://github.com/ReliefApplications/ems-frontend/compare/v2.2.0-alpha.2...v2.2.0-alpha.3) (2023-12-07)
+
+
+### Bug Fixes
+
+* editing widgets could sometimes scroll to top of dashboard ([#2135](https://github.com/ReliefApplications/ems-frontend/issues/2135)) ([da6dd93](https://github.com/ReliefApplications/ems-frontend/commit/da6dd93460ada1446233159ed5988484bd2f9530))
+* few issues with templating & reference data ([c504e92](https://github.com/ReliefApplications/ems-frontend/commit/c504e922e1f73a6f8030b1388f066b6853a0dd4c))
+* incorrect sorting on api configuration ([#2125](https://github.com/ReliefApplications/ems-frontend/issues/2125)) ([5acf213](https://github.com/ReliefApplications/ems-frontend/commit/5acf213d1c7e3880ae69be8a6b62e2de98f09aa2))
+* incorrectly sized columns ([#2127](https://github.com/ReliefApplications/ems-frontend/issues/2127)) ([c0be7b1](https://github.com/ReliefApplications/ems-frontend/commit/c0be7b1e30ac4b71f659b97845caf2f79adf8edd))
+* pull jobs would not be editable ([cc9d685](https://github.com/ReliefApplications/ems-frontend/commit/cc9d685c3620450a38bd3f0cbbaf38d697dcac6d))
+* remove code information in url after login ([bcfb603](https://github.com/ReliefApplications/ems-frontend/commit/bcfb603b2a74a03437ae6a236451de22c343ca3d))
+* sorting in ref data table not working ([#2126](https://github.com/ReliefApplications/ems-frontend/issues/2126)) ([1ae1e27](https://github.com/ReliefApplications/ems-frontend/commit/1ae1e276a7eef1682ab73bfa2ac645bb30ad0dea))
+* text widget edition would lose widget display configuration ([7f3b18b](https://github.com/ReliefApplications/ems-frontend/commit/7f3b18ba98fded73b0a90681a6019fbc86504707))
+
+
+### Features
+
+* allow text & summary card widgets to use record edition when using resource & layout ([#2134](https://github.com/ReliefApplications/ems-frontend/issues/2134)) ([a0f0ca0](https://github.com/ReliefApplications/ems-frontend/commit/a0f0ca0be44bb0c4e908d8317f08abe835592ff8))
+* allow to edit / add reference data fields ([#2128](https://github.com/ReliefApplications/ems-frontend/issues/2128)) ([c7f047b](https://github.com/ReliefApplications/ems-frontend/commit/c7f047b654235516d42cb9f5e645b33b2fc9d715))
+
 # [2.2.0-alpha.2](https://github.com/ReliefApplications/ems-frontend/compare/v2.2.0-alpha.1...v2.2.0-alpha.2) (2023-12-05)
 
 

CHANGELOG/CHANGELOG_alpha.md

@@ -1,3 +1,47 @@
+# [2.2.0-beta.16](https://github.com/ReliefApplications/ems-frontend/compare/v2.2.0-beta.15...v2.2.0-beta.16) (2023-12-08)
+
+
+### Bug Fixes
+
+* prevent aggregation fields to be fetched before query builder is ready ([#2139](https://github.com/ReliefApplications/ems-frontend/issues/2139)) ([3bee583](https://github.com/ReliefApplications/ems-frontend/commit/3bee5837c221a799d9e479e91cab0131afb3c259))
+* toggle of archived records would create incorrect list ([#2132](https://github.com/ReliefApplications/ems-frontend/issues/2132)) ([f1abf81](https://github.com/ReliefApplications/ems-frontend/commit/f1abf811189f67841a8770ac5e6cc35af0bf745c))
+
+
+### Features
+
+* add filter input & output in app-widget ([4d94cef](https://github.com/ReliefApplications/ems-frontend/commit/4d94cefd8718f0b382679e2d0fc79e6242bb49e7))
+* allow fields from ref data linked to a resource to be used  ([#1575](https://github.com/ReliefApplications/ems-frontend/issues/1575)) ([cb8b30c](https://github.com/ReliefApplications/ems-frontend/commit/cb8b30ca36074c1544bf3d95796a6553f1de1b55))
+
+# [2.2.0-beta.15](https://github.com/ReliefApplications/ems-frontend/compare/v2.2.0-beta.14...v2.2.0-beta.15) (2023-12-07)
+
+
+### Bug Fixes
+
+* editing widgets could sometimes scroll to top of dashboard ([#2135](https://github.com/ReliefApplications/ems-frontend/issues/2135)) ([da6dd93](https://github.com/ReliefApplications/ems-frontend/commit/da6dd93460ada1446233159ed5988484bd2f9530))
+* few issues with templating & reference data ([c504e92](https://github.com/ReliefApplications/ems-frontend/commit/c504e922e1f73a6f8030b1388f066b6853a0dd4c))
+* incorrectly sized columns ([#2127](https://github.com/ReliefApplications/ems-frontend/issues/2127)) ([c0be7b1](https://github.com/ReliefApplications/ems-frontend/commit/c0be7b1e30ac4b71f659b97845caf2f79adf8edd))
+* pull jobs would not be editable ([cc9d685](https://github.com/ReliefApplications/ems-frontend/commit/cc9d685c3620450a38bd3f0cbbaf38d697dcac6d))
+* remove code information in url after login ([bcfb603](https://github.com/ReliefApplications/ems-frontend/commit/bcfb603b2a74a03437ae6a236451de22c343ca3d))
+* text widget edition would lose widget display configuration ([7f3b18b](https://github.com/ReliefApplications/ems-frontend/commit/7f3b18ba98fded73b0a90681a6019fbc86504707))
+
+# [2.2.0-beta.14](https://github.com/ReliefApplications/ems-frontend/compare/v2.2.0-beta.13...v2.2.0-beta.14) (2023-12-05)
+
+
+### Bug Fixes
+
+* Changing form locale duplicates some questions ([#2124](https://github.com/ReliefApplications/ems-frontend/issues/2124)) ([ed9bbe6](https://github.com/ReliefApplications/ems-frontend/commit/ed9bbe66421f7fe19bae89aa3580d0a059c29f57))
+* incorrect sorting on api configuration ([#2125](https://github.com/ReliefApplications/ems-frontend/issues/2125)) ([5acf213](https://github.com/ReliefApplications/ems-frontend/commit/5acf213d1c7e3880ae69be8a6b62e2de98f09aa2))
+* reference data would appear as object object in grid ([b9b1910](https://github.com/ReliefApplications/ems-frontend/commit/b9b191032ef2bf74a4fbeec9459d973c99e1b835))
+* reset default button not available in front-office ([#2122](https://github.com/ReliefApplications/ems-frontend/issues/2122)) ([ab81073](https://github.com/ReliefApplications/ems-frontend/commit/ab810737f245ea4b527d4f477dd77ff09819c1e1))
+* some fields would not be accessible in map popup ([48f98aa](https://github.com/ReliefApplications/ems-frontend/commit/48f98aaa83ad05520b21638068254ec171656e43))
+* sorting in ref data table not working ([#2126](https://github.com/ReliefApplications/ems-frontend/issues/2126)) ([1ae1e27](https://github.com/ReliefApplications/ems-frontend/commit/1ae1e276a7eef1682ab73bfa2ac645bb30ad0dea))
+
+
+### Features
+
+* add possibility to fetch nested fields in ref data ([efbcc1d](https://github.com/ReliefApplications/ems-frontend/commit/efbcc1db4e278f346966952fb3411dae3e4c3d9a))
+* allow to edit / add reference data fields ([#2128](https://github.com/ReliefApplications/ems-frontend/issues/2128)) ([c7f047b](https://github.com/ReliefApplications/ems-frontend/commit/c7f047b654235516d42cb9f5e645b33b2fc9d715))
+
 # [2.2.0-beta.13](https://github.com/ReliefApplications/ems-frontend/compare/v2.2.0-beta.12...v2.2.0-beta.13) (2023-12-02)
 
 

CHANGELOG/CHANGELOG_beta.md

@@ -3,7 +3,7 @@
     <app-api-configuration-filter
       #filter
       (filter)="applyFilter($event)"
-      [loading]="loading"
+      [loading]="updating"
     >
     </app-api-configuration-filter>
     <!-- Actions -->
@@ -29,7 +29,7 @@
       cdk-table
       uiTableWrapper
       (sortChange)="onSort($event)"
-      [dataSource]="filteredDataSources"
+      [dataSource]="dataSource"
     >
       <ng-container cdkColumnDef="name">
         <th uiTableHeaderSort="name" uiCellHeader *cdkHeaderCellDef>
@@ -47,7 +47,7 @@
       </ng-container>
 
       <ng-container cdkColumnDef="status">
-        <th uiTableHeaderSort="status" uiCellHeader *cdkHeaderCellDef>
+        <th uiCellHeader *cdkHeaderCellDef>
           <span class="headerTitle">
             {{ 'common.status' | translate }}
           </span>
@@ -60,7 +60,7 @@
       </ng-container>
 
       <ng-container cdkColumnDef="authType">
-        <th uiTableHeaderSort="authType" uiCellHeader *cdkHeaderCellDef>
+        <th uiCellHeader *cdkHeaderCellDef>
           <span class="headerTitle">
             {{ 'models.apiConfiguration.authType' | translate }}
           </span>
@@ -114,7 +114,8 @@
   </div>
 </div>
 <ui-paginator
-  [disabled]="loading"
+  [disabled]="loading || updating"
+  [pageIndex]="pageInfo.pageIndex"
   [pageSize]="pageInfo.pageSize"
   [pageSizeOptions]="[10, 25, 50]"
   [totalItems]="pageInfo.length"

apps/back-office/src/app/dashboard/pages/api-configurations/api-configurations.component.html

@@ -47,20 +47,22 @@ export class ApiConfigurationsComponent
 {
   // === DATA ===
   public loading = true;
+  public updating = false;
   private apiConfigurationsQuery!: QueryRef<ApiConfigurationsQueryResponse>;
   displayedColumns = ['name', 'status', 'authType', 'actions'];
   dataSource = new Array<ApiConfiguration>();
-  filteredDataSources = new Array<ApiConfiguration>();
   public cachedApiConfigurations: ApiConfiguration[] = [];
 
   // === SORTING ===
-  sort?: TableSort;
+  private sort!: TableSort;
 
   // === FILTERS ===
+  public filter: any = {
+    filters: [],
+    logic: 'and',
+  };
   form = this.fb.group({});
   public showFilters = false;
-  public searchText = '';
-  public statusFilter = '';
 
   public pageInfo = {
     pageIndex: 0,
@@ -102,14 +104,19 @@ export class ApiConfigurationsComponent
         variables: {
           first: ITEMS_PER_PAGE,
           afterCursor: this.pageInfo.endCursor,
+          filter: this.filter,
+          sortField: this.sort?.sortDirection && this.sort.active,
+          sortOrder: this.sort?.sortDirection,
         },
       });
 
     this.apiConfigurationsQuery.valueChanges
       .pipe(takeUntil(this.destroy$))
-      .subscribe((results) => {
-        this.updateValues(results.data, results.loading);
-      });
+      .subscribe(
+        (results: ApolloQueryResult<ApiConfigurationsQueryResponse>) => {
+          this.updateValues(results.data, results.loading);
+        }
+      );
     // Initializing sort to an empty one
     this.sort = {
       active: '',
@@ -130,44 +137,19 @@ export class ApiConfigurationsComponent
     );
     if (cachedData && cachedData.length === this.pageInfo.pageSize) {
       this.dataSource = cachedData;
-      this.filteredDataSources = this.dataSource;
     } else {
       this.fetchApiConfigurations();
     }
   }
 
-  /**
-   * Frontend filtering.
-   */
-  private filterPredicate(): void {
-    this.filteredDataSources = this.dataSource.filter(
-      (data: any) =>
-        (this.searchText.trim().length === 0 ||
-          (this.searchText.trim().length > 0 &&
-            data.name.toLowerCase().includes(this.searchText.trim()))) &&
-        (this.statusFilter.trim().length === 0 ||
-          (this.statusFilter.trim().length > 0 &&
-            data.status.toLowerCase().includes(this.statusFilter.trim())))
-    );
-  }
-
   /**
    * Applies the filter to the data source.
    *
    * @param event event value of the filter.
    */
   applyFilter(event: any): void {
-    if (event.statusFilter) {
-      this.statusFilter = event.statusFilter;
-    } else {
-      this.statusFilter = '';
-    }
-    if (event.search) {
-      this.searchText = event.search.toLowerCase();
-    } else {
-      this.searchText = '';
-    }
-    this.filterPredicate();
+    this.filter = event;
+    this.fetchApiConfigurations(true);
   }
 
   /**
@@ -269,7 +251,6 @@ export class ApiConfigurationsComponent
                 this.dataSource = this.dataSource.filter(
                   (x) => x.id !== element.id
                 );
-                this.filteredDataSources = this.dataSource;
               } else {
                 this.snackBar.openSnackBar(
                   this.translate.instant(
@@ -316,7 +297,7 @@ export class ApiConfigurationsComponent
     this.pageInfo.length = data.apiConfigurations.totalCount;
     this.pageInfo.endCursor = data.apiConfigurations.pageInfo.endCursor;
     this.loading = loading;
-    this.filterPredicate();
+    this.updating = false;
   }
 
   /**
@@ -336,10 +317,11 @@ export class ApiConfigurationsComponent
    * @param refetch erase previous query results
    */
   private fetchApiConfigurations(refetch?: boolean): void {
-    this.loading = true;
+    this.updating = true;
     const variables = {
       first: this.pageInfo.pageSize,
       afterCursor: refetch ? null : this.pageInfo.endCursor,
+      filter: this.filter,
       sortField: this.sort?.sortDirection && this.sort.active,
       sortOrder: this.sort?.sortDirection,
     };

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

@@ -17,7 +17,7 @@
       >
         <label>{{ 'common.status' | translate }}</label>
         <ui-select-menu
-          formControlName="statusFilter"
+          formControlName="status"
           [placeholder]="'common.selectStatus' | translate"
         >
           <ui-select-option>-</ui-select-option>

apps/back-office/src/app/dashboard/pages/api-configurations/filter/filter.component.html

@@ -44,7 +44,7 @@ export class FilterComponent extends UnsubscribeComponent implements OnInit {
   expandedFilter!: TemplateRef<any>;
 
   public form = this.fb.group({
-    statusFilter: [''],
+    status: [''],
   });
   public show = false;
 
@@ -75,7 +75,22 @@ export class FilterComponent extends UnsubscribeComponent implements OnInit {
    * @param value Value to be emitted.
    */
   private emitFilter(value: any): void {
-    this.filter.emit(value);
+    const filters: any[] = [];
+    if (value.search) {
+      filters.push({
+        field: 'name',
+        operator: 'contains',
+        value: value.search,
+      });
+    }
+    if (value.status) {
+      filters.push({ field: 'status', operator: 'eq', value: value.status });
+    }
+    const filter = {
+      logic: 'and',
+      filters,
+    };
+    this.filter.emit(filter);
   }
 
   /**

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

@@ -4,8 +4,20 @@ import { gql } from 'apollo-angular';
 
 /** Graphql query for getting multiple api configurations object with a cursor */
 export const GET_API_CONFIGURATIONS = gql`
-  query GetApiConfigurations($first: Int, $afterCursor: ID) {
-    apiConfigurations(first: $first, afterCursor: $afterCursor) {
+  query GetApiConfigurations(
+    $first: Int
+    $afterCursor: ID
+    $filter: JSON
+    $sortField: String
+    $sortOrder: String
+  ) {
+    apiConfigurations(
+      first: $first
+      afterCursor: $afterCursor
+      filter: $filter
+      sortField: $sortField
+      sortOrder: $sortOrder
+    ) {
       edges {
         node {
           id

apps/back-office/src/app/dashboard/pages/api-configurations/graphql/queries.ts

@@ -189,11 +189,9 @@ <h1 class="!m-0 overflow-hidden text-ellipsis">
       <span *ngIf="dashboard.page?.geographicContext?.enabled">
         <!-- Regions -->
         <div uiFormFieldDirective [outline]="false">
-          <label>{{
-            'components.user.summary.region' | translate
-          }}</label>
+          <label>{{ 'components.user.summary.region' | translate }}</label>
           <ui-select-menu
-            (selectedOption)="onSearchChangeGeographicContext({ region: $any($event) })"
+            (selectedOption)="onSearchChangeGeographicContext($event, 'region')"
             [filterable]="true"
             [formControl]="regionCode"
           >
@@ -207,12 +205,12 @@ <h1 class="!m-0 overflow-hidden text-ellipsis">
         </div>
         <!-- Countries -->
         <div uiFormFieldDirective [outline]="false">
-          <label>{{
-            'components.user.summary.country' | translate
-          }}</label>
-          <ui-select-menu 
+          <label>{{ 'components.user.summary.country' | translate }}</label>
+          <ui-select-menu
             [formControl]="countryCode"
-            (selectedOption)="onSearchChangeGeographicContext({ country: $any($event) })"
+            (selectedOption)="
+              onSearchChangeGeographicContext($event, 'country')
+            "
             [filterable]="true"
           >
             <ui-select-option