Merge pull request #292 from navikt/refactor/ART04-search

Refactor/art04 search: fix teamkatalogen field in search

Author: MengZhuNAV

components/productArea/content.tsx

@@ -3,7 +3,6 @@ import { PAItem } from "../../pages/productArea/[id]";
 import SearchResultLink from "../search/searchResultLink";
 import { useContext } from "react";
 import { UserState } from "../../lib/context";
-import { useGetProductAreas } from "../../lib/rest/productAreas";
 
 interface ProductAreaContentProps {
     currentItem: PAItem
@@ -12,11 +11,8 @@ interface ProductAreaContentProps {
 }
 
 const ProductAreaContent = ({ currentItem, currentTab, setCurrentTab }: ProductAreaContentProps) => {
-    const {productAreas, loading, error} = useGetProductAreas()
     const userInfo= useContext(UserState)
 
-    if (loading) return <div>Laster...</div>
-    if (error) return <div>Noe gikk galt</div>
     return (
         <Tabs
             value={currentTab}

components/search/resultList.tsx

@@ -11,9 +11,9 @@ import SearchResultLink from './searchResultLink'
 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 { useSearchTeamKatalogen } from '../../lib/rest/teamkatalogen'
 import { useGetProductAreas } from '../../lib/rest/productAreas'
 
 const Results = ({ children }: { children: React.ReactNode }) => (
@@ -82,18 +82,34 @@ const ResultList = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [search])
   const [deleteStoryQuery] = useDeleteStoryMutation()
-  const userInfo= useContext(UserState)
+  const userInfo = useContext(UserState)
+  const { searchResult: teamkatalogen } = useSearchTeamKatalogen()
+  const { productAreas } = useGetProductAreas()
   const deleteStory = (id: string) => deleteStoryQuery({
-    variables:{
+    variables: {
       id: id
     },
-    refetchQueries:[
+    refetchQueries: [
       {
         query: USER_INFO,
       }
     ]
   })
 
+  const getTeamKatalogenInfo = (item: any) => {
+    const getTeamID = (url: string)  => {
+      var urlComponents = url?.split("/")
+      return urlComponents?.[urlComponents.length - 1]
+    }
+    const tk = teamkatalogen?.find((it) => getTeamID(it.url) == getTeamID(item?.owner?.teamkatalogenURL))
+    const po = productAreas?.find((it) => it.id == tk?.productAreaID)
+
+    return {
+      productArea: po?.name,
+      teamkatalogenTeam: tk?.name || item.group?.group
+    }
+  }
+
   if (search && !!searchParam) {
     const { data, loading, error } = search
 
@@ -106,6 +122,7 @@ const ResultList = ({
       (d) => d.result.__typename === 'Story'
     )
 
+    //dataproducts.forEach((d) => console.log(getTeamKatalogenInfo(d.result)?.teamkatalogenTeam))
     return (
       <Results>
         <Tabs
@@ -128,25 +145,25 @@ const ResultList = ({
           </Tabs.List>
           <Tabs.Panel className="flex flex-col pt-4 gap-4" value="story">
             {datastories.map(
-              (it, idx)=>
+              (it, idx) =>
               (
-                it.result.__typename ==='Story' && (
-                <SearchResultLink
-                  key={idx}
-                  name={it.result.name}
-                  type={'story'}
-                  keywords={it.result.keywords}
-                  description={it.excerpt}
-                  link={`/story/${it.result.id}`}
-                  group={{
-                    group: it.result.groupName,
-                    teamkatalogenURL: it.result.teamkatalogenURL,
-                  }}
-                  //TODO: fix teamkatalogen
-                />
-              )
+                it.result.__typename === 'Story' && (
+                  <SearchResultLink
+                    key={idx}
+                    name={it.result.name}
+                    type={'story'}
+                    keywords={it.result.keywords}
+                    description={it.excerpt}
+                    link={`/story/${it.result.id}`}
+                    group={{
+                      group: it.result.groupName,
+                      teamkatalogenURL: it.result.teamkatalogenURL,
+                    }}
+                    {...getTeamKatalogenInfo(it.result)}
+                  />
+                )
               )
-                 
+
             )}
           </Tabs.Panel>
           <Tabs.Panel className="flex flex-col gap-4" value="dataproduct">
@@ -161,7 +178,7 @@ const ResultList = ({
                     description={d.result.description}
                     link={`/dataproduct/${d.result.id}/${d.result.slug}`}
                     datasets={d.result.datasets}
-                  //TODO: fix teamkatalogen
+                    {...getTeamKatalogenInfo(d.result)}
                   />
                 )
             )}
@@ -181,7 +198,7 @@ const ResultList = ({
             name={d.name}
             keywords={d.keywords}
             link={`/dataproduct/${d.id}/${d.slug}`}
-                  //TODO: fix teamkatalogen
+            {...getTeamKatalogenInfo(d)}
           />
         ))}
       </Results>
@@ -203,11 +220,11 @@ const ResultList = ({
               name={s.name}
               resourceType={"datafortelling"}
               link={`/story/${s.id}`}
-                  //TODO: fix teamkatalogen
-                  keywords={s.keywords}
-              editable = {true}
-              description= {s.description}
-              deleteResource = {deleteStory}
+              {...getTeamKatalogenInfo(s)}
+              keywords={s.keywords}
+              editable={true}
+              description={s.description}
+              deleteResource={deleteStory}
             />
           ))}
         </Results>
@@ -230,10 +247,10 @@ const ResultList = ({
               id={p.id}
               name={p.name}
               link={p.link}
-                  //TODO: fix teamkatalogen
-                  description= {p.description}
+              {...getTeamKatalogenInfo(p)}
+              description={p.description}
               innsiktsproduktType={p.type}
-              editable={!!userInfo?.googleGroups?.find(it=> it.email == p.group)}     
+              editable={!!userInfo?.googleGroups?.find(it => it.email == p.group)}
             />
           ))}
         </Results>