Remove legacy settings cache TTL

Closes #278
VedaWebProject · Jul 12, 2024 · cf1a9be · cf1a9be
1 parent 5a4cc03
commit cf1a9be
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 32 deletions.
diff --git a/.env.docker b/.env.docker
@@ -34,9 +34,6 @@ TEKST_SERVER_URL=http://127.0.0.1:8087
 # TEKST_LOG_LEVEL=warning
 # default: warning
 
-# TEKST_SETTINGS_CACHE_TTL=60
-# default: 60
-
 # TEKST_TEMP_FILES_DIR=/tmp/tekst_tmp
 # default: /tmp/tekst_tmp
 

diff --git a/Tekst-API/.env.template b/Tekst-API/.env.template
@@ -34,9 +34,6 @@
 # TEKST_LOG_LEVEL=warning
 # default: warning
 
-# TEKST_SETTINGS_CACHE_TTL=60
-# default: 60
-
 # TEKST_TEMP_FILES_DIR=/tmp/tekst_tmp
 # default: /tmp/tekst_tmp
 

diff --git a/Tekst-API/.env.test b/Tekst-API/.env.test
@@ -4,8 +4,6 @@ TEKST_DEV_MODE=true
 TEKST_LOG_LEVEL=debug
 TEKST_DEV__USE_ES=false
 
-TEKST_SETTINGS_CACHE_TTL=0
-
 # database (MongoDB)
 TEKST_DB__NAME=tekst_testing
 

diff --git a/Tekst-API/openapi.json b/Tekst-API/openapi.json
@@ -11898,10 +11898,6 @@
             "type": "array",
             "title": "Infosegments"
           },
-          "settingsCacheTtl": {
-            "type": "integer",
-            "title": "Settingscachettl"
-          },
           "tekst": {
             "additionalProperties": {
               "type": "string"
@@ -11917,7 +11913,6 @@
           "security",
           "systemSegments",
           "infoSegments",
-          "settingsCacheTtl",
           "tekst"
         ],
         "title": "PlatformData",

diff --git a/Tekst-API/tekst/config.py b/Tekst-API/tekst/config.py
@@ -314,7 +314,6 @@ class TekstConfig(BaseSettings):
     dev_mode: bool = False
     log_level: str = "warning"
 
-    settings_cache_ttl: int = 60
     temp_files_dir: DirectoryPath = "/tmp/tekst_tmp"
 
     # config sub sections

diff --git a/Tekst-API/tekst/models/platform.py b/Tekst-API/tekst/models/platform.py
@@ -26,7 +26,6 @@ class PlatformData(ModelBase):
     security: PlatformSecurityInfo
     system_segments: list[ClientSegmentRead]
     info_segments: list[ClientSegmentHead]
-    settings_cache_ttl: int
     tekst: dict[str, str]
 
 

diff --git a/Tekst-API/tekst/routers/platform.py b/Tekst-API/tekst/routers/platform.py
@@ -55,7 +55,6 @@ async def get_platform_data(ou: OptionalUserDep, cfg: ConfigDep) -> dict:
     return PlatformData(
         texts=await get_all_texts(ou),
         settings=await get_settings(),
-        settings_cache_ttl=cfg.settings_cache_ttl,
         security=PlatformSecurityInfo(),
         system_segments=await ClientSegmentDocument.find(
             ClientSegmentDocument.is_system_segment == True  # noqa: E712

diff --git a/Tekst-Web/src/api/schema.d.ts b/Tekst-Web/src/api/schema.d.ts
@@ -3084,8 +3084,6 @@ export interface components {
       systemSegments: components['schemas']['ClientSegmentRead'][];
       /** Infosegments */
       infoSegments: components['schemas']['ClientSegmentHead'][];
-      /** Settingscachettl */
-      settingsCacheTtl: number;
       /** Tekst */
       tekst: {
         [key: string]: string;

diff --git a/Tekst-Web/src/views/admin/AdminSystemSettingsView.vue b/Tekst-Web/src/views/admin/AdminSystemSettingsView.vue
@@ -65,13 +65,7 @@ async function handleSaveClick() {
         // If the current locale is invalid after updating the settings,
         // this call will fix it!
         await state.setLocale(state.locale);
-        message.success(
-          $t('admin.system.platformSettings.msgSaved', {
-            cacheTTL: pfData.value?.settingsCacheTtl,
-          }),
-          undefined,
-          10
-        );
+        message.success($t('admin.system.platformSettings.msgSaved'), undefined, 10);
       } else {
         resetForm();
       }

diff --git a/Tekst-Web/translations/ui/deDE.yml b/Tekst-Web/translations/ui/deDE.yml
@@ -759,10 +759,7 @@ admin:
       heading: Einstellungen
       headingInfo: Plattform-Informationen
       headingOptions: Optionen
-      msgSaved: |
-        Plattform-Einstellungen gespeichert.
-        Bitte beachten Sie, dass es bis zu {cacheTTL} Sekunden dauern kann,
-        bis die Änderungen sich auf spätere Anfragen auswirken.
+      msgSaved: Plattform-Einstellungen gespeichert.
       defaultTextPlaceholder: Automatisch
       formLabelDisplay: Darstellung
     maintenance:

diff --git a/Tekst-Web/translations/ui/enUS.yml b/Tekst-Web/translations/ui/enUS.yml
@@ -734,8 +734,7 @@ admin:
       heading: Settings
       headingInfo: Platform Information
       headingOptions: Options
-      msgSaved: |
-        Platform settings saved. Please note that it may take up to {cacheTTL} seconds for the changes to take effect on subsequent page loads.
+      msgSaved: Platform settings saved.
       defaultTextPlaceholder: Automatic
       formLabelDisplay: Display
     maintenance:

diff --git a/docs/content/setup/configuration.md b/docs/content/setup/configuration.md
@@ -18,7 +18,6 @@ Basic configuration, URL, paths, ...
 | `TEKST_WEB_STATIC_DIR` | Local path to static web files directory (String – default: `/var/www/tekst/static/`) |
 | `TEKST_DEV_MODE` | Development mode – only use for development! (Boolean – default: `false`) |
 | `TEKST_LOG_LEVEL` | API log level (`DEBUG` | `INFO` | `WARNING` | `ERROR` | `CRITICAL` – default: `WARNING`) |
-| `TEKST_SETTINGS_CACHE_TTL` | Time-To-Live for the API settings cache (in seconds) (Integer – default: `60`) |
 | `TEKST_TEMP_FILES_DIR` | Absolute path to local temporary directory to use (String – default: `/tmp/tekst_tmp`) |