AW-6046 Fixes
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good

This commit is contained in:
Peter Bastiani 2024-04-15 14:03:35 +02:00
parent ea7e9584ab
commit 39c15d6519
8 changed files with 764 additions and 547 deletions

1257
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -66,11 +66,11 @@
"@types/arcgis-rest-api": "^10.4.5",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "^2.0.9",
"@types/node": "^12.20.15",
"@types/node": "^18.11.6",
"@typescript-eslint/eslint-plugin": "^6.18.0",
"@typescript-eslint/eslint-plugin-tslint": "^6.18.0",
"@typescript-eslint/parser": "^6.18.0",
"codelyzer": "^0.0.28",
"codelyzer": "^6.0.2",
"eslint": "^8.35.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-import": "^2.27.5",

View File

@ -9,7 +9,7 @@ import { ActionReducer, MetaReducer, StoreModule } from '@ngrx/store';
import { AngularOpenlayersModule } from 'ng-openlayers';
//common modules
import { AppCommonModule, ItemService, ItemTypeService, FolderService } from '@farmmaps/common';
import { AppCommonModule } from '@farmmaps/common';
import * as mapActions from './actions/map.actions';
import * as mapEffects from './effects/map.effects';
@ -212,9 +212,6 @@ export {
GeolocationService,
DeviceOrientationService,
TemporalService,
ItemTypeService,
ItemService,
FolderService,
{ provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
{ provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },

View File

@ -23,7 +23,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
public items: Observable<IListItem[]>;
constructor(store: Store<mapReducers.State | commonReducers.State>, @Inject('itemTypeService') itemTypeService: ItemTypeService, location: Location, router: Router, @Inject('itemService$') private itemService$: ItemService,@Inject('folderService$') private folderService$: FolderService) {
constructor(store: Store<mapReducers.State | commonReducers.State>, @Inject('itemTypeService') itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService, private folderService$: FolderService) {
super(store, itemTypeService,location,router);
}
@ -42,7 +42,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
const atLocationItems = this.itemService$.getItemList(null,null,null,this.item.code,true);
this.items = childItems.pipe(
combineLatest(atLocationItems),
switchMap(([ci,ali]) => {
switchMap(([ci, ali]) => {
const retVal:IListItem[] = [];
const codes = {};
ci.forEach((listItem) => {

View File

@ -1,16 +1,16 @@
import { NgModule } from '@angular/core';
import { RouterModule, UrlSegment, ExtraOptions } from '@angular/router';
import { RouterModule, UrlSegment } from '@angular/router';
import { AuthGuard, FullScreenGuard } from '@farmmaps/common';
//import { MapComponent } from '@farmmaps/common-map';
//import { Switch2D3DComponent } from '@farmmaps/common-map3d';
import { NotImplementedComponent } from '@farmmaps/common';
import { NavBarGuard } from 'projects/common/src/public-api';
import { LandingpageComponent } from './landingpage/landingpage.component';
import { LogoComponent } from './logo/logo.component';
import { MenuComponent } from './menu/menu.component';
import { RegisterDeviceComponent } from './registerdevice/registerdevice.component';
import { NotImplementedComponent } from '@farmmaps/common';
import { NavBarGuard } from 'projects/common/src/public-api';
import { TestComponent } from './test/test.component';
import { LandingpageComponent } from './landingpage/landingpage.component';
export function urlMatcher(url: UrlSegment[]) {
return { consumed: url };

View File

@ -1,28 +1,27 @@
import {
NgModule,
Inject,
APP_BOOTSTRAP_LISTENER,
InjectionToken, Type,
Inject,
InjectionToken,
NgModule,
Type,
} from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { AppCommonModule,AppCommonServiceModule,AuthConfigFactory,FM_COMMON_STARTPAGE } from '@farmmaps/common';
import { AppCommonModule, AppCommonServiceModule, AuthConfigFactory, FM_COMMON_STARTPAGE } from '@farmmaps/common';
import {AppRootComponent} from './app.component';
import { AppRootComponent } from './app.component';
import {StoreModule, ActionReducer,MetaReducer} from '@ngrx/store';
import {EffectsModule, EffectSources} from '@ngrx/effects';
import { StoreRouterConnectingModule,routerReducer} from '@ngrx/router-store';
import { EffectSources, EffectsModule } from '@ngrx/effects';
import { StoreRouterConnectingModule, routerReducer } from '@ngrx/router-store';
import { ActionReducer, MetaReducer, StoreModule } from '@ngrx/store';
import {AppRoutingModule} from './app-routing.module';
import { AppRoutingModule } from './app-routing.module';
import { Id4AuthconfigFactory } from './id4AuthconfigFactory';
import { LandingpageComponent } from './landingpage/landingpage.component';
import { LogoComponent } from './logo/logo.component';
import { MenuComponent } from './menu/menu.component';
import {RegisterDeviceComponent} from './registerdevice/registerdevice.component';
import { SecureOAuthStorage} from '@farmmaps/common';
import { OAuthStorage } from 'angular-oauth2-oidc';
import {Id4AuthconfigFactory} from './id4AuthconfigFactory';
import { RegisterDeviceComponent } from './registerdevice/registerdevice.component';
import { TestComponent } from './test/test.component';
import { LandingpageComponent } from './landingpage/landingpage.component';
export const BOOTSTRAP_EFFECTS = new InjectionToken('Bootstrap Effects');

View File

@ -1,6 +1,4 @@
import { Component, OnInit } from '@angular/core';
import { ItemService} from '@farmmaps/common';
import { Observable} from 'rxjs';
@Component({
selector: 'app-test',
@ -11,7 +9,7 @@ export class LandingpageComponent implements OnInit {
//public gradientItems:Observable<any[]>
constructor(private itemService$:ItemService) {
constructor() {
}
ngOnInit(): void {

View File

@ -20,7 +20,7 @@ export class TestComponent implements OnInit {
ngOnInit(): void {
}
onTest(Event) {
onTest() {
const a = {"unread":"1"}
this.store$.dispatch(new commonActions.NotificationEvent(a));
}