2024.12 from develop to master

Merge branch 'develop'

# Conflicts:
#	package-lock.json
#	package.json

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.18.0",
+  "version": "4.12.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "farmmaps-lib-app",
-      "version": "4.18.0",
+      "version": "4.12.0",
       "dependencies": {
         "@angular-eslint/eslint-plugin": "^18.2.0",
         "@angular/animations": "18.2.3",
@@ -90,14 +90,14 @@
     },
     "dist/common": {
       "name": "@farmmaps/common",
-      "version": "4.18.0-prerelease.2576",
+      "version": "4.12.0-prerelease.2532",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.3",
+        "@angular/common": "^18.2.3",
-        "@angular/core": "18.2.3",
+        "@angular/core": "^18.2.3",
-        "@angular/forms": "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.18.0-prerelease.2576",
+      "version": "4.12.0-prerelease.2532",
       "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.18.0-prerelease.2576",
+      "version": "4.12.0-prerelease.2532",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.3",
+        "@angular/common": "^18.2.3",
-        "@angular/core": "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.18.0-prerelease.2576",
+      "version": "4.12.0-prerelease.2532",
       "license": "MPL-2.0",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "18.2.3",
+        "@angular/common": "^18.2.3",
-        "@angular/core": "18.2.3",
+        "@angular/core": "^18.2.3",
         "ol": "^8.2.0"
       }
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.18.0",
+  "version": "4.12.0",
   "scripts":   {
     "ng": "ng",
     "start": "ng serve",

projects/common-map/src/fm-map/common-map.module.ts

@@ -36,12 +36,10 @@ import { RotationResetComponent } from './components/aol/rotation-reset/rotation
 import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component';
 import { FeatureListContainerComponent } from './components/feature-list-container/feature-list-container.component';
 import { FeatureListCropfieldComponent } from './components/feature-list-cropfield/feature-list-cropfield.component';
-import { FeatureListObservationComponent } from './components/feature-list-observation/feature-list-observation.component';
 import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component';
 import { FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component';
 import { FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
 import { FeatureListFeatureCroppingschemeComponent } from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component';
-import { FeatureListFeatureObservationComponent } from './components/feature-list-feature-observation/feature-list-feature-observation.component';
 import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component';
 import { AbstractFeatureListComponent, FeatureListComponent } from './components/feature-list/feature-list.component';
 import { GeometryThumbnailComponent } from './components/feature-thumbnail/feature-thumbnail.component';
@@ -107,7 +105,7 @@ const metaReducers: Array<MetaReducer<any, any>> = [LocalStorageSync];
 
 export {
   AbstractFeatureListComponent,
-  AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListObservationComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureObservationComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild,
+  AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild,
   ForItemType, ForPackage, ForSourceTask, GeolocationService, GeometryThumbnailComponent, GpsLocation, IClickedFeature, ifZoomToShowDirective, IItemLayer, IMapState, IPeriodState, ISelectedFeatures, ItemLayer, ItemLayersComponent, ItemListComponent, ItemListItemComponent,
   ItemListItemContainerComponent, ITemporalItemLayer, ItemVectorSourceComponent, ItemWidgetListComponent, LayerListComponent, LayerSwitcher, LayerVectorImageComponent, LegendComponent, mapActions, MapComponent, mapEffects,
   mapReducers, MapSearchComponent, MetaDataModalComponent, PanToLocation, RotationResetComponent, SelectedItemComponent, SelectedItemContainerComponent, SelectedItemCropfieldComponent,
@@ -144,12 +142,10 @@ export {
         FeatureListContainerComponent,
         FeatureListCroppingschemeComponent,
         FeatureListCropfieldComponent,
-        FeatureListObservationComponent,
         FeatureListFeatureContainerComponent,
         FeatureListFeatureComponent,
         FeatureListFeatureCroppingschemeComponent,
         FeatureListFeatureCropfieldComponent,
-        FeatureListFeatureObservationComponent,
         SelectedItemContainerComponent,
         SelectedItemComponent,
         SelectedItemCropfieldComponent,
@@ -182,7 +178,6 @@ export {
         LayerSwitcher,
         FeatureListFeatureComponent,
         FeatureListFeatureCropfieldComponent,
-        FeatureListFeatureObservationComponent,
         FeatureListFeatureCroppingschemeComponent,
         SelectedItemContainerComponent,
         SelectedItemComponent,
@@ -206,7 +201,6 @@ export {
         FeatureListContainerComponent,
         FeatureListCroppingschemeComponent,
         FeatureListCropfieldComponent,
-        FeatureListObservationComponent,
         FeatureListFeatureContainerComponent,
         ZoomToExtentComponent,
         ifZoomToShowDirective,
@@ -220,11 +214,9 @@ export {
         TemporalService,
         { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
         { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
-        { provide: AbstractFeatureListComponent, useClass: FeatureListObservationComponent, multi: true },        
         { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
         { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
         { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureObservationComponent, multi: true },        
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },

projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.html

@@ -1,10 +0,0 @@
-<div *ngIf="feature;let feature">
-  <div class="row m-0">
-    <div class="col-3 m-0 p-2 thumbnail">
-      <img [src]="getSource(feature)" style="width: 34px">
-    </div>
-    <div class="col p-2" style="margin: auto;">
-      <h1 class="card-title" title="{{feature.get('name')}}">{{feature.get('name')}}</h1>
-    </div>  
-  </div>
-</div>

projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.scss

@@ -1,22 +0,0 @@
-.card-title {
-  font-size: 1rem;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.card-text {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.col {
-  overflow: hidden;
-}
-
-.thumbnail {
-  width: 4em;
-  height: 4em;
-}
-

projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.ts

@@ -1,29 +0,0 @@
-import { Component, Injectable } from '@angular/core';
-import { AppConfig, commonReducers, ItemTypeService } from '@farmmaps/common';
-import { Store } from '@ngrx/store';
-import { Feature } from 'ol';
-import { Geometry } from 'ol/geom';
-import * as mapReducers from '../../reducers/map.reducer';
-import { AbstractFeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
-import { ForItemType } from '../for-item/for-itemtype.decorator';
-
-@ForItemType("vnd.farmmaps.itemtype.observation")
-@Injectable()
-@Component({
-  selector: 'fm-map-feature-list-feature-observation',
-  templateUrl: './feature-list-feature-observation.component.html',
-  styleUrls: ['./feature-list-feature-observation.component.scss']
-})
-export class FeatureListFeatureObservationComponent extends AbstractFeatureListFeatureComponent {
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService,config:AppConfig) {
-    super(store, itemTypeService,config);
-  }
-
-  getSource(feature: Feature<Geometry>): string {
-    let source = "/images/decease.png";
-    var type = feature.get('type');
-    source = '/images/' + type + '.png';
-    return source;
-  }
-}

projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.html

@@ -1,14 +0,0 @@
-<div class="card border-0">
-  <div class="card-body" *ngIf="(schemeItem|async);let schemeItem">
-    <fm-back-button></fm-back-button>
-    <h4 i18n>Farm</h4>
-    <h3>{{schemeItem.name}}</h3>
-    <div *ngIf="features;let features">
-        <div class="cropfields">
-          <div class="row m-0 ps-3 pe-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
-          <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>

projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.scss

@@ -1,20 +0,0 @@
-fm-map-feature-list-feature-container {
-  width:100%;
-  pointer-events:none;
-}
-
-.row {
-  border-bottom: 1px solid var(--bs-gray-500);
-  user-select: none;
-  padding-left:1.5rem;
-}
-
-.row.selected {
-  background-color: var(--bs-gray-100);
-}
-
-.cropfields {
-  border-top: 1px solid var(--bs-gray-500);
-  margin-left: -1.25rem;
-  margin-right: -1.25rem;
-}

projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.ts

@@ -1,30 +0,0 @@
-import { Component, Injectable,AfterViewInit, OnInit,SimpleChanges, ChangeDetectorRef} from '@angular/core';
-import { Location } from '@angular/common';
-import { AbstractFeatureListComponent } from '../feature-list/feature-list.component';
-import {ForItemType } from '../for-item/for-itemtype.decorator';
-import {ForChild } from '../for-item/for-child.decorator';
-import { Store } from '@ngrx/store';
-import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, IItem,ItemService } from '@farmmaps/common';
-import { Observable } from 'rxjs';
-
-@ForChild()
-@ForItemType("vnd.farmmaps.itemtype.observation")
-@Injectable()
-@Component({
-  selector: 'fm-map-feature-list-observation',
-    templateUrl: './feature-list-observation.component.html',
-    styleUrls: ['./feature-list-observation.component.scss']
-})
-export class FeatureListObservationComponent extends AbstractFeatureListComponent implements OnInit {
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, private itemService: ItemService) {
-    super(store, itemTypeService,location);
-  }
-
-  public schemeItem: Observable<IItem>
-
-  ngOnInit() {
-    this.schemeItem = this.itemService.getItem(this.queryState.parentCode);
-  } 
-}

projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html

@@ -10,7 +10,7 @@
         <li class="nav-item py-0">
           <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Base maps</span></span>
           <div  class="mb-4">
-            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
+            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
           </div>
         </li>
         <li class="nav-item py-0">
@@ -20,17 +20,12 @@
           </div>
         </li>
         <li class="nav-item py-0" *ngIf="selectedItemLayer$ | async as selectedItemLayer">
-          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Overlay slider</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span>
+          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Data</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span>
           <div class="mb-4">
             <fm-map-layer-list [dataLayers]="true" [itemLayers]="[selectedItemLayer]" [selectedLayer]="selectedItemLayer" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list>
           </div>
         </li>
-        <li class="nav-item py-0">
+
-          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Aerial photos</span></span>
-          <div  class="mb-4">
-            <fm-map-layer-list [baseLayers]="true" [itemLayers]="aerialMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
-          </div>
-        </li>
       </ul>
   </div>
   </div>

projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts

@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import * as mapActions from '../../actions/map.actions';
 import {createEmpty,extend } from 'ol/extent';
-import { filter, map, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'fm-map-layer-switcher',
@@ -17,8 +17,7 @@ export class LayerSwitcher  implements OnInit,OnChanges{
   public overlayLayers: Observable<Array<IItemLayer>>;
   public selectedOverlayLayer: Observable<IItemLayer>;
   public selectedItemLayer$: Observable<IItemLayer>;
-  public baseMaps: Observable<Array<IItemLayer>>;
+  public baseLayers: Observable<Array<IItemLayer>>;
-  public aerialMaps: Observable<Array<IItemLayer>>;
   public selectedBaseLayer: Observable<IItemLayer>;
 
   constructor( private store: Store<mapReducers.State>) {
@@ -27,8 +26,7 @@ export class LayerSwitcher  implements OnInit,OnChanges{
   ngOnInit() { 
     this.overlayLayers = this.store.select(mapReducers.selectGetOverlayLayers);
     this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
-    this.baseMaps = this.store.select(mapReducers.selectGetBaseMaps);
+    this.baseLayers = this.store.select(mapReducers.selectGetBaseLayers);
-    this.aerialMaps = this.store.select(mapReducers.selectGetArealMaps);
     this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer);
     this.selectedItemLayer$ = this.store.select(mapReducers.selectGetSelectedItemLayer)
     this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher);
@@ -85,4 +83,3 @@ export class LayerSwitcher  implements OnInit,OnChanges{
     event.preventDefault();
   }
 }
- 

projects/common-map/src/fm-map/components/map/map.component.scss

@@ -52,21 +52,12 @@ aol-map { position:absolute;width:100%;height:calc( 100vh );}
   pointer-events: none;
 }
 
-@media screen and (max-width: 768px) {
-  .control-container {
-    margin-left: 1em;
-    margin-right: 1em;
-    pointer-events: all;
-  }
-}
 
-@media screen and (min-width: 768px) {
 .control-container {
   float:right;
   margin-right: 1em;
   pointer-events: all;
 }
-}
 
 .fullscreen .viewport-container {
   margin-bottom: 1em;

projects/common-map/src/fm-map/components/map/map.component.ts

@@ -92,8 +92,6 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
   public noContent = false;
   public overrideSelectedItemLayer = false;
   public overrideOverlayLayers = false;
-  public hideShowLayerValues = false;
-  public const
   public dataLayerSlideValue = 50;
   public dataLayerSlideEnabled = false;
   private visibleAreaBottom = 0;
@@ -118,7 +116,6 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
         const params = route.snapshot.data["fm-map-map"];
         this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
         this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false;
-      this.hideShowLayerValues = params["hideShowLayerValues"] ? params["hideShowLayerValues"] : false;
       }
       this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query,mapState]) =>{
         if(query && query.querystate) {
@@ -300,13 +297,11 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
 
   normalizeMapState(mapState:IMapState):IMapState {
     if(!mapState) return null;
-    return {
+    return {zoom: this.round(mapState.zoom,0),
-      zoom: this.round(mapState.zoom, 0),
       rotation: this.round(mapState.rotation,2),
       xCenter: this.round(mapState.xCenter,5),
       yCenter: this.round(mapState.yCenter,5),
-      baseLayerCode: mapState.baseLayerCode
+      baseLayerCode: mapState.baseLayerCode };
-    };
   }
 
   serializeMapState(mapState:IMapState):string {
@@ -477,13 +472,11 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   handleShowLayerValues(event: MouseEvent) {
-    if (!this.hideShowLayerValues) {
     event.stopPropagation();
     this.zone.run(() =>{
       this.store.dispatch(new mapActions.ToggleLayerValuesEnabled());
     });
   }
-  }
 
   handleOnDownload(event) {
 

projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts

@@ -25,7 +25,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
   public items: Observable<IListItem[]>;
 
   constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService, itemService$, location,router);
+    super(store, itemTypeService,location,router);
   }
 
   areaInHa(item:IItem):number {

projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html

@@ -7,8 +7,7 @@
         <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
         <h1>{{item.name}}</h1>
       </div>
-      <ng-container *ngIf="item?.data.layers;let layers">
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
-        <div class="legend-container">
         <div class="card menu-card">
           <div *ngIf="layers.length>1">
             <select (change)="onLayerChanged($event.target.value)">
@@ -27,11 +26,9 @@
             <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
           </ng-container>
           <li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
-            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
         </ul>
       </div>
       <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
-      </ng-container>
     </div>
   </div>
 </div>

projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts

@@ -1,13 +1,12 @@
+import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Injectable, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
 import { Store } from '@ngrx/store';
-import { Subscription } from 'rxjs';
-import * as mapActions from '../../actions/map.actions';
 import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/common';
+import { Router } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
+import * as mapActions from '../../actions/map.actions';
 
 
 @ForItemType("vnd.farmmaps.itemtype.geotiff.processed")
@@ -17,15 +16,10 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co
   templateUrl: './selected-item-geotiff.component.html',
   styleUrls: ['./selected-item-geotiff.component.scss']
 })
-export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent implements OnDestroy {
+export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent {
-  sub: Subscription;
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,itemService,location,router);
+    super(store, itemTypeService,location,router);
-  }
-
-  ngOnDestroy(): void {
-    if (this.sub) this.sub.unsubscribe();
   }
 
   onLayerChanged(layerIndex: number) {
@@ -35,13 +29,4 @@ export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent
   layer(layers:any,layerIndex:number) {
     return layers.find(l => l.index == layerIndex);
   }
-  
-  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
-    event.stopPropagation();
-    event.preventDefault();
-    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
-    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
-        window.location.href = itemLinkUrl.url;     
-    })
-  }
 }

projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html

@@ -7,8 +7,7 @@
         <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
         <h1>{{item.name}}</h1>
       </div>
-      <ng-container *ngIf="item?.data.layers;let layers">
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
-        <div class="legend-container">
         <div class="card menu-card">
           <div *ngIf="layers.length>1">
             <select (change)="onLayerChanged($event.target.value)">
@@ -25,10 +24,8 @@
             <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-olus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
             <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
           </ng-container>
-            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
         </ul>
       </div>
-      </ng-container>
       <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
     </div>
   </div>

projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts

@@ -1,13 +1,14 @@
+import { Component, Input, Injectable, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Injectable, OnDestroy } from '@angular/core';
+import { Feature } from 'ol';
-import { Router } from '@angular/router';
-import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
 import { Store } from '@ngrx/store';
-import * as mapActions from '../../actions/map.actions';
 import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers, ItemTypeService, IItem, Item, ItemService, FolderService, IListItem} from '@farmmaps/common';
+import * as mapActions from '../../actions/map.actions';
+import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import { Subscription } from 'rxjs';
+import { Observable } from 'rxjs';
 
 
 @ForItemType("vnd.farmmaps.itemtype.shape.processed")
@@ -17,17 +18,12 @@ import { Subscription } from 'rxjs';
   templateUrl: './selected-item-shape.component.html',
   styleUrls: ['./selected-item-shape.component.scss']
 })
-export class SelectedItemShapeComponent extends AbstractSelectedItemComponent implements OnDestroy {
+export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
+
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+    super(store, itemTypeService,location,router);
+  }
   public selectedLayer = 0;
-  sub: Subscription;
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,itemService,location,router);
-  }
-
-  ngOnDestroy(): void {
-    if (this.sub) this.sub.unsubscribe();
-  }
   
   onLayerChanged(layerIndex: number) {
     this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
@@ -36,13 +32,4 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent im
   layer(layers:any,layerIndex:number) {
     return layers.find(l => l.index == layerIndex);
   }
-    
-  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
-    event.stopPropagation();
-    event.preventDefault();
-    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
-    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
-        window.location.href = itemLinkUrl.url;     
-    })
-  }
 }

projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html

@@ -7,8 +7,7 @@
         <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
         <h1>{{item.name}}</h1>
       </div>
-      <ng-container *ngIf="item?.data.layers;let layers">
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
-        <div class="legend-container">
         <div class="card menu-card">
           <h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5>
           <div class="d-flex justify-content-between">
@@ -43,10 +42,8 @@
             <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
           </ng-container>
           <li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li>
-            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
         </ul>
       </div>
-      </ng-container>
     </div>
   </div>
 </div>

projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts

@@ -1,15 +1,16 @@
+import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Injectable, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { commonReducers, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
 import { Store } from '@ngrx/store';
-import { Subscription } from 'rxjs';
-import * as mapActions from '../../actions/map.actions';
-import { IItemLayer, ITemporalItemLayer } from '../../models/item.layer';
 import * as mapReducers from '../../reducers/map.reducer';
-import { TemporalService } from '../../services/temporal.service';
+import { commonReducers, ItemTypeService, IItem } from '@farmmaps/common';
+import { Router } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
+import { ITemporalItemLayer} from '../../models/item.layer';
+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()
@@ -18,15 +19,10 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co
   templateUrl: './selected-item-temporal.component.html',
   styleUrls: ['./selected-item-temporal.component.scss']
 })
-export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent implements OnDestroy {
+export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {
-  sub: Subscription;
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
-    super(store, itemTypeService,itemService,location,router);
+    super(store, itemTypeService,location,router);
-  }
-  
-  ngOnDestroy(): void {
-    if (this.sub) this.sub.unsubscribe();
   }
 
   onLayerChanged(layerIndex: number) {
@@ -37,6 +33,8 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     return  (this.itemLayer as ITemporalItemLayer)?.selectedItemLayer
   }
 
+  
+
   handleNextTemporal(event:MouseEvent) {
     this.store.dispatch(new mapActions.NextTemporal());
     event.preventDefault();    
@@ -63,13 +61,4 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
     return false;
   }
-  
-  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
-    event.stopPropagation();
-    event.preventDefault();
-    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
-    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
-       window.location.href = itemLinkUrl.url;       
-    })
-  }
 }

projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts

@@ -2,7 +2,7 @@ import {Component, Injectable, Input, Directive} from '@angular/core';
 import {Location} from '@angular/common';
 import {Store} from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
-import {AppConfig, commonReducers, IItem, ItemService, ItemTypeService} from '@farmmaps/common';
+import {AppConfig, commonReducers, IItem, ItemTypeService} from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
 import {Router} from '@angular/router';
 import { IItemLayer } from '../../models/item.layer';
@@ -15,7 +15,7 @@ export abstract class AbstractSelectedItemComponent {
   @Input() parentItem: IItem;
   @Input() itemLayer: IItemLayer;
   @Input() overlayLayers: Array<IItemLayer>;
-  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, public itemService: ItemService, private location: Location, public router: Router) {
+  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location, public router: Router) {
   }
 
   handleOnView(item: IItem) {
@@ -37,11 +37,6 @@ export abstract class AbstractSelectedItemComponent {
     return false;
   }
 
-  handleOnDelete(item: IItem) {
-    this.itemService.deleteItem(item.code);
-    return false;
-  }
-
   handleAddAsLayer(item: IItem,layerIndex = -1) {
     this.store.dispatch(new mapActions.AddLayer(item,layerIndex));
     return false;
@@ -81,8 +76,8 @@ export abstract class AbstractSelectedItemComponent {
 })
 export class SelectedItemComponent extends AbstractSelectedItemComponent {
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, itemService: ItemService, location: Location, router: Router, public config:AppConfig) {
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, public config:AppConfig) {
-    super(store, itemTypeService,itemService,location,router);
+    super(store, itemTypeService,location,router);
   }
 
   getThumbnailUrl(item:IItem):string {

projects/common-map/src/fm-map/reducers/map.reducer.ts

@@ -637,8 +637,6 @@ export const selectGetExtent = createSelector(selectMapState, getExtent);
 export const selectGetViewExtent = createSelector(selectMapState, getViewExtent);
 export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers);
 export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers);
