From 0ae2a1f1773bfae56d171f918c2be1edb08d91ac Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Sun, 16 Apr 2023 07:32:32 +0300
Subject: [PATCH] now, when onUpdateAllPages is called, the ClientInfoLogic and
 ClientManagementLogic pages will not be updated

- moved the Client Management button to the Advanced Settings page
-
---
 client/ui/qml/Pages/PageAdvancedServerSettings.qml |  9 +++++++++
 client/ui/qml/Pages/PageClientManagement.qml       |  3 +--
 client/ui/qml/Pages/PageServerSettings.qml         | 11 +----------
 client/ui/uilogic.cpp                              |  3 +++
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/client/ui/qml/Pages/PageAdvancedServerSettings.qml b/client/ui/qml/Pages/PageAdvancedServerSettings.qml
index e00f7326..9f71b2ba 100644
--- a/client/ui/qml/Pages/PageAdvancedServerSettings.qml
+++ b/client/ui/qml/Pages/PageAdvancedServerSettings.qml
@@ -88,6 +88,15 @@ PageBase {
                 }
             }
 
+            BlueButtonType {
+                Layout.topMargin: 10
+                Layout.fillWidth: true
+                text: qsTr("Clients Management")
+                onClicked: {
+                    UiLogic.goToPage(PageEnum.ClientManagement)
+                }
+            }
+
             PopupWithQuestion {
                 id: popupClearServer
                 questionText: "Attention! All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. Continue?"
diff --git a/client/ui/qml/Pages/PageClientManagement.qml b/client/ui/qml/Pages/PageClientManagement.qml
index 2b656def..39defe4c 100644
--- a/client/ui/qml/Pages/PageClientManagement.qml
+++ b/client/ui/qml/Pages/PageClientManagement.qml
@@ -62,8 +62,7 @@ PageBase {
                 implicitHeight: contentHeight + 20
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 10
-                anchors.rightMargin: 10
+                anchors.rightMargin: 20
                 topMargin: 10
                 spacing: 10
                 clip: true
diff --git a/client/ui/qml/Pages/PageServerSettings.qml b/client/ui/qml/Pages/PageServerSettings.qml
index a3f40ae6..f1eee906 100644
--- a/client/ui/qml/Pages/PageServerSettings.qml
+++ b/client/ui/qml/Pages/PageServerSettings.qml
@@ -90,23 +90,14 @@ PageBase {
                 Layout.fillWidth: true
                 Layout.topMargin: 10
                 text: qsTr("Advanced server settings")
-                visible: ServerSettingsLogic.pushButtonShareFullVisible //todo
                 onClicked: {
                     UiLogic.goToPage(PageEnum.AdvancedServerSettings)
                 }
             }
 
             BlueButtonType {
+                Layout.fillWidth: true
                 Layout.topMargin: 60
-                Layout.fillWidth: true
-                text: qsTr("Clients Management")
-                onClicked: {
-                    UiLogic.goToPage(PageEnum.ClientManagement)
-                }
-            }
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
                 text: ServerSettingsLogic.pushButtonClearClientCacheText
                 visible: ServerSettingsLogic.pushButtonClearClientCacheVisible
                 onClicked: {
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index 957af5ca..d47c1186 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -181,6 +181,9 @@ void UiLogic::showOnStartup()
 void UiLogic::onUpdateAllPages()
 {
     for (auto logic : m_logicMap) {
+        if (dynamic_cast<ClientInfoLogic*>(logic) || dynamic_cast<ClientManagementLogic*>(logic)) {
+            continue;
+        }
         logic->onUpdatePage();
     }
 }