From e46d23f4d671db666fb0ef2ddd8cf8d7661b8fa4 Mon Sep 17 00:00:00 2001 From: tlindi Date: Fri, 23 May 2025 19:15:47 +0300 Subject: [PATCH 1/7] Implement App data management to js --- rootfs/standard/var/www/mynode/static/js/manage_apps.js | 1 + 1 file changed, 1 insertion(+) diff --git a/rootfs/standard/var/www/mynode/static/js/manage_apps.js b/rootfs/standard/var/www/mynode/static/js/manage_apps.js index badfcb17c..acfb6a2af 100644 --- a/rootfs/standard/var/www/mynode/static/js/manage_apps.js +++ b/rootfs/standard/var/www/mynode/static/js/manage_apps.js @@ -153,6 +153,7 @@ function restore_data_folder_via_api(name, short_name) { $('#loading_spinner_message').html("Restoring..."); $('#loading_spinner_overlay').fadeIn(); $.get('/api/restore_data_folder?app='+short_name) + .done(function( data ) { if (data != "OK") { alert("Error restoring app data: "+data) From cac88773c22949002e4383f78e0933e836c6f3a6 Mon Sep 17 00:00:00 2001 From: tlindi Date: Thu, 29 May 2025 14:44:40 +0300 Subject: [PATCH 2/7] app_data was reserved changed to data_folder which is used as variable on application_info.py --- rootfs/standard/var/www/mynode/static/js/manage_apps.js | 1 - 1 file changed, 1 deletion(-) diff --git a/rootfs/standard/var/www/mynode/static/js/manage_apps.js b/rootfs/standard/var/www/mynode/static/js/manage_apps.js index acfb6a2af..badfcb17c 100644 --- a/rootfs/standard/var/www/mynode/static/js/manage_apps.js +++ b/rootfs/standard/var/www/mynode/static/js/manage_apps.js @@ -153,7 +153,6 @@ function restore_data_folder_via_api(name, short_name) { $('#loading_spinner_message').html("Restoring..."); $('#loading_spinner_overlay').fadeIn(); $.get('/api/restore_data_folder?app='+short_name) - .done(function( data ) { if (data != "OK") { alert("Error restoring app data: "+data) From 5b3df5257f28273258864547e7f27cd732c91268 Mon Sep 17 00:00:00 2001 From: tlindi Date: Fri, 23 May 2025 19:52:58 +0300 Subject: [PATCH 3/7] simplify API of reset Implement simplification per requested at https://github.com/mynodebtc/mynode/pull/945#discussion_r2125608600 --- rootfs/standard/var/www/mynode/api.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/rootfs/standard/var/www/mynode/api.py b/rootfs/standard/var/www/mynode/api.py index 5d8b27506..d87848d6b 100644 --- a/rootfs/standard/var/www/mynode/api.py +++ b/rootfs/standard/var/www/mynode/api.py @@ -153,12 +153,12 @@ def api_restart_app(): def api_backup_data_folder(): check_logged_in() - app = request.args.get("app") - if not app: + short_name = request.args.get("short_name") + if not short_name: return "NO_APP_SPECIFIED" - if not is_application_valid(app): + if not is_application_valid(short_name): return "INVALID_APP_NAME" - if not backup_data_folder(app): + if not backup_data_folder(short_name): return "ERROR" return "OK" @@ -166,12 +166,12 @@ def api_backup_data_folder(): def api_restore_data_folder(): check_logged_in() - app = request.args.get("app") - if not app: + short_name = request.args.get("short_name") + if not short_name: return "NO_APP_SPECIFIED" - if not is_application_valid(app): + if not is_application_valid(short_name): return "INVALID_APP_NAME" - if not restore_data_folder(app): + if not restore_data_folder(short_name): return "ERROR" return "OK" @@ -179,12 +179,12 @@ def api_restore_data_folder(): def api_reset_data_folder(): check_logged_in() - app = request.args.get("app") - if not app: + short_name = request.args.get("short_name") + if not short_name: return "NO_APP_SPECIFIED" - if not is_application_valid(app): + if not is_application_valid(short_name): return "INVALID_APP_NAME" - if not reset_data_folder(app): + if not reset_data_folder(short_name): return "ERROR" return "OK" From 94f9097922228957175bedca1728a876a375a964 Mon Sep 17 00:00:00 2001 From: tlindi Date: Fri, 13 Jun 2025 17:15:58 +0300 Subject: [PATCH 4/7] [FIX] Implement App data management on js --- rootfs/standard/var/www/mynode/static/js/manage_apps.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rootfs/standard/var/www/mynode/static/js/manage_apps.js b/rootfs/standard/var/www/mynode/static/js/manage_apps.js index badfcb17c..17c659841 100644 --- a/rootfs/standard/var/www/mynode/static/js/manage_apps.js +++ b/rootfs/standard/var/www/mynode/static/js/manage_apps.js @@ -137,7 +137,7 @@ function backup_data_folder_via_api(name, short_name) { if ( confirm("Are you sure you want to backup "+name+"? This will stop the app, backup data, and restart the app.") ) { $('#loading_spinner_message').html("Making backup..."); $('#loading_spinner_overlay').fadeIn(); - $.get('/api/backup_data_folder?app='+short_name) + $.get('/api/backup_data_folder?short_name=' + short_name) .done(function( data ) { if (data != "OK") { alert("Error backing up app data: "+data) @@ -152,7 +152,7 @@ function restore_data_folder_via_api(name, short_name) { if ( confirm("Are you sure you want to restore "+name+"? This will stop the app, DELETE DATA, restore the backup files, and restart the app.") ) { $('#loading_spinner_message').html("Restoring..."); $('#loading_spinner_overlay').fadeIn(); - $.get('/api/restore_data_folder?app='+short_name) + $.get('/api/restore_data_folder?short_name=' + short_name) .done(function( data ) { if (data != "OK") { alert("Error restoring app data: "+data) @@ -167,7 +167,7 @@ function reset_data_folder_via_api(name, short_name) { if ( confirm("Are you sure you want to reset "+name+"? This will stop app, RESET ALL THE APP DATA and start app.") ) { $('#loading_spinner_message').html("Resetting app..."); $('#loading_spinner_overlay').fadeIn(); - $.get('/api/reset_data_folder?app='+short_name) + $.get('/api/reset_data_folder?short_name=' + short_name) .done(function( data ) { if (data != "OK") { alert("Error removing app data: "+data) From fa8b619e2d3f451359aa292c5e514b8d2e02123f Mon Sep 17 00:00:00 2001 From: tlindi Date: Fri, 20 Jun 2025 14:18:03 +0300 Subject: [PATCH 5/7] Revert "[FIX] Implement App data management on js" This reverts commit 9f01df1af93fd2372668c59532e3f4be5c5ce827. --- rootfs/standard/var/www/mynode/static/js/manage_apps.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rootfs/standard/var/www/mynode/static/js/manage_apps.js b/rootfs/standard/var/www/mynode/static/js/manage_apps.js index 17c659841..badfcb17c 100644 --- a/rootfs/standard/var/www/mynode/static/js/manage_apps.js +++ b/rootfs/standard/var/www/mynode/static/js/manage_apps.js @@ -137,7 +137,7 @@ function backup_data_folder_via_api(name, short_name) { if ( confirm("Are you sure you want to backup "+name+"? This will stop the app, backup data, and restart the app.") ) { $('#loading_spinner_message').html("Making backup..."); $('#loading_spinner_overlay').fadeIn(); - $.get('/api/backup_data_folder?short_name=' + short_name) + $.get('/api/backup_data_folder?app='+short_name) .done(function( data ) { if (data != "OK") { alert("Error backing up app data: "+data) @@ -152,7 +152,7 @@ function restore_data_folder_via_api(name, short_name) { if ( confirm("Are you sure you want to restore "+name+"? This will stop the app, DELETE DATA, restore the backup files, and restart the app.") ) { $('#loading_spinner_message').html("Restoring..."); $('#loading_spinner_overlay').fadeIn(); - $.get('/api/restore_data_folder?short_name=' + short_name) + $.get('/api/restore_data_folder?app='+short_name) .done(function( data ) { if (data != "OK") { alert("Error restoring app data: "+data) @@ -167,7 +167,7 @@ function reset_data_folder_via_api(name, short_name) { if ( confirm("Are you sure you want to reset "+name+"? This will stop app, RESET ALL THE APP DATA and start app.") ) { $('#loading_spinner_message').html("Resetting app..."); $('#loading_spinner_overlay').fadeIn(); - $.get('/api/reset_data_folder?short_name=' + short_name) + $.get('/api/reset_data_folder?app='+short_name) .done(function( data ) { if (data != "OK") { alert("Error removing app data: "+data) From 5ce9d2240527c30b8a1f06b8953a3017f7e0ebfc Mon Sep 17 00:00:00 2001 From: tlindi Date: Sat, 12 Jul 2025 15:58:14 +0300 Subject: [PATCH 6/7] [FIX] Implement reset_data functionality --- rootfs/standard/var/pynode/application_info.py | 16 ++++++++-------- rootfs/standard/var/www/mynode/api.py | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rootfs/standard/var/pynode/application_info.py b/rootfs/standard/var/pynode/application_info.py index 0742a8ced..fca33687c 100644 --- a/rootfs/standard/var/pynode/application_info.py +++ b/rootfs/standard/var/pynode/application_info.py @@ -766,18 +766,18 @@ def restore_data_folder(app_data): # Not yet implemented return False -def reset_data_folder(short_name): - log_message(f" Running reset_data_folder for '{short_name}'...") +def reset_data_folder(app): + log_message(f" Running reset_data_folder for '{app}'…") - app_data = get_application(short_name) + app_data = get_application(app) if not app_data: - log_message(f" ERROR: application '{short_name}' not found") + log_message(f" ERROR: application '{app}' not found") return False data_folder = app_data["storage_folder"] # Stop the service before removing data_folder - log_message(f" Stopping '{short_name}'…") - stop_service(short_name) + log_message(f" Stopping '{app}'…") + stop_service(app) # Remove App data_folder log_message(f" Removing storage folder '{data_folder}'…") @@ -788,8 +788,8 @@ def reset_data_folder(short_name): create_application_storage_folder(app_data) # Re-start the service - log_message(f" Starting '{short_name}'…") - start_service(short_name) + log_message(f" Starting '{app}'…") + start_service(app) return True diff --git a/rootfs/standard/var/www/mynode/api.py b/rootfs/standard/var/www/mynode/api.py index d87848d6b..807aef687 100644 --- a/rootfs/standard/var/www/mynode/api.py +++ b/rootfs/standard/var/www/mynode/api.py @@ -179,12 +179,12 @@ def api_restore_data_folder(): def api_reset_data_folder(): check_logged_in() - short_name = request.args.get("short_name") - if not short_name: + app = request.args.get("app") + if not app: return "NO_APP_SPECIFIED" - if not is_application_valid(short_name): + if not is_application_valid(app): return "INVALID_APP_NAME" - if not reset_data_folder(short_name): + if not reset_data_folder(app): return "ERROR" return "OK" From 6b94dde5247cd8eda0f940d2ae7c0a6303fdd889 Mon Sep 17 00:00:00 2001 From: tlindi Date: Sun, 13 Jul 2025 11:19:47 +0300 Subject: [PATCH 7/7] Revert "simplify API of reset" This reverts commit 5b3df5257f28273258864547e7f27cd732c91268. --- rootfs/standard/var/www/mynode/api.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rootfs/standard/var/www/mynode/api.py b/rootfs/standard/var/www/mynode/api.py index 807aef687..5d8b27506 100644 --- a/rootfs/standard/var/www/mynode/api.py +++ b/rootfs/standard/var/www/mynode/api.py @@ -153,12 +153,12 @@ def api_restart_app(): def api_backup_data_folder(): check_logged_in() - short_name = request.args.get("short_name") - if not short_name: + app = request.args.get("app") + if not app: return "NO_APP_SPECIFIED" - if not is_application_valid(short_name): + if not is_application_valid(app): return "INVALID_APP_NAME" - if not backup_data_folder(short_name): + if not backup_data_folder(app): return "ERROR" return "OK" @@ -166,12 +166,12 @@ def api_backup_data_folder(): def api_restore_data_folder(): check_logged_in() - short_name = request.args.get("short_name") - if not short_name: + app = request.args.get("app") + if not app: return "NO_APP_SPECIFIED" - if not is_application_valid(short_name): + if not is_application_valid(app): return "INVALID_APP_NAME" - if not restore_data_folder(short_name): + if not restore_data_folder(app): return "ERROR" return "OK"