mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M3 Integration fixes

Browse Source
This commit is contained in:
Mark Gregory
2026-09-21 10:59:32 +01:00
parent b849dd766b
commit 8f66223767
9 changed files with 22 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Helpdesk/Resources/assets/js/app.js
+2 -3
View File
@@ -10,7 +10,7 @@ window.jQuery = $;
select2(window, $);
function livewireComponentFor(element) {
const componentRoot = element.closest('[wire\\:id]');
const componentRoot = element.closest(String.raw`[wire\:id]`);
if (!componentRoot || ! window.Livewire) {
return null;
@@ -30,8 +30,7 @@ function setLivewireProperty(element, model, value) {
}
function initialiseHelpdeskSelects() {
$('[data-helpdesk-select2]').each(function () {
const select = this;
$('[data-helpdesk-select2]').each((_index, select) => {
const $select = $(select);
const placeholder = $select.data('placeholder') || $select.find('option[value=""]').first().text() || 'Select option';
Modules/Helpdesk/Tests/Feature/GitWebhookIngestionTest.php
+12 -12
View File
@@ -169,7 +169,7 @@ final class GitWebhookIngestionTest extends TestCase
$repository = $this->repository([
'provider' => 'gitea',
'project_id' => $fixtures['project']->id,
'remote_url' => 'http://git.vm:3000/Admin/WMS-Core.git',
'remote_url' => 'https://git.vm:3000/Admin/WMS-Core.git',
'webhook_secret' => 'gitea-secret',
]);
$ticket = $this->ticket(['project_id' => $fixtures['project']->id]);
@@ -178,14 +178,14 @@ final class GitWebhookIngestionTest extends TestCase
'repository' => [
'name' => 'WMS-Core',
'full_name' => 'Admin/WMS-Core',
'clone_url' => 'http://git.vm:3000/Admin/WMS-Core.git',
'html_url' => 'http://git.vm:3000/Admin/WMS-Core',
'clone_url' => 'https://git.vm:3000/Admin/WMS-Core.git',
'html_url' => 'https://git.vm:3000/Admin/WMS-Core',
],
'commits' => [
[
'id' => str_repeat('d', 40),
'message' => $ticket->reference . ' Fix local Gitea webhook ingestion',
'url' => 'http://git.vm:3000/Admin/WMS-Core/commit/' . str_repeat('d', 40),
'url' => 'https://git.vm:3000/Admin/WMS-Core/commit/' . str_repeat('d', 40),
'timestamp' => '2026-06-24T14:20:00+00:00',
'author' => ['name' => 'Mark Gregory', 'email' => 'mark@example.com'],
],
@@ -227,12 +227,12 @@ final class GitWebhookIngestionTest extends TestCase
$this->repository([
'provider' => 'gitea',
'remote_url' => 'http://git.vm:3000/Admin/WMS-Core.git',
'remote_url' => 'https://git.vm:3000/Admin/WMS-Core.git',
'webhook_secret' => 'gitea-secret',
]);
$payload = [
'ref' => 'refs/heads/main',
'repository' => ['clone_url' => 'http://git.vm:3000/Admin/WMS-Core.git'],
'repository' => ['clone_url' => 'https://git.vm:3000/Admin/WMS-Core.git'],
'commits' => [['id' => str_repeat('e', 40), 'message' => 'No auth']],
];
$json = json_encode($payload, JSON_THROW_ON_ERROR);
@@ -256,12 +256,12 @@ final class GitWebhookIngestionTest extends TestCase
$repository = $this->repository([
'provider' => 'gitea',
'remote_url' => 'http://git.vm:3000/Admin/WMS-Core.git',
'remote_url' => 'https://git.vm:3000/Admin/WMS-Core.git',
'webhook_secret' => 'gitea-secret',
]);
$payload = [
'ref' => 'refs/heads/main',
'repository' => ['clone_url' => 'http://git.vm:3000/Admin/WMS-Core.git'],
'repository' => ['clone_url' => 'https://git.vm:3000/Admin/WMS-Core.git'],
'commits' => [['id' => str_repeat('b', 40), 'message' => 'Valid signed Gitea push']],
];
$json = json_encode($payload, JSON_THROW_ON_ERROR);
@@ -291,7 +291,7 @@ final class GitWebhookIngestionTest extends TestCase
'provider' => 'Gitea',
'project_id' => $fixtures['project']->id,
'name' => 'Local',
'remote_url' => 'http://git.vm:3000/Admin/WMS-Core',
'remote_url' => 'https://git.vm:3000/Admin/WMS-Core',
'webhook_secret' => 'gitea-secret',
]);
$payload = [
@@ -299,14 +299,14 @@ final class GitWebhookIngestionTest extends TestCase
'repository' => [
'name' => 'WMS-Core',
'full_name' => 'Admin/WMS-Core',
'clone_url' => 'http://git.vm:3000/Admin/WMS-Core.git',
'html_url' => 'http://git.vm:3000/Admin/WMS-Core',
'clone_url' => 'https://git.vm:3000/Admin/WMS-Core.git',
'html_url' => 'https://git.vm:3000/Admin/WMS-Core',
],
'commits' => [
[
'id' => str_repeat('f', 40),
'message' => 'Local Gitea push should be visible on the dashboard',
'url' => 'http://git.vm:3000/Admin/WMS-Core/commit/' . str_repeat('f', 40),
'url' => 'https://git.vm:3000/Admin/WMS-Core/commit/' . str_repeat('f', 40),
'timestamp' => '2026-06-24T15:00:00+00:00',
'author' => ['name' => 'Mark Gregory', 'email' => 'mark@example.com'],
],