From 6fbb6a22fce01255495455a7359ff9afd054449a Mon Sep 17 00:00:00 2001 From: MatthieuLP Date: Fri, 12 Mar 2021 12:04:29 +0100 Subject: [PATCH] Getting "fake" cache size from getInfos. Displaying infos in maintenance page --- admin/themes/default/js/maintenance.js | 52 +++++++++++++++++++ .../default/template/maintenance_actions.tpl | 21 ++++++-- .../default/template/maintenance_env.tpl | 4 +- include/ws_functions/pwg.php | 5 +- 4 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 admin/themes/default/js/maintenance.js diff --git a/admin/themes/default/js/maintenance.js b/admin/themes/default/js/maintenance.js new file mode 100644 index 000000000..e7ab7ff5f --- /dev/null +++ b/admin/themes/default/js/maintenance.js @@ -0,0 +1,52 @@ +function displayResponse(domElem, values, mDivs, mValues) { + + for (let index = 0; index < domElem.length; index++) { + domElem[index].html(values[index]) + } + + for (let index = 0; index < mDivs.length; index++) { + mDivs[index].title = mValues[index] + "Mo"; + + } +} + +$(document).ready(function () { + $(".refresh-cache-size").on("click", function test () { + $(this).children("span").addClass("spin6").removeClass("icon-arrows-cw") + + return new Promise((res, rej) => { + jQuery.ajax({ + url: "ws.php?format=json&method=pwg.getInfos", + type: "POST", + data: { + param : "test_param", + service : "test_service" + }, + success: function (raw_data) { + data = jQuery.parseJSON(raw_data); + if (data.stat === "ok") { + res(); + + var domElemToRefresh = [$(".cache-size-value"), $(".multiple-pictures-sizes"), $(".multiple-compiledTemplate-sizes")]; + var multipleSizes = $(".delete-check-container").children(".delete-size-check"); + var domElemValues = [data.result.infos[3].value, 69, 42]; + var multipleSizesValues = [11, 10, 9, 8, 7, 6, 4, 3, 2, 1, 0] + + displayResponse(domElemToRefresh , domElemValues, multipleSizes, multipleSizesValues); + + $(".refresh-icon").addClass("icon-arrows-cw").removeClass("spin6"); + + } else { + rej(raw_data); + } + }, + error: function(message) { + rej(message); + } + }); + }) + }) + + + +}) \ No newline at end of file diff --git a/admin/themes/default/template/maintenance_actions.tpl b/admin/themes/default/template/maintenance_actions.tpl index f6216a240..e86e52b48 100644 --- a/admin/themes/default/template/maintenance_actions.tpl +++ b/admin/themes/default/template/maintenance_actions.tpl @@ -94,6 +94,9 @@ $(".delete-size-check").change(function() { }) {/footer_script} + +{combine_script id='ajax' load='footer' path='admin/themes/default/js/maintenance.js'} +
Global Gallery Actions
@@ -130,7 +133,7 @@ $(".delete-size-check").change(function() { 999 Go {'calculated'|@translate} 42 {'months ago'|@translate} - {'Refresh'|@translate} + {'Refresh'|@translate}
{'Purge compiled templates'|@translate} 999 Go @@ -140,8 +143,8 @@ $(".delete-size-check").change(function() { {'Delete multiple size images'|@translate} 999 Go
{foreach from=$purge_derivatives key=name item=url name=loop} -
- {$name} +
+ {$name}
{/foreach}
@@ -195,4 +198,16 @@ $(".delete-size-check").change(function() { width:max-content; text-align:left; } + +.rotate-anim { + animation: spin 4s linear infinite; +} + +@keyframes spin { + 100% { + -webkit-transform: rotate(360deg); + transform:rotate(360deg); + } +} + \ No newline at end of file diff --git a/admin/themes/default/template/maintenance_env.tpl b/admin/themes/default/template/maintenance_env.tpl index c59fe8945..f807ff063 100644 --- a/admin/themes/default/template/maintenance_env.tpl +++ b/admin/themes/default/template/maintenance_env.tpl @@ -1,3 +1,5 @@ +{combine_script id='ajax' load='footer' path='admin/themes/default/js/maintenance.js'} +
{'Environment'|@translate}
diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php index 6aeb36e60..669da4bbf 100644 --- a/include/ws_functions/pwg.php +++ b/include/ws_functions/pwg.php @@ -142,6 +142,10 @@ function ws_getInfos($params, &$service) $query = 'SELECT COUNT(*) FROM '.CATEGORIES_TABLE.';'; list($infos['nb_categories']) = pwg_db_fetch_row(pwg_query($query)); + // Cache size + // TODO for real later + $infos['cache_size'] = 4242; + $query = 'SELECT COUNT(*) FROM '.CATEGORIES_TABLE.' WHERE dir IS NULL;'; list($infos['nb_virtual']) = pwg_db_fetch_row(pwg_query($query)); @@ -187,7 +191,6 @@ function ws_getInfos($params, &$service) 'value' => $value, ); } - return array('infos' => new PwgNamedArray($output, 'item')); }