From ef2918c85bdd26fbb2df0cb4ce462129da135a63 Mon Sep 17 00:00:00 2001
From: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
Date: Mon, 11 Dec 2023 19:49:26 +0100
Subject: [PATCH] cleanup: remove docker volume validation (#2830)
* remove docker volume validation
* remove imports & linting
* remove missed
---
docs/docs/overrides/api.html | 2 +-
frontend/pages/admin/site-settings.vue | 66 ++------------------------
mealie/routes/admin/admin_about.py | 31 +-----------
mealie/schema/admin/__init__.py | 3 +-
mealie/schema/admin/about.py | 4 --
5 files changed, 8 insertions(+), 98 deletions(-)
diff --git a/docs/docs/overrides/api.html b/docs/docs/overrides/api.html
index 24abea5c24c6..a54d6bf3c398 100644
--- a/docs/docs/overrides/api.html
+++ b/docs/docs/overrides/api.html
@@ -14,7 +14,7 @@
diff --git a/frontend/pages/admin/site-settings.vue b/frontend/pages/admin/site-settings.vue
index 0c71d6c3e11b..1a1bd78546e9 100644
--- a/frontend/pages/admin/site-settings.vue
+++ b/frontend/pages/admin/site-settings.vue
@@ -1,5 +1,6 @@
+
@@ -7,6 +8,7 @@
{{ $t("settings.site-settings") }}
+
@@ -27,7 +29,6 @@
@@ -36,6 +37,7 @@
+
-
-
-
-
- {{ $t('settings.docker-volume') }}
-
- {{ $t('settings.docker-volume-help') }}
-
-
-
- {{ $t('settings.volumes-are-misconfigured') }}
-
- {{ $t('settings.volumes-are-configured-correctly') }}
-
-
- {{ $t('settings.status-unknown-try-running-a-validation') }}
-
-
-
-
- {{ $globals.icons.checkboxMarkedCircle }}
- {{ $t('settings.validate') }}
-
-
-
-
-
+
@@ -219,30 +188,6 @@ export default defineComponent({
components: { AppLoader },
layout: "admin",
setup() {
- // ==========================================================
- // Docker Volume Validation
- const docker = reactive({
- loading: false,
- state: DockerVolumeState.Unknown,
- });
- async function dockerValidate() {
- docker.loading = true;
- // Do API Check
- const { data } = await adminApi.about.checkDocker();
- if (data == null) {
- docker.state = DockerVolumeState.Error;
- return;
- }
- // Get File Contents
- const { data: fileContents } = await adminApi.about.getDockerValidateFileContents();
- if (data.text === fileContents) {
- docker.state = DockerVolumeState.Success;
- }
- else {
- docker.state = DockerVolumeState.Error;
- }
- docker.loading = false;
- }
const state = reactive({
loading: false,
address: "",
@@ -444,15 +389,12 @@ export default defineComponent({
text += `${item.text.toString()}: ${status}\n`;
});
text += `${i18n.tc("settings.email-configured")}: ${appConfig.value.emailReady ? i18n.tc("general.yes") : i18n.tc("general.no")}\n`;
- text += `${i18n.tc("settings.docker-volume")}: ${docker.state}`;
return text;
});
return {
bugReportDialog,
bugReportText,
DockerVolumeState,
- docker,
- dockerValidate,
simpleChecks,
appConfig,
validEmail,
diff --git a/mealie/routes/admin/admin_about.py b/mealie/routes/admin/admin_about.py
index ed906913d424..7df4f99f2f77 100644
--- a/mealie/routes/admin/admin_about.py
+++ b/mealie/routes/admin/admin_about.py
@@ -1,15 +1,10 @@
-import asyncio
-import random
-import shutil
-import string
-
-from fastapi import APIRouter, BackgroundTasks
+from fastapi import APIRouter
from recipe_scrapers import __version__ as recipe_scraper_version
from mealie.core.release_checker import get_latest_version
from mealie.core.settings.static import APP_VERSION
from mealie.routes._base import BaseAdminController, controller
-from mealie.schema.admin.about import AdminAboutInfo, AppStatistics, CheckAppConfig, DockerVolumeText
+from mealie.schema.admin.about import AdminAboutInfo, AppStatistics, CheckAppConfig
router = APIRouter(prefix="/about")
@@ -57,25 +52,3 @@ class AdminAboutController(BaseAdminController):
base_url_set=settings.BASE_URL != "http://localhost:8080",
is_up_to_date=APP_VERSION == "develop" or APP_VERSION == "nightly" or get_latest_version() == APP_VERSION,
)
-
- @router.get("/docker/validate", response_model=DockerVolumeText)
- def validate_docker_volume(self, bg: BackgroundTasks):
- validation_dir = self.folders.DATA_DIR / "docker-validation"
- validation_dir.mkdir(exist_ok=True)
-
- random_string = "".join(random.choice(string.ascii_uppercase + string.digits) for _ in range(100))
-
- with validation_dir.joinpath("validate.txt").open("w") as f:
- f.write(random_string)
-
- async def cleanup():
- await asyncio.sleep(60)
-
- try:
- shutil.rmtree(validation_dir)
- except Exception as e:
- self.logger.error(f"Failed to remove docker validation directory: {e}")
-
- bg.add_task(cleanup)
-
- return DockerVolumeText(text=random_string)
diff --git a/mealie/schema/admin/__init__.py b/mealie/schema/admin/__init__.py
index 5f2b2ea2adab..50f06197b0cf 100644
--- a/mealie/schema/admin/__init__.py
+++ b/mealie/schema/admin/__init__.py
@@ -1,5 +1,5 @@
# This file is auto-generated by gen_schema_exports.py
-from .about import AdminAboutInfo, AppInfo, AppStartupInfo, AppStatistics, AppTheme, CheckAppConfig, DockerVolumeText
+from .about import AdminAboutInfo, AppInfo, AppStartupInfo, AppStatistics, AppTheme, CheckAppConfig
from .backup import AllBackups, BackupFile, BackupOptions, CreateBackup, ImportJob
from .email import EmailReady, EmailSuccess, EmailTest
from .maintenance import MaintenanceLogs, MaintenanceStorageDetails, MaintenanceSummary
@@ -31,7 +31,6 @@ __all__ = [
"AppStatistics",
"AppTheme",
"CheckAppConfig",
- "DockerVolumeText",
"EmailReady",
"EmailSuccess",
"EmailTest",
diff --git a/mealie/schema/admin/about.py b/mealie/schema/admin/about.py
index 7df56820da27..738a6e6519a6 100644
--- a/mealie/schema/admin/about.py
+++ b/mealie/schema/admin/about.py
@@ -59,7 +59,3 @@ class CheckAppConfig(MealieModel):
ldap_ready: bool
base_url_set: bool
is_up_to_date: bool
-
-
-class DockerVolumeText(MealieModel):
- text: str