Merge pull request #336 from toshiba/release/fix_linter-ecc-page

fix(Code): Fix linter error for ECC page

src/app/[locale]/ecc/components/ECC.tsx

@@ -11,17 +11,19 @@
 
 import type { Embedded, ECC } from '@/object-types'
 import { SW360_API_URL } from '@/utils/env'
+import { Session } from 'next-auth'
 import { useSession } from 'next-auth/react'
 import { useTranslations } from 'next-intl'
 import { QuickFilter, Table, _ } from 'next-sw360'
+import { ReactNode } from 'react'
 import { Spinner } from 'react-bootstrap'
 
 type EmbeddedECC = Embedded<ECC, 'sw360:releases'>
 
 const Capitalize = (text: string) =>
  text.split('_').reduce((s, c) => s + ' ' + (c.charAt(0) + c.substring(1).toLocaleLowerCase()), '')
 
-export default function ECC() {
+export default function ECC() : ReactNode {
  const t = useTranslations('default')
  const { data: session, status } = useSession()
 
@@ -69,52 +71,52 @@ export default function ECC() {
  },
  ]
 
- const server = {
- url: `${SW360_API_URL}/resource/api/ecc`,
- then: (data: EmbeddedECC) => {
- return data._embedded['sw360:releases'].map((elem: ECC) => [
- Capitalize(elem.eccInformation.eccStatus ?? ''),
- {
- version: elem.version ?? '',
- name: elem.name ?? '',
- },
- elem.version ?? '',
- elem.eccInformation.creatorGroup ?? '',
- elem.eccInformation.assessorContactPerson ?? '',
- elem.eccInformation.assessorDepartment ?? '',
- elem.eccInformation.assessmentDate ?? '',
- elem.eccInformation.eccn ?? '',
- ])
- },
- total: (data: EmbeddedECC) => data.page.totalElements,
- headers: { Authorization: `${status === 'authenticated' ? session.user.access_token : ''}` },
+ const initServerPaginationConfig = (session: Session) => {
+ return {
+ url: `${SW360_API_URL}/resource/api/ecc`,
+ then: (data: EmbeddedECC) => {
+ return data._embedded['sw360:releases'].map((elem: ECC) => [
+ Capitalize(elem.eccInformation.eccStatus),
+ {
+ version: elem.version,
+ name: elem.name,
+ },
+ elem.version,
+ elem.eccInformation.creatorGroup,
+ elem.eccInformation.assessorContactPerson,
+ elem.eccInformation.assessorDepartment,
+ elem.eccInformation.assessmentDate,
+ elem.eccInformation.eccn,
+ ])
+ },
+ total: (data: EmbeddedECC) => data.page ? data.page.totalElements : 0,
+ headers: { Authorization: `${session.user.access_token}` },
+ }
  }
 
  return (
- <>
- <div className='container page-content'>
- <div className='row'>
- <div className='col-lg-2'>
- <div className='row mb-3'>
- <QuickFilter id='vunerabilities.quickSearch' />
- </div>
+ <div className='container page-content'>
+ <div className='row'>
+ <div className='col-lg-2'>
+ <div className='row mb-3'>
+ <QuickFilter id='vunerabilities.quickSearch' />
+ </div>
+ </div>
+ <div className='col-lg-10'>
+ <div className='buttonheader-title ms-1'>
+ {t('ECC Overview')}
  </div>
- <div className='col-lg-10'>
- <div className='buttonheader-title ms-1'>
- {t('ECC Overview')}
- </div>
- <div className='row mt-3'>
- {status === 'authenticated' ? (
- <Table columns={columns} server={server} selector={true} sort={false} />
- ) : (
- <div className='col-12 d-flex justify-content-center align-items-center'>
- <Spinner className='spinner' />
- </div>
- )}
- </div>
+ <div className='row mt-3'>
+ {status === 'authenticated' ? (
+ <Table columns={columns} server={initServerPaginationConfig(session)} selector={true} sort={false} />
+ ) : (
+ <div className='col-12 d-flex justify-content-center align-items-center'>
+ <Spinner className='spinner' />
+ </div>
+ )}
  </div>
  </div>
  </div>
- </>
+ </div>
  )
 }

src/app/[locale]/ecc/page.tsx

@@ -10,11 +10,12 @@
 import { Metadata } from 'next'
 
 import ECCDetails from './components/ECC'
+import { ReactNode } from 'react'
 
 export const metadata: Metadata = {
  title: 'ECC',
 }
 
-export default function ECC() {
+export default function ECC() : ReactNode {
  return <ECCDetails />
 }