Skip to content

Migrate webhooks views/modals to shared components and standardize form CSS #1250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SudoThijn merged 4 commits into from
Mar 31, 2026
Merged

Migrate webhooks views/modals to shared components and standardize form CSS #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7615bb2
converted webhooks and webhook logs
SudoThijn Mar 31, 2026
4cb1c6c
bug fixes and route support for webhook logs
SudoThijn Mar 31, 2026
239023e
converted EditWebhook and added same styles to all forms
SudoThijn Mar 31, 2026
c6a28ef
updated view webhook log modal
SudoThijn Mar 31, 2026
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
1 change: 1 addition & 0 deletions appinfo/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@
['name' => 'ui#searchTrail', 'url' => '/search-trails', 'verb' => 'GET'],
['name' => 'ui#webhooks', 'url' => '/webhooks', 'verb' => 'GET'],
['name' => 'ui#webhooksLogs', 'url' => '/webhooks/logs', 'verb' => 'GET'],
['name' => 'ui#webhooksLogsDetails', 'url' => '/webhooks/logs/{id}', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
['name' => 'ui#endpoints', 'url' => '/endpoints', 'verb' => 'GET'],
['name' => 'ui#endpointLogs', 'url' => '/endpoints/logs', 'verb' => 'GET'],
['name' => 'ui#entities', 'url' => '/entities', 'verb' => 'GET'],
Expand Down
18 changes: 18 additions & 0 deletions lib/Controller/UiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,24 @@ public function webhooksLogs(): TemplateResponse
return $this->makeSpaResponse();
}//end webhooksLogs()

/**
* Returns the webhook logs details page template.
*
* @NoAdminRequired
*
* @NoCSRFRequired
*
* @phpstan-return TemplateResponse
*
* @psalm-return TemplateResponse<200|500, array<string, mixed>>
*
* @return TemplateResponse The SPA template response
*/
public function webhooksLogsDetails(): TemplateResponse
{
return $this->makeSpaResponse();
}//end webhooksLogsDetails()

/**
* Returns the entities page template.
*
Expand Down
41 changes: 39 additions & 2 deletions src/modals/application/EditApplication.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,11 +555,48 @@ export default {
}

.field-hint {
font-size: 12px;
color: var(--color-text-lighter);
font-size: 0.875rem;
color: var(--color-text-maxcontrast);
margin: 0;
}

.selectField,
.checkboxField {
display: flex;
flex-direction: column;
gap: 0.5rem;
}

.selectField label {
font-weight: 500;
color: var(--color-text-maxcontrast);
}

/* Dropdown option styles */
.option-content {
display: flex;
flex-direction: column;
gap: 0.25rem;
}

.option-title {
font-weight: 500;
}

.option-description {
font-size: 0.875rem;
color: var(--color-text-maxcontrast);
max-width: 100%;
white-space: normal;
word-break: break-word;
}

.option-meta {
font-size: 0.75rem;
color: var(--color-text-maxcontrast);
font-style: italic;
}

.group-option {
display: flex;
align-items: center;
Expand Down
24 changes: 13 additions & 11 deletions src/modals/configuration/EditConfiguration.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,29 +1042,25 @@ export default {
</script>

<style scoped>
.selectField {
display: flex;
flex-direction: column;
gap: 0.5rem;
}

.selectField label {
font-weight: 500;
.field-hint {
font-size: 0.875rem;
color: var(--color-text-maxcontrast);
margin: 0;
}

.selectField,
.checkboxField {
display: flex;
flex-direction: column;
gap: 0.5rem;
}

.field-hint {
font-size: 0.875rem;
.selectField label {
font-weight: 500;
color: var(--color-text-maxcontrast);
margin: 0;
}

/* Dropdown option styles */
.option-content {
display: flex;
flex-direction: column;
Expand All @@ -1082,4 +1078,10 @@ export default {
white-space: normal;
word-break: break-word;
}

.option-meta {
font-size: 0.75rem;
color: var(--color-text-maxcontrast);
font-style: italic;
}
</style>
41 changes: 39 additions & 2 deletions src/modals/organisation/EditOrganisation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,11 +964,48 @@ export default {
}

.field-hint {
font-size: 12px;
color: var(--color-text-lighter);
font-size: 0.875rem;
color: var(--color-text-maxcontrast);
margin: 0;
}

.selectField,
.checkboxField {
display: flex;
flex-direction: column;
gap: 0.5rem;
}

.selectField label {
font-weight: 500;
color: var(--color-text-maxcontrast);
}

/* Dropdown option styles */
.option-content {
display: flex;
flex-direction: column;
gap: 0.25rem;
}

.option-title {
font-weight: 500;
}

.option-description {
font-size: 0.875rem;
color: var(--color-text-maxcontrast);
max-width: 100%;
white-space: normal;
word-break: break-word;
}

.option-meta {
font-size: 0.75rem;
color: var(--color-text-maxcontrast);
font-style: italic;
}

.group-option {
display: flex;
align-items: center;
Expand Down
Loading
Loading