try reduce traffic

navikt · Nov 21, 2023 · 55ef7ca · 55ef7ca
1 parent 840229f
commit 55ef7ca
Show file tree

Hide file tree

Showing 28 changed files with 267 additions and 393 deletions.
diff --git a/components/dataproducts/accessRequest/newAccessRequest.tsx b/components/dataproducts/accessRequest/newAccessRequest.tsx
@@ -1,7 +1,7 @@
 import {
   NewAccessRequest,
   useCreateAccessRequestMutation,
-  useDataproductQuery,
+  useDataproductSummaryQuery,
 } from '../../../lib/schema/graphql'
 import { useState } from 'react'
 import AccessRequestForm from './accessRequestForm'
@@ -21,7 +21,7 @@ const NewAccessRequestForm = ({ dataset, setModal }: NewAccessRequestFormProps)
   const [error, setError] = useState<Error | null>(null)
   const router = useRouter()
 
-  const dp = useDataproductQuery({
+  const dp = useDataproductSummaryQuery({
     variables: {
       id: dataset.dataproductID,
     },
@@ -41,7 +41,7 @@ const NewAccessRequestForm = ({ dataset, setModal }: NewAccessRequestFormProps)
       },
       refetchQueries: ['userInfoBasics'],
     }).then(() => {
-      router.push(`/dataproduct/${dp?.data?.dataproduct.id}/${dataset.id}`)
+      router.push(`/dataproduct/${dp?.data?.dataproductSummary.id}/${dataset.id}`)
     })
   }
 

diff --git a/components/dataproducts/dataproductSidebar.tsx b/components/dataproducts/dataproductSidebar.tsx
@@ -1,14 +1,14 @@
 import humanizeDate from '../../lib/humanizeDate'
 import * as React from 'react'
 import { ExternalLink } from '@navikt/ds-icons'
