) => {
+ if ((event.target as HTMLElement).className == styles.expand) {
+ ;(event.target as HTMLElement).className = styles.collapse
} else {
- event.target.className = styles.expand
+ ;(event.target as HTMLElement).className = styles.expand
}
const attachmentDetail = document.getElementById(item.attachmentContentId)
if (!attachmentDetail) {
- const parent = event.target.parentElement.parentElement.parentElement
- const html =
- `|
+ const parent = (event.target as HTMLElement).parentElement.parentElement.parentElement
+ const html = ` |
@@ -62,7 +61,7 @@ const Attachments = ({ documentId, session, documentType }: Props) => {
| ${t('Checked On')} : |
- ${(item.checkedOn) ? item.checkedOn : ''} |
+ ${item.checkedOn ? item.checkedOn : ''} |
${t('Checked Comment')} : |
${item.checkedComment} |
|
@@ -86,66 +85,71 @@ const Attachments = ({ documentId, session, documentType }: Props) => {
}
}
- const fetchData: any = useCallback(
+ const fetchData = useCallback(
async (url: string) => {
const response = await ApiUtils.GET(url, session.user.access_token)
if (response.status == HttpStatus.OK) {
- const data = await response.json()
+ const data = (await response.json()) as LinkedAttachments
return data
} else if (response.status == HttpStatus.UNAUTHORIZED) {
- signOut()
+ await signOut()
} else {
- notFound()
+ return {} as LinkedAttachments
}
},
[session.user.access_token]
)
const downloadAttachment = (attachmentId: string, attachmentName: string) => {
- DownloadService.download(
- `${documentType}/${documentId}/attachments/${attachmentId}`, session, attachmentName)
+ DownloadService.download(`${documentType}/${documentId}/attachments/${attachmentId}`, session, attachmentName)
}
const downloadBundle = () => {
- DownloadService.download(
- `${documentType}/${documentId}/attachments/download`, session, 'AttachmentBundle.zip')
+ DownloadService.download(`${documentType}/${documentId}/attachments/download`, session, 'AttachmentBundle.zip')
}
useEffect(() => {
- fetchData(`${documentType}/${documentId}/attachments`).then((attachments: any) => {
- if (
- !CommonUtils.isNullOrUndefined(attachments['_embedded']) &&
- !CommonUtils.isNullOrUndefined(attachments['_embedded']['sw360:attachmentDTOes'])
- ) {
- const attachmentData = attachments['_embedded']['sw360:attachmentDTOes'].map((item: Attachment) => [
- item,
- item.filename,
- 'n/a',
- item.attachmentType,
- item.createdTeam,
- item.createdBy,
- item.checkedTeam,
- item.checkedBy,
- (item.usageAttachment.visible === 0 && item.usageAttachment.restricted == 0)
- ? 'n/a'
- :
- {item.usageAttachment.visible} / {item.usageAttachment.restricted}
- ,
- [item.attachmentContentId, item.filename],
- ])
- setAttachmentData(attachmentData)
- setTotalRows(attachmentData.length)
- }
- })
+ fetchData(`${documentType}/${documentId}/attachments`)
+ .then((attachments: LinkedAttachments) => {
+ if (
+ !CommonUtils.isNullOrUndefined(attachments['_embedded']) &&
+ !CommonUtils.isNullOrUndefined(attachments['_embedded']['sw360:attachmentDTOes'])
+ ) {
+ const attachmentData = attachments['_embedded']['sw360:attachmentDTOes'].map((item: Attachment) => [
+ item,
+ item.filename,
+ 'n/a',
+ item.attachmentType,
+ item.createdTeam,
+ item.createdBy,
+ item.checkedTeam,
+ item.checkedBy,
+ item.usageAttachment.visible === 0 && item.usageAttachment.restricted == 0 ? (
+ 'n/a'
+ ) : (
+
+ {item.usageAttachment.visible} / {item.usageAttachment.restricted}
+
+ ),
+ [item.attachmentContentId, item.filename],
+ ])
+ setAttachmentData(attachmentData)
+ setTotalRows(attachmentData.length)
+ }
+ })
+ .catch((err) => console.error(err))
}, [documentId, documentType, fetchData])
const columns = [
{
id: 'check',
- name: _(),
- formatter: (item: any) => _(),
+ name: _(
+
+ ),
+ formatter: (item: Attachment) =>
+ _(),
sort: false,
- width: '60px'
+ width: '60px',
},
{
id: 'fileName',
@@ -189,10 +193,14 @@ const Attachments = ({ documentId, session, documentType }: Props) => {
{
id: 'action',
name: t('Action'),
- formatter: ([attachmentId, attachmentName]: Array) => _
- ( downloadAttachment(attachmentId, attachmentName)}
- />),
+ formatter: ([attachmentId, attachmentName]: Array) =>
+ _(
+ downloadAttachment(attachmentId, attachmentName)}
+ />
+ ),
sort: false,
width: '60px',
},
@@ -203,7 +211,7 @@ const Attachments = ({ documentId, session, documentType }: Props) => {
{totalRows ? (
<>
-
+
) : (
diff --git a/src/components/ChangeLog/ChangeLogList/ChangeLogList.tsx b/src/components/ChangeLog/ChangeLogList/ChangeLogList.tsx
index 0fb1effd8..002f92e0c 100644
--- a/src/components/ChangeLog/ChangeLogList/ChangeLogList.tsx
+++ b/src/components/ChangeLog/ChangeLogList/ChangeLogList.tsx
@@ -12,14 +12,14 @@ import { useEffect, useState } from 'react'
import { FaFileAlt } from 'react-icons/fa'
import { useTranslations } from 'next-intl'
import { COMMON_NAMESPACE } from '@/object-types/Constants'
-
import { Table, _ } from '@/components/sw360'
+import { ChangeLog } from '@/object-types/ChangeLogs'
interface Props {
documentId: string
- setChangeLogIndex: any
- setChangesLogTab: any
- changeLogList: Array
+ setChangeLogIndex: React.Dispatch>
+ setChangesLogTab: React.Dispatch>
+ changeLogList: Array
}
const ChangeLogList = ({ documentId, setChangeLogIndex, setChangesLogTab, changeLogList }: Props) => {
@@ -27,7 +27,7 @@ const ChangeLogList = ({ documentId, setChangeLogIndex, setChangesLogTab, change
const [changeLogData, setChangeLogData] = useState([])
useEffect(() => {
- const data = Object.entries(changeLogList).map(([index, item]: any) => [
+ const data = Object.entries(changeLogList).map(([index, item]: [index: string, item: ChangeLog]) => [
item.changeTimestamp,
item.id,
item.documentId === documentId
@@ -58,12 +58,12 @@ const ChangeLogList = ({ documentId, setChangeLogIndex, setChangesLogTab, change
},
{
name: t('Actions'),
- formatter: (index: unknown) =>
+ formatter: (index: string) =>
_(
{
- setChangeLogIndex(index)
+ setChangeLogIndex(parseInt(index))
setChangesLogTab('view-log')
}}
/>
diff --git a/src/components/ResourcesUsing/ComponentsUsing.tsx b/src/components/ResourcesUsing/ComponentsUsing.tsx
index b3ea10a95..1bc01611c 100644
--- a/src/components/ResourcesUsing/ComponentsUsing.tsx
+++ b/src/components/ResourcesUsing/ComponentsUsing.tsx
@@ -14,9 +14,10 @@ import { _, Table } from '../sw360'
import styles from './ResourceUsing.module.css'
import { useTranslations } from 'next-intl'
import { COMMON_NAMESPACE } from '@/object-types/Constants'
+import { EmbeddedComponent } from '@/object-types/EmbeddedComponent'
interface Props {
- componentsUsing: Array
+ componentsUsing: Array
documentName: string
}
@@ -44,7 +45,7 @@ const ComponentsUsing = ({ componentsUsing, documentName }: Props) => {
]
useEffect(() => {
- const data = componentsUsing.map((component: any) => [
+ const data = componentsUsing.map((component: EmbeddedComponent) => [
component.defaultVendor?.shortName,
_(
+ projectUsings: Array
documentName: string
- restrictedResource: any
+ restrictedResource: RestrictedResource
}
const ProjectsUsing = ({ projectUsings, documentName, restrictedResource }: Props) => {
@@ -41,7 +43,7 @@ const ProjectsUsing = ({ projectUsings, documentName, restrictedResource }: Prop
]
useEffect(() => {
- const data = projectUsings.map((project: any) => [
+ const data = projectUsings.map((project: EmbeddedProject) => [
_(
{
- const [resourcesUsing, setResourceUsing] = useState(undefined)
+ const [resourcesUsing, setResourceUsing] = useState(undefined)
useEffect(() => {
ApiUtils.GET(`${documentType}/usedBy/${documentId}`, session.user.access_token)
.then((res) => res.json())
- .then((resourcesUsing) => {
+ .then((resourcesUsing: Resources) => {
setResourceUsing(resourcesUsing)
})
+ .catch((err) => console.log(err))
}, [documentId, documentType, session])
return (
diff --git a/src/object-types/ChangeLogs.ts b/src/object-types/ChangeLogs.ts
new file mode 100644
index 000000000..92ab1690a
--- /dev/null
+++ b/src/object-types/ChangeLogs.ts
@@ -0,0 +1,61 @@
+// Copyright (C) TOSHIBA CORPORATION, 2023. Part of the SW360 Frontend Project.
+// Copyright (C) Toshiba Software Development (Vietnam) Co., Ltd., 2023. Part of the SW360 Frontend Project.
+
+// This program and the accompanying materials are made
+// available under the terms of the Eclipse Public License 2.0
+// which is available at https://www.eclipse.org/legal/epl-2.0/
+
+// SPDX-License-Identifier: EPL-2.0
+// License-Filename: LICENSE
+
+export interface Changes {
+ fieldName: string
+ fieldValueOld: string
+ fieldValueNew: string
+}
+
+export interface ReferenceDoc {
+ refDocId: string
+ refDocType: string
+ refDocOperation: string
+}
+
+export interface ChangeLog {
+ id: string
+ type: string
+ documentId: string
+ documentType: string
+ changes?: Array
+ operation: string
+ userEdited: string
+ changeTimestamp: string
+ referenceDoc?: Array
+ info?: { [k: string]: string }
+}
+
+export interface EmbeddedChangeLogs {
+ _embedded: {
+ 'sw360:changeLogs': Array
+ }
+ _links: {
+ first?: {
+ href: string
+ }
+ last?: {
+ href: string
+ }
+ curies?: [
+ {
+ href: string
+ name: string
+ templated: boolean
+ }
+ ]
+ }
+ page?: {
+ size: number
+ totalElements: number
+ totalPages: number
+ number: number
+ }
+}
diff --git a/src/object-types/Component.ts b/src/object-types/Component.ts
index b2e92e85a..78b588f16 100644
--- a/src/object-types/Component.ts
+++ b/src/object-types/Component.ts
@@ -39,6 +39,8 @@ export default interface Component {
wiki?: string
blog?: string
modifiedOn?: string
+ modifiedBy?: string
+ roles?: { [k: string]: Array }
setBusinessUnit?: boolean
setVisbility?: boolean
_links?: {
diff --git a/src/object-types/EmbeddedLinkedReleases.ts b/src/object-types/EmbeddedLinkedReleases.ts
new file mode 100644
index 000000000..5358a60d5
--- /dev/null
+++ b/src/object-types/EmbeddedLinkedReleases.ts
@@ -0,0 +1,26 @@
+// Copyright (C) TOSHIBA CORPORATION, 2023. Part of the SW360 Frontend Project.
+// Copyright (C) Toshiba Software Development (Vietnam) Co., Ltd., 2023. Part of the SW360 Frontend Project.
+
+// This program and the accompanying materials are made
+// available under the terms of the Eclipse Public License 2.0
+// which is available at https://www.eclipse.org/legal/epl-2.0/
+
+// SPDX-License-Identifier: EPL-2.0
+// License-Filename: LICENSE
+
+import LinkedRelease from './LinkedRelease'
+
+export default interface EmbeddedLinkedReleases {
+ _embedded: {
+ 'sw360:releaseLinks': Array
+ }
+ _links: {
+ curies: [
+ {
+ href: string
+ name: string
+ templated: boolean
+ }
+ ]
+ }
+}
diff --git a/src/object-types/EmbeddedProject.ts b/src/object-types/EmbeddedProject.ts
new file mode 100644
index 000000000..5b5813c15
--- /dev/null
+++ b/src/object-types/EmbeddedProject.ts
@@ -0,0 +1,26 @@
+// Copyright (C) TOSHIBA CORPORATION, 2023. Part of the SW360 Frontend Project.
+// Copyright (C) Toshiba Software Development (Vietnam) Co., Ltd., 2023. Part of the SW360 Frontend Project.
+
+// This program and the accompanying materials are made
+// available under the terms of the Eclipse Public License 2.0
+// which is available at https://www.eclipse.org/legal/epl-2.0/
+
+// SPDX-License-Identifier: EPL-2.0
+// License-Filename: LICENSE
+
+export default interface EmbeddedProject {
+ name?: string
+ version?: string
+ state?: string
+ securityResponsibles?: Array
+ considerReleasesFromExternalList?: boolean
+ projectResponsible?: string
+ projectType?: string
+ visibility?: string
+ businessUnit?: string
+ _links: {
+ self: {
+ href: string
+ }
+ }
+}
diff --git a/src/object-types/LinkedAttachments.ts b/src/object-types/LinkedAttachments.ts
new file mode 100644
index 000000000..238de01c6
--- /dev/null
+++ b/src/object-types/LinkedAttachments.ts
@@ -0,0 +1,26 @@
+// Copyright (C) TOSHIBA CORPORATION, 2023. Part of the SW360 Frontend Project.
+// Copyright (C) Toshiba Software Development (Vietnam) Co., Ltd., 2023. Part of the SW360 Frontend Project.
+
+// This program and the accompanying materials are made
+// available under the terms of the Eclipse Public License 2.0
+// which is available at https://www.eclipse.org/legal/epl-2.0/
+
+// SPDX-License-Identifier: EPL-2.0
+// License-Filename: LICENSE
+
+import Attachment from './Attachment'
+
+export default interface LinkedAttachments {
+ _embedded: {
+ 'sw360:attachmentDTOes': Array
+ }
+ _links: {
+ curies: [
+ {
+ href: string
+ name: string
+ templated: boolean
+ }
+ ]
+ }
+}
diff --git a/src/object-types/LinkedVulnerability.ts b/src/object-types/LinkedVulnerability.ts
index 6586425d1..c4c6e9956 100644
--- a/src/object-types/LinkedVulnerability.ts
+++ b/src/object-types/LinkedVulnerability.ts
@@ -9,26 +9,41 @@
// License-Filename: LICENSE
export interface VerificationStateInfo {
- checkedOn: string,
- checkedBy: string,
- comment: string,
- verificationState: string
+ checkedOn: string
+ checkedBy: string
+ comment: string
+ verificationState: string
}
export interface LinkedVulnerability {
- externalId: string,
- title?: string,
- description?: string,
- priority?: string,
- priorityToolTip?: string,
- releaseVulnerabilityRelation: {
- releaseId: string,
- vulnerabilityId: string,
- verificationStateInfo: Array,
- matchedBy: string,
- usedNeedle: string,
- },
- projectAction?: string,
- intReleaseId?: string,
- intReleaseName?: string
+ externalId: string
+ title?: string
+ description?: string
+ priority?: string
+ priorityToolTip?: string
+ releaseVulnerabilityRelation: {
+ releaseId: string
+ vulnerabilityId: string
+ verificationStateInfo: Array
+ matchedBy: string
+ usedNeedle: string
+ }
+ projectAction?: string
+ intReleaseId?: string
+ intReleaseName?: string
+}
+
+export interface EmbeddedVulnerabilites {
+ _embedded: {
+ 'sw360:vulnerabilityDTOes': Array
+ }
+ _links: {
+ curies: [
+ {
+ href: string
+ name: string
+ templated: boolean
+ }
+ ]
+ }
}
diff --git a/src/object-types/Resources.ts b/src/object-types/Resources.ts
new file mode 100644
index 000000000..56820c059
--- /dev/null
+++ b/src/object-types/Resources.ts
@@ -0,0 +1,33 @@
+// Copyright (C) TOSHIBA CORPORATION, 2023. Part of the SW360 Frontend Project.
+// Copyright (C) Toshiba Software Development (Vietnam) Co., Ltd., 2023. Part of the SW360 Frontend Project.
+
+// This program and the accompanying materials are made
+// available under the terms of the Eclipse Public License 2.0
+// which is available at https://www.eclipse.org/legal/epl-2.0/
+
+// SPDX-License-Identifier: EPL-2.0
+// License-Filename: LICENSE
+
+import { EmbeddedComponent } from './EmbeddedComponent'
+import EmbeddedProject from './EmbeddedProject'
+
+export interface RestrictedResource {
+ projects: number
+}
+
+export interface Resources {
+ _embedded: {
+ 'sw360:projects': Array
+ 'sw360:components': Array
+ 'sw360:restrictedResources': Array
+ }
+ _links: {
+ curies: [
+ {
+ href: string
+ name: string
+ templated: boolean
+ }
+ ]
+ }
+}
diff --git a/src/services/download.service.ts b/src/services/download.service.ts
index ac74f515f..7daecfa56 100644
--- a/src/services/download.service.ts
+++ b/src/services/download.service.ts
@@ -8,24 +8,25 @@
// SPDX-License-Identifier: EPL-2.0
// License-Filename: LICENSE
-import { Session } from "@/object-types/Session";
-import ApiUtils from "@/utils/api/api.util";
+import { Session } from '@/object-types/Session'
+import ApiUtils from '@/utils/api/api.util'
const download = (url: string, session: Session, fileName: string) => {
- ApiUtils.GET(url, session.user.access_token)
- .then((response: any) => response.blob())
- .then((blob: any) => {
- const objectURL = URL.createObjectURL(blob);
- const link = document.createElement("a");
- link.href = objectURL;
- link.setAttribute("download", fileName);
- link.click();
- setTimeout(() => window.URL.revokeObjectURL(objectURL), 0);
- }).catch(error => console.log('error', error));
+ ApiUtils.GET(url, session.user.access_token)
+ .then((response) => response.blob())
+ .then((blob: Blob) => {
+ const objectURL = URL.createObjectURL(blob)
+ const link = document.createElement('a')
+ link.href = objectURL
+ link.setAttribute('download', fileName)
+ link.click()
+ setTimeout(() => window.URL.revokeObjectURL(objectURL), 0)
+ })
+ .catch((error) => console.log('error', error))
}
const DownloadService = {
- download
+ download,
}
-export default DownloadService
\ No newline at end of file
+export default DownloadService
|