Merge pull request eclipse-sw360#81 from siemens/projects/add-project…

…/summary feat(project): Added external urls integration while creating project
toshiba · Aug 22, 2023 · cb4cd96 · cb4cd96
2 parents a06da6a + 2cd0ffa
commit cb4cd96
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 16 deletions.
diff --git a/src/app/[locale]/projects/add/page.tsx b/src/app/[locale]/projects/add/page.tsx
@@ -31,6 +31,10 @@ export default function AddProjects() {
         id: '',
         fullName: ''
     })
+    const [externalUrls, setExternalUrls] = useState<Input[]>([{
+        key: '',
+        value:''
+    }])
     const [projectPayload, setProjectPayload] = useState<ProjectPayload>({
         name: '',
         description: '',
@@ -41,6 +45,7 @@ export default function AddProjects() {
         domain: '',
         leadArchitect: '',
         defaultVendorId: '',
+        externalUrls: null,
         state: 'ACTIVE',
         phaseOutSince: '',
         moderators: null,
@@ -54,6 +59,15 @@ export default function AddProjects() {
             theme: 'colored',
         })
 
+    const setExternalUrlsData = (externalUrls: Map<string, string>) => {
+        const obj = Object.fromEntries(externalUrls)
+        setProjectPayload({
+            ...projectPayload,
+            externalUrls: obj,
+        })
+    }
+
+
     const createProject = async () => {
         const response = await ApiUtils.POST('projects',
                                               projectPayload,
@@ -128,6 +142,9 @@ export default function AddProjects() {
                                         <Summary token={AUTH_TOKEN}
                                                  vendor={vendor}
                                                  setVendor={setVendor}
+                                                 externalUrls={externalUrls}
+                                                 setExternalUrls={setExternalUrls}
+                                                 setExternalUrlsData={setExternalUrlsData}
                                                  projectPayload={projectPayload}
                                                  setProjectPayload={setProjectPayload}
                                         />

diff --git a/src/components/ProjectAddSummary/Summary.tsx b/src/components/ProjectAddSummary/Summary.tsx
@@ -18,16 +18,28 @@ import ProjectPayload from "@/object-types/CreateProjectPayload"
 import { COMMON_NAMESPACE } from '@/object-types/Constants'
 import { useTranslations } from "next-intl"
 import Vendor from '@/object-types/Vendor'
+import { AddtionalDataType } from '@/object-types/AddtionalDataType'
 
 interface Props{
     token: string
     vendor: Vendor
     setVendor: React.Dispatch<React.SetStateAction<Vendor>>
+    externalUrls: Input[]
+    setExternalUrls: React.Dispatch<React.SetStateAction<Input[]>>
+    setExternalUrlsData: AddtionalDataType
     projectPayload: ProjectPayload
     setProjectPayload: React.Dispatch<React.SetStateAction<ProjectPayload>>
 }
 
-export default function Summary({token, vendor, setVendor, projectPayload, setProjectPayload}: Props) {
+export default function Summary({token,
+                                 vendor,
+                                 setVendor,
+                                 externalUrls,
+                                 setExternalUrls,
+                                 setExternalUrlsData,
+                                 projectPayload,
+                                 setProjectPayload
+                                }: Props) {
 
     const t = useTranslations(COMMON_NAMESPACE)
 
@@ -45,6 +57,9 @@ export default function Summary({token, vendor, setVendor, projectPayload, setPr
                     <AddKeyValueComponent
                         header={t('External URLs')}
                         keyName={t('External URL')}
+                        data={externalUrls}
+                        setData={setExternalUrls}
+                        setObject={setExternalUrlsData}
                     />
                 </div>
                 <Roles/>

diff --git a/src/components/ProjectAddSummary/component/AddKeyValue.tsx b/src/components/ProjectAddSummary/component/AddKeyValue.tsx
@@ -20,7 +20,9 @@ import { COMMON_NAMESPACE } from '@/object-types/Constants'
 interface Props {
     header: string
     keyName: string
-    setData?: AddtionalDataType
+    data?: Input[]
+    setData?: React.Dispatch<React.SetStateAction<Input[]>>
+    setObject?: AddtionalDataType
 }
 
 interface Input {
@@ -37,13 +39,13 @@ export default function AddKeyValueComponent(props: Props) {
         const { name, value } = e.target
         const list: Input[] = [...inputList]
         list[index][name as keyof Input] = value
-        setInputList(list)
-        if(props.setData) {
+        props.setData(list)
+        if(props.setObject) {
             const map = new Map<string, string>()
             list.forEach((item) => {
                 map.set(item.key, item.value)
             })
-            props.setData(map)
+            props.setObject(map)
         }
     }
 
@@ -87,7 +89,7 @@ export default function AddKeyValueComponent(props: Props) {
                                     className='form-control'
                                     placeholder={t(`Enter ${props.keyName.toLowerCase()} value`)}
                                     required
-                                    aria-describedby={t(`${props.keyName.toLowerCase()} value`)}
+                                    aria-describedby={`${props.keyName.toLowerCase()} value`}
                                 />
                             </div>
                             <div className='col-lg-1'>

diff --git a/src/object-types/CreateProjectPayload.ts b/src/object-types/CreateProjectPayload.ts
@@ -10,16 +10,17 @@
 
 export default interface ProjectPayload {
     name: string
-    description: string
-    version: string
+    description?: string
+    version?: string
     visibility: string
     projectType: string
-    tag: string
-    domain: string
-    leadArchitect: string
-    defaultVendorId: string
-    state: string
-    phaseOutSince: string
-    moderators: string[]
-    contributors: string[]
+    tag?: string
+    domain?: string
+    leadArchitect?: string
+    defaultVendorId?: string
+    externalUrls?: object
+    state?: string
+    phaseOutSince?: string
+    moderators?: string[]
+    contributors?: string[]
 }