Skip to content

Commit edf6793

Browse files
committed
fix: UAT issues
1 parent a336aa7 commit edf6793

File tree

3 files changed

+27
-9
lines changed

3 files changed

+27
-9
lines changed

src/Shared/Components/CICDHistory/LogsRenderer.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@
1818
border: none !important;
1919
background: transparent;
2020
}
21+
22+
&__icon {
23+
path:nth-child(1) {
24+
fill: none !important;
25+
}
26+
27+
path:nth-child(2) {
28+
fill: var(--N400);
29+
}
30+
}
2131
}
2232

2333
.search-bar:focus-within {

src/Shared/Components/CICDHistory/TriggerOutput.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ const Finished = React.memo(
7575
({ status, finishedOn, artifact, type }: FinishedType): JSX.Element => (
7676
<div className="flexbox pt-12 dc__gap-8 left dc__min-width-fit-content dc__align-items-center">
7777
<div
78-
className={`${status} fs-14 fw-6 ${TERMINAL_STATUS_COLOR_CLASS_MAP[status.toLowerCase()] || 'cn-5'}`}
78+
className={`${status} fs-13 fw-6 ${TERMINAL_STATUS_COLOR_CLASS_MAP[status.toLowerCase()] || 'cn-5'}`}
7979
data-testid="deployment-status-text"
8080
>
81-
{status && status.toLowerCase() === 'cancelled' ? 'ABORTED' : status}
81+
{status && status.toLowerCase() === 'cancelled' ? 'Aborted' : status}
8282
</div>
8383

8484
{finishedOn && finishedOn !== ZERO_TIME_STRING && (
85-
<time className="dc__vertical-align-middle">
85+
<time className="dc__vertical-align-middle fs-13">
8686
{moment(finishedOn, 'YYYY-MM-DDTHH:mm:ssZ').format(DATE_TIME_FORMATS.TWELVE_HOURS_FORMAT)}
8787
</time>
8888
)}
@@ -115,7 +115,7 @@ const WorkerStatus = React.memo(
115115
) : null
116116

117117
return (
118-
<div className="display-grid trigger-details__grid">
118+
<div className="display-grid trigger-details__grid py-4">
119119
<div className="flexbox dc__content-center">
120120
<ICLines className="icon-dim-20 dc__no-shrink scn-7" />
121121
</div>
@@ -295,13 +295,13 @@ const StartDetails = ({
295295
Start
296296
</span>
297297

298-
<time className="cn-7 fs-12">
298+
<time className="cn-7 fs-13">
299299
{moment(startedOn, 'YYYY-MM-DDTHH:mm:ssZ').format(DATE_TIME_FORMATS.TWELVE_HOURS_FORMAT)}
300300
</time>
301301

302302
<div className="dc__bullet" />
303303

304-
<div className="trigger-details__trigger-by cn-7 fs-12">
304+
<div className="trigger-details__trigger-by cn-7 fs-13">
305305
{triggeredBy === 1 ? 'auto trigger' : triggeredByEmail}
306306
</div>
307307

@@ -343,7 +343,7 @@ const StartDetails = ({
343343
)}
344344

345345
{!pathname.includes('source-code') && (
346-
<Link to={`${url}/source-code`} className="anchor" data-testid="commit-details-link">
346+
<Link to={`${url}/source-code`} className="anchor fs-13" data-testid="commit-details-link">
347347
Commit details
348348
</Link>
349349
)}

src/Shared/Components/ShowMoreText/ShowMoreText.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ import { ReactComponent as ICCaretDown } from '@Icons/ic-caret-down.svg'
1919

2020
interface ShowMoreTextProps {
2121
text: string
22+
textClass?: string
2223
}
2324

24-
const ShowMoreText = ({ text }: ShowMoreTextProps) => {
25+
const ShowMoreText = ({ text, textClass }: ShowMoreTextProps) => {
2526
const ellipsisText = useRef(null)
2627
const [showToggle, setShowToggle] = useState(false)
2728
const [showAllText, setShowAllText] = useState(false)
@@ -39,10 +40,17 @@ const ShowMoreText = ({ text }: ShowMoreTextProps) => {
3940
const toggleShowText = () => {
4041
setShowAllText(!showAllText)
4142
}
43+
const getTextClassName = () => {
44+
if (showAllText) {
45+
return textClass || ''
46+
}
47+
48+
return `${textClass} dc__truncate`
49+
}
4250

4351
return (
4452
<div className="min-w-385 pr-20">
45-
<span ref={ellipsisText} className={`${showAllText ? '' : 'dc__truncate '}`}>
53+
<span ref={ellipsisText} className={getTextClassName()}>
4654
{text}
4755
</span>
4856
{showToggle && (

0 commit comments

Comments
 (0)