Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
php-version: ["8.2", "8.3", "8.4", "8.5"]
typo3-version: ["13.4"]
typo3-version: ["13.4", "14.3"]
dependencies: ["highest", "lowest"]
env:
typo3DatabaseName: typo3
Expand Down
2 changes: 2 additions & 0 deletions Classes/Controller/MailqueueModuleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,12 @@ public function __construct(
private readonly Core\Mail\Mailer $mailer,
private readonly Backend\Routing\UriBuilder $uriBuilder,
private readonly Core\Context\Context $context,
private readonly Core\Page\PageRenderer $pageRenderer,
) {}

public function __invoke(Message\ServerRequestInterface $request): Message\ResponseInterface
{
$this->pageRenderer->loadJavaScriptModule('@typo3/backend/modal.js');
$page = $this->resolvePageIdFromRequest($request);

// Force redirect when page selector was used
Expand Down
37 changes: 25 additions & 12 deletions Resources/Private/Partials/List/QueueItem.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@

<tr class="{f:render(section: 'rowClass', arguments: {state: queueItem.state, date: queueItem.date, delayThreshold: delayThreshold}) -> f:spaceless()}">
<td class="col-icon align-top">
<f:render partial="Modal/ConfirmDelete" arguments="{queueItem: queueItem, iterator: iterator}" />

<f:switch expression="{queueItem.state.value}">
<f:case value="failed">
<span class="badge badge-danger d-block">{f:translate(key: 'queueItem.state.failed', extensionName: 'Mailqueue')}</span>

<f:if condition="{queueItem.failure}">
<f:render partial="Modal/TransportFailureDetails" arguments="{queueItem: queueItem, iterator: iterator}" />
</f:if>
</f:case>
<f:case value="queued">
<f:if condition="{queueItem.date} && {queueItem.date -> m:dateInterval()} >= {delayThreshold}">
Expand Down Expand Up @@ -69,20 +65,37 @@
<td class="align-top nowrap col-control">
<div class="btn-group">
<f:if condition="{queueItem.state.value} == 'failed' && {queueItem.failure}">
<button type="button" class="btn btn-default btn-sm" data-bs-toggle="modal"
data-bs-target="#queue-item-{iterator.cycle}-info-modal"
title="{f:translate(key: 'button.info', extensionName: 'Mailqueue')}"
<a class="btn btn-default btn-sm t3js-modal-trigger"
href="{f:be.uri(route: 'system_mailqueue', parameters: '{send: queueItem.id}')}"
data-severity="error"
data-title="{f:translate(key: 'modal.failureDetails.header', extensionName: 'Mailqueue')}"
data-content="{queueItem.failure.exception}: {queueItem.failure.message} ({queueItem.id})"
data-button-close-text="{f:translate(key: 'aria.close', extensionName: 'Mailqueue')}"
data-button-ok-text="{f:translate(key: 'button.retry', extensionName: 'Mailqueue')}"
title="{f:translate(key: 'button.info', extensionName: 'Mailqueue')}"
>
<c:icon identifier="actions-info" />
</button>
</a>
</f:if>

<button type="button" class="btn btn-default btn-sm" data-bs-toggle="modal"
data-bs-target="#queue-item-{iterator.cycle}-delete-modal"
title="{f:translate(key: 'button.delete', extensionName: 'Mailqueue')}"
<f:variable name="mailSubject">
<f:if condition="{queueItem.message.message.subject}">
<f:then>{queueItem.message.message.subject}</f:then>
<f:else if="{queueItem.message.originalMessage.subject}">{queueItem.message.originalMessage.subject}</f:else>
<f:else>{f:translate(key: 'queueItem.subject.unknown', extensionName: 'Mailqueue')}</f:else>
</f:if>
</f:variable>
<a class="btn btn-default btn-sm t3js-modal-trigger"
href="{f:be.uri(route: 'system_mailqueue', parameters: '{delete: queueItem.id}')}"
data-severity="warning"
data-title="{f:translate(key: 'modal.delete.header', extensionName: 'Mailqueue')}"
data-content="{f:translate(key: 'modal.delete.text', extensionName: 'Mailqueue', arguments: '{0: mailSubject}')}"
data-button-close-text="{f:translate(key: 'button.cancel', extensionName: 'Mailqueue')}"
data-button-ok-text="{f:translate(key: 'button.delete', extensionName: 'Mailqueue')}"
title="{f:translate(key: 'button.delete', extensionName: 'Mailqueue')}"
>
<c:icon identifier="actions-delete" />
</button>
</a>

<f:be.link route="system_mailqueue" parameters="{send: queueItem.id}" class="btn btn-default btn-sm"
title="{f:translate(key: 'button.send', extensionName: 'Mailqueue')}"
Expand Down
40 changes: 0 additions & 40 deletions Resources/Private/Partials/Modal/ConfirmDelete.html

This file was deleted.

40 changes: 0 additions & 40 deletions Resources/Private/Partials/Modal/TransportFailureDetails.html

This file was deleted.

1 change: 1 addition & 0 deletions Resources/Private/Templates/List.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<f:layout name="Module" />

<f:section name="Content">
<f:asset.module identifier="@typo3/backend/modal.js" />
<h1>{f:translate(key: 'header.list', extensionName: 'Mailqueue')}</h1>

<f:if condition="{unsupportedTransport}">
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"symfony/event-dispatcher-contracts": "^3.0",
"symfony/mailer": "^7.0",
"symfony/mime": "^7.0",
"typo3/cms-backend": "~13.4.23",
"typo3/cms-core": "~13.4.23",
"typo3fluid/fluid": "^4.0"
"typo3/cms-backend": "~13.4.23 || ^14.3.7",
"typo3/cms-core": "~13.4.23 || ^14.3.7",
"typo3fluid/fluid": "^4.0 || ^5.0"
},
"require-dev": {
"eliashaeussler/version-bumper": "^4.0",
"phpunit/phpcov": "^10.0 || ^11.0 || ^12.0 || ^13.0",
"phpunit/phpunit": "^11.5 || ^12.0 || ^13.0",
"typo3/cms-lowlevel": "~13.4.23",
"typo3/cms-lowlevel": "~13.4.23 || ^14.3.7",
"typo3/testing-framework": "^9.3.0"
},
"autoload": {
Expand Down
Loading