Make public if aggregate-table-json is empty

cns-iu · Apr 22, 2024 · 0463d01 · 0463d01
1 parent 852a5d8
commit 0463d01
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/apps/a2agc/src/app/core/services/dataset-loader/dataset-loader.service.ts b/apps/a2agc/src/app/core/services/dataset-loader/dataset-loader.service.ts
@@ -100,6 +100,10 @@ export class DatasetLoaderService {
    * @returns parsed results
    */
   private parseRawData(data: RawData): ParseResults {
+    if (!data) {
+      return { datasets: [], variables: [] };
+    }
+
     const datasets: Dataset[] = [];
     const variables: DatasetVariable[] = [];
 

diff --git a/apps/a2agc/src/app/core/state/data/data.state.ts b/apps/a2agc/src/app/core/state/data/data.state.ts
@@ -58,7 +58,7 @@ export class DataState extends NgxsImmutableDataRepository<DataStateModel> {
   isPrivate(): Observable<boolean> {
     const response = this.http.get<string>(DATA_CONFIG.datasetsPath);
     return response.pipe(
-      map((result) => this.isValidJson(result)),
+      map((result) => !!result),
       catchError(this.handleError)
     );
   }
@@ -70,18 +70,4 @@ export class DataState extends NgxsImmutableDataRepository<DataStateModel> {
   private handleError(): Observable<boolean> {
     return of(false);
   }
-
-  /**
-   * Checks if string is valid json
-   * @param input string
-   * @returns true if valid json
-   */
-  private isValidJson(input: string): boolean {
-    try {
-      JSON.parse(input);
-      return true;
-    } catch {
-      return false;
-    }
-  }
 }