This commit is contained in:
Andras Bacsai
2022-10-18 12:43:35 +02:00
parent 877577efdb
commit 8fbd08003c
2 changed files with 31 additions and 23 deletions

View File

@@ -319,27 +319,7 @@
Loading... Loading...
</button> </button>
{:else if $status.application.overallStatus === 'healthy'} {:else if $status.application.overallStatus === 'healthy'}
<button
on:click={stopApplication}
type="submit"
disabled={!$isDeploymentEnabled}
class="btn btn-sm gap-2"
>
<svg
xmlns="http://www.w3.org/2000/svg"
class="w-6 h-6 text-error"
viewBox="0 0 24 24"
stroke-width="1.5"
stroke="currentColor"
fill="none"
stroke-linecap="round"
stroke-linejoin="round"
>
<path stroke="none" d="M0 0h24v24H0z" fill="none" />
<rect x="6" y="5" width="4" height="14" rx="1" />
<rect x="14" y="5" width="4" height="14" rx="1" />
</svg> Stop
</button>
{#if application.buildPack !== 'compose'} {#if application.buildPack !== 'compose'}
<button <button
on:click={restartApplication} on:click={restartApplication}
@@ -387,6 +367,27 @@
Force Redeploy Force Redeploy
</button> </button>
<button
on:click={stopApplication}
type="submit"
disabled={!$isDeploymentEnabled}
class="btn btn-sm gap-2"
>
<svg
xmlns="http://www.w3.org/2000/svg"
class="w-6 h-6 text-error"
viewBox="0 0 24 24"
stroke-width="1.5"
stroke="currentColor"
fill="none"
stroke-linecap="round"
stroke-linejoin="round"
>
<path stroke="none" d="M0 0h24v24H0z" fill="none" />
<rect x="6" y="5" width="4" height="14" rx="1" />
<rect x="14" y="5" width="4" height="14" rx="1" />
</svg> Stop
</button>
{:else if $isDeploymentEnabled && !$page.url.pathname.startsWith(`/applications/${id}/configuration/`)} {:else if $isDeploymentEnabled && !$page.url.pathname.startsWith(`/applications/${id}/configuration/`)}
{#if $status.application.overallStatus === 'degraded'} {#if $status.application.overallStatus === 'degraded'}
<button <button

View File

@@ -435,7 +435,6 @@
<div class="title font-bold pb-3">{template[oneService].name}</div> <div class="title font-bold pb-3">{template[oneService].name}</div>
<ServiceStatus id={oneService} /> <ServiceStatus id={oneService} />
</div> </div>
<div class="grid grid-flow-row gap-2 px-4"> <div class="grid grid-flow-row gap-2 px-4">
{#if template[oneService].environment.length > 0} {#if template[oneService].environment.length > 0}
{#each template[oneService].environment as variable} {#each template[oneService].environment as variable}
@@ -463,9 +462,17 @@
<option value="true">true</option> <option value="true">true</option>
<option value="false"> false</option> <option value="false"> false</option>
</select> </select>
{:else if variable.defaultValue === '$$generate_password'}
<CopyPasswordField
isPasswordField
readonly
disabled
name={variable.name}
id={variable.name}
value={variable.value}
/>
{:else} {:else}
<CopyPasswordField <CopyPasswordField
isPasswordField={variable.defaultValue === '$$generate_password'}
readonly={isDisabled} readonly={isDisabled}
disabled={isDisabled} disabled={isDisabled}
name={variable.name} name={variable.name}