Merge pull request #53 from catenax-ng/known_bug_fixes

fix(empty page): Null check for contract table column
eclipse-tractusx · Jan 4, 2024 · dfdb7bf · dfdb7bf
2 parents f0ec9bb + e388ae1
commit dfdb7bf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/components/ContractsTable.tsx b/src/components/ContractsTable.tsx
@@ -82,7 +82,7 @@ function ContractsTable({ type, title, subtitle }: IContractsTable) {
       field: 'assetId',
       flex: 1,
       headerName: t('content.contractHistory.columns.assetId'),
-      valueGetter: ({ row }) => row.contractAgreementInfo,
+      valueGetter: ({ row }) => row?.contractAgreementInfo?.assetId,
       valueFormatter: ({ value }) => value?.assetId,
       renderCell: ({ row }) => (
         <Tooltips tooltipPlacement="top-start" tooltipArrow={false} tooltipText={row?.contractAgreementInfo?.assetId}>
@@ -111,7 +111,7 @@ function ContractsTable({ type, title, subtitle }: IContractsTable) {
       headerName: t('content.contractHistory.columns.contractSigningDate'),
       sortingOrder: ['asc', 'desc'],
       sortComparator: (v1, v2, param1: GridValidRowModel, param2: GridValidRowModel) => param2.id - param1.id,
-      valueGetter: ({ row }) => row.contractAgreementInfo,
+      valueGetter: ({ row }) => convertEpochToDate(row.contractAgreementInfo?.contractSigningDate),
       valueFormatter: ({ value }) => convertEpochToDate(value?.contractSigningDate),
       renderCell: ({ row }) =>
         row.contractAgreementInfo?.contractSigningDate ? (

diff --git a/src/helpers/RouteHelper.tsx b/src/helpers/RouteHelper.tsx
@@ -16,18 +16,18 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-import { lazy, ReactElement } from 'react';
+import { Logout } from '@mui/icons-material';
+import { ReactElement } from 'react';
 
-const ConsumeData = lazy(() => import('../pages/ConsumeData'));
-const ConsumerContracts = lazy(() => import('../pages/ConsumerContracts'));
-const CreateData = lazy(() => import('../pages/CreateData'));
-const Help = lazy(() => import('../pages/Help'));
-const Home = lazy(() => import('../pages/Home'));
-const Logout = lazy(() => import('../pages/Logout'));
-const PageNotFound = lazy(() => import('../pages/PageNotFound'));
-const ProviderContracts = lazy(() => import('../pages/ProviderContracts'));
-const UploadHistoryNew = lazy(() => import('../pages/UploadHistoryNew'));
-const About = lazy(() => import('../pages/About'));
+import About from '../pages/About';
+import ConsumeData from '../pages/ConsumeData';
+import ConsumerContracts from '../pages/ConsumerContracts';
+import CreateData from '../pages/CreateData';
+import Help from '../pages/Help';
+import Home from '../pages/Home';
+import PageNotFound from '../pages/PageNotFound';
+import ProviderContracts from '../pages/ProviderContracts';
+import UploadHistoryNew from '../pages/UploadHistoryNew';
 
 export interface IRoutes {
   key?: string;