Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Only render log status info when it's available

Browse Source 
[MAILPOET-5436]
This commit is contained in:
 Ján Mikláš
2024-07-01 09:33:37 +02:00
committed by Aschepikov
parent b725f7af17
commit 61f992a823
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mailpoet/assets/css/src/components-automation-analytics/tabs/_subscribers.scss
View File

@ -79,6 +79,9 @@
}
.mailpoet-analytics-activity-modal-status-info {
margin-top: 8px;
max-width: 220px;
&:not(:empty) {
margin-top: 8px;
}
}

25
mailpoet/assets/js/src/automation/integrations/mailpoet/analytics/components/tabs/subscribers/modal/rows.tsx
View File

@ -28,6 +28,15 @@ export const headers = [
},
];
function StatusInfo({ info }: { info: string | null }): JSX.Element {
if (!info) {
return null;
}
return (
<div className="mailpoet-analytics-activity-modal-status-info">{info}</div>
);
}
export function transformLogsToRows(
logs: Log[],
steps: Steps,
@ -59,15 +68,18 @@ export function transformLogsToRows(
display: (
<>
<AutomationRunStatus status={log.status} />
<div className="mailpoet-analytics-activity-modal-status-info">
{log.error && log.error.message}
</div>
<StatusInfo info={log.error && log.error.message} />
</>
),
},
])
: [];
if (nextStep) {
// translators: "Time left: 1 hour" or "Time left: 1 minute", uses WordPress' human_time_diff() to get the value
const timeLeft = sprintf(
__('Time left: %s', 'mailpoet'),
nextStep.time_left,
);
items.push([
{
display: <StepCell name={nextStep.name} data={nextStep.step} />,
@ -85,12 +97,7 @@ export function transformLogsToRows(
display: (
<>
<AutomationRunStatus status="running" />
<div className="mailpoet-analytics-activity-modal-status-info">
{
// translators: "Time left: 1 hour" or "Time left: 1 minute", uses WordPress' human_time_diff() to get the value
sprintf(__('Time left: %s', 'mailpoet'), nextStep.time_left)
}
</div>
<StatusInfo info={timeLeft} />
</>
),
},