Skip to content

Commit 6b9c869

Browse files
committed
fix pagination styling
1 parent 066bc18 commit 6b9c869

2 files changed

Lines changed: 28 additions & 41 deletions

File tree

Source/Applications/SystemCenterNotification/Scripts/TSX/EmailTypes/History.tsx

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const History = (props: IProps) => {
4242
const [selectedEmailLabel, setSelectedEmailLabel] = React.useState<string | null>(null);
4343

4444
const steps: IStep[] = React.useMemo(() => {
45-
if ((selectedEmailLabel?.length ?? 0) == 0)
45+
if ((selectedEmailLabel?.length ?? 0) == 0)
4646
return []
4747
return [
4848
{ Label: 'History', ID: "history", IsNavigable: true },
@@ -65,38 +65,32 @@ const History = (props: IProps) => {
6565

6666
return (
6767
<>
68-
<div className="container-fluid d-flex h-100 flex-column" style={{ height: 'inherit' }}>
69-
<div className="row" style={{ flex: 1, overflow: 'hidden' }}>
70-
<div className="card" style={{ width: '100%', height: '100%' }}>
71-
<div className="card-header">
72-
<div className="row">
73-
{selectedEmailID == null ? < div className="col-6 align-self-center">
74-
<h2>Email History:</h2>
75-
</div> :
76-
<div className="col">
77-
<Breadcrumb
78-
Steps={steps}
79-
CurrentStep={currentStep}
80-
OnClick={resetToHistory}
81-
/>
82-
</div>}
83-
</div>
84-
</div>
85-
<div className="card-body" style={{ paddingTop: 10, paddingBottom: 0, overflow: 'hidden' }}>
86-
<div className="container-fluid d-flex h-100 flex-column" style={{ padding: 0 }}>
87-
{selectedEmailID == null ?
88-
<SentEmailTable
89-
EmailTypeID={props.Record?.ID}
90-
OnClick={handleOnHistoryTableClick}
91-
/> :
92-
<SentEmailTimeline
93-
SentEmailID={selectedEmailID}
94-
/>
95-
}
96-
</div>
97-
</div>
68+
<div className="card d-flex flex-column flex-grow-1" style={{ width: '100%', height: '100%' , overflow: 'hidden'}}>
69+
<div className="card-header">
70+
<div className="row">
71+
{selectedEmailID == null ? < div className="col-6 align-self-center">
72+
<h2>Email History:</h2>
73+
</div> :
74+
<div className="col">
75+
<Breadcrumb
76+
Steps={steps}
77+
CurrentStep={currentStep}
78+
OnClick={resetToHistory}
79+
/>
80+
</div>}
9881
</div>
9982
</div>
83+
<div className="card-body d-flex flex-column h-100" style={{ paddingTop: 10, paddingBottom: 0, overflow: 'hidden' }}>
84+
{selectedEmailID == null ?
85+
<SentEmailTable
86+
EmailTypeID={props.Record?.ID}
87+
OnClick={handleOnHistoryTableClick}
88+
/> :
89+
<SentEmailTimeline
90+
SentEmailID={selectedEmailID}
91+
/>
92+
}
93+
</div>
10094
</div>
10195
</>
10296
)

Source/Applications/SystemCenterNotification/Scripts/TSX/EmailTypes/SentEmailTable.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//******************************************************************************************************
22
// SentEmailTable.tsx - Gbtc
33
//
4-
// Copyright © 2026, Grid Protection Alliance. All Rights Reserved.
4+
// Copyright © 2026, Grid Protection Alliance. All Rights Reserved.
55
//
66
// Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
77
// the NOTICE file distributed with this work for additional information regarding copyright ownership.
@@ -60,8 +60,8 @@ const SentEmailTable = (props: IProps) => {
6060
return (
6161
<>
6262
<LoadingScreen Show={pageStatus == 'loading'} />
63-
<div className="row flex-grow-1" style={{overflow: 'hidden'}}>
64-
<div className="col h-100 d-flex flex-column" style={{ overflow: 'hidden' }}>
63+
<div className="row" style={{ overflow: 'hidden', flex: '1 1 0%' }}>
64+
<div className="col h-100" style={{ overflow: 'hidden' }}>
6565
<Table<SentEmail>
6666
TableClass="table table-hover"
6767
Data={data}
@@ -71,13 +71,6 @@ const SentEmailTable = (props: IProps) => {
7171
if (d.colKey === sortKey) setAscending(a => !a);
7272
else setSortKey(d.colField);
7373
}}
74-
TableStyle={{
75-
padding: 0, width: 'calc(100%)', height: 'calc(100% - 16px)',
76-
tableLayout: 'fixed', overflow: 'hidden', display: 'flex', flexDirection: 'column'
77-
}}
78-
TheadStyle={{ fontSize: 'smaller', display: 'table', tableLayout: 'fixed', width: '100%' }}
79-
TbodyStyle={{ display: 'block', overflowY: 'scroll', flex: 1 }}
80-
RowStyle={{ display: 'table', tableLayout: 'fixed', width: '100%' }}
8174
Selected={(item) => false}
8275
KeySelector={(item) => item.ID}
8376
OnClick={(data) => props.OnClick(data.row)}

0 commit comments

Comments
 (0)