tested

Author: MengZhuNAV

components/dataproducts/dataset/editDatasetForm.tsx

@@ -63,7 +63,7 @@ const schema = yup.object().shape({
 })
 
 const EditDatasetForm = ({ dataset, setEdit }: EditDatasetFormProps) => {
-  const [backendError, setBackendError] = useState()
+  const [backendError, setBackendError] = useState<Error>()
   const router = useRouter()
 
   const { register, handleSubmit, watch, formState, setValue, getValues, control } =
@@ -126,14 +126,10 @@ const EditDatasetForm = ({ dataset, setEdit }: EditDatasetFormProps) => {
       setBackendError(undefined)
       setEdit(false)
       router.reload()
+    }).catch((e:Error) => {
+      setBackendError(e)
     })
   }
-  {
-    backendError && (
-      <ErrorSummary heading={'Feil fra server'}>{backendError}</ErrorSummary>
-    )
-  }
-
   const hasPseudoColumns = !!dataset.datasource.pseudoColumns?.length
   const selectedAllColumns = Array.from(pseudoColumns).filter(e=> e[1]).length === columns?.length
   return (
@@ -229,6 +225,12 @@ const EditDatasetForm = ({ dataset, setEdit }: EditDatasetFormProps) => {
           </Button>
           <Button type="submit" disabled={selectedAllColumns}>Lagre</Button>
         </div>
+        {
+    backendError && (
+      <ErrorSummary heading={`Cannot update dataset: ${backendError.message || backendError.toString()}`}>error</ErrorSummary>
+    )
+  }
+
       </form>
     </div>
   )

components/dataproducts/dataset/newDatasetForm.tsx

@@ -142,7 +142,6 @@ const NewDatasetForm = ({ dataproduct }: NewDatasetFormProps) => {
       setBackendError(undefined)
     } catch (e) {
       setBackendError(e)
-      console.log(e)
     }
   }
   const selectedAllColumns = Array.from(pseudoColumns).filter(e=> e[1]).length === columns?.length
@@ -231,7 +230,7 @@ const NewDatasetForm = ({ dataproduct }: NewDatasetFormProps) => {
           >
             Avbryt
           </Button>
-          <Button type="submit" disabled={selectedAllColumns || submitted}>Lagre</Button>
+          <Button type="submit" disabled={false && (selectedAllColumns || submitted)}>Lagre</Button>
         </div>
       </form>
     </div>

components/dataproducts/dataset/useColumnTags.tsx

@@ -63,6 +63,7 @@ export const useColumnTags = (
       datasetID &&
       tableID &&
       !tagsMap.has(tableKey) &&
+      fetchColumns.bqColumns &&
       !fetchColumns.error &&
       !fetchColumns.loading &&
       fetchColumns.bqColumns

lib/rest/bigquery.ts

@@ -66,7 +66,7 @@ export const useFetchBQTables = (projectID: string, datasetID: string) => {
 }
 
 export const useFetchBQcolumns = (projectID: string, datasetID: string, tableID: string) => {
-    const [columns, setColumns] = useState<any[]>([])
+    const [columns, setColumns] = useState<any[]|undefined>(undefined)
     const [loading, setLoading] = useState(false)
     const [error, setError] = useState<any>(null)
 

lib/rest/dataproducts.ts

@@ -1,13 +1,13 @@
-import { useEffect, useState } from "react";
-import { createDataproductUrl, createDatasetUrl, deleteDataproductUrl, deleteDatasetUrl, deleteTemplate, fetchTemplate, getAccessiblePseudoDatasetsUrl, getDataproductUrl, getDatasetUrl, mapDatasetToServicesUrl, postTemplate, putTemplate, updateDataproductUrl } from "./restApi";
+import { useEffect, useState } from "react"
+import { createDataproductUrl, createDatasetUrl, deleteDataproductUrl, deleteDatasetUrl, deleteTemplate, fetchTemplate, getAccessiblePseudoDatasetsUrl, getDataproductUrl, getDatasetUrl, mapDatasetToServicesUrl, postTemplate, putTemplate, updateDataproductUrl, updateDatasetUrl } from "./restApi"
 
 const getDataproduct = async (id: string) => {
-    const url = getDataproductUrl(id);
+    const url = getDataproductUrl(id)
     return fetchTemplate(url)
 }
 
 const getDataset = async (id: string) => {
-    const url = getDatasetUrl(id);
+    const url = getDatasetUrl(id)
     return fetchTemplate(url)
 }
 
@@ -61,44 +61,44 @@ export const useGetDataset = (id: string)=>{
 }
 
 export const createDataproduct = async (dp: any) => {
-    const url = createDataproductUrl();
-    return postTemplate(url, dp).then((res)=>res.json());
+    const url = createDataproductUrl()
+    return postTemplate(url, dp).then((res)=>res.json())
 }
 
 export const updateDataproduct = async (id: string, dp: any) => {
-    const url = updateDataproductUrl(id);
-    return putTemplate(url, dp).then((res)=>res.json());
+    const url = updateDataproductUrl(id)
+    return putTemplate(url, dp).then((res)=>res.json())
 }
 
 export const deleteDataproduct = async (id: string) => {
-    const url = deleteDataproductUrl(id);
-    return deleteTemplate(url).then((res)=>res.json());
+    const url = deleteDataproductUrl(id)
+    return deleteTemplate(url).then((res)=>res.json())
 }
 
 export const mapDatasetToServices = (id: string, services: string[])=>{
-    const url = mapDatasetToServicesUrl(id);
+    const url = mapDatasetToServicesUrl(id)
     return postTemplate(url, {
-        services}).then((res)=>res.json());
+        services}).then((res)=>res.json())
 }
 
 export const createDataset = async (dataset: any) => {
-    const url = createDatasetUrl();
-    return postTemplate(url, dataset).then((res)=>res.json());
+    const url = createDatasetUrl()
+    return postTemplate(url, dataset).then((res)=>res.json())
 }
 
 export const deleteDataset = async (id: string) => {
-    const url = deleteDatasetUrl(id);
-    return deleteTemplate(url).then((res)=>res.json());
+    const url = deleteDatasetUrl(id)
+    return deleteTemplate(url).then((res)=>res.json())
 }
 
 export const updateDataset = async (id: string, dataset: any) => {
-    const url = deleteDatasetUrl(id);
-    return putTemplate(url, dataset).then((res)=>res.json());
+    const url = updateDatasetUrl(id)
+    return putTemplate(url, dataset).then((res)=>res.json())
 }
 
 export const getAccessiblePseudoDatasets = async () => {
     const url = getAccessiblePseudoDatasetsUrl()
-    return fetchTemplate(url);
+    return fetchTemplate(url)
 }
 
 export const useGetAccessiblePseudoDatasets = ()=>{