From b1f70b02ffa519cc284daab47792250554426a2c Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Mon, 27 May 2024 12:29:38 +0530 Subject: [PATCH] Update object explorer icons for EPAS and replication related nodes --- .../pgd_replication_groups/__init__.py | 2 +- .../static/img/pgd_node_data.svg | 38 ++++++++++- .../static/img/pgd_node_standby.svg | 38 ++++++++++- .../static/img/pgd_node_subscriber-only.svg | 38 ++++++++++- .../static/img/pgd_node_witness.svg | 38 ++++++++++- .../static/img/pgd_node_group.svg | 1 - .../static/img/pgd_replication_groups.svg | 64 +++++++++++++++++++ .../servers/replica_nodes/__init__.py | 4 ++ .../static/img/replica_nodes.svg | 15 ++++- .../server_groups/servers/static/img/ppas.svg | 62 +++++++++--------- 10 files changed, 263 insertions(+), 37 deletions(-) delete mode 100644 web/pgadmin/browser/server_groups/servers/pgd_replication_groups/static/img/pgd_node_group.svg create mode 100644 web/pgadmin/browser/server_groups/servers/pgd_replication_groups/static/img/pgd_replication_groups.svg diff --git a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/__init__.py b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/__init__.py index b7a3945e9..12755397c 100644 --- a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/__init__.py @@ -245,7 +245,7 @@ class PGDReplicationGroupsView(PGChildNodeView): row['node_group_id'], sid, row['node_group_name'], - icon='icon-server_group', + icon='icon-pgd_replication_groups', inode=True )) diff --git a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_data.svg b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_data.svg index 176a1517b..e16e88726 100644 --- a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_data.svg +++ b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_data.svg @@ -1 +1,37 @@ -server \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_standby.svg b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_standby.svg index 176a1517b..88876ce92 100644 --- a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_standby.svg +++ b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_standby.svg @@ -1 +1,37 @@ -server \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_subscriber-only.svg b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_subscriber-only.svg index 176a1517b..cd697c755 100644 --- a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_subscriber-only.svg +++ b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_subscriber-only.svg @@ -1 +1,37 @@ -server \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_witness.svg b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_witness.svg index 176a1517b..31373b47d 100644 --- a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_witness.svg +++ b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/pgd_replication_servers/static/img/pgd_node_witness.svg @@ -1 +1,37 @@ -server \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/static/img/pgd_node_group.svg b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/static/img/pgd_node_group.svg deleted file mode 100644 index 176a1517b..000000000 --- a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/static/img/pgd_node_group.svg +++ /dev/null @@ -1 +0,0 @@ -server \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/static/img/pgd_replication_groups.svg b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/static/img/pgd_replication_groups.svg new file mode 100644 index 000000000..9e0ddb93c --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/pgd_replication_groups/static/img/pgd_replication_groups.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/pgadmin/browser/server_groups/servers/replica_nodes/__init__.py b/web/pgadmin/browser/server_groups/servers/replica_nodes/__init__.py index 70ee52948..bee3b2d1c 100644 --- a/web/pgadmin/browser/server_groups/servers/replica_nodes/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/replica_nodes/__init__.py @@ -85,6 +85,10 @@ class ReplicationNodesModule(CollectionNodeModule): """ return False + @property + def collection_icon(self): + return 'icon-server_group' + @property def script_load(self): """ diff --git a/web/pgadmin/browser/server_groups/servers/replica_nodes/static/img/replica_nodes.svg b/web/pgadmin/browser/server_groups/servers/replica_nodes/static/img/replica_nodes.svg index 176a1517b..35a176645 100644 --- a/web/pgadmin/browser/server_groups/servers/replica_nodes/static/img/replica_nodes.svg +++ b/web/pgadmin/browser/server_groups/servers/replica_nodes/static/img/replica_nodes.svg @@ -1 +1,14 @@ -server \ No newline at end of file + + + + + + + + + + + + + + diff --git a/web/pgadmin/browser/server_groups/servers/static/img/ppas.svg b/web/pgadmin/browser/server_groups/servers/static/img/ppas.svg index bfdab85ce..f3ae7ed08 100644 --- a/web/pgadmin/browser/server_groups/servers/static/img/ppas.svg +++ b/web/pgadmin/browser/server_groups/servers/static/img/ppas.svg @@ -1,31 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + +