Fix error

kamu-data · Jul 7, 2023 · 23fc120 · 23fc120
1 parent 91ce587
commit 23fc120
Show file tree

Hide file tree

Showing 5 changed files with 134 additions and 67 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/common/app.helpers.ts b/src/app/common/app.helpers.ts
@@ -1,6 +1,6 @@
 import moment from "moment";
 import { MaybeNull } from "./app.types";
-import { GetDatasetSchemaQuery } from "../api/kamu.graphql.interface";
+import { DataSchema } from "../api/kamu.graphql.interface";
 import { DatasetSchema } from "../interface/dataset.interface";
 
 export function requireValue<T>(input: MaybeNull<T>) {
@@ -61,11 +61,7 @@ export function momentConvertDatetoLocalWithFormat(dateParams: {
 }
 
 export function parseCurrentSchema(
-    data: GetDatasetSchemaQuery,
+    data: MaybeNull<DataSchema | undefined>,
 ): MaybeNull<DatasetSchema> {
-    return data.datasets.byId?.metadata.currentSchema
-        ? (JSON.parse(
-              data.datasets.byId.metadata.currentSchema.content,
-          ) as DatasetSchema)
-        : null;
+    return data ? (JSON.parse(data.content) as DatasetSchema) : null;
 }
diff --git a/...-component/components/set-transform/components/search-section/search-section.component.ts b/...-component/components/set-transform/components/search-section/search-section.component.ts
@@ -82,7 +82,9 @@ export class SearchSectionComponent extends BaseComponent {
                                 data.datasets.byId as DatasetBasicsFragment
                             ).owner.name;
                             const schema: MaybeNull<DatasetSchema> =
-                                parseCurrentSchema(data);
+                                parseCurrentSchema(
+                                    data.datasets.byId.metadata.currentSchema,
+                                );
                             this.TREE_DATA.push({
                                 name: value.dataset.name as string,
                                 children: schema?.fields,

diff --git a/...itional-components/metadata-component/components/set-transform/set-transform.component.ts b/...itional-components/metadata-component/components/set-transform/set-transform.component.ts
@@ -137,7 +137,10 @@ export class SetTransformComponent extends BaseComponent implements OnInit {
                                     data.datasets.byId as DatasetBasicsFragment
                                 ).owner.name;
                                 const schema: MaybeNull<DatasetSchema> =
-                                    parseCurrentSchema(data);
+                                    parseCurrentSchema(
+                                        data.datasets.byId.metadata
+                                            .currentSchema,
+                                    );
                                 this.TREE_DATA.push({
                                     name: item.name as string,
                                     children: schema?.fields,

diff --git a/src/app/dataset-view/dataset.service.ts b/src/app/dataset-view/dataset.service.ts
@@ -66,7 +66,10 @@ export class DatasetService {
                     const dataTail = data.datasets.byOwnerAndName.data.tail;
                     if (dataTail.__typename === "DataQueryResultSuccess") {
                         const schema: MaybeNull<DatasetSchema> =
-                            parseCurrentSchema(data);
+                            parseCurrentSchema(
+                                data.datasets.byOwnerAndName.metadata
+                                    .currentSchema,
+                            );
                         this.datasetUpdate(data.datasets.byOwnerAndName);
                         this.overviewTabDataUpdate(
                             data.datasets.byOwnerAndName,