Merge branch 'develop'

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

README.md

@@ -53,7 +53,7 @@ ng serve
 ```
 *Go*`
 
-Point your browser to http://localhost:4200
+Point your browser to http://localhost:4200 
 
 *ESLint*
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.10.0",
+  "version": "4.5.0",
-  "scripts":   {
+  "scripts": {
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
@@ -10,7 +10,7 @@
     "e2e": "ng e2e"
   },
   "private": true,
-  "dependencies":   {
+  "dependencies": {
     "@angular/animations": "^17.3.3",
     "@angular/common": "^17.3.3",
     "@angular/compiler": "^17.3.3",
@@ -56,7 +56,7 @@
     "util": "^0.12.4",
     "zone.js": "~0.14.4"
   },
-  "devDependencies":   {
+  "devDependencies": {
     "@angular-builders/custom-webpack": "^17",
     "@angular-devkit/build-angular": "^17.3.3",
     "@angular/cli": "^17.3.3",
@@ -86,4 +86,4 @@
     "ts-node": "^8.8.1",
     "typescript": "~5.4.4"
   }
-}
+}

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

@@ -148,7 +148,7 @@ export class AppCommonEffects {
     ofType(appCommonActions.VIEWITEM),
     withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)),
     switchMap(([action, itemtypes]) => {
-      const a = action as appCommonActions.ViewItem;
+      const a = action as appCommonActions.EditItem;
       const itemType = itemtypes[a.item.itemType];
       const viewer = itemType.viewer;
       const editor = itemType.editor;

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

@@ -1,11 +1,9 @@
-import { HttpClient, HttpParams } from "@angular/common/http";
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { IItem } from '../models/item';
-import { IItemTask } from '../models/itemTask';
+import { HttpClient, HttpParams } from "@angular/common/http";
-import { IUser } from '../models/user';
 import { AppConfig } from "../shared/app.config";
-import { ItemTypeService } from './itemtype.service';
+import {ItemTypeService} from './itemtype.service';
 
 @Injectable({
   providedIn: 'root',
@@ -44,12 +42,4 @@ export class AdminService {
   deleteItem(code: string): Observable<any> {
     return this.httpClient.delete<any>(`${this.ApiEndpoint()}/api/v1/admin/${code}`);
   }
-
-  getAllUsers(): Observable<IUser[]> {
-    return this.httpClient.get<IUser[]>(`${this.ApiEndpoint()}/api/v1/admin/users`);
-  }
-
-  postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
-    return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
-  }
 }

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

@@ -18,37 +18,33 @@ export class FolderService {
     return this.appConfig.getConfig("apiEndPoint");
   }
 
-  getFolder(code: string): Observable<IListItem> {
+     getFolder(code: string): Observable<IListItem> {
-    return this.httpClient.get<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/${code}`);
+      return this.httpClient.get<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/${code}`);
-  }
+    }
 
-  getMyRoot(): Observable<IListItem> {
+    getMyRoots(): Observable<IListItem[]> {
-    return this.httpClient.get<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/my_root`);
+      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/my_roots`);
-  }
+    }
 
-  getMyRoots(): Observable<IListItem[]> {
+    getFolderParents(code: string): Observable<IListItem[]> {
-    return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/my_roots`);
+      return this.itemService.getBreadcrumbs(code);
-  }
+    }
 
-  getFolderParents(code: string): Observable<IListItem[]> {
+    getChildFolders(code: string): Observable<IListItem[]> {
-    return this.itemService.getBreadcrumbs(code);
+      const folderItemTypes = "FOLDER,FTP_FOLDER";
-  }
+      return this.itemService.getChildItemList(code, folderItemTypes);
+    }
 
-  getChildFolders(code: string): Observable<IListItem[]> {
+    getItems(code: string,skip:number, take:number): Observable<IListItem[]> {
-    const folderItemTypes = "FOLDER,FTP_FOLDER";
+      return this.itemService.getChildItemList(code, null, null, 1, true, null, null, skip, take);
-    return this.itemService.getChildItemList(code, folderItemTypes);
+    }
-  }
 
-  getItems(code: string,skip:number, take:number): Observable<IListItem[]> {
+    moveItem(itemCode: string, newParentCode: string): Observable<IListItem> {
-    return this.itemService.getChildItemList(code, null, null, 1, true, null, null, skip, take);
+        const body = { itemCode: itemCode,newParentCode: newParentCode };
-  }
+      return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/items/move`, body);
+    }
 
-  moveItem(itemCode: string, newParentCode: string): Observable<IListItem> {
+    createFolder(folder: IItem): Observable<IListItem> {
-      const body = { itemCode: itemCode,newParentCode: newParentCode };
+      return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/`, folder);
-    return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/items/move`, body);
+    }
-  }
-
-  createFolder(folder: IItem): Observable<IListItem> {
-    return this.httpClient.post<IListItem>(`${this.ApiEndpoint()}/api/v1/folders/`, folder);
-  }
 }

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

@@ -79,9 +79,7 @@ export class ItemService {
     return this.httpClient.get<IItem>(`${this.ApiEndpoint()}/api/v1/items/${code}/${itemType}`);
   }
 
-  getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string,
+  getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string, indexed?: boolean, validToday?: boolean,tags?:string,crs?:string): Observable<IItem[]> {
-    indexed?: boolean, validToday?: boolean,tags?:string,crs?:string, startDate?: Date, endDate?: Date,
-    skip?: number, take?: number): Observable<IItem[]> {
     let params = new HttpParams();
     if(itemType)  params = params.append("it", itemType);
     if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));
@@ -91,22 +89,10 @@ export class ItemService {
     if (validToday) params = params.append("vt", validToday ? "true" : "false");
     if (tags) params = params.append("t", tags);
     if (crs) params = params.append("crs", crs);
-    if (startDate) params = params.append("sDate", startDate.toISOString());
-    if (endDate) params = params.append("eDate", endDate.toISOString());
-    if(skip) params = params.append("skip", skip);
-    if(take) params = params.append("take", take);
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
   }
-  
-  getItemListCount(itemType: string, startDate?: Date, endDate?: Date): Observable<number> {
-    let params = new HttpParams();
-    params = params.append("it", itemType);
-    if (startDate) params = params.append("sDate", startDate.toISOString());
-    if (endDate) params = params.append("eDate", endDate.toISOString());
-    return this.httpClient.get<number>(`${this.ApiEndpoint()}/api/v1/items/count`, { params: params });
-  }
 
-  getChildItemList(parentcode: string, itemType?: string, dataFilter?: any, level = 1, deep = true,
+  getChildItemList(parentcode: string, itemType: string, dataFilter?: any, level = 1, deep = true,
                    startDate?: Date, endDate?: Date, skip?: number, take?: number): Observable<IItem[]> {
     let params = new HttpParams();
     if(itemType != null) {
@@ -125,11 +111,9 @@ export class ItemService {
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
   }
 
-  getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any): Observable<number> {
+  getChildItemListCount(parentcode: string, itemType: string,dataFilter?: any): Observable<number> {
     let params = new HttpParams();
-    if(itemType != null) {
+    params = params.append("it", itemType);
-      params = params.append("it", itemType);
-    }
     if (dataFilter != null) {
       params = params.append("df", JSON.stringify(dataFilter));
     }