@ngrx/data 15.3.0 → 15.4.0

package/fesm2020/ngrx-data.mjs

@@ -702,26 +702,26 @@ class DefaultDataService {
     }
     add(entity, options) {
         const entityOrError = entity || new Error(`No "${this.entityName}" entity to add`);
-        return this.execute('POST', this.entityUrl, entityOrError, options);
+        return this.execute('POST', this.entityUrl, entityOrError, null, options);
     }
     delete(key, options) {
         let err;
         if (key == null) {
             err = new Error(`No "${this.entityName}" key to delete`);
         }
-        return this.execute('DELETE', this.entityUrl + key, err, options).pipe(
+        return this.execute('DELETE', this.entityUrl + key, err, null, options).pipe(
         // forward the id of deleted entity as the result of the HTTP DELETE
         map((result) => key));
     }
     getAll(options) {
-        return this.execute('GET', this.entitiesUrl, options);
+        return this.execute('GET', this.entitiesUrl, null, options);
     }
     getById(key, options) {
         let err;
         if (key == null) {
             err = new Error(`No "${this.entityName}" key to get`);
         }
-        return this.execute('GET', this.entityUrl + key, err, options);
+        return this.execute('GET', this.entityUrl + key, err, null, options);
     }
     getWithQuery(queryParams, options) {
         const qParams = typeof queryParams === 'string'
@@ -735,20 +735,20 @@ class DefaultDataService {
         const updateOrError = id == null
             ? new Error(`No "${this.entityName}" update data or id`)
             : update.changes;
-        return this.execute('PUT', this.entityUrl + id, updateOrError, options);
+        return this.execute('PUT', this.entityUrl + id, updateOrError, null, options);
     }
     // Important! Only call if the backend service supports upserts as a POST to the target URL
     upsert(entity, options) {
         const entityOrError = entity || new Error(`No "${this.entityName}" entity to upsert`);
-        return this.execute('POST', this.entityUrl, entityOrError, options);
+        return this.execute('POST', this.entityUrl, entityOrError, null, options);
     }
     execute(method, url, data, // data, error, or undefined/null
     options, // options or undefined/null
     httpOptions // these override any options passed via options
     ) {
-        let ngHttpClientOptions = undefined;
+        let entityActionHttpClientOptions = undefined;
         if (httpOptions) {
-            ngHttpClientOptions = {
+            entityActionHttpClientOptions = {
                 headers: httpOptions?.httpHeaders
                     ? new HttpHeaders(httpOptions?.httpHeaders)
                     : undefined,
@@ -757,21 +757,24 @@ class DefaultDataService {
                     : undefined,
             };
         }
+        // Now we may have:
+        // options: containing headers, params, or any other allowed http options already in angular's api
+        // entityActionHttpClientOptions: headers and params in angular's api
+        // We therefore need to merge these so that the action ones override the
+        // existing keys where applicable.
         // If any options have been specified, pass them to http client. Note
         // the new http options, if specified, will override any options passed
         // from the deprecated options parameter
         let mergedOptions = undefined;
-        if (options || ngHttpClientOptions) {
-            if (isDevMode() && options && ngHttpClientOptions) {
+        if (options || entityActionHttpClientOptions) {
+            if (isDevMode() && options && entityActionHttpClientOptions) {
                 console.warn('@ngrx/data: options.httpParams will be merged with queryParams when both are are provided to getWithQuery(). In the event of a conflict HttpOptions.httpParams will override queryParams`. The queryParams parameter of getWithQuery() will be removed in next major release.');
             }
-            mergedOptions = {};
-            if (ngHttpClientOptions?.headers) {
-                mergedOptions.headers = ngHttpClientOptions?.headers;
-            }
-            if (ngHttpClientOptions?.params || options?.params) {
-                mergedOptions.params = ngHttpClientOptions?.params ?? options?.params;
-            }
+            mergedOptions = {
+                ...options,
+                headers: entityActionHttpClientOptions?.headers ?? options?.headers,
+                params: entityActionHttpClientOptions?.params ?? options?.params,
+            };
         }
         const req = {
             method,
@@ -785,7 +788,7 @@ class DefaultDataService {
         let result$;
         switch (method) {
             case 'DELETE': {
-                result$ = this.http.delete(url, ngHttpClientOptions);
+                result$ = this.http.delete(url, mergedOptions);
                 if (this.saveDelay) {
                     result$ = result$.pipe(delay(this.saveDelay));
                 }
@@ -799,7 +802,7 @@ class DefaultDataService {
                 break;
             }
             case 'POST': {
-                result$ = this.http.post(url, data, ngHttpClientOptions);
+                result$ = this.http.post(url, data, mergedOptions);
                 if (this.saveDelay) {
                     result$ = result$.pipe(delay(this.saveDelay));
                 }
@@ -807,7 +810,7 @@ class DefaultDataService {
             }
             // N.B.: It must return an Update<T>
             case 'PUT': {
-                result$ = this.http.put(url, data, ngHttpClientOptions);
+                result$ = this.http.put(url, data, mergedOptions);
                 if (this.saveDelay) {
                     result$ = result$.pipe(delay(this.saveDelay));
                 }