5 Commits

Author SHA1 Message Date
semantic-release-bot
8bd78a610f chore(release): 1.2.2 2026-03-10 12:52:57 +00:00
975b0f9718 Merge pull request 'fix/backup-ui-download' (#8) from fix/backup-ui-download into develop
All checks were successful
Release / release (push) Successful in 25s
Reviewed-on: #8
2026-03-10 12:52:33 +00:00
889d723e81 refactor: simplify backup result handling 2026-03-10 13:51:21 +01:00
4757c766f6 fix: align backup ui and downloads 2026-03-10 13:48:55 +01:00
acee6d471c fix: ssh connection correctif 2026-03-10 11:47:37 +01:00
7 changed files with 299 additions and 134 deletions

View File

@@ -1,3 +1,11 @@
## [1.2.2](https://gitea.malio.fr/MALIO-DEV/Supervisor/compare/v1.2.1...v1.2.2) (2026-03-10)
### Bug Fixes
* align backup ui and downloads ([4757c76](https://gitea.malio.fr/MALIO-DEV/Supervisor/commit/4757c766f613a1888b62716a2c6852c8d92e3f6e))
* ssh connection correctif ([acee6d4](https://gitea.malio.fr/MALIO-DEV/Supervisor/commit/acee6d471c63671bfb9bdef62a3b6e2ebe40ba55))
## [1.2.1](https://gitea.malio.fr/MALIO-DEV/Supervisor/compare/v1.2.0...v1.2.1) (2026-03-10) ## [1.2.1](https://gitea.malio.fr/MALIO-DEV/Supervisor/compare/v1.2.0...v1.2.1) (2026-03-10)

View File

@@ -1,15 +1,31 @@
<template> <template>
<div class="backup-card card-glow"> <div
class="backup-card card-glow"
:class="{
'card-glow-success': message && !isError,
'card-glow-error': message && isError
}"
>
<div class="card-header"> <div class="card-header">
<h2 class="card-title">Run Script</h2> <h2 class="card-title">Run Script</h2>
<span class="font-mono text-[10px] text-m-muted tracking-widest uppercase">Scripts</span> <span class="font-mono text-[10px] text-m-muted tracking-widest uppercase">Scripts</span>
</div> </div>
<div v-if="loading" class="status-box"> <div
v-if="loading"
class="status-box"
role="status"
aria-live="polite"
aria-busy="true"
>
Chargement des scripts... Chargement des scripts...
</div> </div>
<div v-else class="backup-list"> <div
v-else-if="scripts.length"
class="backup-list"
:aria-busy="runningKey !== null"
>
<button <button
v-for="item in scripts" v-for="item in scripts"
:key="item.key" :key="item.key"
@@ -17,6 +33,8 @@
class="backup-btn" class="backup-btn"
:class="{ 'backup-btn-active': active === item.key }" :class="{ 'backup-btn-active': active === item.key }"
:disabled="runningKey !== null" :disabled="runningKey !== null"
:aria-pressed="active === item.key"
:aria-label="`Executer ${item.label}`"
@click="runScript(item.key)" @click="runScript(item.key)"
> >
<div class="flex items-center gap-2.5"> <div class="flex items-center gap-2.5">
@@ -36,10 +54,25 @@
</button> </button>
</div> </div>
<div v-if="message" class="status-box" :class="statusClass"> <div
<p class="status-title">{{ message }}</p> v-else
<pre v-if="output" class="status-output">{{ output }}</pre> class="status-box status-empty"
role="status"
aria-live="polite"
>
Aucun script disponible.
</div> </div>
<div
v-if="message"
class="status-box"
:class="statusClass"
role="status"
:aria-live="isError ? 'assertive' : 'polite'"
>
<p class="status-title">{{ message }}</p>
</div>
</div> </div>
</template> </template>
@@ -51,6 +84,7 @@ type BackupScript = {
key: string key: string
label: string label: string
icon: string icon: string
downloadFolders?: string[]
} }
type BackupScriptListResponse = { type BackupScriptListResponse = {
@@ -61,27 +95,58 @@ type BackupScriptRunResponse = {
ok: boolean ok: boolean
key: string key: string
label: string label: string
downloadFolders?: string[]
output: string output: string
} }
type ScriptResult = {
key: string | null
label: string
output: string
isError: boolean
downloadFolders: string[]
}
const emit = defineEmits<{
result: [payload: ScriptResult]
}>()
const active = ref<string | null>(null) const active = ref<string | null>(null)
const loading = ref(true) const loading = ref(true)
const runningKey = ref<string | null>(null) const runningKey = ref<string | null>(null)
const scripts = ref<BackupScript[]>([]) const scripts = ref<BackupScript[]>([])
const output = ref("") const output = ref<string>("")
const message = ref("") const message = ref<string>("")
const isError = ref(false) const isError = ref(false)
const statusClass = computed(() => (isError.value ? "status-error" : "status-success")) const statusClass = computed(() => (isError.value ? "status-error" : "status-success"))
const loadScripts = async () => { const loadScripts = async () => {
loading.value = true loading.value = true
message.value = ""
output.value = ""
isError.value = false
emit("result", {
key: null,
label: "",
output: "",
isError: false,
downloadFolders: []
})
try { try {
const data = await $fetch<BackupScriptListResponse>("/api/backup-script") const data = await $fetch<BackupScriptListResponse>("/api/backup-script")
scripts.value = data.scripts scripts.value = data.scripts
} catch (error) { } catch (error) {
scripts.value = []
isError.value = true isError.value = true
message.value = `Erreur chargement scripts: ${error instanceof Error ? error.message : String(error)}` message.value = `Erreur chargement scripts: ${error instanceof Error ? error.message : String(error)}`
emit("result", {
key: null,
label: "",
output: "",
isError: true,
downloadFolders: []
})
} finally { } finally {
loading.value = false loading.value = false
} }
@@ -99,12 +164,26 @@ const runScript = async (key: string) => {
method: "POST", method: "POST",
body: { key } body: { key }
}) })
message.value = `${data.label} execute` message.value = `${data.label} execute avec succes`
output.value = data.output output.value = data.output || "Aucune sortie retournee."
emit("result", {
key: data.key,
label: data.label,
output: output.value,
isError: false,
downloadFolders: data.downloadFolders || []
})
} catch (error: any) { } catch (error: any) {
isError.value = true isError.value = true
message.value = error?.data?.statusMessage || "Erreur execution script" message.value = error?.data?.statusMessage || "Erreur execution script"
output.value = "" output.value = ""
emit("result", {
key,
label: scripts.value.find((item) => item.key === key)?.label || key,
output: "",
isError: true,
downloadFolders: []
})
} finally { } finally {
runningKey.value = null runningKey.value = null
} }
@@ -154,6 +233,11 @@ onMounted(loadScripts)
color: rgb(var(--m-text)); color: rgb(var(--m-text));
} }
.backup-btn:focus-visible {
outline: 2px solid rgb(var(--m-accent) / 0.7);
outline-offset: 2px;
}
.backup-btn:disabled { .backup-btn:disabled {
cursor: wait; cursor: wait;
opacity: 0.7; opacity: 0.7;
@@ -188,14 +272,12 @@ onMounted(loadScripts)
border: 1px solid rgb(255 99 99 / 0.3); border: 1px solid rgb(255 99 99 / 0.3);
} }
.status-title { .status-empty {
margin: 0;
}
.status-output {
margin: 0.75rem 0 0;
white-space: pre-wrap;
word-break: break-word;
color: rgb(var(--m-muted)); color: rgb(var(--m-muted));
} }
.status-title {
margin: 0;
line-height: 1.5;
}
</style> </style>

