dnn-sxc-angular bug fix and minor

2sic · Mar 10, 2022 · 5dff085 · 5dff085
1 parent 893f73e
commit 5dff085
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts
@@ -1,5 +1,5 @@
 export interface MetaDataFor {
-  TargetType: number;
+  Target: number;
   Number?: number;
   String?: string;
   Guid?: string;

diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
@@ -37,11 +37,12 @@ export class Query<T> {
    */
   getAll(params?: HttpParams | string, data?: T): Observable<T> {
     const url = `${routeQuery}/${this.name}`;
-    const streamParams = new HttpParams({fromString: params.toString() });
+    let streamParams: HttpParams = null;
+
+    if (params) streamParams = new HttpParams({fromString: params.toString() });
     if (data) return this.http.post<T>(url, data, { params: streamParams });
-    if (params) return this.http.get<T>(url, { params: streamParams });
 
-    return this.http.get<T>(url);
+    return this.http.get<T>(url, { params: streamParams });
   }
 
   /**
@@ -64,11 +65,12 @@ export class Query<T> {
    */
   getStream(stream: string, params?: HttpParams | string, data?: T): Observable<T> {
     const url = `${routeQuery}/${this.name}?${this.streamParamKey}=${stream}`;
-    const streamParams = new HttpParams({fromString: params.toString() });
-    if (data) return this.http.post<T>(url, data, { params: streamParams });
-    if (params) return this.http.get<T>(url, { params: streamParams });
+    let streamParams: HttpParams = null;
 
-    return this.http.get<T>(url);
+    if (params) streamParams = new HttpParams({fromString: params.toString() });
+    if (data) return this.http.post<T>(url, data, { params: streamParams }).pipe(map(res => res[stream]));
+
+    return this.http.get<T>(url, { params: streamParams }).pipe(map(res => res[stream]));
   }
 
   /**
@@ -92,10 +94,11 @@ export class Query<T> {
    */
   getStreams(streams: string[], params?: HttpParams | string, data?: T): Observable<T> {
     const url = `${routeQuery}/${this.name}?${this.streamParamKey}=${streams.join(',')}`;
-    const streamParams = new HttpParams({fromString: params.toString() });
+    let streamParams: HttpParams = null;
+
+    if (params) streamParams = new HttpParams({fromString: params.toString() });
     if (data) return this.http.post<T>(url, data, { params: streamParams });
-    if (params) return this.http.get<T>(url, { params: streamParams });
 
-    return this.http.get<T>(url);
+    return this.http.get<T>(url, { params: streamParams });
   }
 }