From 65063ed4ba7f3aed0f60c1dffa9f9f6e8cdb471e Mon Sep 17 00:00:00 2001 From: zhangxiquan Date: Wed, 27 Nov 2024 06:53:05 +0000 Subject: [PATCH] * [msic] Format code. --- module/cne/model.php | 8 ++++---- module/instance/config.php | 2 +- module/instance/js/logs.ui.js | 24 ++++++++++++++++-------- module/instance/lang/de.php | 6 +++--- module/instance/lang/en.php | 6 +++--- module/instance/lang/fr.php | 6 +++--- module/instance/lang/zh-cn.php | 6 +++--- 7 files changed, 33 insertions(+), 25 deletions(-) diff --git a/module/cne/model.php b/module/cne/model.php index 26bd1b4c09..1b9b0f0eef 100644 --- a/module/cne/model.php +++ b/module/cne/model.php @@ -679,10 +679,10 @@ class cneModel extends model $apiParams->name = $instance->k8name; $apiParams->tail = 500; - !empty($component) && $apiParams->component = $component; - !empty($pod) && $apiParams->pod_name = $pod; - !empty($container) && $apiParams->container_name = $container; - $previous && $apiParams->previous = $previous; + !empty($component) && $apiParams->component = $component; + !empty($pod) && $apiParams->pod_name = $pod; + !empty($container) && $apiParams->container_name = $container; + $previous && $apiParams->previous = $previous; return $this->apiGet('/api/cne/app/logs', $apiParams, $this->config->CNE->api->headers); } diff --git a/module/instance/config.php b/module/instance/config.php index 9a47bbda35..9f9b78e8d0 100644 --- a/module/instance/config.php +++ b/module/instance/config.php @@ -63,7 +63,7 @@ $config->instance->actionList['upgrade']['url'] = helper::createLink('in $config->instance->actions = new stdclass(); $config->instance->actions->view = array(); -$config->instance->actions->view['mainActions'] = array('visit','showLogs', 'ajaxStart', 'ajaxStop', 'upgrade'); +$config->instance->actions->view['mainActions'] = array('visit', 'showLogs', 'ajaxStart', 'ajaxStop', 'upgrade'); $config->instance->actions->view['suffixActions'] = array('ajaxUninstall'); $config->instance->devopsApps = array('gitea', 'gitlab', 'jenkins', 'sonarqube', 'nexus3', 'nexus'); diff --git a/module/instance/js/logs.ui.js b/module/instance/js/logs.ui.js index 9504622397..fa512e8a4e 100644 --- a/module/instance/js/logs.ui.js +++ b/module/instance/js/logs.ui.js @@ -1,25 +1,31 @@ -window.initComponent = function (instanceID) { +window.initComponent = function (instanceID) +{ toggleLoading('#logs-panel', true); const $picker = $('[name=component]').zui('picker'); $picker.$.clear(); - $.getJSON($.createLink('instance', 'ajaxGetComponents', 'id=' + instanceID), function (items) { + $.getJSON($.createLink('instance', 'ajaxGetComponents', 'id=' + instanceID), function (items) + { toggleLoading('#logs-panel', false); $picker.render({items: items}); - if (typeof (items) !== 'undefined') { + if (typeof (items) !== 'undefined') + { $picker.$.setValue(items.component); } }); }; -window.changeComponent = function (instanceID) { +window.changeComponent = function (instanceID) +{ toggleLoading('#logs-panel', true); const $picker = $('[name=pod]').zui('picker'); $picker.$.clear(); const component = $('[name=component]').val(); - $.getJSON($.createLink('instance', 'ajaxGetPods', 'id=' + instanceID + '&component=' + component), function (items) { + $.getJSON($.createLink('instance', 'ajaxGetPods', 'id=' + instanceID + '&component=' + component), function (items) + { $picker.render({items: items}); - if (typeof (items) !== 'undefined') { + if (typeof (items) !== 'undefined') + { $picker.$.setValue(items.pod); } toggleLoading('#logs-panel', false); @@ -27,13 +33,15 @@ window.changeComponent = function (instanceID) { }); }; -window.showLogs = function (instanceID) { +window.showLogs = function (instanceID) +{ const instanceComponent = $('[name=component]').val(); const instancePod = $('[name=pod]').val(); const previous = $('[name=previous]').val(); const target = $.createLink('instance', 'showlogs', 'id=' + instanceID + "&component=" + instanceComponent + "&pod=" + instancePod + "&previous=" + previous); toggleLoading('#logs-panel', true); - $.getJSON(target, function (data) { + $.getJSON(target, function (data) + { toggleLoading('#logs-panel', false); $('#logs-content').html(data.data.map(item => item.timestamp + ' ' + item.content).join('\n')); }); diff --git a/module/instance/lang/de.php b/module/instance/lang/de.php index 6e7bb82708..ef860f591b 100644 --- a/module/instance/lang/de.php +++ b/module/instance/lang/de.php @@ -187,9 +187,9 @@ $lang->instance->log = new stdclass; $lang->instance->log->date = 'date'; $lang->instance->log->message = 'Content'; -$lang->instance->log->viewButton = 'Logs'; -$lang->instance->log->title = 'Watch Logs'; -$lang->instance->log->button = 'View Now'; +$lang->instance->log->viewButton = 'Logs'; +$lang->instance->log->title = 'Watch Logs'; +$lang->instance->log->button = 'View Now'; $lang->instance->component = 'Component'; $lang->instance->pod = 'Pod'; diff --git a/module/instance/lang/en.php b/module/instance/lang/en.php index 6e7bb82708..ef860f591b 100644 --- a/module/instance/lang/en.php +++ b/module/instance/lang/en.php @@ -187,9 +187,9 @@ $lang->instance->log = new stdclass; $lang->instance->log->date = 'date'; $lang->instance->log->message = 'Content'; -$lang->instance->log->viewButton = 'Logs'; -$lang->instance->log->title = 'Watch Logs'; -$lang->instance->log->button = 'View Now'; +$lang->instance->log->viewButton = 'Logs'; +$lang->instance->log->title = 'Watch Logs'; +$lang->instance->log->button = 'View Now'; $lang->instance->component = 'Component'; $lang->instance->pod = 'Pod'; diff --git a/module/instance/lang/fr.php b/module/instance/lang/fr.php index 6e7bb82708..ef860f591b 100644 --- a/module/instance/lang/fr.php +++ b/module/instance/lang/fr.php @@ -187,9 +187,9 @@ $lang->instance->log = new stdclass; $lang->instance->log->date = 'date'; $lang->instance->log->message = 'Content'; -$lang->instance->log->viewButton = 'Logs'; -$lang->instance->log->title = 'Watch Logs'; -$lang->instance->log->button = 'View Now'; +$lang->instance->log->viewButton = 'Logs'; +$lang->instance->log->title = 'Watch Logs'; +$lang->instance->log->button = 'View Now'; $lang->instance->component = 'Component'; $lang->instance->pod = 'Pod'; diff --git a/module/instance/lang/zh-cn.php b/module/instance/lang/zh-cn.php index a08964a1be..263901511c 100644 --- a/module/instance/lang/zh-cn.php +++ b/module/instance/lang/zh-cn.php @@ -191,9 +191,9 @@ $lang->instance->log = new stdclass; $lang->instance->log->date = '日期'; $lang->instance->log->message = '内容'; -$lang->instance->log->viewButton = '日志'; -$lang->instance->log->title = '查看日志'; -$lang->instance->log->button = '立即查看'; +$lang->instance->log->viewButton = '日志'; +$lang->instance->log->title = '查看日志'; +$lang->instance->log->button = '立即查看'; $lang->instance->component = '组件'; $lang->instance->pod = 'Pod';