fix
This commit is contained in:
parent
a4c5105d78
commit
9d6557bacb
@ -87,4 +87,10 @@ class Previews extends Component
|
|||||||
return general_error_handler(err: $e, that: $this);
|
return general_error_handler(err: $e, that: $this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public function previewRefresh()
|
||||||
|
{
|
||||||
|
$this->application->previews->each(function ($preview) {
|
||||||
|
$preview->refresh();
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,6 +24,9 @@ class Upgrade extends Component
|
|||||||
public function upgrade()
|
public function upgrade()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
if ($this->showProgress) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
$this->showProgress = true;
|
$this->showProgress = true;
|
||||||
resolve(UpdateCoolify::class)(true);
|
resolve(UpdateCoolify::class)(true);
|
||||||
Toaster::success("Upgrading to {$this->latestVersion} version...");
|
Toaster::success("Upgrading to {$this->latestVersion} version...");
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
return '4.0.0-nightly.21';
|
return '4.0.0-nightly.22';
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
@if ($type === 'password')
|
@if ($type === 'password')
|
||||||
<div class="w-full rounded join" x-data>
|
<div class="w-full rounded join" x-data>
|
||||||
<input {{ $attributes }} class="join-item" wire:model.defer={{ $id }}
|
<input {{ $attributes }} class="join-item" wire:model.defer={{ $id }}
|
||||||
wire:dirty.class="input-warning" @readonly($readonly) @disabled($disabled)
|
wire:dirty.class="input-warning" wire:loading.attr='disabled' @readonly($readonly)
|
||||||
type={{ $type }} id={{ $id }} name={{ $name }}
|
@disabled($disabled) type={{ $type }} id={{ $id }}
|
||||||
@isset($value) value={{ $value }} @endisset
|
name={{ $name }} @isset($value) value={{ $value }} @endisset
|
||||||
@isset($placeholder) placeholder={{ $placeholder }} @endisset>
|
@isset($placeholder) placeholder={{ $placeholder }} @endisset>
|
||||||
@if (!$cannotPeakPassword)
|
@if (!$cannotPeakPassword)
|
||||||
<span x-on:click="changePasswordFieldType" x-cloak @class([
|
<span x-on:click="changePasswordFieldType" x-cloak @class([
|
||||||
@ -41,8 +41,9 @@
|
|||||||
</div>
|
</div>
|
||||||
@else
|
@else
|
||||||
<input {{ $attributes }} id={{ $id }} name={{ $name }}
|
<input {{ $attributes }} id={{ $id }} name={{ $name }}
|
||||||
wire:model.defer={{ $id }} wire:dirty.class="input-warning" @readonly($readonly)
|
wire:model.defer={{ $id }} wire:dirty.class="input-warning" wire:loading.attr='disabled'
|
||||||
@disabled($disabled) @isset($value) value={{ $value }} @endisset
|
@readonly($readonly) @disabled($disabled)
|
||||||
|
@isset($value) value={{ $value }} @endisset
|
||||||
@isset($placeholder) placeholder={{ $placeholder }} @endisset>
|
@isset($placeholder) placeholder={{ $placeholder }} @endisset>
|
||||||
@endif
|
@endif
|
||||||
@if (!$label && $helper)
|
@if (!$label && $helper)
|
||||||
|
@ -66,6 +66,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function revive() {
|
function revive() {
|
||||||
|
if (checkHealthInterval) return true;
|
||||||
console.log('Checking server\'s health...')
|
console.log('Checking server\'s health...')
|
||||||
checkHealthInterval = setInterval(() => {
|
checkHealthInterval = setInterval(() => {
|
||||||
fetch('/api/health')
|
fetch('/api/health')
|
||||||
@ -85,6 +86,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function upgrade() {
|
function upgrade() {
|
||||||
|
if (checkIfIamDeadInterval) return true;
|
||||||
console.log('Update initiated.')
|
console.log('Update initiated.')
|
||||||
checkIfIamDeadInterval = setInterval(() => {
|
checkIfIamDeadInterval = setInterval(() => {
|
||||||
fetch('/api/health')
|
fetch('/api/health')
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="gap-4 pt-10 sm:mt-4 sm:flex">
|
<div class="gap-4 pt-10 sm:mt-4 sm:flex">
|
||||||
<x-forms.button class="w-24 bg-coolgray-100 hover:bg-coolgray-100"
|
<x-forms.button class="w-24 bg-coolgray-200 hover:bg-coolgray-100"
|
||||||
x-on:click="{{ $show }} = false" type="button">Cancel
|
x-on:click="{{ $show }} = false" type="button">Cancel
|
||||||
</x-forms.button>
|
</x-forms.button>
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
@if ($application->previews->count() > 0)
|
@if ($application->previews->count() > 0)
|
||||||
<h4 class="pt-4">Preview Deployments</h4>
|
<h4 class="py-4" wire:poll.10000ms='previewRefresh'>Deployed Previews</h4>
|
||||||
<div class="flex gap-6 ">
|
<div class="flex gap-6 ">
|
||||||
@foreach ($application->previews as $preview)
|
@foreach ($application->previews as $preview)
|
||||||
<div class="flex flex-col p-4 bg-coolgray-200 " x-init="$wire.loadStatus('{{ data_get($preview, 'pull_request_id') }}')">
|
<div class="flex flex-col p-4 bg-coolgray-200 " x-init="$wire.loadStatus('{{ data_get($preview, 'pull_request_id') }}')">
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<li title="New version available" x-init="$wire.checkUpdate" x-data>
|
<li title="New version available" x-init="$wire.checkUpdate" x-data>
|
||||||
@if ($isUpgradeAvailable)
|
@if ($isUpgradeAvailable)
|
||||||
<div wire:click='upgrade' class="hover:bg-transparent focus:bg-transparent" x-on:click="upgrade" <button>
|
<button wire:click='upgrade' class="hover:bg-transparent focus:bg-transparent" x-on:click="upgrade">
|
||||||
@if ($showProgress)
|
@if ($showProgress)
|
||||||
<svg xmlns="http://www.w3.org/2000/svg"
|
<svg xmlns="http://www.w3.org/2000/svg"
|
||||||
class="w-6 h-6 text-pink-500 transition-colors hover:text-pink-300 lds-heart" viewBox="0 0 24 24"
|
class="w-6 h-6 text-pink-500 transition-colors hover:text-pink-300 lds-heart" viewBox="0 0 24 24"
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
"version": "3.12.32"
|
"version": "3.12.32"
|
||||||
},
|
},
|
||||||
"v4": {
|
"v4": {
|
||||||
"version": "4.0.0-nightly.21"
|
"version": "4.0.0-nightly.22"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user