1 Commits

Author SHA1 Message Date
Sebastian 3688bfcadf chore(deps): update mongo docker tag to v8
Build Test / test (pull_request) Successful in 38s
JS Unit Tests / test (pull_request) Successful in 46s
PHP Unit Tests / test (pull_request) Successful in 2m12s
PHP Integration Tests / Integration Tests (pull_request) Failing after 2m51s
2026-07-27 03:04:57 +00:00
4 changed files with 27 additions and 24 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
services: services:
mongo: mongo:
image: mongo:7 image: mongo:8
options: >- options: >-
--health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\"" --health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
--health-interval 5s --health-interval 5s
+6 -6
View File
@@ -7,8 +7,8 @@ namespace KTXM\Mail\Controllers;
use InvalidArgumentException; use InvalidArgumentException;
use KTXC\Http\Response\JsonResponse; use KTXC\Http\Response\JsonResponse;
use KTXC\Http\Response\Response; use KTXC\Http\Response\Response;
use KTXC\Context\IdentityContextInterface; use KTXC\SessionIdentity;
use KTXC\Context\TenantContextInterface; use KTXC\SessionTenant;
use KTXF\Controller\ControllerAbstract; use KTXF\Controller\ControllerAbstract;
use KTXF\Routing\Attributes\AuthenticatedRoute; use KTXF\Routing\Attributes\AuthenticatedRoute;
use KTXM\Mail\CompositionManager; use KTXM\Mail\CompositionManager;
@@ -18,8 +18,8 @@ use Throwable;
final class CompositionController extends ControllerAbstract { final class CompositionController extends ControllerAbstract {
public function __construct( public function __construct(
private readonly TenantContextInterface $tenantContext, private readonly SessionTenant $tenantIdentity,
private readonly IdentityContextInterface $identityContext, private readonly SessionIdentity $userIdentity,
private readonly CompositionManager $compositionManager, private readonly CompositionManager $compositionManager,
private readonly LoggerInterface $logger, private readonly LoggerInterface $logger,
) {} ) {}
@@ -31,8 +31,8 @@ final class CompositionController extends ControllerAbstract {
string|null $operation = null, string|null $operation = null,
array|null $data = null, array|null $data = null,
): Response { ): Response {
$tenantId = $this->tenantContext->identifier(); $tenantId = $this->tenantIdentity->identifier();
$userId = $this->identityContext->identifier(); $userId = $this->userIdentity->identifier();
try { try {
if ($operation === null) { if ($operation === null) {
+18 -14
View File
@@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import type { ComposerSenderIdentity } from '@/types/composer'; import type { ComposerSenderIdentity } from '@/types/composer';
import { computed, watch } from 'vue' import { computed } from 'vue'
interface Props { interface Props {
modelValue: ComposerSenderIdentity | null modelValue: ComposerSenderIdentity | null
@@ -27,6 +27,11 @@ const items = computed<SenderListItem[]>(() => {
const selectedValue = computed(() => props.modelValue?.address ?? null) const selectedValue = computed(() => props.modelValue?.address ?? null)
const singleOptionLabel = computed(() => {
const onlyOption = props.options[0]
return onlyOption ? formatSenderLabel(onlyOption.label, onlyOption.address) : ''
})
const errorMessages = computed(() => { const errorMessages = computed(() => {
if (props.options.length === 0) { if (props.options.length === 0) {
return ['No send-capable account is available.'] return ['No send-capable account is available.']
@@ -35,18 +40,6 @@ const errorMessages = computed(() => {
return [] return []
}) })
// Auto-select (and keep selected) the only send-capable account, since
// there's no "from" UI shown for the user to pick it themselves.
watch(
() => props.options,
options => {
if (options.length === 1 && props.modelValue?.address !== options[0].address) {
emit('update:modelValue', options[0])
}
},
{ immediate: true },
)
function handleUpdate(value: string | null) { function handleUpdate(value: string | null) {
const match = value ? props.options.find(o => o.address === value) ?? null : null const match = value ? props.options.find(o => o.address === value) ?? null : null
emit('update:modelValue', match) emit('update:modelValue', match)
@@ -58,8 +51,19 @@ function formatSenderLabel(label: string | null | undefined, address: string): s
</script> </script>
<template> <template>
<div v-if="options.length !== 1" class="composer-sender px-4 pt-4 pb-0"> <div class="composer-sender px-4 pt-4 pb-0">
<v-text-field
v-if="options.length === 1"
:model-value="singleOptionLabel"
label="From"
variant="outlined"
density="compact"
readonly
class="mb-2"
/>
<v-select <v-select
v-else
:model-value="selectedValue" :model-value="selectedValue"
:items="items" :items="items"
item-title="title" item-title="title"
+2 -3
View File
@@ -40,11 +40,10 @@ const handleAccountSaved = async () => {
<v-list-item <v-list-item
v-for="service in servicesStore.services" v-for="service in servicesStore.services"
:key="`${service.provider}:${service.identifier}`" :key="`${service.provider}:${service.identifier}`"
:class="{ 'opacity-60': !service.enabled }"
> >
<template #prepend> <template #prepend>
<v-avatar :color="service.enabled ? 'primary' : 'grey'"> <v-avatar color="primary">
<v-icon>{{ service.enabled ? 'mdi-email' : 'mdi-email-off' }}</v-icon> <v-icon>mdi-email</v-icon>
</v-avatar> </v-avatar>
</template> </template>