From 4c106ebff30df9e9bba4a46239a14403c0f63c88 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 3 Mar 2025 15:02:59 +0100 Subject: [PATCH 01/23] AW-3128 Taalinstellingen profiel gebruiken voor FarmMaps ipv browser instelling --- .../src/fm/actions/app-common.actions.ts | 11 +++++++- .../src/fm/effects/app-common.effects.ts | 27 ++++++++++++++++--- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/projects/common/src/fm/actions/app-common.actions.ts b/projects/common/src/fm/actions/app-common.actions.ts index ca8ef37..71e17e7 100644 --- a/projects/common/src/fm/actions/app-common.actions.ts +++ b/projects/common/src/fm/actions/app-common.actions.ts @@ -83,6 +83,8 @@ export const SETPAGEMODE = '[AppCommon] SetPageMode'; export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications'; +export const SWITCHLANGUAGE = '[AppCommon] SwitchLanguage'; + export class InitUser implements Action { readonly type = INITUSER; @@ -371,6 +373,12 @@ export class SetUnreadNotifications implements Action { } +export class SwitchLanguage implements Action { + readonly type = SWITCHLANGUAGE; + + constructor(public locale:string) { } +} + export type Actions = OpenModal | InitRoot @@ -418,6 +426,7 @@ export type Actions = OpenModal | ToggleHelpMenu | ToggleSettingMenu | NotificationEvent - | SetUnreadNotifications; + | SetUnreadNotifications + | SwitchLanguage; diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts index 87e42ff..da41a12 100644 --- a/projects/common/src/fm/effects/app-common.effects.ts +++ b/projects/common/src/fm/effects/app-common.effects.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable, Inject, LOCALE_ID } from '@angular/core'; import { Router } from '@angular/router'; import { OAuthService,UserInfo } from 'angular-oauth2-oidc'; import { Store } from '@ngrx/store'; @@ -16,6 +16,7 @@ import {StateSerializerService} from '../services/state-serializer.service'; @Injectable() export class AppCommonEffects { + locale: string; login$ = createEffect(() => this.actions$.pipe( ofType(appCommonActions.LOGIN), @@ -47,11 +48,24 @@ export class AppCommonEffects { first(), switchMap((action) => { return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe( - switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ), + switchMap(([user,userInfo]) => { + if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale) + { + return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo)) + } + return of(new appCommonActions.SwitchLanguage(user.language)) + }), catchError(error => of(new appCommonActions.Fail(error)))) } ))); - + + switchLanguage$ = createEffect(() => this.actions$.pipe( + ofType(appCommonActions.SWITCHLANGUAGE), + switchMap((action) => { + const a = action as appCommonActions.SwitchLanguage; + location.replace(`/${a.locale}/`); + return of(undefined); + })),{ dispatch:false}); initUserPackages$ = createEffect(() => this.actions$.pipe( ofType(appCommonActions.INITUSERPACKAGES), @@ -208,7 +222,12 @@ export class AppCommonEffects { - constructor(private actions$: Actions, private store$: Store, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService) { + constructor(private actions$: Actions, private store$: Store, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService, @Inject(LOCALE_ID) locale: string) { + this.locale = locale; store$.dispatch(new appCommonActions.LoadItemTypes()); } } +function tap(arg0: () => any): any { + throw new Error('Function not implemented.'); +} + From a3d4dfbd5925bf882e1fe4b98c9502e45ba7cc20 Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 3 Mar 2025 14:05:03 +0000 Subject: [PATCH 02/23] [ci skip] Updated packages #2534 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb39ee0..d20e039 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "farmmaps-lib-app", - "version": "4.12.0", + "version": "4.14.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "farmmaps-lib-app", - "version": "4.12.0", + "version": "4.14.0", "dependencies": { "@angular-eslint/eslint-plugin": "^18.2.0", "@angular/animations": "18.2.3", diff --git a/package.json b/package.json index 9c5d09b..75ea77e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "farmmaps-lib-app", - "version": "4.12.0", + "version": "4.14.0", "scripts": { "ng": "ng", "start": "ng serve", From 64a0e58238ab4a48aa50ecf3d1cd2756e150ab1f Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 3 Mar 2025 15:32:16 +0100 Subject: [PATCH 03/23] AW-3128 Cleanup --- projects/common/src/fm/effects/app-common.effects.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts index da41a12..087b423 100644 --- a/projects/common/src/fm/effects/app-common.effects.ts +++ b/projects/common/src/fm/effects/app-common.effects.ts @@ -226,8 +226,4 @@ export class AppCommonEffects { this.locale = locale; store$.dispatch(new appCommonActions.LoadItemTypes()); } -} -function tap(arg0: () => any): any { - throw new Error('Function not implemented.'); -} - +} \ No newline at end of file From 362e6c8534fcc5b4aee7a32339a00954fbce0ad7 Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 3 Mar 2025 14:34:07 +0000 Subject: [PATCH 04/23] [ci skip] Updated packages #2535 --- package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index d20e039..1ccda05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,14 +90,14 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2532", + "version": "4.14.0-prerelease.2534", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^18.2.3", - "@angular/core": "^18.2.3", - "@angular/forms": "^18.2.3", + "@angular/common": "18.2.3", + "@angular/core": "18.2.3", + "@angular/forms": "18.2.3", "@microsoft/signalr": "^3.1.16", "@ng-bootstrap/ng-bootstrap": "^17.0.1", "@ngrx/effects": "^18.0.2", @@ -115,12 +115,12 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2532", + "version": "4.14.0-prerelease.2534", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^18.2.3", + "@angular/core": "18.2.3", "@ngrx/effects": "^18.0.2", "@ngrx/router-store": "^18.0.2", "@ngrx/store": "^18.0.2", @@ -130,27 +130,27 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2532", + "version": "4.14.0-prerelease.2534", "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": "^18.2.3", - "@angular/core": "^18.2.3", + "@angular/common": "18.2.3", + "@angular/core": "18.2.3", "cesium": "^1.97.0", "ol-cesium": ">=2.13.0" } }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2532", + "version": "4.14.0-prerelease.2534", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^18.2.3", - "@angular/core": "^18.2.3", + "@angular/common": "18.2.3", + "@angular/core": "18.2.3", "ol": "^8.2.0" } }, From 89061774de5896c22a7d85bfbc3a9b494602ec98 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 4 Mar 2025 08:52:38 +0100 Subject: [PATCH 05/23] AW-6716 Uploaden avatar geeft foutmelding Caused by BREAKING CHANGE: by default the output will be set to blob. Using blob instead of a base64 should decrease the memory usage. If you wish to keep using base64, simply add output="base64" to the tag. (https://github.com/Mawi137/ngx-image-cropper/releases/tag/7.0.0) --- .../components/edit-image-modal/edit-image-modal.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html b/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html index ce6161b..8acf39b 100644 --- a/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html +++ b/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html @@ -11,7 +11,7 @@
No image selected
- Date: Tue, 4 Mar 2025 07:54:29 +0000 Subject: [PATCH 06/23] [ci skip] Updated packages #2536 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1ccda05..27d941e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.14.0-prerelease.2534", + "version": "4.14.0-prerelease.2535", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.14.0-prerelease.2534", + "version": "4.14.0-prerelease.2535", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.14.0-prerelease.2534", + "version": "4.14.0-prerelease.2535", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.14.0-prerelease.2534", + "version": "4.14.0-prerelease.2535", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From e9880d6eb2562f726b4e3c535f9485d2a9a28a5a Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 10 Mar 2025 11:28:34 +0100 Subject: [PATCH 07/23] AW-2925 Data temporal item --- .../selected-item-temporal.component.html | 2 +- .../selected-item-temporal.component.ts | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html index 6aaa0c4..74d623d 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html @@ -41,7 +41,7 @@
  •  Add as overlay
  •  Remove overlay
    • -
  •  Show chart
    • +
  •  Download
    • diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts index 5814910..bc6af67 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts @@ -2,7 +2,7 @@ import { Component, Injectable } from '@angular/core'; import { Location } from '@angular/common'; import { Store } from '@ngrx/store'; import * as mapReducers from '../../reducers/map.reducer'; -import { commonReducers, ItemTypeService, IItem } from '@farmmaps/common'; +import { commonReducers, ItemTypeService, IItem, ItemService, IItemLinkType, IUrlType } from '@farmmaps/common'; import { Router } from '@angular/router'; import { ForItemType } from '../for-item/for-itemtype.decorator'; import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component'; @@ -11,7 +11,6 @@ import * as mapActions from '../../actions/map.actions'; import { IItemLayer } from '../../models/item.layer'; import {TemporalService} from '../../services/temporal.service'; - @ForItemType("vnd.farmmaps.itemtype.temporal") @Injectable() @Component({ @@ -21,7 +20,7 @@ import {TemporalService} from '../../services/temporal.service'; }) export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent { - constructor(store: Store, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) { + constructor(store: Store, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) { super(store, itemTypeService,location,router); } @@ -61,4 +60,15 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]); return false; } + + download(item:IItem,event:MouseEvent) { + event.stopPropagation(); + event.preventDefault(); + const itemLink : IItemLinkType = {itemcode:item.code,pathsuffix:"download", validminutes:10} + console.log('download1', itemLink) + const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => { + console.log('download2', itemLinkUrl) + window.location.href =itemLinkUrl.url + }) + } } From fd479c92d85f6d2428ff27c3280339aba5aa8565 Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 10 Mar 2025 10:30:23 +0000 Subject: [PATCH 08/23] [ci skip] Updated packages #2537 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 27d941e..4f456bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.14.0-prerelease.2535", + "version": "4.14.0-prerelease.2536", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.14.0-prerelease.2535", + "version": "4.14.0-prerelease.2536", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.14.0-prerelease.2535", + "version": "4.14.0-prerelease.2536", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.14.0-prerelease.2535", + "version": "4.14.0-prerelease.2536", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 5995d205a4de51d78c8467a4109e025224fa4559 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 12 Mar 2025 08:58:19 +0100 Subject: [PATCH 09/23] AW-2925 Accidently removed --- .../selected-item-temporal/selected-item-temporal.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html index 74d623d..5076153 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html @@ -41,6 +41,7 @@
  •  Add as overlay
  •  Remove overlay
    • +
  •  Show chart
  •  Download
    • From 3027c69fa8234845214e1309a682dfc33f640f01 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 12 Mar 2025 08:00:13 +0000 Subject: [PATCH 10/23] [ci skip] Updated packages #2538 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f456bf..0e6aaf0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.14.0-prerelease.2536", + "version": "4.14.0-prerelease.2537", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.14.0-prerelease.2536", + "version": "4.14.0-prerelease.2537", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.14.0-prerelease.2536", + "version": "4.14.0-prerelease.2537", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.14.0-prerelease.2536", + "version": "4.14.0-prerelease.2537", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From b2fe8f3bd714e5afe1aa244cd84035555f0bb69b Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 12 Mar 2025 14:47:17 +0100 Subject: [PATCH 11/23] Fix RVO redirect URL for locale --- projects/common/src/fm/effects/app-common.effects.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts index 087b423..b849f87 100644 --- a/projects/common/src/fm/effects/app-common.effects.ts +++ b/projects/common/src/fm/effects/app-common.effects.ts @@ -63,7 +63,10 @@ export class AppCommonEffects { ofType(appCommonActions.SWITCHLANGUAGE), switchMap((action) => { const a = action as appCommonActions.SwitchLanguage; - location.replace(`/${a.locale}/`); + if (location.pathname.includes(`/${this.locale}/`)) { + const newPath = location.pathname.replace(`/${this.locale}/`, `/${a.locale}/`); + location.replace(newPath); + } return of(undefined); })),{ dispatch:false}); From c7c131d43767c06a64f82c3028569e0f0b8134d4 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 12 Mar 2025 13:49:12 +0000 Subject: [PATCH 12/23] [ci skip] Updated packages #2539 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e6aaf0..4fb7bbd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.14.0-prerelease.2537", + "version": "4.14.0-prerelease.2538", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.14.0-prerelease.2537", + "version": "4.14.0-prerelease.2538", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.14.0-prerelease.2537", + "version": "4.14.0-prerelease.2538", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.14.0-prerelease.2537", + "version": "4.14.0-prerelease.2538", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From df14427d604ed254908c9192f5789e2ba924660d Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 12 Mar 2025 15:14:58 +0100 Subject: [PATCH 13/23] Fix RVO redirect URL for locale (without loosing queryparms) --- .../src/fm/effects/app-common.effects.ts | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts index b849f87..992b026 100644 --- a/projects/common/src/fm/effects/app-common.effects.ts +++ b/projects/common/src/fm/effects/app-common.effects.ts @@ -1,18 +1,18 @@ -import { Injectable, Inject, LOCALE_ID } from '@angular/core'; +import { Inject, Injectable, LOCALE_ID } from '@angular/core'; import { Router } from '@angular/router'; -import { OAuthService,UserInfo } from 'angular-oauth2-oidc'; +import { Actions, createEffect, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; -import { Actions,ofType,createEffect } from '@ngrx/effects'; -import { of,from,zip } from 'rxjs'; -import { withLatestFrom,mergeMap,switchMap,map,catchError,first} from 'rxjs/operators'; +import { OAuthService, UserInfo } from 'angular-oauth2-oidc'; +import { from, of, zip } from 'rxjs'; +import { catchError, first, map, mergeMap, switchMap, withLatestFrom } from 'rxjs/operators'; import * as appCommonActions from '../actions/app-common.actions'; -import * as appCommonReducers from '../reducers/app-common.reducer'; -import { ItemService } from '../services/item.service'; -import { FolderService } from '../services/folder.service'; -import { UserService } from '../services/user.service'; import { IItemTypes } from '../models/item.types'; import { IListItem } from '../models/list.item'; -import {StateSerializerService} from '../services/state-serializer.service'; +import * as appCommonReducers from '../reducers/app-common.reducer'; +import { FolderService } from '../services/folder.service'; +import { ItemService } from '../services/item.service'; +import { StateSerializerService } from '../services/state-serializer.service'; +import { UserService } from '../services/user.service'; @Injectable() export class AppCommonEffects { @@ -63,9 +63,9 @@ export class AppCommonEffects { ofType(appCommonActions.SWITCHLANGUAGE), switchMap((action) => { const a = action as appCommonActions.SwitchLanguage; - if (location.pathname.includes(`/${this.locale}/`)) { - const newPath = location.pathname.replace(`/${this.locale}/`, `/${a.locale}/`); - location.replace(newPath); + if (this.router$.url.includes(`/${this.locale}/`)) { + const newUrl = this.router$.url.replace(`/${this.locale}/`, `/${a.locale}/`); + this.router$.navigateByUrl(newUrl); } return of(undefined); })),{ dispatch:false}); From 10df983ae3a38fe58d0f87c2f47e8058f5e3a27d Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 12 Mar 2025 14:16:55 +0000 Subject: [PATCH 14/23] [ci skip] Updated packages #2540 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4fb7bbd..3645b8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.14.0-prerelease.2538", + "version": "4.14.0-prerelease.2539", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.14.0-prerelease.2538", + "version": "4.14.0-prerelease.2539", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.14.0-prerelease.2538", + "version": "4.14.0-prerelease.2539", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.14.0-prerelease.2538", + "version": "4.14.0-prerelease.2539", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 9f4328743313ee27c7244a1528d85e5be272e7c4 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 12 Mar 2025 15:37:59 +0100 Subject: [PATCH 15/23] Revert "Fix RVO redirect URL for locale (without loosing queryparms)" This reverts commit df14427d604ed254908c9192f5789e2ba924660d. --- .../src/fm/effects/app-common.effects.ts | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts index 992b026..b849f87 100644 --- a/projects/common/src/fm/effects/app-common.effects.ts +++ b/projects/common/src/fm/effects/app-common.effects.ts @@ -1,18 +1,18 @@ -import { Inject, Injectable, LOCALE_ID } from '@angular/core'; +import { Injectable, Inject, LOCALE_ID } from '@angular/core'; import { Router } from '@angular/router'; -import { Actions, createEffect, ofType } from '@ngrx/effects'; +import { OAuthService,UserInfo } from 'angular-oauth2-oidc'; import { Store } from '@ngrx/store'; -import { OAuthService, UserInfo } from 'angular-oauth2-oidc'; -import { from, of, zip } from 'rxjs'; -import { catchError, first, map, mergeMap, switchMap, withLatestFrom } from 'rxjs/operators'; +import { Actions,ofType,createEffect } from '@ngrx/effects'; +import { of,from,zip } from 'rxjs'; +import { withLatestFrom,mergeMap,switchMap,map,catchError,first} from 'rxjs/operators'; import * as appCommonActions from '../actions/app-common.actions'; +import * as appCommonReducers from '../reducers/app-common.reducer'; +import { ItemService } from '../services/item.service'; +import { FolderService } from '../services/folder.service'; +import { UserService } from '../services/user.service'; import { IItemTypes } from '../models/item.types'; import { IListItem } from '../models/list.item'; -import * as appCommonReducers from '../reducers/app-common.reducer'; -import { FolderService } from '../services/folder.service'; -import { ItemService } from '../services/item.service'; -import { StateSerializerService } from '../services/state-serializer.service'; -import { UserService } from '../services/user.service'; +import {StateSerializerService} from '../services/state-serializer.service'; @Injectable() export class AppCommonEffects { @@ -63,9 +63,9 @@ export class AppCommonEffects { ofType(appCommonActions.SWITCHLANGUAGE), switchMap((action) => { const a = action as appCommonActions.SwitchLanguage; - if (this.router$.url.includes(`/${this.locale}/`)) { - const newUrl = this.router$.url.replace(`/${this.locale}/`, `/${a.locale}/`); - this.router$.navigateByUrl(newUrl); + if (location.pathname.includes(`/${this.locale}/`)) { + const newPath = location.pathname.replace(`/${this.locale}/`, `/${a.locale}/`); + location.replace(newPath); } return of(undefined); })),{ dispatch:false}); From 758613aa12e3a4c4ede9e647609b4e4e192d3898 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 12 Mar 2025 14:40:01 +0000 Subject: [PATCH 16/23] [ci skip] Updated packages #2541 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3645b8d..276fe5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.14.0-prerelease.2539", + "version": "4.14.0-prerelease.2540", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.14.0-prerelease.2539", + "version": "4.14.0-prerelease.2540", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.14.0-prerelease.2539", + "version": "4.14.0-prerelease.2540", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.14.0-prerelease.2539", + "version": "4.14.0-prerelease.2540", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 39c619a8378c4c1e1d55e95de620cd6e490592e6 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Thu, 13 Mar 2025 08:38:24 +0100 Subject: [PATCH 17/23] Fix RVO redirect URL for locale (without loosing queryparms) --- projects/common/src/fm/effects/app-common.effects.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts index b849f87..8447a37 100644 --- a/projects/common/src/fm/effects/app-common.effects.ts +++ b/projects/common/src/fm/effects/app-common.effects.ts @@ -49,7 +49,7 @@ export class AppCommonEffects { switchMap((action) => { return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe( switchMap(([user,userInfo]) => { - if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale) + if (this.location.path === 'localhost' || user.language === undefined || user.language === this.locale) { return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo)) } @@ -63,8 +63,8 @@ export class AppCommonEffects { ofType(appCommonActions.SWITCHLANGUAGE), switchMap((action) => { const a = action as appCommonActions.SwitchLanguage; - if (location.pathname.includes(`/${this.locale}/`)) { - const newPath = location.pathname.replace(`/${this.locale}/`, `/${a.locale}/`); + if (location.href.includes(`/${this.locale}/`)) { + const newPath = location.href.replace(`/${this.locale}/`, `/${a.locale}/`); location.replace(newPath); } return of(undefined); From 84a1004977aebaa26baabb424e4776af2ff228ea Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Thu, 13 Mar 2025 08:44:46 +0100 Subject: [PATCH 18/23] Fix redirect URL for locale (without loosing queryparms) --- projects/common/src/fm/effects/app-common.effects.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts index 8447a37..3e147df 100644 --- a/projects/common/src/fm/effects/app-common.effects.ts +++ b/projects/common/src/fm/effects/app-common.effects.ts @@ -49,7 +49,7 @@ export class AppCommonEffects { switchMap((action) => { return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe( switchMap(([user,userInfo]) => { - if (this.location.path === 'localhost' || user.language === undefined || user.language === this.locale) + if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale) { return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo)) } From 4866a6f22d9620183547913284c6f82935e90768 Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 13 Mar 2025 07:46:33 +0000 Subject: [PATCH 19/23] [ci skip] Updated packages #2543 --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 276fe5c..914ca9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.14.0-prerelease.2540", + "version": "4.14.0-prerelease.2541", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.14.0-prerelease.2540", + "version": "4.14.0-prerelease.2541", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.14.0-prerelease.2540", + "version": "18.0.0", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 6810da8b79a3af825b831c38e18cb849b0080368 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 14 Mar 2025 15:25:06 +0100 Subject: [PATCH 20/23] AW-6742 Add analyse functions --- projects/common/src/fm/services/admin.service.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/projects/common/src/fm/services/admin.service.ts b/projects/common/src/fm/services/admin.service.ts index a8aaeea..9ba956a 100644 --- a/projects/common/src/fm/services/admin.service.ts +++ b/projects/common/src/fm/services/admin.service.ts @@ -52,4 +52,16 @@ export class AdminService { postItemTask(item: IItem, task: IItemTask): Observable { return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task); } + + getAnalyseFolderOverview(): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/overview`); + } + + getAnalyseFolderInfo(user: string): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/${user}`); + } + + getAnalyseFolderLog(): Observable { + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/log`); + } } From 2ca973073527f84bc223a5e616df2ac6608e10c5 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 14 Mar 2025 14:27:03 +0000 Subject: [PATCH 21/23] [ci skip] Updated packages #2544 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 914ca9d..8314acc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.14.0-prerelease.2540", + "version": "4.14.0-prerelease.2543", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.14.0-prerelease.2541", + "version": "4.14.0-prerelease.2543", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.14.0-prerelease.2541", + "version": "4.14.0-prerelease.2543", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "18.0.0", + "version": "4.14.0-prerelease.2543", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From a46e8040b2952ce54e5ba3e98dc1839d3c72c0ff Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 24 Mar 2025 09:13:47 +0100 Subject: [PATCH 22/23] AW-6756 Settingsknop Explorer dezelfde kleur als het logo van de explorer. --- .../common/src/fm/actions/app-common.actions.ts | 11 ++++++++++- .../src/fm/components/app/app.component.html | 2 +- .../common/src/fm/components/app/app.component.ts | 1 + .../setting-menu/setting-menu.component.html | 2 +- .../setting-menu/setting-menu.component.ts | 1 + .../common/src/fm/reducers/app-common.reducer.ts | 14 ++++++++++---- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/projects/common/src/fm/actions/app-common.actions.ts b/projects/common/src/fm/actions/app-common.actions.ts index 71e17e7..7175cc4 100644 --- a/projects/common/src/fm/actions/app-common.actions.ts +++ b/projects/common/src/fm/actions/app-common.actions.ts @@ -85,6 +85,9 @@ export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications'; export const SWITCHLANGUAGE = '[AppCommon] SwitchLanguage'; +export const SETSETTINGMENUBACKGROUNDCOLOR = '[AppCommon] SetSettingMenuBackgroundColor'; + + export class InitUser implements Action { readonly type = INITUSER; @@ -379,6 +382,11 @@ export class SwitchLanguage implements Action { constructor(public locale:string) { } } +export class SetSettingMenuBackgroundColor implements Action { + readonly type = SETSETTINGMENUBACKGROUNDCOLOR; + + constructor(public color:string) { } +} export type Actions = OpenModal | InitRoot @@ -427,6 +435,7 @@ export type Actions = OpenModal | ToggleSettingMenu | NotificationEvent | SetUnreadNotifications - | SwitchLanguage; + | SwitchLanguage + | SetSettingMenuBackgroundColor; diff --git a/projects/common/src/fm/components/app/app.component.html b/projects/common/src/fm/components/app/app.component.html index 1f33cf6..b025e09 100644 --- a/projects/common/src/fm/components/app/app.component.html +++ b/projects/common/src/fm/components/app/app.component.html @@ -33,7 +33,7 @@
    - + diff --git a/projects/common/src/fm/components/app/app.component.ts b/projects/common/src/fm/components/app/app.component.ts index 4808d08..04193ec 100644 --- a/projects/common/src/fm/components/app/app.component.ts +++ b/projects/common/src/fm/components/app/app.component.ts @@ -50,6 +50,7 @@ export class AppComponent implements OnInit, OnDestroy { public unreadNotifications: Observable = this.store$.select(appReducers.SelectgetUnreadNotifications); public user: Observable = this.store$.select(appReducers.SelectGetUser); public isPageMode: Observable = this.store$.select(appReducers.SelectGetIsPageMode); + public settingMenuBackgroundColor: Observable = this.store$.select(appReducers.SelectGetSettingMenuBackgroundColor); @Input() showUploadProgress = true; constructor( diff --git a/projects/common/src/fm/components/setting-menu/setting-menu.component.html b/projects/common/src/fm/components/setting-menu/setting-menu.component.html index fa19285..886fadb 100644 --- a/projects/common/src/fm/components/setting-menu/setting-menu.component.html +++ b/projects/common/src/fm/components/setting-menu/setting-menu.component.html @@ -1,5 +1,5 @@
    -