26 Commits

Author SHA1 Message Date
Sebastian 8a18494883 feat: show disabled accounts
Signed-off-by: Sebastian <krupinski01@gmail.com>
2026-07-28 20:52:13 -04:00
Sebastian 0a2a87acfa fix: auto selected sending account when only once available
Signed-off-by: Sebastian <krupinski01@gmail.com>
2026-07-28 13:10:01 -04:00
Sebastian 436197fbfe refactor: migrate to scoped execution contexts
Signed-off-by: Sebastian <krupinski01@gmail.com>
2026-07-27 00:52:28 -04:00
Sebastian 75d034f478 Merge pull request 'chore(deps): update tiptap monorepo to v3.29.0' (#83) from renovate/tiptap-monorepo into main
Reviewed-on: #83
2026-07-25 23:50:06 +00:00
Sebastian 44fb30b74d chore(deps): update tiptap monorepo to v3.29.0
JS Unit Tests / test (pull_request) Successful in 1m28s
Build Test / test (pull_request) Successful in 1m30s
PHP Unit Tests / test (pull_request) Successful in 2m23s
PHP Integration Tests / Integration Tests (pull_request) Successful in 2m36s
2026-07-25 03:05:33 +00:00
Sebastian 671bad6f22 Merge pull request 'fix: checkout companion module in CI for cross-module type imports' (#82) from chore/js-test-suites into main
Reviewed-on: #82
2026-07-24 05:04:21 +00:00
Sebastian 05e6171b31 fix: regenerate package-lock.json to fix corrupted vue dependency tree
Build Test / test (pull_request) Successful in 48s
JS Unit Tests / test (pull_request) Successful in 50s
PHP Unit Tests / test (pull_request) Successful in 1m25s
PHP Integration Tests / Integration Tests (pull_request) Successful in 1m26s
Signed-off-by: Sebastian <krupinski01@gmail.com>
2026-07-24 01:02:36 -04:00
Sebastian 415cd96450 fix: checkout companion module in CI for cross-module type imports
JS Unit Tests / test (pull_request) Failing after 1m1s
Build Test / test (pull_request) Failing after 1m2s
PHP Integration Tests / Integration Tests (pull_request) Successful in 1m45s
PHP Unit Tests / test (pull_request) Successful in 1m57s
Signed-off-by: Sebastian <krupinski01@gmail.com>
2026-07-24 00:51:26 -04:00
Sebastian c9f720d46e Merge pull request 'chore: implement js test suites' (#81) from chore/js-test-suites into main
Reviewed-on: #81
2026-07-24 04:25:37 +00:00
Sebastian ac0d8de3fb chore: implement js test suites
JS Unit Tests / test (pull_request) Successful in 58s
Build Test / test (pull_request) Successful in 1m2s
PHP Integration Tests / Integration Tests (pull_request) Successful in 1m54s
PHP Unit Tests / test (pull_request) Successful in 3m5s
Signed-off-by: Sebastian <krupinski01@gmail.com>
2026-07-24 00:13:52 -04:00
Sebastian 3d0016bf3e Merge pull request 'chore(deps): update dependency vue-tsc to v3.3.8' (#80) from renovate/vue-language-tools-monorepo into main
Reviewed-on: #80
2026-07-24 03:19:29 +00:00
Sebastian 121014cd20 Merge pull request 'chore(deps): update dependency vue to v3.5.40' (#79) from renovate/vue-monorepo into main
Reviewed-on: #79
2026-07-24 03:19:21 +00:00
Sebastian 3178b2e234 chore(deps): update dependency vue-tsc to v3.3.8
PHP Unit Tests / test (pull_request) Successful in 1m3s
PHP Integration Tests / Integration Tests (pull_request) Successful in 1m44s
2026-07-24 03:10:31 +00:00
Sebastian e9ce62fc3f chore(deps): update dependency vue to v3.5.40
PHP Unit Tests / test (pull_request) Successful in 1m6s
PHP Integration Tests / Integration Tests (pull_request) Successful in 1m36s
2026-07-24 03:10:29 +00:00
Sebastian f285c7b51e Merge pull request 'Chore/php83 test suites' (#78) from chore/php83-test-suites into main
Reviewed-on: #78
2026-07-24 02:51:58 +00:00
Sebastian 9826913c91 Merge pull request 'chore(deps): update dependency typescript to v7' (#74) from renovate/typescript-7.x into main
Reviewed-on: #74
2026-07-24 02:47:23 +00:00
Sebastian 0242f00d40 Merge pull request 'chore(deps): update dependency vuetify to v4.1.5' (#75) from renovate/vuetify-4.x-lockfile into main
Reviewed-on: #75
2026-07-24 02:47:10 +00:00
Sebastian 946b20ce5b Merge pull request 'chore(deps): update dependency @vitejs/plugin-vue to v6.0.8' (#77) from renovate/vitejs-plugin-vue-6.x-lockfile into main
Reviewed-on: #77
2026-07-24 02:47:05 +00:00
Sebastian b914e9b2df Merge pull request 'chore(deps): update tiptap monorepo to v3.28.0' (#76) from renovate/tiptap-monorepo into main
Reviewed-on: #76
2026-07-24 02:46:37 +00:00
Sebastian f02d141be0 fix: install module dependencies before running integration tests
PHP Unit Tests / test (pull_request) Successful in 47s
PHP Integration Tests / Integration Tests (pull_request) Successful in 58s
Signed-off-by: Sebastian <krupinski01@gmail.com>
2026-07-23 22:32:05 -04:00
Sebastian f87503d139 chore: implement php test suites
Signed-off-by: Sebastian <krupinski01@gmail.com>
2026-07-23 22:20:36 -04:00
Sebastian b43753665b Merge pull request 'chore(deps): update dependency vite to v8.1.5' (#73) from renovate/vite-8.x-lockfile into main
Reviewed-on: #73
2026-07-23 19:59:01 +00:00
Sebastian 53d2d41cf1 chore(deps): update tiptap monorepo to v3.28.0 2026-07-18 03:07:43 +00:00
Sebastian ab705e3612 chore(deps): update dependency vuetify to v4.1.5 2026-07-18 03:07:39 +00:00
Sebastian c63b516c2e chore(deps): update dependency @vitejs/plugin-vue to v6.0.8 2026-07-18 03:07:33 +00:00
Sebastian acb8c14fb2 chore(deps): update dependency typescript to v7 2026-07-10 03:02:35 +00:00
18 changed files with 4308 additions and 428 deletions
+58
View File
@@ -0,0 +1,58 @@
name: Build Test
on:
pull_request:
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Retrieve Server Install Action
uses: actions/checkout@v6.0.2
with:
repository: Nodarx/action-server-install
ref: main
path: action-server-install
github-server-url: https://git.ktrix.dev
- name: Install Server
uses: ./action-server-install
with:
install-php: 'false'
install-node: 'true'
php-version: '8.5'
node-version: '24'
server-path: './server'
- name: Install Mail Manager
uses: actions/checkout@v6.0.2
with:
repository: Nodarx/mail_manager
ref: main
path: server/modules/mail_manager
github-server-url: https://git.ktrix.dev
- name: Install People Manager
uses: actions/checkout@v6.0.2
with:
repository: Nodarx/people_manager
ref: main
path: server/modules/people_manager
github-server-url: https://git.ktrix.dev
- name: Checkout Pull Request
uses: actions/checkout@v6.0.2
with:
repository: ${{ github.repository }}
ref: ${{ github.event.pull_request.head.sha }}
path: server/modules/mail
github-server-url: https://git.ktrix.dev
- name: Install dependencies
run: npm ci
working-directory: server/modules/mail
- name: Build
run: npm run build
working-directory: server/modules/mail
+58
View File
@@ -0,0 +1,58 @@
name: JS Unit Tests
on:
pull_request:
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Retrieve Server Install Action
uses: actions/checkout@v6.0.2
with:
repository: Nodarx/action-server-install
ref: main
path: action-server-install
github-server-url: https://git.ktrix.dev
- name: Install Server
uses: ./action-server-install
with:
install-php: 'false'
install-node: 'true'
php-version: '8.5'
node-version: '24'
server-path: './server'
- name: Install Mail Manager
uses: actions/checkout@v6.0.2
with:
repository: Nodarx/mail_manager
ref: main
path: server/modules/mail_manager
github-server-url: https://git.ktrix.dev
- name: Install People Manager
uses: actions/checkout@v6.0.2
with:
repository: Nodarx/people_manager
ref: main
path: server/modules/people_manager
github-server-url: https://git.ktrix.dev
- name: Checkout Pull Request
uses: actions/checkout@v6.0.2
with:
repository: ${{ github.repository }}
ref: ${{ github.event.pull_request.head.sha }}
path: server/modules/mail
github-server-url: https://git.ktrix.dev
- name: Install dependencies
run: npm ci
working-directory: server/modules/mail
- name: Run tests
run: npm run test:unit
working-directory: server/modules/mail
@@ -0,0 +1,59 @@
name: PHP Integration Tests
on:
pull_request:
workflow_dispatch:
jobs:
test:
name: Integration Tests
runs-on: ubuntu-latest
services:
mongo:
image: mongo:7
options: >-
--health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
--health-interval 5s
--health-timeout 5s
--health-retries 12
steps:
- name: Retrieve Server Install Action
uses: actions/checkout@v6.0.2
with:
repository: Nodarx/action-server-install
ref: main
path: action-server-install
github-server-url: https://git.ktrix.dev
- name: Install server
uses: ./action-server-install
with:
install-php: 'true'
php-version: '8.5'
server-path: './server'
database-uri: 'mongodb://mongo:27017/?tls=false'
database-name: 'ktrix_ci'
app-environment: 'test'
- name: Checkout module under test
uses: actions/checkout@v6.0.2
with:
repository: ${{ github.repository }}
ref: ${{ github.event.pull_request.head.sha || github.sha }}
path: server/modules/mail
github-server-url: https://git.ktrix.dev
- name: Install module dependencies
run: composer install --prefer-dist --no-progress
working-directory: server/modules/mail
- name: Install and enable module
working-directory: server
run: |
php bin/console module:install mail
php bin/console module:enable mail
- name: Run integration tests
working-directory: server/modules/mail
run: composer test:integration
+42
View File
@@ -0,0 +1,42 @@
name: PHP Unit Tests
on:
pull_request:
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Retrieve Server Install Action
uses: actions/checkout@v6.0.2
with:
repository: Nodarx/action-server-install
ref: main
path: action-server-install
github-server-url: https://git.ktrix.dev
- name: Install Server
uses: ./action-server-install
with:
install-php: 'true'
install-node: 'false'
php-version: '8.5'
node-version: '24'
server-path: './server'
- name: Checkout Pull Request
uses: actions/checkout@v6.0.2
with:
repository: ${{ github.repository }}
ref: ${{ github.event.pull_request.head.sha }}
path: server/modules/mail
github-server-url: https://git.ktrix.dev
- name: Install dependencies
run: composer install --prefer-dist --no-progress
working-directory: server/modules/mail
- name: Run tests
run: composer test:unit
working-directory: server/modules/mail
+1 -4
View File
@@ -15,10 +15,7 @@ node_modules/
/vendor/ /vendor/
/lib/vendor/ /lib/vendor/
coverage/ coverage/
phpunit.xml.cache *.cache
.phpunit.result.cache
.php-cs-fixer.cache
.phpstan.cache
.phpactor/ .phpactor/
# Editors # Editors
+13 -1
View File
@@ -9,6 +9,18 @@
} }
}, },
"require": { "require": {
"php": ">=8.2" "php": ">=8.3"
},
"require-dev": {
"phpunit/phpunit": "^12.0"
},
"autoload-dev": {
"psr-4": {
"KTXT\\Mail\\Tests\\": "tests/php/"
}
},
"scripts": {
"test:unit": "phpunit --configuration tests/php/phpunit.xml --testsuite \"Unit Tests\" --colors=always --testdox",
"test:integration": "phpunit --configuration tests/php/phpunit.xml --testsuite \"Integration Tests\" --colors=always --testdox"
} }
} }
Generated
+1685 -3
View File
File diff suppressed because it is too large Load Diff
+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\SessionIdentity; use KTXC\Context\IdentityContextInterface;
use KTXC\SessionTenant; use KTXC\Context\TenantContextInterface;
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 SessionTenant $tenantIdentity, private readonly TenantContextInterface $tenantContext,
private readonly SessionIdentity $userIdentity, private readonly IdentityContextInterface $identityContext,
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->tenantIdentity->identifier(); $tenantId = $this->tenantContext->identifier();
$userId = $this->userIdentity->identifier(); $userId = $this->identityContext->identifier();
try { try {
if ($operation === null) { if ($operation === null) {
+2179 -391
View File
File diff suppressed because it is too large Load Diff
+11 -3
View File
@@ -11,7 +11,11 @@
"dev": "vite build --mode development --config vite.config.ts", "dev": "vite build --mode development --config vite.config.ts",
"watch": "vite build --mode development --watch --config vite.config.ts", "watch": "vite build --mode development --watch --config vite.config.ts",
"typecheck": "vue-tsc --noEmit", "typecheck": "vue-tsc --noEmit",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore" "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
"test": "vitest run --config tests/js/vitest.config.ts",
"test:unit": "vitest run --config tests/js/vitest.config.ts",
"test:watch": "vitest watch --config tests/js/vitest.config.ts",
"test:coverage": "vitest run --coverage --config tests/js/vitest.config.ts"
}, },
"dependencies": { "dependencies": {
"@tiptap/vue-3": "^3.0.0", "@tiptap/vue-3": "^3.0.0",
@@ -28,8 +32,12 @@
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "^6.0.0", "@vitejs/plugin-vue": "^6.0.0",
"@vue/tsconfig": "^0.9.0", "@vue/tsconfig": "^0.9.0",
"typescript": "^6.0.0", "typescript": "~6.0.0",
"vite": "^8.0.0", "vite": "^8.0.0",
"vue-tsc": "^3.0.0" "vue-tsc": "^3.0.0",
"@vitest/coverage-v8": "^4.1.6",
"@vue/test-utils": "^2.4.10",
"jsdom": "^29.1.1",
"vitest": "^4.1.6"
} }
} }
+14 -18
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 } from 'vue' import { computed, watch } from 'vue'
interface Props { interface Props {
modelValue: ComposerSenderIdentity | null modelValue: ComposerSenderIdentity | null
@@ -27,11 +27,6 @@ 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.']
@@ -40,6 +35,18 @@ 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)
@@ -51,19 +58,8 @@ function formatSenderLabel(label: string | null | undefined, address: string): s
</script> </script>
<template> <template>
<div class="composer-sender px-4 pt-4 pb-0"> <div v-if="options.length !== 1" 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"
+3 -2
View File
@@ -40,10 +40,11 @@ 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="primary"> <v-avatar :color="service.enabled ? 'primary' : 'grey'">
<v-icon>mdi-email</v-icon> <v-icon>{{ service.enabled ? 'mdi-email' : 'mdi-email-off' }}</v-icon>
</v-avatar> </v-avatar>
</template> </template>
+30
View File
@@ -0,0 +1,30 @@
import { describe, it, expect } from 'vitest'
describe('Basic Tests', () => {
it('should perform basic assertion', () => {
expect(true).toBe(true)
})
it('should test array operations', () => {
const array = ['foo', 'bar', 'baz']
expect(array).toHaveLength(3)
expect(array).toContain('bar')
expect(array[0]).toBe('foo')
})
it('should test string operations', () => {
const string = 'Hello, World!'
expect(string).toContain('World')
expect(string.length).toBe(13)
})
it('should test object operations', () => {
const obj = { foo: 'bar', count: 42 }
expect(obj).toHaveProperty('foo')
expect(obj.foo).toBe('bar')
expect(obj.count).toBeGreaterThan(40)
})
})
+33
View File
@@ -0,0 +1,33 @@
import { fileURLToPath } from 'node:url'
import { defineConfig, configDefaults } from 'vitest/config'
import vue from '@vitejs/plugin-vue'
import path from 'path'
const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
export default defineConfig({
plugins: [vue()],
resolve: {
alias: {
'@': path.resolve(__dirname, '../../src'),
'@KTXC': path.resolve(__dirname, '../../../../core/src'),
},
},
test: {
environment: 'jsdom',
exclude: [...configDefaults.exclude, 'e2e/**'],
root: fileURLToPath(new URL('../../', import.meta.url)),
coverage: {
provider: 'v8',
reporter: ['text', 'json', 'html'],
exclude: [
'node_modules/',
'tests/',
'**/*.d.ts',
'**/*.config.*',
'**/dist/**',
],
},
},
})
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace KTXT\Mail\Tests\Integration;
use PHPUnit\Framework\TestCase;
class BaseTest extends TestCase
{
public function testBasicAssertion(): void
{
$this->assertTrue(true);
}
public function testArrayOperations(): void
{
$array = ['foo' => 'bar'];
$this->assertArrayHasKey('foo', $array);
$this->assertEquals('bar', $array['foo']);
}
public function testStringOperations(): void
{
$string = 'Hello, World!';
$this->assertStringContainsString('World', $string);
$this->assertEquals(13, strlen($string));
}
}
+29
View File
@@ -0,0 +1,29 @@
<?php
namespace KTXT\Mail\Tests\Unit;
use PHPUnit\Framework\TestCase;
class BaseTest extends TestCase
{
public function testBasicAssertion(): void
{
$this->assertTrue(true);
}
public function testArrayOperations(): void
{
$array = ['foo' => 'bar'];
$this->assertArrayHasKey('foo', $array);
$this->assertEquals('bar', $array['foo']);
}
public function testStringOperations(): void
{
$string = 'Hello, World!';
$this->assertStringContainsString('World', $string);
$this->assertEquals(13, strlen($string));
}
}
+17
View File
@@ -0,0 +1,17 @@
<?php
require dirname(__DIR__, 2).'/vendor/autoload.php';
// When this module is checked out inside a full server (server/modules/<handle>,
// as it is in CI and in this monorepo checkout), also load the server's own
// core/shared autoloader so tests can reference framework (KTXC/KTXF) types.
// Standalone module checkouts without a server alongside them skip this.
define('SERVER_ROOT', dirname(__DIR__, 4));
$serverAutoload = SERVER_ROOT . '/vendor/autoload.php';
if (is_file($serverAutoload)) {
require $serverAutoload;
}
if (isset($_SERVER['APP_DEBUG']) && $_SERVER['APP_DEBUG']) {
umask(0000);
}
+41
View File
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
colors="true"
failOnDeprecation="true"
failOnNotice="true"
failOnWarning="true"
bootstrap="bootstrap.php"
cacheDirectory="../../.phpunit.cache"
>
<php>
<ini name="display_errors" value="1" />
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />
</php>
<testsuites>
<testsuite name="Unit Tests">
<directory>Unit</directory>
</testsuite>
<testsuite name="Integration Tests">
<directory>Integration</directory>
</testsuite>
</testsuites>
<source ignoreSuppressionOfDeprecations="true"
ignoreIndirectDeprecations="true"
restrictNotices="true"
restrictWarnings="true"
>
<include>
<directory>../../lib</directory>
</include>
</source>
<extensions>
</extensions>
</phpunit>