Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

Merge remote-tracking branch 'origin/main' into pr-11443-next

Andras Bacsaia29f02fbb1dc
diff --cc openapi.json
index a1fc7249c3,f8173b7aa8..964b50fe61
--- a/openapi.json
+++ b/openapi.json
@@@ -3568,175 -3508,104 +3568,273 @@@
]
}
},
+ "\/applications\/{uuid}\/previews\/{pull_request_id}\/logs": {
+ "get": {
+ "tags": [
+ "Applications"
+ ],
+ "summary": "Get preview application logs.",
+ "description": "Get runtime container logs for a preview deployment by application UUID and pull request ID.",
+ "operationId": "get-preview-application-logs-by-pull-request-id",
+ "parameters": [
+ {
+ "name": "uuid",
+ "in": "path",
+ "description": "UUID of the application.",
+ "required": true,
+ "schema": {
+ "type": "string"
+ }
+ },
+ {
+ "name": "pull_request_id",
+ "in": "path",
+ "description": "Pull request ID of the preview deployment.",
+ "required": true,
+ "schema": {
+ "type": "integer",
+ "minimum": 1
+ }
+ },
+ {
+ "name": "lines",
+ "in": "query",
+ "description": "Number of lines to show from the end of the logs. Use `all` to return all logs. `-1` remains available as a compatibility alias.",
+ "required": false,
+ "schema": {
+ "oneOf": [
+ {
+ "type": "integer",
+ "format": "int32",
+ "default": 100,
+ "maximum": 10000,
+ "minimum": -1
+ },
+ {
+ "type": "string",
+ "enum": [
+ "all"
+ ]
+ }
+ ]
+ }
+ },
+ {
+ "name": "show_timestamps",
+ "in": "query",
+ "description": "Show timestamps in the logs.",
+ "required": false,
+ "schema": {
+ "type": "boolean",
+ "default": false
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "Preview runtime logs.",
+ "content": {
+ "application\/json": {
+ "schema": {
+ "properties": {
+ "logs": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ }
+ }
+ },
+ "401": {
+ "$ref": "#\/components\/responses\/401"
+ },
+ "400": {
+ "$ref": "#\/components\/responses\/400"
+ },
+ "404": {
+ "$ref": "#\/components\/responses\/404"
+ },
+ "422": {
+ "$ref": "#\/components\/responses\/422"
+ }
+ },
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ]
+ }
+ },
+ "\/applications\/{uuid}\/previews\/{pull_request_id}": {
+ "delete": {
+ "tags": [
+ "Applications"
+ ],
+ "summary": "Delete Preview Deployment",
+ "description": "Delete a preview deployment for a pull request. Cancels active deployments, stops containers, removes volumes\/networks, and deletes the preview record.",
+ "operationId": "delete-preview-deployment-by-pull-request-id",
+ "parameters": [
+ {
+ "name": "uuid",
+ "in": "path",
+ "description": "UUID of the application.",
+ "required": true,
+ "schema": {
+ "type": "string"
+ }
+ },
+ {
+ "name": "pull_request_id",
+ "in": "path",
+ "description": "Pull request ID of the preview to delete.",
+ "required": true,
+ "schema": {
+ "type": "integer"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "Preview deletion queued.",
+ "content": {
+ "application\/json": {
+ "schema": {
+ "properties": {
+ "message": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ }
+ }
+ },
+ "401": {
+ "$ref": "#\/components\/responses\/401"
+ },
+ "400": {
+ "$ref": "#\/components\/responses\/400"
+ },
+ "404": {
+ "$ref": "#\/components\/responses\/404"
+ },
+ "422": {
+ "$ref": "#\/components\/responses\/422"
+ }
+ },
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ]
+ },
+ "patch": {
+ "tags": [
+ "Applications"
+ ],
+ "summary": "Update Preview Domains",
+ "description": "Replace domains for a preview deployment. Use domains for regular applications or docker_compose_domains for Docker Compose applications. Ports are stored as internal overrides while public domains remain portless.",
+ "operationId": "update-preview-domains-by-pull-request-id",
+ "parameters": [
+ {
+ "name": "uuid",
+ "in": "path",
+ "required": true,
+ "schema": {
+ "type": "string"
+ }
+ },
+ {
+ "name": "pull_request_id",
+ "in": "path",
+ "required": true,
+ "schema": {
+ "type": "integer"
+ }
+ }
+ ],
+ "requestBody": {
+ "required": true,
+ "content": {
+ "application\/json": {
+ "schema": {
+ "properties": {
+ "domains": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "example": "https:\/\/pr.example.com:3000"
+ },
+ "docker_compose_domains": {
+ "type": [
+ "array",
+ "null"
+ ],
+ "items": {
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "domain": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "redirect": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "enum": [
+ "www",
+ "non-www",
+ "both"
+ ]
+ }
+ },
+ "type": "object"
+ }
+ },
+ "force_domain_override": {
+ "type": "boolean",
+ "default": false
+ }
+ },
+ "type": "object"
+ }
+ }
+ }
+ },
+ "responses": {
+ "200": {
+ "description": "Preview domains updated."
+ },
+ "401": {
+ "$ref": "#\/components\/responses\/401"
+ },
+ "403": {
+ "$ref": "#\/components\/responses\/403"
+ },
+ "404": {
+ "$ref": "#\/components\/responses\/404"
+ },
+ "409": {
+ "description": "Domain conflict."
+ },
+ "422": {
+ "$ref": "#\/components\/responses\/422"
+ }
+ },
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ]
+ }
+ },
"\/applications\/{uuid}\/envs": {
"get": {
"tags": [
diff --cc openapi.yaml
index e9403ca62c,3f4993eae9..b0843f9194
--- a/openapi.yaml
+++ b/openapi.yaml
@@@ -2346,99 -2307,74 +2346,167 @@@ paths
security:
-
bearerAuth: []
+ '/applications/{uuid}/previews/{pull_request_id}/logs':
+ get:
+ tags:
+ - Applications
+ summary: 'Get preview application logs.'
+ description: 'Get runtime container logs for a preview deployment by application UUID and pull request ID.'
+ operationId: get-preview-application-logs-by-pull-request-id
+ parameters:
+ -
+ name: uuid
+ in: path
+ description: 'UUID of the application.'
+ required: true
+ schema:
+ type: string
+ -
+ name: pull_request_id
+ in: path
+ description: 'Pull request ID of the preview deployment.'
+ required: true
+ schema:
+ type: integer
+ minimum: 1
+ -
+ name: lines
+ in: query
+ description: 'Number of lines to show from the end of the logs. Use `all` to return all logs. `-1` remains available as a compatibility alias.'
+ required: false
+ schema:
+ oneOf:
+ -
+ type: integer
+ format: int32
+ default: 100
+ maximum: 10000
+ minimum: -1
+ -
+ type: string
+ enum:
+ - all
+ -
+ name: show_timestamps
+ in: query
+ description: 'Show timestamps in the logs.'
+ required: false
+ schema:
+ type: boolean
+ default: false
+ responses:
+ '200':
+ description: 'Preview runtime logs.'
+ content:
+ application/json:
+ schema:
+ properties:
+ logs: { type: string }
+ type: object
+ '401':
+ $ref: '#/components/responses/401'
+ '400':
+ $ref: '#/components/responses/400'
+ '404':
+ $ref: '#/components/responses/404'
+ '422':
+ $ref: '#/components/responses/422'
+ security:
+ -
+ bearerAuth: []
+ '/applications/{uuid}/previews/{pull_request_id}':
+ delete:
+ tags:
+ - Applications
+ summary: 'Delete Preview Deployment'
+ description: 'Delete a preview deployment for a pull request. Cancels active deployments, stops containers, removes volumes/networks, and deletes the preview record.'
+ operationId: delete-preview-deployment-by-pull-request-id
+ parameters:
+ -
+ name: uuid
+ in: path
+ description: 'UUID of the application.'
+ required: true
+ schema:
+ type: string
+ -
+ name: pull_request_id
+ in: path
+ description: 'Pull request ID of the preview to delete.'
+ required: true
+ schema:
+ type: integer
+ responses:
+ '200':
+ description: 'Preview deletion queued.'
+ content:
+ application/json:
+ schema:
+ properties:
+ message: { type: string }
+ type: object
+ '401':
+ $ref: '#/components/responses/401'
+ '400':
+ $ref: '#/components/responses/400'
+ '404':
+ $ref: '#/components/responses/404'
+ '422':
+ $ref: '#/components/responses/422'
+ security:
+ -
+ bearerAuth: []
+ patch:
+ tags:
+ - Applications
+ summary: 'Update Preview Domains'
+ description: 'Replace domains for a preview deployment. Use domains for regular applications or docker_compose_domains for Docker Compose applications. Ports are stored as internal overrides while public domains remain portless.'
+ operationId: update-preview-domains-by-pull-request-id
+ parameters:
+ -
+ name: uuid
+ in: path
+ required: true
+ schema:
+ type: string
+ -
+ name: pull_request_id
+ in: path
+ required: true
+ schema:
+ type: integer
+ requestBody:
+ required: true
+ content:
+ application/json:
+ schema:
+ properties:
+ domains:
+ type: [string, 'null']
+ example: 'https://pr.example.com:3000'
+ docker_compose_domains:
+ type: [array, 'null']
+ items: { properties: { name: { type: string }, domain: { type: [string, 'null'] }, redirect: { type: [string, 'null'], enum: [www, non-www, both] } }, type: object }
+ force_domain_override:
+ type: boolean
+ default: false
+ type: object
+ responses:
+ '200':
+ description: 'Preview domains updated.'
+ '401':
+ $ref: '#/components/responses/401'
+ '403':
+ $ref: '#/components/responses/403'
+ '404':
+ $ref: '#/components/responses/404'
+ '409':
+ description: 'Domain conflict.'
+ '422':
+ $ref: '#/components/responses/422'
+ security:
+ -
+ bearerAuth: []
'/applications/{uuid}/envs':
get:
tags:
diff --cc resources/views/livewire/project/application/heading.blade.php
index fd41fc99ac,feb5f9b46c..7f96be121b
--- a/resources/views/livewire/project/application/heading.blade.php
+++ b/resources/views/livewire/project/application/heading.blade.php
@@@ -46,69 -43,110 +46,69 @@@
<div class="w-full xl:hidden">
@if (!($application->build_pack === 'dockercompose' && is_null($application->docker_compose_raw)))
@can('deploy', $application)
- <div id="application-mobile-actions" class="relative mb-3"
- x-data="{ open: false }" @click.outside="open = false"
- @keydown.escape.window="open = false">
- <button type="button" class="button w-full justify-between" @click="open = !open"
- :aria-expanded="open" aria-haspopup="menu">
- <span class="inline-flex items-center gap-2">
- Actions
- </span>
- <span class="inline-flex transition-transform" :class="open && 'rotate-180'">
- <x-reicon name="chevron-down" class="size-3 opacity-55" />
- </span>
- </button>
-
- <div x-cloak x-show="open" x-transition.origin.top.left
- class="listbox-panel top-full! left-0! right-0! mt-1! w-full! min-w-0!" role="menu">
- @if (!str($application->status)->startsWith('exited'))
+ <x-split-action id="application-mobile-actions" class="mb-3 flex w-full">
+ @if (str($application->status)->startsWith('exited'))
+ <x-slot:main wire:click="deploy">
+ <x-reicon name="play-circle" class="size-3.5" />
+ {{ $application->stoppedAfterRestartLimit() ? 'Retry deployment' : 'Deploy' }}
+ </x-slot:main>
@if (!$application->destination->server->isSwarm())
- @can('deploy', $application)
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- wire:click="deploy" @click="open = false" role="menuitem">
- <x-reicon name="refresh" class="size-3.5 opacity-70" />
- Deploy
- </button>
- @else
- <button type="button" class="listbox-option justify-start! gap-2.5!" disabled
- role="menuitem">
- <x-reicon name="refresh" class="size-3.5 opacity-70" />
- Deploy
- </button>
- @endcan
- @endif
- @if ($application->build_pack !== 'dockercompose')
- @if ($application->destination->server->isSwarm())
- @can('deploy', $application)
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- wire:click="deploy" @click="open = false" role="menuitem">
- <x-reicon name="refresh" class="size-3.5 opacity-70" />
- Update Service
- </button>
- @else
- <button type="button" class="listbox-option justify-start! gap-2.5!" disabled
- role="menuitem">
- <x-reicon name="refresh" class="size-3.5 opacity-70" />
- Update Service
- </button>
- @endcan
- @else
- @can('deploy', $application)
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- @click="open = false; document.getElementById('application-mobile-restart-trigger')?.click()"
- role="menuitem">
- <x-reicon name="restart" class="size-3.5 opacity-70" />
- Restart
- </button>
- @else
- <button type="button" class="listbox-option justify-start! gap-2.5!" disabled
- role="menuitem">
- <x-reicon name="restart" class="size-3.5 opacity-70" />
- Restart
- </button>
- @endcan
- @endif
+ <button type="button" class="listbox-option justify-start! gap-2.5!" wire:click="deploy(true)"
+ @click="open = false" role="menuitem">
+ <x-reicon name="refresh" class="size-3.5 opacity-70" />
+ {{ $application->stoppedAfterRestartLimit() ? 'Retry deployment (without cache)' : 'Deploy (without cache)' }}
+ </button>
@endif
- @else
- @can('deploy', $application)
+ @if ($application->container_present !== false)
<button type="button" class="listbox-option justify-start! gap-2.5!"
- wire:click="deploy" @click="open = false" role="menuitem">
- <x-reicon name="play-circle" class="size-3.5 opacity-70" />
- {{ $application->stoppedAfterRestartLimit() ? 'Retry deployment' : 'Deploy' }}
+ @click="open = false; document.getElementById('application-mobile-stop-trigger')?.click()" role="menuitem">
+ <x-reicon name="stop-circle" class="size-3.5 text-error" />
+ Remove container
</button>
+ @endif
+ @else
+ @if ($application->destination->server->isSwarm())
+ @if ($application->build_pack !== 'dockercompose')
+ <x-slot:main wire:click="deploy">
+ <x-reicon name="refresh" class="size-3.5" />
+ Update Service
+ </x-slot:main>
+ @else
+ <x-slot:main @click="document.getElementById('application-mobile-stop-trigger')?.click()">
+ <x-reicon name="stop-circle" class="size-3.5" />
+ Stop
+ </x-slot:main>
+ @endif
@else
- <button type="button" class="listbox-option justify-start! gap-2.5!" disabled
- role="menuitem">
- <x-reicon name="play-circle" class="size-3.5 opacity-70" />
- {{ $application->stoppedAfterRestartLimit() ? 'Retry deployment' : 'Deploy' }}
- </button>
- @endcan
- @endif
- @if (!$application->destination->server->isSwarm())
- @can('deploy', $application)
+ <x-slot:main wire:click="deploy">
+ <x-reicon name="refresh" class="size-3.5" />
- Redeploy
++ Deploy
+ </x-slot:main>
<button type="button" class="listbox-option justify-start! gap-2.5!"
- wire:click="{{ $application->status === 'running' ? 'force_deploy_without_cache' : 'deploy(true)' }}"
+ wire:click="{{ str($application->status)->startsWith('running') ? 'force_deploy_without_cache' : 'deploy(true)' }}"
@click="open = false" role="menuitem">
<x-reicon name="refresh" class="size-3.5 opacity-70" />
- {{ str($application->status)->startsWith('running') ? 'Redeploy (without cache)' : 'Deploy (without cache)' }}
- {{ $application->stoppedAfterRestartLimit() ? 'Retry deployment (without cache)' : 'Deploy (without cache)' }}
++ Deploy (without cache)
</button>
- @else
- <button type="button" class="listbox-option justify-start! gap-2.5!" disabled
+ @if ($application->build_pack !== 'dockercompose')
+ <button type="button" class="listbox-option justify-start! gap-2.5!"
+ @click="open = false; document.getElementById('application-mobile-restart-trigger')?.click()"
+ role="menuitem">
+ <x-reicon name="restart" class="size-3.5 opacity-70" />
+ Restart
+ </button>
+ @endif
+ @endif
+ @unless ($application->destination->server->isSwarm() && $application->build_pack === 'dockercompose')
+ <button type="button" class="listbox-option justify-start! gap-2.5!"
+ @click="open = false; document.getElementById('application-mobile-stop-trigger')?.click()"
role="menuitem">
- <x-reicon name="refresh" class="size-3.5 opacity-70" />
- {{ $application->stoppedAfterRestartLimit() ? 'Retry deployment (without cache)' : 'Deploy (without cache)' }}
+ <x-reicon name="stop-circle" class="size-3.5 text-error" />
+ Stop
</button>
- @endcan
- @endif
- @if (!str($application->status)->startsWith('exited') || $application->container_present !== false)
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- @click="open = false; document.getElementById('application-mobile-stop-trigger')?.click()"
- role="menuitem">
- <x-reicon name="stop-circle" class="size-3.5 text-error" />
- {{ str($application->status)->startsWith('exited') ? 'Remove container' : 'Stop' }}
- </button>
+ @endunless
@endif
- </div>
- </div>
+ </x-split-action>
@endcan
@endif
<div class="hidden" aria-hidden="true">
@@@ -174,39 -223,58 +174,39 @@@
</button>
@endif
@else
- @if (!$application->destination->server->isSwarm())
- @can('deploy', $application)
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- wire:click="deploy" @click="open = false" role="menuitem">
- <x-reicon name="refresh" class="size-3.5 opacity-70" />
- Deploy
- </button>
+ @if ($application->destination->server->isSwarm())
+ @if ($application->build_pack !== 'dockercompose')
+ <x-slot:main wire:click="deploy">
+ <x-reicon name="refresh" class="size-3.5" />
+ Update Service
+ </x-slot:main>
@else
- <button type="button" class="listbox-option justify-start! gap-2.5!" disabled>
- <x-reicon name="refresh" class="size-3.5 opacity-70" />
- Deploy
- </button>
- @endcan
+ <x-slot:main @click="document.getElementById('application-mobile-stop-trigger')?.click()">
+ <x-reicon name="stop-circle" class="size-3.5" />
+ Stop
+ </x-slot:main>
+ @endif
+ @else
+ <x-slot:main wire:click="deploy">
+ <x-reicon name="refresh" class="size-3.5" />
- Redeploy
++ Deploy
+ </x-slot:main>
<button type="button" class="listbox-option justify-start! gap-2.5!"
- @disabled(!auth()->user()->can('deploy', $application))
wire:click="{{ str($application->status)->startsWith('running') ? 'force_deploy_without_cache' : 'deploy(true)' }}"
@click="open = false" role="menuitem">
<x-reicon name="refresh" class="size-3.5 opacity-70" />
- {{ str($application->status)->startsWith('running') ? 'Redeploy (without cache)' : 'Deploy (without cache)' }}
+ Deploy (without cache)
</button>
- @endif
- @if ($application->build_pack !== 'dockercompose')
- @if ($application->destination->server->isSwarm())
- @can('deploy', $application)
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- wire:click="deploy" @click="open = false" role="menuitem">
- <x-reicon name="refresh" class="size-3.5 opacity-70" />
- Update Service
- </button>
- @else
- <button type="button" class="listbox-option justify-start! gap-2.5!" disabled>
- <x-reicon name="refresh" class="size-3.5 opacity-70" />
- Update Service
- </button>
- @endcan
- @else
- @can('deploy', $application)
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- @click="open = false; document.getElementById('application-mobile-restart-trigger')?.click()"
- role="menuitem">
- <x-reicon name="restart" class="size-3.5 opacity-70" />
- Restart
- </button>
- @else
- <button type="button" class="listbox-option justify-start! gap-2.5!" disabled>
- <x-reicon name="restart" class="size-3.5 opacity-70" />
- Restart
- </button>
- @endcan
+ @if ($application->build_pack !== 'dockercompose')
+ <button type="button" class="listbox-option justify-start! gap-2.5!"
+ @click="open = false; document.getElementById('application-mobile-restart-trigger')?.click()"
+ role="menuitem">
+ <x-reicon name="restart" class="size-3.5 opacity-70" />
+ Restart
+ </button>
@endif
@endif
- @can('deploy', $application)
+ @unless ($application->destination->server->isSwarm() && $application->build_pack === 'dockercompose')
<button type="button" class="listbox-option justify-start! gap-2.5!"
@click="open = false; document.getElementById('application-mobile-stop-trigger')?.click()"
role="menuitem">
diff --cc resources/views/livewire/project/service/heading.blade.php
index 29b9523092,0d2fb5ca05..480ad3b539
--- a/resources/views/livewire/project/service/heading.blade.php
+++ b/resources/views/livewire/project/service/heading.blade.php
@@@ -184,29 -225,59 +184,29 @@@
<x-services.links :service="$service" />
</div>
@can('deploy', $service)
- <div id="service-desktop-actions" class="relative" x-data="{ open: false }"
- x-effect="$dispatch('resource-actions-toggled', { open })"
- @click.outside="open = false" @keydown.escape.window="open = false">
- <button type="button" class="button button-highlighted" @click="open = !open" :aria-expanded="open">
- Actions
- <x-reicon name="chevron-down" class="size-3 opacity-55" />
- </button>
- <div x-cloak x-show="open" x-transition.origin.top.right
- class="listbox-panel top-full! right-0! left-auto! mt-1! w-64! min-w-0!" role="menu">
- @if ($selectedResource && $selectedResource->container_present !== false && $selectedResourceStatus->startsWith('exited'))
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- @click="open = false; document.getElementById('selected-resource-remove-trigger')?.click()"
- role="menuitem">
- <x-reicon name="trash" class="size-3.5 text-error" />
- Remove container
- </button>
- @else
- @if ($serviceStatus->contains('running') || $serviceStatus->contains('degraded'))
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- @disabled(!auth()->user()->can('deploy', $service))
- @click="open = false; document.getElementById('service-restart-trigger')?.click()">
- <x-reicon name="restart" class="size-3.5 opacity-70" />
- Restart current version
- </button>
- @if ($serviceStatus->contains('running'))
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- @disabled(!auth()->user()->can('deploy', $service))
- @click="$wire.dispatch('pullAndRestartEvent'); open = false">
- <x-reicon name="refresh" class="size-3.5 opacity-70" />
- Pull latest and restart
- </button>
- @endif
- <button type="button" class="listbox-option justify-start! gap-2.5!"
- @disabled(!auth()->user()->can('stop', $service))
- @click="open = false; document.getElementById('service-stop-trigger')?.click()">
- <x-reicon name="stop-circle" class="size-3.5 text-error" />
- Stop
- </button>
- @elseif (! $serviceStatus->contains('running'))
+ <x-split-action id="service-desktop-actions">
+ @if ($selectedResource && $selectedResource->container_present !== false && $selectedResourceStatus->startsWith('exited'))
+ <x-slot:main @click="document.getElementById('selected-resource-remove-trigger')?.click()">
+ <x-reicon name="trash" class="size-3.5" />
+ Remove container
+ </x-slot:main>
+ @elseif ($serviceStatus->contains('running') || $serviceStatus->contains('degraded'))
+ <x-slot:main x-bind:disabled="deploying"
+ @click="document.getElementById('service-restart-trigger')?.click()">
+ <x-loading-on-button x-show="deploying" x-cloak />
+ <x-reicon name="restart" class="size-3.5" x-show="!deploying" />
- <span x-text="deploying ? 'Restarting…' : 'Restart'">Restart</span>
++ <span x-text="deploying ? 'Restarting…' : 'Restart current version'">Restart current version</span>
+ </x-slot:main>
+ @if ($serviceStatus->contains('running'))
<button type="button" class="listbox-option justify-start! gap-2.5!"
- @disabled(!auth()->user()->can('deploy', $service))
- @click="deploying = true; $wire.dispatch('startEvent'); open = false">
- <x-reicon name="play-circle" class="size-3.5 opacity-70" />
- Deploy
+ @click="$wire.dispatch('pullAndRestartEvent'); open = false" role="menuitem">
+ <x-reicon name="refresh" class="size-3.5 opacity-70" />
- Restart (pull latest)
++ Pull latest and restart
</button>
@endif
- @if (! $serviceStatus->contains('running'))
- <div class="my-1 border-t border-coolgray-200 dark:border-coolgray-300" role="separator"></div>
- @endif
@if ($serviceStatus->contains('degraded'))
<button type="button" class="listbox-option justify-start! gap-2.5!"
- @disabled(!auth()->user()->can('deploy', $service))
- @click="$wire.dispatch('forceDeployEvent'); open = false">
+ @click="$wire.dispatch('forceDeployEvent'); open = false" role="menuitem">
<x-reicon name="refresh" class="size-3.5 opacity-70" />
Force Restart
</button>
diff --cc tests/Feature/ResourceHeadingUnifiedNavbarTest.php
index 66e5499715,4ade069a39..6af19d4ed6
--- a/tests/Feature/ResourceHeadingUnifiedNavbarTest.php
+++ b/tests/Feature/ResourceHeadingUnifiedNavbarTest.php
@@@ -256,11 -258,16 +258,12 @@@ it('promotes the primary application ac
expect($desktop)
->toContain('id="application-desktop-actions"')
- ->toContain('Actions')
+ ->toContain('<x-slot:main wire:click="deploy">')
->toContain('Deploy')
->toContain('Deploy (without cache)')
+ ->not->toContain('Redeploy')
->toContain('force_deploy_without_cache')
- ->toContain('deploy(true)')
- ->and($trigger)
- ->toContain('button button-highlighted')
- ->not->toContain('play-circle');
+ ->toContain('deploy(true)');
$mobile = str($heading)->before("@teleport('#resource-action-hud-slot')")->toString();