-import { DataproductQuery } from '../../lib/schema/graphql'
+import { DataproductSummaryQuery } from '../../lib/schema/graphql'
 import { useRouter } from 'next/router'
 import { Alert, Link } from '@navikt/ds-react'
 import { Subject, SubjectHeader } from '../subject'
 import { isEmail } from '../../lib/validators'
 
 interface DataproductDetailProps {
-  product: DataproductQuery['dataproduct']
+  product: DataproductSummaryQuery['dataproductSummary']
   isOwner: boolean
   menuItems: Array<{
     title: string

diff --git a/components/dataproducts/dataset/dataset.tsx b/components/dataproducts/dataset/dataset.tsx
@@ -1,22 +1,25 @@
 import { isAfter, parseISO } from 'date-fns'
 import {
-  DataproductQuery,
+  DataproductSummaryQuery,
   DatasetQuery,
   UserInfoBasicsQuery,
+  useDatasetQuery,
 } from '../../../lib/schema/graphql'
 import * as React from 'react'
 import { useState } from 'react'
 import EditDataset from './editDataset'
 import ViewDataset from './viewDataset'
+import LoaderSpinner from '../../lib/spinner'
+import { Alert } from '@navikt/ds-react'
 
 const findAccessType = (
-  groups: UserInfoBasicsQuery['userInfo']['groups'] | undefined,
-  dataset: DatasetQuery['dataset'],
+  groups: UserInfoBasicsQuery['userInfoBasics']['groups'] | undefined,
+  dataset: DatasetQuery['dataset'] | undefined,
   isOwner: boolean
 ) => {
   if (!groups) return { type: 'utlogget' }
   if (isOwner) return { type: 'owner' }
-  const activeAccess = dataset.access.filter(
+  const activeAccess = dataset?.access.filter(
     (a) =>
       !a.revoked && (!a.expires || isAfter(parseISO(a.expires), Date.now()))
   )[0]
@@ -25,19 +28,27 @@ const findAccessType = (
 }
 
 interface EntryProps {
-  dataproduct: DataproductQuery['dataproduct']
-  dataset: DatasetQuery['dataset']
-  userInfo: UserInfoBasicsQuery['userInfo'] | undefined
+  dataproduct: DataproductSummaryQuery['dataproductSummary']
+  datasetID: string
+  userInfo: UserInfoBasicsQuery['userInfoBasics'] | undefined
   isOwner: boolean
 }
 
-const Dataset = ({ dataset, userInfo, isOwner, dataproduct }: EntryProps) => {
-  const accessType = findAccessType(userInfo?.groups, dataset, isOwner)
+const Dataset = ({ datasetID, userInfo, isOwner, dataproduct }: EntryProps) => {
+  const { data, loading, error } = useDatasetQuery({
+    variables: { id: datasetID, rawDesc: true },
+    fetchPolicy: "network-only"
+})
+
+  const dataset = data?.dataset
+  const accessType = findAccessType(userInfo?.groups, data?.dataset, isOwner)
   const [edit, setEdit] = useState(false)
 
   return (
     <>
-      {edit ? (
+    {loading && <LoaderSpinner></LoaderSpinner>}
+    {error && <Alert variant='error'>{error.message}</Alert>}
+      {dataset ? edit ? (
         <EditDataset datasetID={dataset.id} setEdit={setEdit} />
       ) : (
         <ViewDataset
@@ -48,7 +59,7 @@ const Dataset = ({ dataset, userInfo, isOwner, dataproduct }: EntryProps) => {
           isOwner={isOwner}
           setEdit={setEdit}
         />
-      )}
+      ): <div></div>}
     </>
   )
 }

diff --git a/components/dataproducts/dataset/datasetOwnerMenu.tsx b/components/dataproducts/dataset/datasetOwnerMenu.tsx
@@ -3,19 +3,19 @@ import { Button } from '@navikt/ds-react'
 import { Dropdown } from '@navikt/ds-react-internal'
 import { useRouter } from 'next/router'
 import { useState } from 'react'
-import { GET_DATAPRODUCT } from '../../../lib/queries/dataproduct/dataproduct'
 import {
-  DataproductQuery,
   useDeleteDatasetMutation,
   useUpdateDatasetMutation,
   DatasetQuery,
+  DataproductSummaryQuery,
 } from '../../../lib/schema/graphql'
 import DeleteModal from '../../lib/deleteModal'
 import MoveModal from '../../lib/MoveModal'
+import { GET_DATAPRODUCT_SUMMARY } from '../../../lib/queries/dataproduct/dataproductSummary'
 
 interface IDatasetOwnerMenuProps {
   dataset: DatasetQuery['dataset']
-  dataproduct: DataproductQuery['dataproduct']
+  dataproduct: DataproductSummaryQuery['dataproductSummary']
   setEdit: (value: boolean) => void
 }
 
@@ -35,7 +35,7 @@ const DatasetOwnerMenu = ({
     awaitRefetchQueries: true,
     refetchQueries: [
       {
-        query: GET_DATAPRODUCT,
+        query: GET_DATAPRODUCT_SUMMARY,
         variables: {
           id: dataproduct?.id,
         },

diff --git a/components/dataproducts/dataset/editDatasetForm.tsx b/components/dataproducts/dataset/editDatasetForm.tsx
@@ -20,11 +20,11 @@ import {
 } from '../../../lib/schema/graphql'
 import { GET_DATASET } from '../../../lib/queries/dataset/dataset'
 import DescriptionEditor from '../../lib/DescriptionEditor'
-import { GET_DATAPRODUCT } from '../../../lib/queries/dataproduct/dataproduct'
 import TagsSelector from '../../lib/tagsSelector';
 import { useColumnTags } from './useColumnTags';
 import AnnotateDatasetTable from './annotateDatasetTable';
 import {Personopplysninger} from "./helptext";
+import { GET_DATAPRODUCT_SUMMARY } from '../../../lib/queries/dataproduct/dataproductSummary';
 
 interface EditDatasetFormProps {
   dataset: DatasetQuery["dataset"]
@@ -144,7 +144,7 @@ const EditDatasetForm = ({ dataset, setEdit }: EditDatasetFormProps) => {
           },
         },
         {
-          query: GET_DATAPRODUCT,
+          query: GET_DATAPRODUCT_SUMMARY,
           variables: {
             id: dataset.dataproductID,
           },

diff --git a/components/dataproducts/dataset/newDatasetForm.tsx b/components/dataproducts/dataset/newDatasetForm.tsx
@@ -5,7 +5,7 @@ import { useRouter } from 'next/router'
 import { Controller, FieldValues, useForm } from 'react-hook-form'
 import * as yup from 'yup'
 import { CREATE_DATASET } from '../../../lib/queries/dataset/createDataset'
-import { DataproductQuery, PiiLevel } from '../../../lib/schema/graphql'
+import { DataproductSummaryQuery, PiiLevel } from '../../../lib/schema/graphql'
 import DescriptionEditor from '../../lib/DescriptionEditor'
 import TagsSelector from '../../lib/tagsSelector'
 import AnnotateDatasetTable from './annotateDatasetTable'
@@ -16,7 +16,7 @@ import { PiiForm } from './piiForm'
 import { useState } from 'react'
 
 interface NewDatasetFormProps {
-  dataproduct: DataproductQuery
+  dataproduct: DataproductSummaryQuery
 }
 
 const defaultValues: FieldValues = {
@@ -88,7 +88,7 @@ const NewDatasetForm = ({ dataproduct }: NewDatasetFormProps) => {
   }
 
   const keywords = watch('keywords')
-  const team = dataproduct.dataproduct.owner.group
+  const team = dataproduct.dataproductSummary.owner.group
 
   const onAddKeyword = (keyword: string) => {
     keywords
@@ -101,13 +101,13 @@ const NewDatasetForm = ({ dataproduct }: NewDatasetFormProps) => {
     {
       onCompleted: (data) =>
         router.push(
-          `/dataproduct/${dataproduct.dataproduct.id}/${dataproduct.dataproduct.slug}/${data.createDataset.id}`
+          `/dataproduct/${dataproduct.dataproductSummary.id}/${dataproduct.dataproductSummary.slug}/${data.createDataset.id}`
         ),
     }
   )
 
   const onSubmitForm = async (requestData: any) => {
-    requestData.dataproductID = dataproduct.dataproduct.id
+    requestData.dataproductID = dataproduct.dataproductSummary.id
     requestData.bigquery.piiTags = JSON.stringify(Object.fromEntries(tags || new Map<string, string>()))
     const pii = requestData.pii === "sensitive"
       ? PiiLevel.Sensitive
@@ -209,7 +209,7 @@ const NewDatasetForm = ({ dataproduct }: NewDatasetFormProps) => {
             variant="secondary"
             onClick={() => {
               router.push(
-                `/dataproduct/${dataproduct.dataproduct.id}/${dataproduct.dataproduct.slug}/info`
+                `/dataproduct/${dataproduct.dataproductSummary.id}/${dataproduct.dataproductSummary.slug}/info`
               )
             }}
           >

diff --git a/components/dataproducts/dataset/viewDataset.tsx b/components/dataproducts/dataset/viewDataset.tsx
@@ -5,7 +5,7 @@ import { useState } from 'react'
 import ReactMarkdown from 'react-markdown'
 import remarkGfm from 'remark-gfm'
 import {
-  DataproductQuery,
+  DataproductSummaryQuery,
   DatasetQuery,
   PiiLevel,
   UserInfoBasicsQuery,
@@ -23,12 +23,12 @@ import { Personopplysninger } from './helptext'
 
 interface ViewDatasetProps {
   dataset: DatasetQuery['dataset']
-  dataproduct: DataproductQuery['dataproduct']
+  dataproduct: DataproductSummaryQuery['dataproductSummary']
   accessType: {
     type: string
     expires?: any
   }
-  userInfo: UserInfoBasicsQuery['userInfo'] | undefined
+  userInfo: UserInfoBasicsQuery['userInfoBasics'] | undefined
   isOwner: boolean
   setEdit: (value: boolean) => void
 }

diff --git a/components/dataproducts/editDataproduct.tsx b/components/dataproducts/editDataproduct.tsx
@@ -5,17 +5,17 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useState } from 'react'
 import TeamkatalogenSelector from '../lib/teamkatalogenSelector'
 import {
-  DataproductQuery,
+  DataproductSummaryQuery,
   UpdateDataproduct,
   useUpdateDataproductMutation,
 } from '../../lib/schema/graphql'
 import DescriptionEditor from '../lib/DescriptionEditor'
 import { useRouter } from 'next/router'
-import { GET_DATAPRODUCT } from '../../lib/queries/dataproduct/dataproduct'
 import { ContactInput } from './contactInput';
+import { GET_DATAPRODUCT_SUMMARY } from '../../lib/queries/dataproduct/dataproductSummary';
 
 interface EditDatacollectionFormProps {
-  product: DataproductQuery['dataproduct']
+  product: DataproductSummaryQuery['dataproductSummary']
 }
 
 const EditDataproduct = ({ product }: EditDatacollectionFormProps) => {
@@ -45,7 +45,7 @@ const EditDataproduct = ({ product }: EditDatacollectionFormProps) => {
       awaitRefetchQueries: true,
       refetchQueries: [
         {
-          query: GET_DATAPRODUCT,
+          query: GET_DATAPRODUCT_SUMMARY,
           variables: {
             id: product.id,
           },

diff --git a/components/dataproducts/explore.tsx b/components/dataproducts/explore.tsx
@@ -1,13 +1,12 @@
 import {
   MappingService,
-  useDataproductQuery,
   useUpdateMappingMutation,
 } from '../../lib/schema/graphql'
 import ExploreLink, { ItemType } from './exploreLink'
 import { useState } from 'react'
 import ErrorMessage from '../lib/error'
 import { DatasetQuery } from '../../lib/schema/datasetQuery'
-import { GET_DATAPRODUCT } from '../../lib/queries/dataproduct/dataproduct'
+import { GET_DATAPRODUCT_SUMMARY } from '../../lib/queries/dataproduct/dataproductSummary'
 
 interface ExploreProps {
   dataproductId: string
@@ -18,11 +17,6 @@ interface ExploreProps {
 const Explore = ({ dataproductId, dataset, isOwner }: ExploreProps) => {
   const [formError, setFormError] = useState(undefined)
   const [updateMapping] = useUpdateMappingMutation()
-  useDataproductQuery({
-    variables: { id: dataproductId },
-    ssr: true,
-    pollInterval: 30_000,
-  })
 
   const addToMetabase = async () => {
     try {
@@ -33,7 +27,7 @@ const Explore = ({ dataproductId, dataset, isOwner }: ExploreProps) => {
         },
         refetchQueries: [
           {
-            query: GET_DATAPRODUCT,
+            query: GET_DATAPRODUCT_SUMMARY,
             variables: {
               id: dataproductId,
             },

diff --git a/components/insightProducts/editInsightProduct.tsx b/components/insightProducts/editInsightProduct.tsx
@@ -19,7 +19,7 @@ import TagsSelector from '../lib/tagsSelector'
 import { UserState } from "../../lib/context";
 import { UPDATE_INSIGHT_PRODUCT_METADATA } from '../../lib/queries/insightProducts/editInsightProduct'
 import { useUpdateInsightProductMetadataMutation } from '../../lib/schema/graphql'
-import { USER_INFO } from '../../lib/queries/userInfo/userInfo'
+import { USER_INFO_BASICS } from '../../lib/queries/userInfo/userInfoBasics'
 
 const schema = yup.object().shape({
     name: yup.string().nullable().required('Skriv inn navnet på innsiktsproduktet'),
@@ -112,7 +112,7 @@ export const EditInsightProductMetadataForm = ({ id, name, description, type, li
             },
             refetchQueries: [
                 {
-                    query: USER_INFO,
+                    query: USER_INFO_BASICS,
                 }]
         }
 

diff --git a/components/lib/detailTypography.tsx b/components/lib/detailTypography.tsx
@@ -4,12 +4,12 @@ import remarkGfm from 'remark-gfm'
 import TagPill from './tagPill'
 import { Accordion, Heading, Link, Button, Alert } from '@navikt/ds-react'
 import { useRouter } from 'next/router'
-import { DataproductQuery } from '../../lib/schema/graphql'
+import { DataproductSummaryQuery } from '../../lib/schema/graphql'
 
 export const Description = ({
     dataproduct
 }: {
-    dataproduct: DataproductQuery['dataproduct']
+    dataproduct: DataproductSummaryQuery['dataproductSummary']
 }) => {
     const router = useRouter()
     const handleChange = (newSlug: string) => {

diff --git a/components/search/resultList.tsx b/components/search/resultList.tsx
@@ -14,8 +14,8 @@ import { Tabs } from '@navikt/ds-react'
 import React, { useContext, useEffect, useState } from 'react'
 import { SearchParam } from '../../pages/search'
 import { useRouter } from 'next/router'
-import { USER_INFO } from '../../lib/queries/userInfo/userInfo'
 import { UserState } from '../../lib/context'
+import { USER_INFO_BASICS } from '../../lib/queries/userInfo/userInfoBasics'
 
 const Results = ({ children }: { children: React.ReactNode }) => (
   <div className="results">{children}</div>
@@ -103,7 +103,7 @@ const ResultList = ({
     },
     refetchQueries:[
       {
-        query: USER_INFO,
+        query: USER_INFO_BASICS,
       }
     ]
   })

diff --git a/components/search/searchResultLink.tsx b/components/search/searchResultLink.tsx
@@ -8,8 +8,8 @@ import humanizeDate from '../../lib/humanizeDate'
 import DeleteModal from '../lib/deleteModal'
 import { useState } from 'react'
 import { useRouter } from 'next/router'
-import { USER_INFO } from '../../lib/queries/userInfo/userInfo'
 import { GET_PRODUCT_AREAS } from '../../lib/queries/productAreas/productAreas'
+import { USER_INFO_BASICS } from '../../lib/queries/userInfo/userInfoBasics'
 
 export interface SearchResultProps {
   resourceType?: string
@@ -79,7 +79,7 @@ export const SearchResultLink = ({
           query: GET_PRODUCT_AREAS,
         },
         {
-          query: USER_INFO,
+          query: USER_INFO_BASICS,
         }
       ]
     })