Merge branch 'main' of https://github.com/EOS-uiux-Solutions/user-story into tests/setup

Author: SundeepChand

src/components/Dragdrop.js

@@ -1,12 +1,13 @@
 import React, { useEffect, useState } from 'react'
 import { useDropzone } from 'react-dropzone'
 
-const Dragdrop = () => {
+const Dragdrop = ({ setAttachments }) => {
   const [files, setFiles] = useState([])
 
   const { getRootProps, getInputProps } = useDropzone({
     multiple: true,
     onDrop: (acceptedFiles) => {
+      setAttachments(acceptedFiles)
       setFiles((files) => [
         ...files,
         ...acceptedFiles.map((file) =>

src/pages/NewStory.js

@@ -1,6 +1,5 @@
 import React, { useLayoutEffect, useState, useEffect, useContext } from 'react'
 import { useForm } from 'react-hook-form'
-
 import MarkdownEditor from '../components/MarkdownEditor'
 import { filterDescriptionText } from '../utils/filterText'
 import { trackPromise, usePromiseTracker } from 'react-promise-tracker'
@@ -49,6 +48,8 @@ const NewStory = () => {
 
   const [screenSize, setScreenSize] = useState(0)
 
+  const [attachments, setAttachments] = useState([])
+
   useLayoutEffect(() => {
     function updateScreenSize() {
       setScreenSize(window.innerWidth)
@@ -123,8 +124,15 @@ const NewStory = () => {
       setDescriptionError(true)
       return
     }
-    data.description = filterDescriptionText(description)
-    await userStory.createStory(data)
+    data.Description = filterDescriptionText(description)
+    const formData = new FormData()
+    formData.append('data', JSON.stringify(data))
+    if (attachments.length) {
+      attachments.forEach((file) => {
+        formData.append('files.Attachment', file)
+      })
+    }
+    await userStory.createStory(formData)
     navigate('/')
   }
 
@@ -148,7 +156,7 @@ const NewStory = () => {
                   <input
                     className='input-default'
                     type='text'
-                    name='title'
+                    name='Title'
                     data-cy='title'
                     autoComplete='off'
                     ref={register({ required: true })}
@@ -190,7 +198,7 @@ const NewStory = () => {
                   <label htmlFor='category'>Category</label>
                   <select
                     className='select-default'
-                    name='category'
+                    name='Category'
                     data-cy='category'
                     ref={register({ required: true })}
                   >
@@ -212,7 +220,7 @@ const NewStory = () => {
                   <label htmlFor='priority'>Priority</label>
                   <select
                     className='select-default'
-                    name='priority'
+                    name='Priority'
                     data-cy='priority'
                     ref={register({ required: true })}
                   >
@@ -247,7 +255,7 @@ const NewStory = () => {
                   />
                   {descriptionError && <FormError type='emptyDescription' />}
                 </div>
-                <Dragdrop />
+                <Dragdrop setAttachments={setAttachments} />
                 <div className='flex flex-row flex-center'>
                   <Button
                     type='submit'

src/pages/Story.js

@@ -235,6 +235,11 @@ const Story = (props) => {
                   />
                 )}
               </div>
+              <div>
+                {story.Attachment?.map((obj) => (
+                  <img src={obj.url} alt='attachment' />
+                ))}
+              </div>
               <Comments storyId={storyId} />
             </div>
           </div>

src/services/user_story.js

@@ -5,28 +5,8 @@ import {
 } from './gql_fragments'
 
 const userStory = {
-  createStory: ({ description, title, category, product, priority }) => {
-    const createQuery = {
-      query: `mutation {
-        createUserStory(
-          input: {
-            data: {
-              Description: "${description}"
-              Title: "${title}"
-              Category: ${category}
-              product: "${product}"
-              Priority: ${priority}
-            }
-          }
-        ) {
-          userStory {
-            createdAt
-          }
-        }
-      }
-      `
-    }
-    return apiCall('/graphql', createQuery)
+  createStory: (data) => {
+    return apiCall('/user-stories', data)
   },
   checkAuthor: (userId, storyId) => {
     return apiCall('/checkAuthor', {
@@ -112,6 +92,9 @@ const userStory = {
             id
             username
           }
+          Attachment {
+            url
+          }
         }
       }
       ${BASIC_STORY_INFO_FRAGMENT}