-export const selectGetBaseMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "baseMap"));
-export const selectGetArealMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "aerialPhoto").sort((a, b) => a.item.dataDate <= b.item.dataDate ? 1 : -1));
 export const selectGetProjection = createSelector(selectMapState, getProjection);
 export const selectGetSelectedBaseLayer = createSelector(selectMapState, getSelectedBaseLayer);
 export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getSelectedOverlayLayer);

projects/common/src/fm/actions/app-common.actions.ts

@@ -83,11 +83,6 @@ export const SETPAGEMODE = '[AppCommon] SetPageMode';
 
 export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications';
 
-export const SWITCHLANGUAGE = '[AppCommon] SwitchLanguage';
-
-export const SETSETTINGMENUBACKGROUNDCOLOR = '[AppCommon] SetSettingMenuBackgroundColor';
-
-
 export class InitUser implements Action {
   readonly type = INITUSER;
 
@@ -376,17 +371,6 @@ export class SetUnreadNotifications implements Action {
 
 }
   
-export class SwitchLanguage implements Action {
-  readonly type = SWITCHLANGUAGE;
-
-  constructor(public locale:string) { }
-}
-
-export class SetSettingMenuBackgroundColor implements Action {
-  readonly type = SETSETTINGMENUBACKGROUNDCOLOR;
-
-  constructor(public color:string) { }
-}
 
 export type Actions = OpenModal
   | InitRoot
@@ -434,8 +418,6 @@ export type Actions = OpenModal
   | ToggleHelpMenu
   | ToggleSettingMenu
   | NotificationEvent
-  | SetUnreadNotifications
+  | SetUnreadNotifications;
-  | SwitchLanguage
-  | SetSettingMenuBackgroundColor;
 
 

projects/common/src/fm/components/app/app.component.html

@@ -33,7 +33,7 @@
     <fm-resumable-file-upload></fm-resumable-file-upload>
   </ng-container>  
   <div class="user-menu apponly">
-    <fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu>
+    <fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async"></fm-setting-menu>
     <fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
     <fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
     <fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>

projects/common/src/fm/components/app/app.component.ts

@@ -50,7 +50,6 @@ export class AppComponent implements OnInit, OnDestroy {
   public unreadNotifications: Observable<number> = this.store$.select(appReducers.SelectgetUnreadNotifications);
   public user: Observable<IUser> = this.store$.select(appReducers.SelectGetUser);
   public isPageMode: Observable<boolean> = this.store$.select(appReducers.SelectGetIsPageMode);
-  public settingMenuBackgroundColor: Observable<string> = this.store$.select(appReducers.SelectGetSettingMenuBackgroundColor);
   @Input() showUploadProgress = true;
 
   constructor(

projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html

@@ -11,7 +11,7 @@
         <i class="fal fa-image"></i>
         <div i18n>No image selected</div>
       </div>
-      <image-cropper #imageCropper output="base64" 
+      <image-cropper #imageCropper
       [imageChangedEvent]="imageChangedEvent"
       [maintainAspectRatio]="true"
       [format]="imageType"

projects/common/src/fm/components/setting-menu/setting-menu.component.html

@@ -1,5 +1,5 @@
 <div>
-    <div (click)="toggle($event)" class="rounded-circle menu-button hidden" [style.background-color]="backgroundColor" [ngClass]="{'hidden':!user || noContent}">
+    <div (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
         <span i18n-title title="Settings"><i class="fas fa-gear" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
             <router-outlet name="setting-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>            

projects/common/src/fm/components/setting-menu/setting-menu.component.ts

@@ -15,7 +15,6 @@ export class SettingMenuComponent implements OnInit {
   
   @Input() user:IUser;
   @Input() showMenu:boolean;
-  @Input() backgroundColor:string;
   public noContent = true;
 
   constructor(private store: Store<appReducers.State>) { }

projects/common/src/fm/effects/app-common.effects.ts

@@ -1,4 +1,4 @@
-import { Injectable, Inject, LOCALE_ID } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
 import { Store } from '@ngrx/store';
@@ -16,7 +16,6 @@ import {StateSerializerService} from '../services/state-serializer.service';
 
 @Injectable()
 export class AppCommonEffects {
-  locale: string;
 
   login$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.LOGIN),
@@ -48,27 +47,11 @@ export class AppCommonEffects {
     first(),
     switchMap((action) => {
         return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
-        switchMap(([user,userInfo]) => {
+        switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as 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;
-      if (location.href.includes(`/${this.locale}/`)) {
-        const newPath = location.href.replace(`/${this.locale}/`, `/${a.locale}/`);
-        location.replace(newPath);
-      }
-      return of(undefined);
-    })),{ dispatch:false});
 
   initUserPackages$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSERPACKAGES),
@@ -225,8 +208,7 @@ export class AppCommonEffects {
 
 
 
-  constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService, @Inject(LOCALE_ID) locale: string) {
+  constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService) {
-    this.locale = locale;
     store$.dispatch(new appCommonActions.LoadItemTypes());
   }
 }

projects/common/src/fm/models/item.ts

@@ -26,7 +26,6 @@ export class Item implements IItem {
   public data?:any;
   public isEditable?:boolean;
   public owner?: string;
-  public fullPath?: string;
 
   constructor() {  
   }

projects/common/src/fm/reducers/app-common.reducer.ts

@@ -29,8 +29,7 @@ export interface State {
   settingMenuVisible: boolean,
   unreadNotifications: number,
   isOnline: boolean,
-  isPageMode:boolean,
+  isPageMode:boolean
-  settingMenuBackgroundColor:string
 }
 
 export const initialState: State = {
@@ -52,8 +51,7 @@ export const initialState: State = {
   settingMenuVisible: false,
   unreadNotifications: 0,
   isOnline: true,
-  isPageMode: true,
+  isPageMode: true
-  settingMenuBackgroundColor:'rgb(128, 128, 128)'
 }
 
 export function reducer(state = initialState, action: appCommonActions.Actions ): State {
@@ -189,10 +187,6 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
       const a = action as appCommonActions.SetUnreadNotifications;
       return tassign(state,{unreadNotifications:a.unread});
     }
-    case appCommonActions.SETSETTINGMENUBACKGROUNDCOLOR: {
-      const a = action as appCommonActions.SetSettingMenuBackgroundColor;
-      return tassign(state,{settingMenuBackgroundColor:a.color});
-    }    
     default: {
       return state;
     }
@@ -218,7 +212,6 @@ export const getSettingMenuVisible = (state: State) => state.settingMenuVisible;
 export const getUnreadNotifications = (state: State) => state.unreadNotifications;
 export const getIsOnline = (state: State) => state.isOnline;
 export const getIsPageMode = (state: State) => state.isPageMode;
-export const getSettingMenuBackgroundColor = (state: State) => state.settingMenuBackgroundColor;
 
 export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME);
 
@@ -245,4 +238,5 @@ export const SelectgetUnreadNotifications = createSelector(selectAppCommonState,
 
 export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);
 export const SelectGetIsPageMode = createSelector(selectAppCommonState,getIsPageMode);
-export const SelectGetSettingMenuBackgroundColor= createSelector(selectAppCommonState,getSettingMenuBackgroundColor);
+
+

projects/common/src/fm/services/admin.service.ts

@@ -52,20 +52,4 @@ export class AdminService {
   postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
     return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
   }
-
-  getFileStorageOverview(): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/overview`);
-  }
-
-  getFileStorageInfo(user: string): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/${user}`);
-  }
-
-  getFileStorageLog(): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/log`);
-  }
-
-  validateEmail(user: IUser) {
-    return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/admin/user/${user.code}/validateemail`, user);
-  }
 }

projects/common/src/fm/services/item.service.ts

@@ -79,8 +79,7 @@ export class ItemService {
 
   getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string,
     indexed?: boolean, validToday?: boolean,tags?:string,crs?:string, startDate?: Date, endDate?: Date,
-    skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean, owner?:string,
+    skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean, owner?:string): Observable<IItem[]> {
-    includeFullpath?: boolean): Observable<IItem[]> {
     let params = new HttpParams();
     if(itemType)  params = params.append("it", itemType);
     if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));
@@ -97,7 +96,6 @@ export class ItemService {
     if(take) params = params.append("take", take);
     if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
     if(owner) params = params.append("owner", owner);
-    if(includeFullpath) params = params.append("includeFullpath",includeFullpath?"true":"false");
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
   }