Merge branch 'beta' of github.com-relief:ReliefApplications/ems-frontend into feat/AB#80878_limit-zoom-of-map-widgets-for-the-given-geographic-context-in-the-page

Author: unai-reliefapp

.eslintrc.json

@@ -49,6 +49,7 @@
           {
             "exemptEmptyConstructors": false,
             "contexts": [
+              "PropertyDefinition",
               "ExportDefaultDeclaration > ArrowFunctionExpression",
               "TSInterfaceDeclaration",
               "TSEnumDeclaration",
@@ -95,4 +96,4 @@
       "rules": {}
     }
   ]
-}
+}

CHANGELOG.md

@@ -1,3 +1,21 @@
+## [2.2.2](https://github.com/ReliefApplications/ems-frontend/compare/v2.2.1...v2.2.2) (2023-12-13)
+
+
+### Bug Fixes
+
+* non readable message when failing to load application's style ([06c692a](https://github.com/ReliefApplications/ems-frontend/commit/06c692a39c4475067866bb4eb88147de3d207202))
+
+## [2.2.1](https://github.com/ReliefApplications/ems-frontend/compare/v2.2.0...v2.2.1) (2023-12-12)
+
+
+### Bug Fixes
+
+* incorrect position of dashboard filter in front-office ([6dc6184](https://github.com/ReliefApplications/ems-frontend/commit/6dc61841a6a69dddd30abc91d62c45e8849c6cc1))
+* layout & aggregation not appearing in grid widget when adding them ([66f7dc1](https://github.com/ReliefApplications/ems-frontend/commit/66f7dc1e57d56928f685660f108a1e79a1a5a7d1))
+* profile page not working in front-office ([#2150](https://github.com/ReliefApplications/ems-frontend/issues/2150)) ([fe5bad3](https://github.com/ReliefApplications/ems-frontend/commit/fe5bad366908a5ab1fd5562a7bf0c922787b73d6))
+* put Accept headers in graphql module instead of auth-interceptor ([4ba7456](https://github.com/ReliefApplications/ems-frontend/commit/4ba74563471b2a0c5808e7f0719df595dd383f5d))
+* setting sort fields in summary cards would refresh the modal ([#2156](https://github.com/ReliefApplications/ems-frontend/issues/2156)) ([539017b](https://github.com/ReliefApplications/ems-frontend/commit/539017bca5d93214dfdeb02360e3b74a58954f75))
+
 # [2.2.0](https://github.com/ReliefApplications/ems-frontend/compare/v2.1.8...v2.2.0) (2023-12-08)
 
 

CHANGELOG/CHANGELOG_beta.md

@@ -1,3 +1,22 @@
+# [2.3.0-beta.2](https://github.com/ReliefApplications/ems-frontend/compare/v2.3.0-beta.1...v2.3.0-beta.2) (2023-12-11)
+
+
+### Bug Fixes
+
+* put Accept headers in graphql module instead of auth-interceptor ([4ba7456](https://github.com/ReliefApplications/ems-frontend/commit/4ba74563471b2a0c5808e7f0719df595dd383f5d))
+
+
+### Features
+
+* allow reference data to be used in charts ([#2148](https://github.com/ReliefApplications/ems-frontend/issues/2148)) ([6adf1d1](https://github.com/ReliefApplications/ems-frontend/commit/6adf1d1a6e2f88e92a61576f8b7db007be6ff49d)), closes [#68346](https://github.com/ReliefApplications/ems-frontend/issues/68346) [#68346](https://github.com/ReliefApplications/ems-frontend/issues/68346) [#68346](https://github.com/ReliefApplications/ems-frontend/issues/68346) [#68346](https://github.com/ReliefApplications/ems-frontend/issues/68346) [#68346](https://github.com/ReliefApplications/ems-frontend/issues/68346) [#68346](https://github.com/ReliefApplications/ems-frontend/issues/68346)
+
+# [2.3.0-beta.1](https://github.com/ReliefApplications/ems-frontend/compare/v2.2.0...v2.3.0-beta.1) (2023-12-09)
+
+
+### 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))
+
 # [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)
 
 

README.md

@@ -1,15 +1,15 @@
 OORT Front-end
 =======
-[![Github Pages](https://github.com/ReliefApplications/oort-frontend/actions/workflows/github-pages.yml/badge.svg)](https://github.com/ReliefApplications/oort-frontend/actions/workflows/github-pages.yml)
-[![Storybook](https://github.com/ReliefApplications/oort-frontend/actions/workflows/storybook.yml/badge.svg)](https://github.com/ReliefApplications/oort-frontend/actions/workflows/storybook.yml)
+[![Github Pages](https://github.com/ReliefApplications/ems-frontend/actions/workflows/github-pages.yml/badge.svg)](https://github.com/ReliefApplications/ems-frontend/actions/workflows/github-pages.yml)
+[![Storybook](https://github.com/ReliefApplications/ems-frontend/actions/workflows/storybook.yml/badge.svg)](https://github.com/ReliefApplications/ems-frontend/actions/workflows/storybook.yml)
 
 # Versions
 
 Branch | Version | CI
 --- | --- | ---
-main | ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/ReliefApplications/oort-frontend/main) | [![Version](https://github.com/ReliefApplications/oort-frontend/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/ReliefApplications/oort-frontend/actions/workflows/ci.yml)
-next | ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/ReliefApplications/oort-frontend/next?color=6ded5a) | [![Version](https://github.com/ReliefApplications/oort-frontend/actions/workflows/ci.yml/badge.svg?branch=next)](https://github.com/ReliefApplications/oort-frontend/actions/workflows/ci.yml)
-beta | ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/ReliefApplications/oort-frontend/beta?color=ecf495) | [![Version](https://github.com/ReliefApplications/oort-frontend/actions/workflows/ci.yml/badge.svg?branch=beta)](https://github.com/ReliefApplications/oort-frontend/actions/workflows/ci.yml)
+main | ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/ReliefApplications/ems-frontend/main) | [![Version](https://github.com/ReliefApplications/ems-frontend/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/ReliefApplications/ems-frontend/actions/workflows/ci.yml)
+next | ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/ReliefApplications/ems-frontend/next?color=6ded5a) | [![Version](https://github.com/ReliefApplications/ems-frontend/actions/workflows/ci.yml/badge.svg?branch=next)](https://github.com/ReliefApplications/ems-frontend/actions/workflows/ci.yml)
+beta | ![GitHub package.json version (branch)](https://img.shields.io/github/package-json/v/ReliefApplications/ems-frontend/beta?color=ecf495) | [![Version](https://github.com/ReliefApplications/ems-frontend/actions/workflows/ci.yml/badge.svg?branch=beta)](https://github.com/ReliefApplications/ems-frontend/actions/workflows/ci.yml)
 
 # Introduction
 

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

@@ -169,7 +169,7 @@ export class AggregationsTabComponent
     dialogRef.closed.pipe(takeUntil(this.destroy$)).subscribe((value: any) => {
       if (value) {
         this.aggregationService
-          .addAggregation(value, this.resource.id)
+          .addAggregation(value, { resource: this.resource.id })
           .subscribe(({ data }: any) => {
             if (data.addAggregation) {
               this.aggregations = [...this.aggregations, data?.addAggregation];
@@ -199,7 +199,7 @@ export class AggregationsTabComponent
     dialogRef.closed.pipe(takeUntil(this.destroy$)).subscribe((value: any) => {
       if (value) {
         this.aggregationService
-          .editAggregation(aggregation, value, this.resource.id)
+          .editAggregation(aggregation, value, { resource: this.resource.id })
           .subscribe(({ data }: any) => {
             if (data.editAggregation) {
               this.aggregations = this.aggregations.map((x: any) => {
@@ -236,7 +236,7 @@ export class AggregationsTabComponent
     dialogRef.closed.pipe(takeUntil(this.destroy$)).subscribe((value: any) => {
       if (value) {
         this.aggregationService
-          .deleteAggregation(aggregation, this.resource.id)
+          .deleteAggregation(aggregation, { resource: this.resource.id })
           .subscribe(({ data }: any) => {
             if (data.deleteAggregation) {
               this.aggregations = this.aggregations.filter(

apps/back-office/src/app/graphql.module.ts

@@ -25,7 +25,7 @@ export const createApollo = (httpLink: HttpLink): ApolloClientOptions<any> => {
   const basic = setContext(() => ({
     headers: {
       // eslint-disable-next-line @typescript-eslint/naming-convention
-      Accept: 'charset=utf-8',
+      Accept: 'application/json; charset=utf-8',
       UserTimeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
     },
   }));

apps/front-office/src/app/application/application.component.html

@@ -11,7 +11,7 @@
   [leftSidenav]="pages"
   [sideMenu]="sideMenu"
   [menuOpened]="!hideMenu"
-  [profileRoute]="'/' + appID + '/profile'"
+  [profileRoute]="appID ? '/' + appID + '/profile' : '/profile'"
   (openApplication)="onOpenApplication($event)"
 ></shared-layout>
 <!--Need the nav variable, don't remove let-nav, used in layout-->

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

@@ -93,6 +93,7 @@ export class ApplicationComponent
     this.route.params.pipe(takeUntil(this.destroy$)).subscribe((params) => {
       this.loading = true;
       this.applicationService.loadApplication(params.id);
+      this.appID = params.id;
     });
     // Get list of available applications
     this.authService.user$

apps/front-office/src/app/application/pages/dashboard/dashboard.component.html

@@ -1,5 +1,17 @@
+<shared-dashboard-filter
+  *ngIf="showFilter && !isFullScreen"
+  [isFullScreen]="isFullScreen"
+  [variant]="variant"
+  [closable]="closable"
+></shared-dashboard-filter>
 <!-- We use a div so we can have a standard background when seeing the dashboard on fullscreen -->
 <div [ngClass]="{ 'py-8 px-6 h-full bg-white overflow-auto': isFullScreen }">
+  <shared-dashboard-filter
+    *ngIf="showFilter && isFullScreen"
+    [isFullScreen]="isFullScreen"
+    [variant]="variant"
+    [closable]="closable"
+  ></shared-dashboard-filter>
   <ng-container
     sharedFullScreen
     [(isFullScreenMode)]="isFullScreen"
@@ -11,12 +23,12 @@
       shape: 'rectangle'
     "
   >
-    <ng-container *ngIf="dashboard && (showName || buttonActions.length > 0)">
+    <ng-container *ngIf="dashboard">
       <div
         id="dashboard-header"
         class="flex flex-wrap items-center mb-6 gap-4 justify-between"
       >
-        <ng-container *ngIf="showName">
+        <ng-container>
           <h1 class="!m-0 overflow-hidden text-ellipsis">
             {{ dashboard.name }}
           </h1>
@@ -49,16 +61,4 @@ <h1 class="!m-0 overflow-hidden text-ellipsis">
     [options]="dashboard?.gridOptions"
     (changeStep)="changeStep.emit($event)"
   ></shared-widget-grid>
-  <shared-dashboard-filter
-    *ngIf="showFilter && isFullScreen"
-    [isFullScreen]="isFullScreen"
-    [variant]="variant"
-    [closable]="closable"
-  ></shared-dashboard-filter>
 </div>
-<shared-dashboard-filter
-  *ngIf="showFilter && !isFullScreen"
-  [isFullScreen]="isFullScreen"
-  [variant]="variant"
-  [closable]="closable"
-></shared-dashboard-filter>

apps/front-office/src/app/application/pages/dashboard/dashboard.component.ts

@@ -61,14 +61,11 @@ export class DashboardComponent
   public dashboard?: Dashboard;
   /** Show dashboard filter */
   public showFilter!: boolean;
-  /** Show name ( contextual pages ) */
-  public showName = false;
   /** Current style variant */
   public variant!: string;
   /** hide / show the close icon on the right */
   public closable = true;
-
-  // === BUTTON ACTIONS ===
+  /** Dashboard button actions */
   public buttonActions: ButtonActionT[] = [];
 
   /** @returns type of context element */
@@ -138,7 +135,6 @@ export class DashboardComponent
         if (id) {
           if (queryId) {
             // Try to load template
-            this.showName = true;
             this.loadDashboard(id).then(() => {
               const templates = this.dashboard?.page?.contentWithContext;
               const type = this.contextType;
@@ -176,7 +172,6 @@ export class DashboardComponent
             });
           } else {
             // Don't use template, and directly load the dashboard from router's params
-            this.showName = false;
             this.loadDashboard(id).then(() => (this.loading = false));
           }
         }