From d7ab7e84cebbbc8f48ce904b99dbfbecce14632a Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 23 Feb 2026 15:34:34 +0100 Subject: [PATCH] Shared services --- projects/common/src/fm/models/list.item.acl.rights.ts | 2 +- projects/common/src/fm/models/shared.item.ts | 2 +- projects/common/src/fm/services/cache-service.ts | 3 ++- projects/common/src/fm/services/shared-item.service.ts | 3 ++- projects/common/src/fm/services/user-data.service.ts | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/projects/common/src/fm/models/list.item.acl.rights.ts b/projects/common/src/fm/models/list.item.acl.rights.ts index 32f6420..843108b 100644 --- a/projects/common/src/fm/models/list.item.acl.rights.ts +++ b/projects/common/src/fm/models/list.item.acl.rights.ts @@ -1,5 +1,5 @@ -import { IItem } from '@farmmaps/common'; import { IAclRights } from './acl.rights'; +import { IItem } from './item'; export interface IListItemAclRights extends IItem { aclRights: IAclRights[] diff --git a/projects/common/src/fm/models/shared.item.ts b/projects/common/src/fm/models/shared.item.ts index 4158426..863adf7 100644 --- a/projects/common/src/fm/models/shared.item.ts +++ b/projects/common/src/fm/models/shared.item.ts @@ -1,4 +1,4 @@ -import { IUser } from '@farmmaps/common'; +import { IUser } from "../common.module"; export interface ISharedItem { code: string, diff --git a/projects/common/src/fm/services/cache-service.ts b/projects/common/src/fm/services/cache-service.ts index 2025eb9..65c8522 100644 --- a/projects/common/src/fm/services/cache-service.ts +++ b/projects/common/src/fm/services/cache-service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; -import { IItem, ItemService } from '@farmmaps/common'; import { OAuthService } from 'angular-oauth2-oidc'; import { Observable, ReplaySubject, Subscription, timer } from 'rxjs'; import { catchError, take } from 'rxjs/operators'; +import { IItem } from '../models/item'; +import { ItemService } from './item.service'; const REFRESH_INTERVAL = 15 * 60 * 1000; // 15m diff --git a/projects/common/src/fm/services/shared-item.service.ts b/projects/common/src/fm/services/shared-item.service.ts index c7ee375..fcc3371 100644 --- a/projects/common/src/fm/services/shared-item.service.ts +++ b/projects/common/src/fm/services/shared-item.service.ts @@ -1,9 +1,10 @@ import { HttpClient, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AppConfig, IListItem } from '@farmmaps/common'; import { Observable } from 'rxjs'; import { IListItemAclRights } from '../models/list.item.acl.rights'; import { ISharedItem } from '../models/shared.item'; +import { AppConfig } from '../shared/app.config'; +import { IListItem } from '../models/list.item'; @Injectable({ providedIn: 'root' diff --git a/projects/common/src/fm/services/user-data.service.ts b/projects/common/src/fm/services/user-data.service.ts index ddf96e0..9403981 100644 --- a/projects/common/src/fm/services/user-data.service.ts +++ b/projects/common/src/fm/services/user-data.service.ts @@ -1,7 +1,8 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AppConfig, IUser } from '@farmmaps/common'; import { Observable } from 'rxjs'; +import { AppConfig } from '../shared/app.config'; +import { IUser } from '../models/user'; @Injectable({ providedIn: 'root'