View File

@@ -23,6 +23,7 @@
<BackupRun <BackupRun
class="animate-fade-in-up" class="animate-fade-in-up"
style="animation-delay: 180ms" style="animation-delay: 180ms"
@result="handleScriptResult"
/> />
</section> </section>
@@ -45,6 +46,47 @@
:folder="selectedBackup" :folder="selectedBackup"
/> />
</div> </div>
<section
class="files-panel output-panel animate-fade-in-up"
style="animation-delay: 300ms"
aria-labelledby="backup-output-title"
>
<div class="files-panel-header">
<div>
<p class="section-kicker">Execution</p>
<h2 id="backup-output-title" class="files-panel-title">Resultat du script</h2>
</div>
<span
class="panel-badge"
:class="{
'panel-badge-idle': !scriptResult.label,
'panel-badge-success': scriptResult.label && !scriptResult.isError,
'panel-badge-error': scriptResult.isError
}"
>
{{ scriptResult.label || "Pret" }}
</span>
</div>
<div
v-if="!scriptResult.output"
class="output-empty"
role="status"
aria-live="polite"
>
<p class="output-empty-title">Aucune sortie disponible</p>
<p class="output-empty-text">
Lancez un script depuis le panneau de gauche pour afficher son retour ici.
</p>
</div>
<pre
v-else
class="output-console"
:class="{ 'output-console-error': scriptResult.isError }"
>{{ scriptResult.output }}</pre>
</section>
</section> </section>
</div> </div>
</div> </div>
@@ -57,7 +99,62 @@ import BackupRun from "~/components/BackupRun.vue"
definePageMeta({ layout: false }) definePageMeta({ layout: false })
type ScriptResult = {
key: string | null
label: string
output: string
isError: boolean
downloadFolders: string[]
}
const emptyScriptResult = (): ScriptResult => ({
key: null,
label: "",
output: "",
isError: false,
downloadFolders: []
})
const selectedBackup = ref<string | null>(null) const selectedBackup = ref<string | null>(null)
const scriptResult = ref<ScriptResult>(emptyScriptResult())
const fetchLatestBackup = async (folder: string) => {
const files = await $fetch<string[]>(`/api/backups?folder=${encodeURIComponent(folder)}`)
return files[0] || null
}
const triggerDownload = (folder: string, file: string) => {
const link = document.createElement("a")
link.href = `/api/download?folder=${encodeURIComponent(folder)}&file=${encodeURIComponent(file)}`
link.style.display = "none"
document.body.appendChild(link)
link.click()
link.remove()
}
const downloadLatestBackup = async (folder: string) => {
const latestFile = await fetchLatestBackup(folder)
if (latestFile) {
triggerDownload(folder, latestFile)
}
}
const handleScriptResult = async (payload: ScriptResult) => {
scriptResult.value = { ...emptyScriptResult(), ...payload }
if (payload.isError || payload.downloadFolders.length === 0) {
return
}
for (const folder of payload.downloadFolders) {
try {
await downloadLatestBackup(folder)
} catch (error) {
console.error(`Erreur telechargement automatique pour ${folder}:`, error)
}
}
}
</script> </script>
<style scoped> <style scoped>
@@ -93,108 +190,6 @@ const selectedBackup = ref<string | null>(null)
line-height: 1.65; line-height: 1.65;
} }
.selection-card {
padding: 1.25rem;
border-radius: 16px;
background:
linear-gradient(180deg, rgb(var(--m-secondary)), rgb(var(--m-tertiary)));
}
.selection-label {
margin: 0;
font-family: var(--font-mono);
font-size: 0.7rem;
letter-spacing: 0.16em;
text-transform: uppercase;
color: rgb(var(--m-muted));
}
.selection-value {
margin: 0.65rem 0 0;
font-size: 1.1rem;
font-weight: 700;
color: rgb(var(--m-text));
}
.selection-description {
margin: 0.5rem 0 0;
color: rgb(var(--m-muted));
line-height: 1.6;
}
.intro-panel {
position: relative;
overflow: hidden;
margin-bottom: 1.5rem;
padding: 1.5rem;
border-radius: 20px;
background:
radial-gradient(circle at top right, rgb(var(--m-accent) / 0.12), transparent 28%),
linear-gradient(180deg, rgb(var(--m-secondary)), rgb(var(--m-secondary) / 0.82));
}
.intro-panel::after {
content: "";
position: absolute;
inset: 0;
border: 1px solid rgb(var(--m-accent) / 0.08);
border-radius: inherit;
pointer-events: none;
}
.intro-title {
margin: 0;
font-family: var(--font-display);
font-size: clamp(1.5rem, 2.2vw, 2rem);
font-weight: 700;
line-height: 1.15;
color: rgb(var(--m-text));
}
.intro-description {
max-width: 68ch;
margin: 0.85rem 0 0;
color: rgb(var(--m-muted));
line-height: 1.7;
}
.workflow-grid {
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
gap: 1rem;
margin-top: 1.5rem;
}
.workflow-step {
padding: 1rem;
border: 1px solid rgb(var(--m-accent) / 0.08);
border-radius: 16px;
background: rgb(var(--m-bg) / 0.24);
backdrop-filter: blur(4px);
}
.workflow-index {
display: inline-block;
margin-bottom: 0.75rem;
font-family: var(--font-mono);
font-size: 0.75rem;
letter-spacing: 0.16em;
color: rgb(var(--m-accent));
}
.workflow-title {
margin: 0;
font-size: 1rem;
font-weight: 700;
color: rgb(var(--m-text));
}
.workflow-text {
margin: 0.45rem 0 0;
color: rgb(var(--m-muted));
line-height: 1.6;
}
.dashboard-grid { .dashboard-grid {
display: grid; display: grid;
grid-template-columns: 300px minmax(0, 1fr); grid-template-columns: 300px minmax(0, 1fr);
@@ -217,6 +212,10 @@ const selectedBackup = ref<string | null>(null)
border: 1px solid rgb(var(--m-accent) / 0.08); border: 1px solid rgb(var(--m-accent) / 0.08);
} }
.output-panel {
min-height: 220px;
}
.files-panel-header { .files-panel-header {
display: flex; display: flex;
align-items: end; align-items: end;
@@ -243,10 +242,86 @@ const selectedBackup = ref<string | null>(null)
text-align: right; text-align: right;
} }
.panel-badge {
display: inline-flex;
align-items: center;
border-radius: 999px;
padding: 0.35rem 0.7rem;
font-family: var(--font-mono);
font-size: 0.68rem;
letter-spacing: 0.08em;
text-transform: uppercase;
border: 1px solid transparent;
}
.panel-badge-idle {
color: rgb(var(--m-muted));
background: rgb(var(--m-tertiary) / 0.45);
border-color: rgb(var(--m-border) / 0.25);
}
.panel-badge-success {
color: rgb(var(--m-success));
background: rgb(var(--m-success) / 0.08);
border-color: rgb(var(--m-success) / 0.18);
}
.panel-badge-error {
color: rgb(var(--m-error));
background: rgb(var(--m-error) / 0.08);
border-color: rgb(var(--m-error) / 0.18);
}
.output-empty {
display: flex;
min-height: 132px;
flex-direction: column;
justify-content: center;
border-radius: 14px;
border: 1px dashed rgb(var(--m-border) / 0.55);
background: rgb(var(--m-tertiary) / 0.38);
padding: 1.25rem;
}
.output-empty-title {
margin: 0;
font-family: var(--font-display);
font-size: 1rem;
font-weight: 700;
color: rgb(var(--m-text));
}
.output-empty-text {
margin: 0.5rem 0 0;
max-width: 52ch;
color: rgb(var(--m-muted));
line-height: 1.65;
}
.output-console {
margin: 0;
min-height: 132px;
overflow-x: auto;
border-radius: 14px;
border: 1px solid rgb(var(--m-border) / 0.3);
background:
linear-gradient(180deg, rgb(var(--m-bg) / 0.96), rgb(var(--m-secondary) / 0.92));
padding: 1rem 1.1rem;
font-family: var(--font-mono);
font-size: 0.78rem;
line-height: 1.7;
white-space: pre-wrap;
word-break: break-word;
color: rgb(var(--m-success));
}
.output-console-error {
color: rgb(var(--m-error));
}
@media (max-width: 1180px) { @media (max-width: 1180px) {
.dashboard-header, .dashboard-header,
.dashboard-grid, .dashboard-grid {
.workflow-grid {
grid-template-columns: 1fr; grid-template-columns: 1fr;
} }
@@ -265,14 +340,8 @@ const selectedBackup = ref<string | null>(null)
padding: 4.5rem 1.25rem 1.25rem; padding: 4.5rem 1.25rem 1.25rem;
} }
.intro-panel,
.selection-card,
.files-panel { .files-panel {
padding: 1rem; padding: 1rem;
} }
.workflow-grid {
margin-top: 1rem;
}
} }
</style> </style>

