From ce880013cc3fbdd1bf68836132954a34927d9472 Mon Sep 17 00:00:00 2001
From: Mathias Beaulieu-Duncan <mathias@openharbor.io>
Date: Mon, 2 Sep 2024 21:27:25 -0400
Subject: [PATCH] fix DI in BaseHttpDataSourceOptionsBuilder since inject is
 not compatible with no injectable classes

---
 projects/openharbor/ngx-data/package.json              |  2 +-
 .../src/lib/BaseHttpDataSourceOptionsBuilder.ts        |  4 ++--
 .../src/lib/http-data-source-service.service.ts        | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/projects/openharbor/ngx-data/package.json b/projects/openharbor/ngx-data/package.json
index cc33637..3573cef 100644
--- a/projects/openharbor/ngx-data/package.json
+++ b/projects/openharbor/ngx-data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openharbor/ngx-data",
-  "version": "18.0.0-alpha.5",
+  "version": "18.0.0-alpha.6",
   "repository": "https://git.openharbor.io/Open-Harbor/ngx-data",
   "license": "MIT",
   "dependencies": {
diff --git a/projects/openharbor/ngx-data/src/lib/BaseHttpDataSourceOptionsBuilder.ts b/projects/openharbor/ngx-data/src/lib/BaseHttpDataSourceOptionsBuilder.ts
index b8c7014..6aab33a 100644
--- a/projects/openharbor/ngx-data/src/lib/BaseHttpDataSourceOptionsBuilder.ts
+++ b/projects/openharbor/ngx-data/src/lib/BaseHttpDataSourceOptionsBuilder.ts
@@ -14,7 +14,6 @@ import {
 } from "@openharbor/data";
 import {Observable, of, throwError} from "rxjs";
 import {catchError, switchMap} from "rxjs/operators";
-import {inject} from "@angular/core";
 
 export abstract class BaseHttpDataSourceOptionsBuilder<TQuery, TModel> {
   protected _commands: { [key: string]: IDataSourceCommandAdapterOptions<any>; } = {};
@@ -22,7 +21,8 @@ export abstract class BaseHttpDataSourceOptionsBuilder<TQuery, TModel> {
   protected _defaultCriteria: IQueryCriteria;
   protected _query: IDataSourceQueryAdapterOptions<TQuery, TModel>;
 
-  readonly http: HttpClient = inject(HttpClient);
+  constructor(protected readonly http: HttpClient) {
+  }
 
   createDataSource(): IDataSource<TQuery, TModel> {
     return new DataSource<TQuery, TModel>(this.createOptions());
diff --git a/projects/openharbor/ngx-data/src/lib/http-data-source-service.service.ts b/projects/openharbor/ngx-data/src/lib/http-data-source-service.service.ts
index 3bb338b..bf3fcfc 100644
--- a/projects/openharbor/ngx-data/src/lib/http-data-source-service.service.ts
+++ b/projects/openharbor/ngx-data/src/lib/http-data-source-service.service.ts
@@ -1,4 +1,4 @@
-import {Inject, Injectable} from "@angular/core";
+import {inject, Inject, Injectable} from "@angular/core";
 import { HttpClient } from '@angular/common/http';
 import { HttpDataSourceOptionsBuilder } from "./HttpDataSourceBuilder";
 import { SingleDataSourceOptionsBuilder } from "./SingleObjectDataSourceBuilder";
@@ -9,17 +9,17 @@ import { ListDataSourceOptionsBuilder } from "./ListDataSourceBuilder";
   providedIn: 'root'
 })
 export class HttpDataSourceService {
-  @Inject(HttpClient) protected http!: HttpClient;
+  protected http: HttpClient = inject(HttpClient);
 
   builder<TQuery, TModel>() {
-    return new HttpDataSourceOptionsBuilder<TQuery, TModel>();
+    return new HttpDataSourceOptionsBuilder<TQuery, TModel>(this.http);
   }
 
   singleBuilder<TQuery, TModel>() {
-    return new SingleDataSourceOptionsBuilder<TQuery, TModel>();
+    return new SingleDataSourceOptionsBuilder<TQuery, TModel>(this.http);
   }
 
   listBuilder<TQuery, TModel>() {
-    return new ListDataSourceOptionsBuilder<TQuery, TModel>();
+    return new ListDataSourceOptionsBuilder<TQuery, TModel>(this.http);
   }
 }