fix upload story

Author: MengZhuNAV

components/search/resultList.tsx

@@ -9,6 +9,7 @@ import { useSearchTeamKatalogen } from '../../lib/rest/teamkatalogen'
 import { useGetProductAreas } from '../../lib/rest/productAreas'
 import { SearchResult } from '../../lib/rest/search'
 import { deleteStory } from '../../lib/rest/stories'
+import { Router, useRouter } from 'next/router'
 
 const Results = ({ children }: { children: React.ReactNode }) => (
   <div className="results">{children}</div>
@@ -61,6 +62,7 @@ const ResultList = ({
   const userInfo = useContext(UserState)
   const { searchResult: teamkatalogen } = useSearchTeamKatalogen()
   const { productAreas } = useGetProductAreas()
+  const router = useRouter()
 
   const isDataProduct = (item: any) => !!item.datasets
 
@@ -191,7 +193,7 @@ const ResultList = ({
               keywords={s.keywords}
               editable={true}
               description={s.description}
-              deleteResource={()=> deleteStory(s.id)}
+              deleteResource={()=> deleteStory(s.id).then(()=>router.reload())}
             />
           ))}
         </Results>

components/stories/newStory.tsx

@@ -64,21 +64,21 @@ export const NewStoryForm = () => {
   } = useForm({
     resolver: yupResolver(schema),
     defaultValues: {
-        name: undefined,
-        description: '',
-        teamkatalogenURL: '',
-        keywords: [] as string[],
+      name: undefined,
+      description: '',
+      teamkatalogenURL: '',
+      keywords: [] as string[],
     },
   })
 
   const { errors } = formState
   const keywords = watch('keywords')
 
   const onDeleteKeyword = (keyword: string) => {
-    keywords !== undefined ? 
-    setValue('keywords', keywords.filter((k: string) => k !== keyword))
-    :
-    setValue('keywords', [])
+    keywords !== undefined ?
+      setValue('keywords', keywords.filter((k: string) => k !== keyword))
+      :
+      setValue('keywords', [])
   }
 
   const onAddKeyword = (keyword: string) => {
@@ -90,25 +90,25 @@ export const NewStoryForm = () => {
   const valueOrNull = (val: string) => (val == '' ? null : val);
 
   const onSubmit = async (data: any) => {
-        const files= storyFiles.map<UploadFile>(it=>({
-          path: fixRelativePath(it),
-          file: it,
-        }))
-        const storyInput= {
-          name: data.name,
-          description: valueOrNull(data.description),
-          keywords: data.keywords,
-          teamkatalogenURL: data.teamkatalogenURL,
-          productAreaID: productAreaID,
-          teamID: teamID,
-          group: data.group,
-        }
+    const files = storyFiles.map<UploadFile>(it => ({
+      path: fixRelativePath(it),
+      file: it,
+    }))
+    const storyInput = {
+      name: data.name,
+      description: valueOrNull(data.description),
+      keywords: data.keywords,
+      teamkatalogenURL: data.teamkatalogenURL,
+      productAreaID: productAreaID,
+      teamID: teamID,
+      group: data.group,
+    }
 
     try {
       const data = await createStory(storyInput, files);
       setError(undefined);
       amplitudeLog('skjema fullført', { skjemanavn: 'ny-datafortelling' });
-      router.push(`/story/${data.id}`);
+      router.push(`/user/stories`);
     } catch (e) {
       setError(e as Error);
       amplitudeLog('skjemainnsending feilet', {
@@ -117,7 +117,7 @@ export const NewStoryForm = () => {
       console.log(e)
     }
   }
-  
+
 
   const onCancel = () => {
     amplitudeLog(
@@ -147,10 +147,10 @@ export const NewStoryForm = () => {
     }
   }
 
-  const fixRelativePath = (file: File) =>{
+  const fixRelativePath = (file: File) => {
     var path = file.webkitRelativePath
     var pathParts = path.split('/');
-    return pathParts.length <= 1? file.name:pathParts.slice(1).reduce((p, s, i)=>i===0? s: p+ "/" +s)
+    return pathParts.length <= 1 ? file.name : pathParts.slice(1).reduce((p, s, i) => i === 0 ? s : p + "/" + s)
   }
 
   const generateFileTree = (files: File[]) => {
@@ -159,7 +159,7 @@ export const NewStoryForm = () => {
       var pathParts = file.webkitRelativePath.split('/');
       if (pathParts.length === 1) {
         pathParts = [file.name]
-      }else{
+      } else {
         pathParts = pathParts.slice(1)
       }
       let currentLevel = tree;

lib/rest/stories.ts

@@ -3,13 +3,26 @@ import { createStoryUrl, deleteTemplate, postTemplate, putTemplate, updateStoryU
 import { isThenable } from "next/dist/client/components/router-reducer/router-reducer-types"
 
 export const createStory = (newStory: any, files: any[]) => {
+    console.log(newStory, files)
     const formData = new FormData()
     files.forEach((file, idx) => {
+        console.log(file, idx)
         formData.append(`files[${idx}][path]`, file.path)
-        formData.append(`files[${idx}[file]`, file.file)
+        formData.append(`files[${idx}][file]`, file.file)
     })
     formData.append('story', JSON.stringify(newStory))
-    return postTemplate(createStoryUrl(), formData).then((res) => res.json())
+    console.log(formData)
+    console.log(formData.get('files[0][file]'))
+    return fetch(createStoryUrl(), {
+        method: 'POST',
+        credentials: 'include',
+        body: formData,
+      }).then(res => {
+        if (!res.ok) {
+          throw new Error(res.statusText)
+        }
+        return res.json()
+      })    
 }
 
 export const updateStory =(storyId: string, updatedStory: any) => {