View File

@@ -4,15 +4,17 @@ type BackupScript = {
key: string key: string
label: string label: string
icon?: string icon?: string
downloadFolders?: string[]
command: string command: string
} }
export default defineEventHandler(() => { export default defineEventHandler(() => {
return { return {
scripts: (scripts as BackupScript[]).map(({ key, label, icon }) => ({ scripts: (scripts as BackupScript[]).map(({ key, label, icon, downloadFolders }) => ({
key, key,
label, label,
icon: icon || "mdi:play-circle-outline" icon: icon || "mdi:play-circle-outline",
downloadFolders: downloadFolders || []
})) }))
} }
}) })

View File

@@ -4,6 +4,7 @@ import scripts from "../config/backup-script.json"
type BackupScript = { type BackupScript = {
key: string key: string
label: string label: string
downloadFolders?: string[]
command: string command: string
} }
@@ -44,6 +45,7 @@ export default defineEventHandler(async (event) => {
ok: true, ok: true,
key: script.key, key: script.key,
label: script.label, label: script.label,
downloadFolders: script.downloadFolders || [],
output: output.trim() output: output.trim()
} }
} catch (error) { } catch (error) {

View File

@@ -3,18 +3,20 @@
"key": "backup-bdd-recette", "key": "backup-bdd-recette",
"label": "Backup BDD recette", "label": "Backup BDD recette",
"icon": "mdi:database-export", "icon": "mdi:database-export",
"command": "ssh malio-b@192.168.0.179 'cd /home/malio-b/Malio-ops/RecetteScripts && bash backup-bdd-recette.sh && exit'" "downloadFolders": ["ferme", "inventory", "sirh", "user"],
"command": "ssh ferme 'cd /home/malio/Malio-ops/RecetteScripts && bash backup-bdd-recette.sh && exit'"
}, },
{ {
"key": "check-statut-recette", "key": "check-statut-recette",
"label": "Check statut recette", "label": "Check statut recette",
"icon": "mdi:server-network", "icon": "mdi:server-network",
"command": "ssh malio-b@192.168.0.179 'cd /home/malio-b/Malio-ops/RecetteScripts && bash check-statut-recette.sh && exit'" "command": "ssh ferme 'cd /home/malio/Malio-ops/RecetteScripts && bash check-statut-recette.sh && exit'"
}, },
{ {
"key": "backup-vaultwarden", "key": "backup-vaultwarden",
"label": "Backup vaultwarden", "label": "Backup vaultwarden",
"icon": "mdi:data", "icon": "mdi:data",
"command": "ssh malio-b@192.168.0.179 'cd /home/malio-b/Malio-ops/BackupVaultWarden && bash backup-vaultwarden.sh && exit'" "downloadFolders": ["bitwarden"],
"command": "ssh bitwarden 'cd /home/matt/vaultwarden/Malio-ops/BackupVaultWarden && bash backup-vaultwarden.sh && exit'"
} }
] ]

View File

@@ -2,7 +2,7 @@
{ {
"key": "remote", "key": "remote",
"label": "Serveur distant", "label": "Serveur distant",
"command": "ssh malio-b@192.168.0.179 'cd /home/malio-b/Malio-ops/CheckStorage && bash check-storage.sh && exit'" "command": "ssh malio-b 'cd /home/malio-b/Malio-ops/CheckStorage && bash check-storage.sh && exit'"
}, },
{ {
"key": "local", "key": "local",