public inbox for [email protected]help / color / mirror / Atom feed
[pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up 13+ messages / 4 participants [nested] [flat]
* [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-05-21 08:52 Pradip Parkale <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Pradip Parkale @ 2021-05-21 08:52 UTC (permalink / raw) To: pgadmin-hackers Hi Hackers, Please find the attached patch for #6231. I have added OS, NW.js, browser details, and some server configuration in the About pgAdmin pop-up. Server configuration won't be visible to the non-admin users in server mode. -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation Attachments: [application/octet-stream] RM6231.patch (7.1K, 3-RM6231.patch) download | inline diff: diff --git a/requirements.txt b/requirements.txt index 08dc344db..605b335d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,3 +37,4 @@ sshtunnel==0.* ldap3==2.* Flask-BabelEx==0.* gssapi==1.6.* +httpagentparser==1.9.* \ No newline at end of file diff --git a/runtime/package.json b/runtime/package.json index bdc024b18..82628732d 100644 --- a/runtime/package.json +++ b/runtime/package.json @@ -6,6 +6,7 @@ "author": "pgAdmin Development Team (https://www.pgadmin.org/)", "license": "PostgreSQL", "chromium-args": "--disable-popup-blocking", + "user-agent": "Nwjs:%nwver-%osinfo-%chromium_ver", "window": { "width": 440, "height": 170, diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py index 94ffefe6e..d40de006a 100644 --- a/web/pgadmin/about/__init__.py +++ b/web/pgadmin/about/__init__.py @@ -10,13 +10,15 @@ """A blueprint module implementing the about box.""" import sys -from flask import Response, render_template, __version__, url_for +from flask import Response, render_template, __version__, url_for, request from flask_babelex import gettext from flask_security import current_user, login_required from pgadmin.utils import PgAdminModule from pgadmin.utils.menu import MenuItem from pgadmin.utils.constants import MIMETYPE_APP_JS import config +import httpagentparser +from pgadmin.model import User MODULE_NAME = 'about' @@ -59,23 +61,74 @@ blueprint = AboutModule(MODULE_NAME, __name__, static_url_path='') @login_required def index(): """Render the about box.""" - info = { - 'python_version': sys.version, - 'flask_version': __version__ - } + info = {} + # Get OS , NW.js, Browser details + browser, os_details, nwjs_version = detect_browser(request) + + if nwjs_version: + info['nwjs'] = nwjs_version + + info['browser_details'] = browser + info['os_details'] = os_details + info['config_db'] = config.SQLITE_PATH + info['log_file'] = config.LOG_FILE if config.SERVER_MODE: info['app_mode'] = gettext('Server') + admin = is_admin(current_user.email) + info['admin'] = admin else: info['app_mode'] = gettext('Desktop') info['current_user'] = current_user.email + settings = '' + for setting in dir(config): + if not setting.startswith('_') and setting.isupper() and \ + setting not in ['CSRF_SESSION_KEY', + 'SECRET_KEY', + 'SECURITY_PASSWORD_SALT', + 'SECURITY_PASSWORD_HASH', + 'ALLOWED_HOSTS']: + settings = settings + '{} = {}\n'.format(setting, + getattr(config, setting)) + + info['settings'] = settings + return render_template( MODULE_NAME + '/index.html', info=info, _=gettext ) +def is_admin(load_user): + user = User.query.filter_by(email=load_user).first() + return user.has_role("Administrator") + + +def detect_browser(request): + """This function returns the browser and os details""" + nwjs_version = None + agent = request.environ.get('HTTP_USER_AGENT') + + if 'Nwjs' in agent: + agent = agent.split('-') + nwjs_version = agent[0].split(':')[1] + browser = agent[2] + os_details = agent[1].split('; ')[1] + + else: + browser = httpagentparser.detect(agent) + os_details = browser['platform']['name'] + ' ' + browser['platform'][ + 'version'] + if not browser: + browser = agent.split('/')[0] + else: + browser = browser['browser']['name'] + ' ' + browser['browser'][ + 'version'] + + return browser, os_details, nwjs_version + + @blueprint.route("/about.js") @login_required def script(): diff --git a/web/pgadmin/about/static/js/about.js b/web/pgadmin/about/static/js/about.js index c6c73e6c2..a1e45bdba 100644 --- a/web/pgadmin/about/static/js/about.js +++ b/web/pgadmin/about/static/js/about.js @@ -62,7 +62,7 @@ define( function(data) { alertify.aboutDialog( gettext('About %s', pgAdmin.Browser.utils.app_name), data - ).resizeTo(pgAdmin.Browser.stdW.md, pgAdmin.Browser.stdH.md); + ).resizeTo(pgAdmin.Browser.stdW.md, 450); }); }, }; diff --git a/web/pgadmin/about/templates/about/index.html b/web/pgadmin/about/templates/about/index.html index 607e6c298..c7c260822 100644 --- a/web/pgadmin/about/templates/about/index.html +++ b/web/pgadmin/about/templates/about/index.html @@ -4,29 +4,41 @@ <div class="col-sm-9">{{ config.APP_VERSION }}</div> </div> <div class="row"> - <div class="col-sm-3"><strong>{{ _('Copyright') }}</strong></div> - <div class="col-sm-9">{{ config.APP_COPYRIGHT }}</div> + <div class="col-sm-3"><strong>{{ _('Application Mode') }}</strong></div> + <div class="col-sm-9">{{ info.app_mode }}</div> </div> <div class="row"> - <div class="col-sm-3"><strong>{{ _('Python Version') }}</strong></div> - <div class="col-sm-9">{{ info.python_version }}</div> + <div class="col-sm-3"><strong>{{ _('Current User') }}</strong></div> + <div class="col-sm-9">{{ info.current_user }}</div> </div> + {% if info.nwjs %} + <div class="row"> + <div class="col-sm-3"><strong>{{ _('NW.js Version') }}</strong></div> + <div class="col-sm-9">{{ info.nwjs }}</div> + </div> + {% endif %} <div class="row"> - <div class="col-sm-3"><strong>{{ _('Flask Version') }}</strong></div> - <div class="col-sm-9">{{ info.flask_version }}</div> + <div class="col-sm-3"><strong>{{ _('Browser Details') }}</strong></div> + <div class="col-sm-9">{{ info.browser_details }}</div> </div> <div class="row"> - <div class="col-sm-3"><strong>{{ _('Application Mode') }}</strong></div> - <div class="col-sm-9">{{ info.app_mode }}</div> + <div class="col-sm-3"><strong>{{ _('OS') }}</strong></div> + <div class="col-sm-9">{{ info.os_details }}</div> </div> <div class="row"> - <div class="col-sm-3"><strong>{{ _('Current User') }}</strong></div> - <div class="col-sm-9">{{ info.current_user }}</div> + <div class="col-sm-3"><strong>{{ _('Config DB') }}</strong></div> + <div class="col-sm-9">{{ info.config_db }}</div> + </div> + <div class="row"> + <div class="col-sm-3"><strong>{{ _('Log file') }}</strong></div> + <div class="col-sm-9">{{ info.log_file }}</div> + </div> + {%if (info.app_mode == 'Desktop') or (info.app_mode == 'Server' and info.admin)%} + <div class="row"> + <div class="col-sm-3"><b>{{ _('Server Configuration') }}</b></div> </div> <div class="row"> - <div class="col-12 text-right"><img - src="{{ url_for('static', filename='img/logo-right-128.png') }}" - alt="{{ config.APP_NAME }} {{ _('logo') }}" - ></div> + <div class="col-sm-3"><textarea rows="7" cols="85" style="white-space: nowrap;">{{ info.settings|safe }}</textarea></div> </div> + {% endif %} </div> ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-05-24 11:14 Akshay Joshi <[email protected]> parent: Pradip Parkale <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Akshay Joshi @ 2021-05-24 11:14 UTC (permalink / raw) To: Pradip Parkale <[email protected]>; +Cc: pgadmin-hackers Hi Pradip Following are the review comments: - Following labels should be changed - Browser Details -> Browser - OS -> Operating System - Config DB -> pgAdmin Database File - Server Configuration Text Area should be *readonly* and it should have a "col-sm-9" class instead of "col-sm-3". - If the user resizes the About dialog then instead of showing blank space can we automatically resize the Server configuration text area? - The height of the About dialog in the Server mode should be less as we are not showing "Server Configuration". - In Runtime, we should merge the 'Browser details' in 'NW.js version' like *0.51.2 (Chromium 89.0.4389.114)* OR at least prefix 'Chromium' before the version in the 'Browser details'. - Found string difference in OS details for Runtime and Desktop mode. - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS X 10.15.7" in Dekstop mode. - Windows: "Win64" in Runtime, while "Windows 10" in Desktop which also not correct, I am using "Windows Server 2016". - Following issue found on Firefox (First Image) configuration in a single line, Safari (Second image) too many scroll bars. [image: Firefox.png]. [image: Safari.png] On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < [email protected]> wrote: > Hi Hackers, > > Please find the attached patch for #6231. I have added OS, NW.js, browser > details, and some server configuration in the About pgAdmin pop-up. > > Server configuration won't be visible to the non-admin users in server > mode. > -- > Thanks & Regards, > Pradip Parkale > Software Engineer | EnterpriseDB Corporation > -- *Thanks & Regards* *Akshay Joshi* *pgAdmin Hacker | Principal Software Architect* *EDB Postgres <http://edbpostgres.com>* *Mobile: +91 976-788-8246* Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-01 08:32 Pradip Parkale <[email protected]> parent: Akshay Joshi <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Pradip Parkale @ 2021-06-01 08:32 UTC (permalink / raw) To: Akshay Joshi <[email protected]>; +Cc: pgadmin-hackers Hi Akshay, Please find an updated patch. On Mon, May 24, 2021 at 4:45 PM Akshay Joshi <[email protected]> wrote: > Hi Pradip > > Following are the review comments: > > - Following labels should be changed > - Browser Details -> Browser > - OS -> Operating System > - Config DB -> pgAdmin Database File > > Done. > > - Server Configuration Text Area should be *readonly* and it should > have a "col-sm-9" class instead of "col-sm-3". > > Done. > > - If the user resizes the About dialog then instead of showing blank > space can we automatically resize the Server configuration text area? > > Done. > > - The height of the About dialog in the Server mode should be less as > we are not showing "Server Configuration". > > Done. > > - In Runtime, we should merge the 'Browser details' in 'NW.js version' > like *0.51.2 (Chromium 89.0.4389.114)* OR at least prefix 'Chromium' > before the version in the 'Browser details'. > > Done. > > - Found string difference in OS details for Runtime and Desktop mode. > - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS X > 10.15.7" in Dekstop mode. > - Windows: "Win64" in Runtime, while "Windows 10" in Desktop which > also not correct, I am using "Windows Server 2016". > - Following issue found on Firefox (First Image) configuration in a > single line, Safari (Second image) too many scroll bars. > > Done. > [image: Firefox.png]. [image: Safari.png] > > On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < > [email protected]> wrote: > >> Hi Hackers, >> >> Please find the attached patch for #6231. I have added OS, NW.js, browser >> details, and some server configuration in the About pgAdmin pop-up. >> >> Server configuration won't be visible to the non-admin users in server >> mode. >> -- >> Thanks & Regards, >> Pradip Parkale >> Software Engineer | EnterpriseDB Corporation >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > *pgAdmin Hacker | Principal Software Architect* > *EDB Postgres <http://edbpostgres.com>* > > *Mobile: +91 976-788-8246* > -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image [application/octet-stream] RM6231_v2.patch (8.2K, 5-RM6231_v2.patch) download | inline diff: diff --git a/requirements.txt b/requirements.txt index a14774736..e3133e368 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,3 +38,5 @@ Flask-BabelEx==0.* gssapi==1.6.* flask-socketio>=5.0.1 eventlet==0.30.2 +httpagentparser==1.9.* +user_agents==2.2.* diff --git a/runtime/package.json b/runtime/package.json index bdc024b18..82628732d 100644 --- a/runtime/package.json +++ b/runtime/package.json @@ -6,6 +6,7 @@ "author": "pgAdmin Development Team (https://www.pgadmin.org/)", "license": "PostgreSQL", "chromium-args": "--disable-popup-blocking", + "user-agent": "Nwjs:%nwver-%osinfo-%chromium_ver", "window": { "width": 440, "height": 170, diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py index 94ffefe6e..a27248559 100644 --- a/web/pgadmin/about/__init__.py +++ b/web/pgadmin/about/__init__.py @@ -10,13 +10,16 @@ """A blueprint module implementing the about box.""" import sys -from flask import Response, render_template, __version__, url_for +from flask import Response, render_template, __version__, url_for, request from flask_babelex import gettext from flask_security import current_user, login_required from pgadmin.utils import PgAdminModule from pgadmin.utils.menu import MenuItem from pgadmin.utils.constants import MIMETYPE_APP_JS import config +import httpagentparser +from pgadmin.model import User +from user_agents import parse MODULE_NAME = 'about' @@ -59,23 +62,74 @@ blueprint = AboutModule(MODULE_NAME, __name__, static_url_path='') @login_required def index(): """Render the about box.""" - info = { - 'python_version': sys.version, - 'flask_version': __version__ - } + info = {} + # Get OS , NW.js, Browser details + browser, os_details, nwjs_version = detect_browser(request) + + if nwjs_version: + info['nwjs'] = nwjs_version + + info['browser_details'] = browser + info['os_details'] = os_details + info['config_db'] = config.SQLITE_PATH + info['log_file'] = config.LOG_FILE if config.SERVER_MODE: info['app_mode'] = gettext('Server') + admin = is_admin(current_user.email) + info['admin'] = admin else: info['app_mode'] = gettext('Desktop') info['current_user'] = current_user.email + settings = '' + for setting in dir(config): + if not setting.startswith('_') and setting.isupper() and \ + setting not in ['CSRF_SESSION_KEY', + 'SECRET_KEY', + 'SECURITY_PASSWORD_SALT', + 'SECURITY_PASSWORD_HASH', + 'ALLOWED_HOSTS']: + settings = settings + '{} = {}\n'.format(setting, + getattr(config, setting)) + + info['settings'] = settings + return render_template( MODULE_NAME + '/index.html', info=info, _=gettext ) +def is_admin(load_user): + user = User.query.filter_by(email=load_user).first() + return user.has_role("Administrator") + + +def detect_browser(request): + """This function returns the browser and os details""" + nwjs_version = None + agent = request.environ.get('HTTP_USER_AGENT') + user_agent = parse(agent) + + if 'Nwjs' in agent: + agent = agent.split('-') + nwjs_version = agent[0].split(':')[1] + browser = 'Chromium' + ' ' + agent[2] + os_details = user_agent.os.family + ' ' + user_agent.os.version_string + + else: + browser = httpagentparser.detect(agent) + os_details = user_agent.os.family + ' ' + user_agent.os.version_string + if not browser: + browser = agent.split('/')[0] + else: + browser = browser['browser']['name'] + ' ' + browser['browser'][ + 'version'] + + return browser, os_details, nwjs_version + + @blueprint.route("/about.js") @login_required def script(): diff --git a/web/pgadmin/about/static/js/about.js b/web/pgadmin/about/static/js/about.js index c6c73e6c2..4dfa6b149 100644 --- a/web/pgadmin/about/static/js/about.js +++ b/web/pgadmin/about/static/js/about.js @@ -9,9 +9,9 @@ define( ['jquery', 'alertify', 'sources/pgadmin', 'sources/gettext', - 'sources/url_for','sources/utils', + 'sources/url_for','sources/utils','pgadmin.user_management.current_user', ], - function($, alertify, pgAdmin, gettext, url_for, commonUtils) { + function($, alertify, pgAdmin, gettext, url_for, commonUtils, current_user) { pgAdmin = pgAdmin || window.pgAdmin || {}; /* Return back, this has been called more than once */ @@ -52,7 +52,6 @@ define( prepare:function() { this.setContent(this.message); - }, }; }); @@ -60,9 +59,15 @@ define( $.get(url_for('about.index'), function(data) { - alertify.aboutDialog( - gettext('About %s', pgAdmin.Browser.utils.app_name), data - ).resizeTo(pgAdmin.Browser.stdW.md, pgAdmin.Browser.stdH.md); + if(!current_user.is_admin && pgAdmin.server_mode){ + alertify.aboutDialog( + gettext('About %s', pgAdmin.Browser.utils.app_name), data + ).resizeTo(pgAdmin.Browser.stdW.md, 300); + }else{ + alertify.aboutDialog( + gettext('About %s', pgAdmin.Browser.utils.app_name), data + ).resizeTo(750, 470); + } }); }, }; diff --git a/web/pgadmin/about/templates/about/index.html b/web/pgadmin/about/templates/about/index.html index 607e6c298..e1c94f0bf 100644 --- a/web/pgadmin/about/templates/about/index.html +++ b/web/pgadmin/about/templates/about/index.html @@ -4,29 +4,41 @@ <div class="col-sm-9">{{ config.APP_VERSION }}</div> </div> <div class="row"> - <div class="col-sm-3"><strong>{{ _('Copyright') }}</strong></div> - <div class="col-sm-9">{{ config.APP_COPYRIGHT }}</div> + <div class="col-sm-3"><strong>{{ _('Application Mode') }}</strong></div> + <div class="col-sm-9">{{ info.app_mode }}</div> </div> <div class="row"> - <div class="col-sm-3"><strong>{{ _('Python Version') }}</strong></div> - <div class="col-sm-9">{{ info.python_version }}</div> + <div class="col-sm-3"><strong>{{ _('Current User') }}</strong></div> + <div class="col-sm-9">{{ info.current_user }}</div> </div> + {% if info.nwjs %} + <div class="row"> + <div class="col-sm-3"><strong>{{ _('NW.js Version') }}</strong></div> + <div class="col-sm-9">{{ info.nwjs }}</div> + </div> + {% endif %} <div class="row"> - <div class="col-sm-3"><strong>{{ _('Flask Version') }}</strong></div> - <div class="col-sm-9">{{ info.flask_version }}</div> + <div class="col-sm-3"><strong>{{ _('Browser') }}</strong></div> + <div class="col-sm-9">{{ info.browser_details }}</div> </div> <div class="row"> - <div class="col-sm-3"><strong>{{ _('Application Mode') }}</strong></div> - <div class="col-sm-9">{{ info.app_mode }}</div> + <div class="col-sm-3"><strong>{{ _('Operating System') }}</strong></div> + <div class="col-sm-9">{{ info.os_details }}</div> </div> <div class="row"> - <div class="col-sm-3"><strong>{{ _('Current User') }}</strong></div> - <div class="col-sm-9">{{ info.current_user }}</div> + <div class="col-sm-3"><strong>{{ _('pgAdmin Database File') }}</strong></div> + <div class="col-sm-9">{{ info.config_db }}</div> + </div> + <div class="row"> + <div class="col-sm-3"><strong>{{ _('Log File') }}</strong></div> + <div class="col-sm-9">{{ info.log_file }}</div> + </div> + {%if (info.app_mode == 'Desktop') or (info.app_mode == 'Server' and info.admin)%} + <div class="row"> + <div class="col-sm-3"><b>{{ _('Server Configuration') }}</b></div> </div> <div class="row"> - <div class="col-12 text-right"><img - src="{{ url_for('static', filename='img/logo-right-128.png') }}" - alt="{{ config.APP_NAME }} {{ _('logo') }}" - ></div> + <div class="col-sm-9"><textarea rows="7" cols="85" style="width:120%; height: 120%; white-space: pre-wrap;" readonly>{{ info.settings|safe }}</textarea></div> </div> + {% endif %} </div> ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-01 15:18 Akshay Joshi <[email protected]> parent: Pradip Parkale <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Akshay Joshi @ 2021-06-01 15:18 UTC (permalink / raw) To: Pradip Parkale <[email protected]>; +Cc: pgadmin-hackers Thanks, patch applied. On Tue, Jun 1, 2021 at 2:03 PM Pradip Parkale < [email protected]> wrote: > Hi Akshay, > > Please find an updated patch. > > > On Mon, May 24, 2021 at 4:45 PM Akshay Joshi < > [email protected]> wrote: > >> Hi Pradip >> >> Following are the review comments: >> >> - Following labels should be changed >> - Browser Details -> Browser >> - OS -> Operating System >> - Config DB -> pgAdmin Database File >> >> Done. > >> >> - Server Configuration Text Area should be *readonly* and it should >> have a "col-sm-9" class instead of "col-sm-3". >> >> Done. > >> >> - If the user resizes the About dialog then instead of showing blank >> space can we automatically resize the Server configuration text area? >> >> Done. > >> >> - The height of the About dialog in the Server mode should be less as >> we are not showing "Server Configuration". >> >> Done. > >> >> - In Runtime, we should merge the 'Browser details' in 'NW.js >> version' like *0.51.2 (Chromium 89.0.4389.114)* OR at least prefix >> 'Chromium' before the version in the 'Browser details'. >> >> Done. > >> >> - Found string difference in OS details for Runtime and Desktop mode. >> - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS X >> 10.15.7" in Dekstop mode. >> - Windows: "Win64" in Runtime, while "Windows 10" in Desktop which >> also not correct, I am using "Windows Server 2016". >> - Following issue found on Firefox (First Image) configuration in a >> single line, Safari (Second image) too many scroll bars. >> >> Done. > >> [image: Firefox.png]. [image: Safari.png] >> >> On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < >> [email protected]> wrote: >> >>> Hi Hackers, >>> >>> Please find the attached patch for #6231. I have added OS, NW.js, >>> browser details, and some server configuration in the About pgAdmin pop-up. >>> >>> Server configuration won't be visible to the non-admin users in server >>> mode. >>> -- >>> Thanks & Regards, >>> Pradip Parkale >>> Software Engineer | EnterpriseDB Corporation >>> >> >> >> -- >> *Thanks & Regards* >> *Akshay Joshi* >> *pgAdmin Hacker | Principal Software Architect* >> *EDB Postgres <http://edbpostgres.com>* >> >> *Mobile: +91 976-788-8246* >> > > > -- > Thanks & Regards, > Pradip Parkale > Software Engineer | EnterpriseDB Corporation > -- *Thanks & Regards* *Akshay Joshi* *pgAdmin Hacker | Principal Software Architect* *EDB Postgres <http://edbpostgres.com>* *Mobile: +91 976-788-8246* Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-04 12:03 Pradip Parkale <[email protected]> parent: Akshay Joshi <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Pradip Parkale @ 2021-06-04 12:03 UTC (permalink / raw) To: Akshay Joshi <[email protected]>; +Cc: pgadmin-hackers Hi Akshay, Please find the updated patch. I have fixed the OS details issue for Linux, MacOS big sur. On Tue, Jun 1, 2021 at 8:48 PM Akshay Joshi <[email protected]> wrote: > Thanks, patch applied. > > On Tue, Jun 1, 2021 at 2:03 PM Pradip Parkale < > [email protected]> wrote: > >> Hi Akshay, >> >> Please find an updated patch. >> >> >> On Mon, May 24, 2021 at 4:45 PM Akshay Joshi < >> [email protected]> wrote: >> >>> Hi Pradip >>> >>> Following are the review comments: >>> >>> - Following labels should be changed >>> - Browser Details -> Browser >>> - OS -> Operating System >>> - Config DB -> pgAdmin Database File >>> >>> Done. >> >>> >>> - Server Configuration Text Area should be *readonly* and it should >>> have a "col-sm-9" class instead of "col-sm-3". >>> >>> Done. >> >>> >>> - If the user resizes the About dialog then instead of showing blank >>> space can we automatically resize the Server configuration text area? >>> >>> Done. >> >>> >>> - The height of the About dialog in the Server mode should be less >>> as we are not showing "Server Configuration". >>> >>> Done. >> >>> >>> - In Runtime, we should merge the 'Browser details' in 'NW.js >>> version' like *0.51.2 (Chromium 89.0.4389.114)* OR at least prefix >>> 'Chromium' before the version in the 'Browser details'. >>> >>> Done. >> >>> >>> - Found string difference in OS details for Runtime and Desktop >>> mode. >>> - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS X >>> 10.15.7" in Dekstop mode. >>> - Windows: "Win64" in Runtime, while "Windows 10" in Desktop >>> which also not correct, I am using "Windows Server 2016". >>> - Following issue found on Firefox (First Image) configuration in a >>> single line, Safari (Second image) too many scroll bars. >>> >>> Done. >> >>> [image: Firefox.png]. [image: Safari.png] >>> >>> On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < >>> [email protected]> wrote: >>> >>>> Hi Hackers, >>>> >>>> Please find the attached patch for #6231. I have added OS, NW.js, >>>> browser details, and some server configuration in the About pgAdmin pop-up. >>>> >>>> Server configuration won't be visible to the non-admin users in server >>>> mode. >>>> -- >>>> Thanks & Regards, >>>> Pradip Parkale >>>> Software Engineer | EnterpriseDB Corporation >>>> >>> >>> >>> -- >>> *Thanks & Regards* >>> *Akshay Joshi* >>> *pgAdmin Hacker | Principal Software Architect* >>> *EDB Postgres <http://edbpostgres.com>* >>> >>> *Mobile: +91 976-788-8246* >>> >> >> >> -- >> Thanks & Regards, >> Pradip Parkale >> Software Engineer | EnterpriseDB Corporation >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > *pgAdmin Hacker | Principal Software Architect* > *EDB Postgres <http://edbpostgres.com>* > > *Mobile: +91 976-788-8246* > -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image [application/octet-stream] RM6231_v3.patch (2.0K, 5-RM6231_v3.patch) download | inline diff: diff --git a/requirements.txt b/requirements.txt index e3133e368..284803485 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,4 +39,3 @@ gssapi==1.6.* flask-socketio>=5.0.1 eventlet==0.30.2 httpagentparser==1.9.* -user_agents==2.2.* diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py index a27248559..6fbac436a 100644 --- a/web/pgadmin/about/__init__.py +++ b/web/pgadmin/about/__init__.py @@ -20,6 +20,7 @@ import config import httpagentparser from pgadmin.model import User from user_agents import parse +import platform MODULE_NAME = 'about' @@ -110,17 +111,15 @@ def detect_browser(request): """This function returns the browser and os details""" nwjs_version = None agent = request.environ.get('HTTP_USER_AGENT') - user_agent = parse(agent) + os_details = parse(platform.platform()).ua_string if 'Nwjs' in agent: agent = agent.split('-') nwjs_version = agent[0].split(':')[1] browser = 'Chromium' + ' ' + agent[2] - os_details = user_agent.os.family + ' ' + user_agent.os.version_string else: browser = httpagentparser.detect(agent) - os_details = user_agent.os.family + ' ' + user_agent.os.version_string if not browser: browser = agent.split('/')[0] else: diff --git a/web/pgadmin/about/templates/about/index.html b/web/pgadmin/about/templates/about/index.html index e1c94f0bf..a3c6d0c2d 100644 --- a/web/pgadmin/about/templates/about/index.html +++ b/web/pgadmin/about/templates/about/index.html @@ -38,7 +38,7 @@ <div class="col-sm-3"><b>{{ _('Server Configuration') }}</b></div> </div> <div class="row"> - <div class="col-sm-9"><textarea rows="7" cols="85" style="width:120%; height: 120%; white-space: pre-wrap;" readonly>{{ info.settings|safe }}</textarea></div> + <div class="col-sm-9"><textarea rows="7" cols="85" style="width:120%; height: auto; white-space: pre-wrap;" readonly>{{ info.settings|safe }}</textarea></div> </div> {% endif %} </div> ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-04 13:33 Murtuza Zabuawala <[email protected]> parent: Pradip Parkale <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Murtuza Zabuawala @ 2021-06-04 13:33 UTC (permalink / raw) To: pgadmin-hackers; +Cc: Akshay Joshi <[email protected]>; Dave Page <[email protected]> Hello, I want to propose a suggestion here, If we can display configuration data in category/tab like below then it will make sense for the user (instead of dumping everthing in one single textbox randomly from config file) SMTP - config1=value1 - config2=value2 - config3=value3 ... AUTHENTICATION - KERBERSOE - config1=value1 - config2=value2 - config3=value3 ... - LDAP - config1=value1 - config2=value2 - config3=value3 ... SECURITY - config1=value1 - config2=value2 - config3=value3 ... Regards, Murtuza On Fri, Jun 4, 2021 at 5:33 PM Pradip Parkale < [email protected]> wrote: > Hi Akshay, > > Please find the updated patch. I have fixed the OS details issue for > Linux, MacOS big sur. > > On Tue, Jun 1, 2021 at 8:48 PM Akshay Joshi <[email protected]> > wrote: > >> Thanks, patch applied. >> >> On Tue, Jun 1, 2021 at 2:03 PM Pradip Parkale < >> [email protected]> wrote: >> >>> Hi Akshay, >>> >>> Please find an updated patch. >>> >>> >>> On Mon, May 24, 2021 at 4:45 PM Akshay Joshi < >>> [email protected]> wrote: >>> >>>> Hi Pradip >>>> >>>> Following are the review comments: >>>> >>>> - Following labels should be changed >>>> - Browser Details -> Browser >>>> - OS -> Operating System >>>> - Config DB -> pgAdmin Database File >>>> >>>> Done. >>> >>>> >>>> - Server Configuration Text Area should be *readonly* and it should >>>> have a "col-sm-9" class instead of "col-sm-3". >>>> >>>> Done. >>> >>>> >>>> - If the user resizes the About dialog then instead of showing >>>> blank space can we automatically resize the Server configuration text area? >>>> >>>> Done. >>> >>>> >>>> - The height of the About dialog in the Server mode should be less >>>> as we are not showing "Server Configuration". >>>> >>>> Done. >>> >>>> >>>> - In Runtime, we should merge the 'Browser details' in 'NW.js >>>> version' like *0.51.2 (Chromium 89.0.4389.114)* OR at least prefix >>>> 'Chromium' before the version in the 'Browser details'. >>>> >>>> Done. >>> >>>> >>>> - Found string difference in OS details for Runtime and Desktop >>>> mode. >>>> - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS X >>>> 10.15.7" in Dekstop mode. >>>> - Windows: "Win64" in Runtime, while "Windows 10" in Desktop >>>> which also not correct, I am using "Windows Server 2016". >>>> - Following issue found on Firefox (First Image) configuration in a >>>> single line, Safari (Second image) too many scroll bars. >>>> >>>> Done. >>> >>>> [image: Firefox.png]. [image: Safari.png] >>>> >>>> On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < >>>> [email protected]> wrote: >>>> >>>>> Hi Hackers, >>>>> >>>>> Please find the attached patch for #6231. I have added OS, NW.js, >>>>> browser details, and some server configuration in the About pgAdmin pop-up. >>>>> >>>>> Server configuration won't be visible to the non-admin users in server >>>>> mode. >>>>> -- >>>>> Thanks & Regards, >>>>> Pradip Parkale >>>>> Software Engineer | EnterpriseDB Corporation >>>>> >>>> >>>> >>>> -- >>>> *Thanks & Regards* >>>> *Akshay Joshi* >>>> *pgAdmin Hacker | Principal Software Architect* >>>> *EDB Postgres <http://edbpostgres.com>* >>>> >>>> *Mobile: +91 976-788-8246* >>>> >>> >>> >>> -- >>> Thanks & Regards, >>> Pradip Parkale >>> Software Engineer | EnterpriseDB Corporation >>> >> >> >> -- >> *Thanks & Regards* >> *Akshay Joshi* >> *pgAdmin Hacker | Principal Software Architect* >> *EDB Postgres <http://edbpostgres.com>* >> >> *Mobile: +91 976-788-8246* >> > > > -- > Thanks & Regards, > Pradip Parkale > Software Engineer | EnterpriseDB Corporation > Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-04 13:53 Dave Page <[email protected]> parent: Murtuza Zabuawala <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Dave Page @ 2021-06-04 13:53 UTC (permalink / raw) To: Murtuza Zabuawala <[email protected]>; +Cc: pgadmin-hackers; Akshay Joshi <[email protected]> Hi On Fri, Jun 4, 2021 at 2:34 PM Murtuza Zabuawala < [email protected]> wrote: > Hello, > > I want to propose a suggestion here, If we can display configuration data > in category/tab like below then it will make sense for the user (instead of > dumping everthing in one single textbox randomly from config file) > > SMTP > - config1=value1 > - config2=value2 > - config3=value3 ... > AUTHENTICATION > - KERBERSOE > - config1=value1 > - config2=value2 > - config3=value3 ... > - LDAP > - config1=value1 > - config2=value2 > - config3=value3 ... > SECURITY > - config1=value1 > - config2=value2 > - config3=value3 ... > It would, but it's not really worth the effort. This is really intended as debugging info the user can just copy/paste into an email to us. > > > Regards, > Murtuza > > On Fri, Jun 4, 2021 at 5:33 PM Pradip Parkale < > [email protected]> wrote: > >> Hi Akshay, >> >> Please find the updated patch. I have fixed the OS details issue for >> Linux, MacOS big sur. >> >> On Tue, Jun 1, 2021 at 8:48 PM Akshay Joshi < >> [email protected]> wrote: >> >>> Thanks, patch applied. >>> >>> On Tue, Jun 1, 2021 at 2:03 PM Pradip Parkale < >>> [email protected]> wrote: >>> >>>> Hi Akshay, >>>> >>>> Please find an updated patch. >>>> >>>> >>>> On Mon, May 24, 2021 at 4:45 PM Akshay Joshi < >>>> [email protected]> wrote: >>>> >>>>> Hi Pradip >>>>> >>>>> Following are the review comments: >>>>> >>>>> - Following labels should be changed >>>>> - Browser Details -> Browser >>>>> - OS -> Operating System >>>>> - Config DB -> pgAdmin Database File >>>>> >>>>> Done. >>>> >>>>> >>>>> - Server Configuration Text Area should be *readonly* and it >>>>> should have a "col-sm-9" class instead of "col-sm-3". >>>>> >>>>> Done. >>>> >>>>> >>>>> - If the user resizes the About dialog then instead of showing >>>>> blank space can we automatically resize the Server configuration text area? >>>>> >>>>> Done. >>>> >>>>> >>>>> - The height of the About dialog in the Server mode should be less >>>>> as we are not showing "Server Configuration". >>>>> >>>>> Done. >>>> >>>>> >>>>> - In Runtime, we should merge the 'Browser details' in 'NW.js >>>>> version' like *0.51.2 (Chromium 89.0.4389.114)* OR at least prefix >>>>> 'Chromium' before the version in the 'Browser details'. >>>>> >>>>> Done. >>>> >>>>> >>>>> - Found string difference in OS details for Runtime and Desktop >>>>> mode. >>>>> - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS X >>>>> 10.15.7" in Dekstop mode. >>>>> - Windows: "Win64" in Runtime, while "Windows 10" in Desktop >>>>> which also not correct, I am using "Windows Server 2016". >>>>> - Following issue found on Firefox (First Image) configuration in >>>>> a single line, Safari (Second image) too many scroll bars. >>>>> >>>>> Done. >>>> >>>>> [image: Firefox.png]. [image: Safari.png] >>>>> >>>>> On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < >>>>> [email protected]> wrote: >>>>> >>>>>> Hi Hackers, >>>>>> >>>>>> Please find the attached patch for #6231. I have added OS, NW.js, >>>>>> browser details, and some server configuration in the About pgAdmin pop-up. >>>>>> >>>>>> Server configuration won't be visible to the non-admin users in >>>>>> server mode. >>>>>> -- >>>>>> Thanks & Regards, >>>>>> Pradip Parkale >>>>>> Software Engineer | EnterpriseDB Corporation >>>>>> >>>>> >>>>> >>>>> -- >>>>> *Thanks & Regards* >>>>> *Akshay Joshi* >>>>> *pgAdmin Hacker | Principal Software Architect* >>>>> *EDB Postgres <http://edbpostgres.com>* >>>>> >>>>> *Mobile: +91 976-788-8246* >>>>> >>>> >>>> >>>> -- >>>> Thanks & Regards, >>>> Pradip Parkale >>>> Software Engineer | EnterpriseDB Corporation >>>> >>> >>> >>> -- >>> *Thanks & Regards* >>> *Akshay Joshi* >>> *pgAdmin Hacker | Principal Software Architect* >>> *EDB Postgres <http://edbpostgres.com>* >>> >>> *Mobile: +91 976-788-8246* >>> >> >> >> -- >> Thanks & Regards, >> Pradip Parkale >> Software Engineer | EnterpriseDB Corporation >> > -- Dave Page VP, Chief Architect, Database Infrastructure Blog: https://www.enterprisedb.com/dave-page Twitter: @pgsnake EDB: https://www.enterprisedb.com Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-04 14:14 Murtuza Zabuawala <[email protected]> parent: Dave Page <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Murtuza Zabuawala @ 2021-06-04 14:14 UTC (permalink / raw) To: Dave Page <[email protected]>; +Cc: pgadmin-hackers; Akshay Joshi <[email protected]> Hi Dave, On Fri, Jun 4, 2021 at 7:23 PM Dave Page <[email protected]> wrote: > Hi > > On Fri, Jun 4, 2021 at 2:34 PM Murtuza Zabuawala < > [email protected]> wrote: > >> Hello, >> >> I want to propose a suggestion here, If we can display configuration data >> in category/tab like below then it will make sense for the user (instead of >> dumping everthing in one single textbox randomly from config file) >> >> SMTP >> - config1=value1 >> - config2=value2 >> - config3=value3 ... >> AUTHENTICATION >> - KERBERSOE >> - config1=value1 >> - config2=value2 >> - config3=value3 ... >> - LDAP >> - config1=value1 >> - config2=value2 >> - config3=value3 ... >> SECURITY >> - config1=value1 >> - config2=value2 >> - config3=value3 ... >> > > It would, but it's not really worth the effort. This is really intended as > debugging info the user can just copy/paste into an email to us. > If it is for debugging purpose only then can we just place a "Copy configuration" button and hide this textbox, by clicking on the button will copy all the pgadmin4 configuration on the user's clipboard and can avoid clutter from the about window. > >> >> >> Regards, >> Murtuza >> >> On Fri, Jun 4, 2021 at 5:33 PM Pradip Parkale < >> [email protected]> wrote: >> >>> Hi Akshay, >>> >>> Please find the updated patch. I have fixed the OS details issue for >>> Linux, MacOS big sur. >>> >>> On Tue, Jun 1, 2021 at 8:48 PM Akshay Joshi < >>> [email protected]> wrote: >>> >>>> Thanks, patch applied. >>>> >>>> On Tue, Jun 1, 2021 at 2:03 PM Pradip Parkale < >>>> [email protected]> wrote: >>>> >>>>> Hi Akshay, >>>>> >>>>> Please find an updated patch. >>>>> >>>>> >>>>> On Mon, May 24, 2021 at 4:45 PM Akshay Joshi < >>>>> [email protected]> wrote: >>>>> >>>>>> Hi Pradip >>>>>> >>>>>> Following are the review comments: >>>>>> >>>>>> - Following labels should be changed >>>>>> - Browser Details -> Browser >>>>>> - OS -> Operating System >>>>>> - Config DB -> pgAdmin Database File >>>>>> >>>>>> Done. >>>>> >>>>>> >>>>>> - Server Configuration Text Area should be *readonly* and it >>>>>> should have a "col-sm-9" class instead of "col-sm-3". >>>>>> >>>>>> Done. >>>>> >>>>>> >>>>>> - If the user resizes the About dialog then instead of showing >>>>>> blank space can we automatically resize the Server configuration text area? >>>>>> >>>>>> Done. >>>>> >>>>>> >>>>>> - The height of the About dialog in the Server mode should be >>>>>> less as we are not showing "Server Configuration". >>>>>> >>>>>> Done. >>>>> >>>>>> >>>>>> - In Runtime, we should merge the 'Browser details' in 'NW.js >>>>>> version' like *0.51.2 (Chromium 89.0.4389.114)* OR at least >>>>>> prefix 'Chromium' before the version in the 'Browser details'. >>>>>> >>>>>> Done. >>>>> >>>>>> >>>>>> - Found string difference in OS details for Runtime and Desktop >>>>>> mode. >>>>>> - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS X >>>>>> 10.15.7" in Dekstop mode. >>>>>> - Windows: "Win64" in Runtime, while "Windows 10" in Desktop >>>>>> which also not correct, I am using "Windows Server 2016". >>>>>> - Following issue found on Firefox (First Image) configuration in >>>>>> a single line, Safari (Second image) too many scroll bars. >>>>>> >>>>>> Done. >>>>> >>>>>> [image: Firefox.png]. [image: Safari.png] >>>>>> >>>>>> On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < >>>>>> [email protected]> wrote: >>>>>> >>>>>>> Hi Hackers, >>>>>>> >>>>>>> Please find the attached patch for #6231. I have added OS, NW.js, >>>>>>> browser details, and some server configuration in the About pgAdmin pop-up. >>>>>>> >>>>>>> Server configuration won't be visible to the non-admin users in >>>>>>> server mode. >>>>>>> -- >>>>>>> Thanks & Regards, >>>>>>> Pradip Parkale >>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> *Thanks & Regards* >>>>>> *Akshay Joshi* >>>>>> *pgAdmin Hacker | Principal Software Architect* >>>>>> *EDB Postgres <http://edbpostgres.com>* >>>>>> >>>>>> *Mobile: +91 976-788-8246* >>>>>> >>>>> >>>>> >>>>> -- >>>>> Thanks & Regards, >>>>> Pradip Parkale >>>>> Software Engineer | EnterpriseDB Corporation >>>>> >>>> >>>> >>>> -- >>>> *Thanks & Regards* >>>> *Akshay Joshi* >>>> *pgAdmin Hacker | Principal Software Architect* >>>> *EDB Postgres <http://edbpostgres.com>* >>>> >>>> *Mobile: +91 976-788-8246* >>>> >>> >>> >>> -- >>> Thanks & Regards, >>> Pradip Parkale >>> Software Engineer | EnterpriseDB Corporation >>> >> > > -- > Dave Page > VP, Chief Architect, Database Infrastructure > Blog: https://www.enterprisedb.com/dave-page > Twitter: @pgsnake > > EDB: https://www.enterprisedb.com > Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-04 14:39 Dave Page <[email protected]> parent: Murtuza Zabuawala <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Dave Page @ 2021-06-04 14:39 UTC (permalink / raw) To: Murtuza Zabuawala <[email protected]>; +Cc: pgadmin-hackers; Akshay Joshi <[email protected]> On Fri, Jun 4, 2021 at 3:14 PM Murtuza Zabuawala < [email protected]> wrote: > Hi Dave, > > On Fri, Jun 4, 2021 at 7:23 PM Dave Page <[email protected]> > wrote: > >> Hi >> >> On Fri, Jun 4, 2021 at 2:34 PM Murtuza Zabuawala < >> [email protected]> wrote: >> >>> Hello, >>> >>> I want to propose a suggestion here, If we can display configuration >>> data in category/tab like below then it will make sense for the user >>> (instead of dumping everthing in one single textbox randomly from >>> config file) >>> >>> SMTP >>> - config1=value1 >>> - config2=value2 >>> - config3=value3 ... >>> AUTHENTICATION >>> - KERBERSOE >>> - config1=value1 >>> - config2=value2 >>> - config3=value3 ... >>> - LDAP >>> - config1=value1 >>> - config2=value2 >>> - config3=value3 ... >>> SECURITY >>> - config1=value1 >>> - config2=value2 >>> - config3=value3 ... >>> >> >> It would, but it's not really worth the effort. This is really intended >> as debugging info the user can just copy/paste into an email to us. >> > > If it is for debugging purpose only then can we just place a "Copy > configuration" button and hide this textbox, by clicking on the button will > copy all the pgadmin4 configuration on the user's clipboard and can avoid > clutter from the about window. > It's still useful to read it occasionally IMHO. > > >> >>> >>> >>> Regards, >>> Murtuza >>> >>> On Fri, Jun 4, 2021 at 5:33 PM Pradip Parkale < >>> [email protected]> wrote: >>> >>>> Hi Akshay, >>>> >>>> Please find the updated patch. I have fixed the OS details issue for >>>> Linux, MacOS big sur. >>>> >>>> On Tue, Jun 1, 2021 at 8:48 PM Akshay Joshi < >>>> [email protected]> wrote: >>>> >>>>> Thanks, patch applied. >>>>> >>>>> On Tue, Jun 1, 2021 at 2:03 PM Pradip Parkale < >>>>> [email protected]> wrote: >>>>> >>>>>> Hi Akshay, >>>>>> >>>>>> Please find an updated patch. >>>>>> >>>>>> >>>>>> On Mon, May 24, 2021 at 4:45 PM Akshay Joshi < >>>>>> [email protected]> wrote: >>>>>> >>>>>>> Hi Pradip >>>>>>> >>>>>>> Following are the review comments: >>>>>>> >>>>>>> - Following labels should be changed >>>>>>> - Browser Details -> Browser >>>>>>> - OS -> Operating System >>>>>>> - Config DB -> pgAdmin Database File >>>>>>> >>>>>>> Done. >>>>>> >>>>>>> >>>>>>> - Server Configuration Text Area should be *readonly* and it >>>>>>> should have a "col-sm-9" class instead of "col-sm-3". >>>>>>> >>>>>>> Done. >>>>>> >>>>>>> >>>>>>> - If the user resizes the About dialog then instead of showing >>>>>>> blank space can we automatically resize the Server configuration text area? >>>>>>> >>>>>>> Done. >>>>>> >>>>>>> >>>>>>> - The height of the About dialog in the Server mode should be >>>>>>> less as we are not showing "Server Configuration". >>>>>>> >>>>>>> Done. >>>>>> >>>>>>> >>>>>>> - In Runtime, we should merge the 'Browser details' in 'NW.js >>>>>>> version' like *0.51.2 (Chromium 89.0.4389.114)* OR at least >>>>>>> prefix 'Chromium' before the version in the 'Browser details'. >>>>>>> >>>>>>> Done. >>>>>> >>>>>>> >>>>>>> - Found string difference in OS details for Runtime and Desktop >>>>>>> mode. >>>>>>> - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS X >>>>>>> 10.15.7" in Dekstop mode. >>>>>>> - Windows: "Win64" in Runtime, while "Windows 10" in Desktop >>>>>>> which also not correct, I am using "Windows Server 2016". >>>>>>> - Following issue found on Firefox (First Image) configuration >>>>>>> in a single line, Safari (Second image) too many scroll bars. >>>>>>> >>>>>>> Done. >>>>>> >>>>>>> [image: Firefox.png]. [image: Safari.png] >>>>>>> >>>>>>> On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < >>>>>>> [email protected]> wrote: >>>>>>> >>>>>>>> Hi Hackers, >>>>>>>> >>>>>>>> Please find the attached patch for #6231. I have added OS, NW.js, >>>>>>>> browser details, and some server configuration in the About pgAdmin pop-up. >>>>>>>> >>>>>>>> Server configuration won't be visible to the non-admin users in >>>>>>>> server mode. >>>>>>>> -- >>>>>>>> Thanks & Regards, >>>>>>>> Pradip Parkale >>>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> *Thanks & Regards* >>>>>>> *Akshay Joshi* >>>>>>> *pgAdmin Hacker | Principal Software Architect* >>>>>>> *EDB Postgres <http://edbpostgres.com>* >>>>>>> >>>>>>> *Mobile: +91 976-788-8246* >>>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Thanks & Regards, >>>>>> Pradip Parkale >>>>>> Software Engineer | EnterpriseDB Corporation >>>>>> >>>>> >>>>> >>>>> -- >>>>> *Thanks & Regards* >>>>> *Akshay Joshi* >>>>> *pgAdmin Hacker | Principal Software Architect* >>>>> *EDB Postgres <http://edbpostgres.com>* >>>>> >>>>> *Mobile: +91 976-788-8246* >>>>> >>>> >>>> >>>> -- >>>> Thanks & Regards, >>>> Pradip Parkale >>>> Software Engineer | EnterpriseDB Corporation >>>> >>> >> >> -- >> Dave Page >> VP, Chief Architect, Database Infrastructure >> Blog: https://www.enterprisedb.com/dave-page >> Twitter: @pgsnake >> >> EDB: https://www.enterprisedb.com >> > -- Dave Page VP, Chief Architect, Database Infrastructure Blog: https://www.enterprisedb.com/dave-page Twitter: @pgsnake EDB: https://www.enterprisedb.com Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-11 13:49 Pradip Parkale <[email protected]> parent: Dave Page <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Pradip Parkale @ 2021-06-11 13:49 UTC (permalink / raw) To: Akshay Joshi <[email protected]>; +Cc: pgadmin-hackers Hi Akshay, Please find the attached patch for #6231.I have fixed all review comments given in the team. On Fri, Jun 4, 2021 at 8:09 PM Dave Page <[email protected]> wrote: > > > On Fri, Jun 4, 2021 at 3:14 PM Murtuza Zabuawala < > [email protected]> wrote: > >> Hi Dave, >> >> On Fri, Jun 4, 2021 at 7:23 PM Dave Page <[email protected]> >> wrote: >> >>> Hi >>> >>> On Fri, Jun 4, 2021 at 2:34 PM Murtuza Zabuawala < >>> [email protected]> wrote: >>> >>>> Hello, >>>> >>>> I want to propose a suggestion here, If we can display configuration >>>> data in category/tab like below then it will make sense for the user >>>> (instead of dumping everthing in one single textbox randomly from >>>> config file) >>>> >>>> SMTP >>>> - config1=value1 >>>> - config2=value2 >>>> - config3=value3 ... >>>> AUTHENTICATION >>>> - KERBERSOE >>>> - config1=value1 >>>> - config2=value2 >>>> - config3=value3 ... >>>> - LDAP >>>> - config1=value1 >>>> - config2=value2 >>>> - config3=value3 ... >>>> SECURITY >>>> - config1=value1 >>>> - config2=value2 >>>> - config3=value3 ... >>>> >>> >>> It would, but it's not really worth the effort. This is really intended >>> as debugging info the user can just copy/paste into an email to us. >>> >> >> If it is for debugging purpose only then can we just place a "Copy >> configuration" button and hide this textbox, by clicking on the button will >> copy all the pgadmin4 configuration on the user's clipboard and can avoid >> clutter from the about window. >> > > It's still useful to read it occasionally IMHO. > > >> >> >>> >>>> >>>> >>>> Regards, >>>> Murtuza >>>> >>>> On Fri, Jun 4, 2021 at 5:33 PM Pradip Parkale < >>>> [email protected]> wrote: >>>> >>>>> Hi Akshay, >>>>> >>>>> Please find the updated patch. I have fixed the OS details issue for >>>>> Linux, MacOS big sur. >>>>> >>>>> On Tue, Jun 1, 2021 at 8:48 PM Akshay Joshi < >>>>> [email protected]> wrote: >>>>> >>>>>> Thanks, patch applied. >>>>>> >>>>>> On Tue, Jun 1, 2021 at 2:03 PM Pradip Parkale < >>>>>> [email protected]> wrote: >>>>>> >>>>>>> Hi Akshay, >>>>>>> >>>>>>> Please find an updated patch. >>>>>>> >>>>>>> >>>>>>> On Mon, May 24, 2021 at 4:45 PM Akshay Joshi < >>>>>>> [email protected]> wrote: >>>>>>> >>>>>>>> Hi Pradip >>>>>>>> >>>>>>>> Following are the review comments: >>>>>>>> >>>>>>>> - Following labels should be changed >>>>>>>> - Browser Details -> Browser >>>>>>>> - OS -> Operating System >>>>>>>> - Config DB -> pgAdmin Database File >>>>>>>> >>>>>>>> Done. >>>>>>> >>>>>>>> >>>>>>>> - Server Configuration Text Area should be *readonly* and it >>>>>>>> should have a "col-sm-9" class instead of "col-sm-3". >>>>>>>> >>>>>>>> Done. >>>>>>> >>>>>>>> >>>>>>>> - If the user resizes the About dialog then instead of showing >>>>>>>> blank space can we automatically resize the Server configuration text area? >>>>>>>> >>>>>>>> Done. >>>>>>> >>>>>>>> >>>>>>>> - The height of the About dialog in the Server mode should be >>>>>>>> less as we are not showing "Server Configuration". >>>>>>>> >>>>>>>> Done. >>>>>>> >>>>>>>> >>>>>>>> - In Runtime, we should merge the 'Browser details' in 'NW.js >>>>>>>> version' like *0.51.2 (Chromium 89.0.4389.114)* OR at least >>>>>>>> prefix 'Chromium' before the version in the 'Browser details'. >>>>>>>> >>>>>>>> Done. >>>>>>> >>>>>>>> >>>>>>>> - Found string difference in OS details for Runtime and Desktop >>>>>>>> mode. >>>>>>>> - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS X >>>>>>>> 10.15.7" in Dekstop mode. >>>>>>>> - Windows: "Win64" in Runtime, while "Windows 10" in Desktop >>>>>>>> which also not correct, I am using "Windows Server 2016". >>>>>>>> - Following issue found on Firefox (First Image) configuration >>>>>>>> in a single line, Safari (Second image) too many scroll bars. >>>>>>>> >>>>>>>> Done. >>>>>>> >>>>>>>> [image: Firefox.png]. [image: Safari.png] >>>>>>>> >>>>>>>> On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < >>>>>>>> [email protected]> wrote: >>>>>>>> >>>>>>>>> Hi Hackers, >>>>>>>>> >>>>>>>>> Please find the attached patch for #6231. I have added OS, NW.js, >>>>>>>>> browser details, and some server configuration in the About pgAdmin pop-up. >>>>>>>>> >>>>>>>>> Server configuration won't be visible to the non-admin users in >>>>>>>>> server mode. >>>>>>>>> -- >>>>>>>>> Thanks & Regards, >>>>>>>>> Pradip Parkale >>>>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> *Thanks & Regards* >>>>>>>> *Akshay Joshi* >>>>>>>> *pgAdmin Hacker | Principal Software Architect* >>>>>>>> *EDB Postgres <http://edbpostgres.com>* >>>>>>>> >>>>>>>> *Mobile: +91 976-788-8246* >>>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Thanks & Regards, >>>>>>> Pradip Parkale >>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> *Thanks & Regards* >>>>>> *Akshay Joshi* >>>>>> *pgAdmin Hacker | Principal Software Architect* >>>>>> *EDB Postgres <http://edbpostgres.com>* >>>>>> >>>>>> *Mobile: +91 976-788-8246* >>>>>> >>>>> >>>>> >>>>> -- >>>>> Thanks & Regards, >>>>> Pradip Parkale >>>>> Software Engineer | EnterpriseDB Corporation >>>>> >>>> >>> >>> -- >>> Dave Page >>> VP, Chief Architect, Database Infrastructure >>> Blog: https://www.enterprisedb.com/dave-page >>> Twitter: @pgsnake >>> >>> EDB: https://www.enterprisedb.com >>> >> > > -- > Dave Page > VP, Chief Architect, Database Infrastructure > Blog: https://www.enterprisedb.com/dave-page > Twitter: @pgsnake > > EDB: https://www.enterprisedb.com > -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image [application/octet-stream] RM6231_v4.patch (3.7K, 5-RM6231_v4.patch) download | inline diff: diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py index 6fbac436a..0076a8a93 100644 --- a/web/pgadmin/about/__init__.py +++ b/web/pgadmin/about/__init__.py @@ -84,16 +84,25 @@ def index(): info['current_user'] = current_user.email - settings = '' + settings = "" for setting in dir(config): if not setting.startswith('_') and setting.isupper() and \ setting not in ['CSRF_SESSION_KEY', 'SECRET_KEY', 'SECURITY_PASSWORD_SALT', 'SECURITY_PASSWORD_HASH', - 'ALLOWED_HOSTS']: - settings = settings + '{} = {}\n'.format(setting, - getattr(config, setting)) + 'ALLOWED_HOSTS' + 'MAIL_PASSWORD', + 'LDAP_BIND_PASSWORD', + 'SECURITY_PASSWORD_HASH']: + if isinstance(getattr(config, setting), str): + settings = \ + settings + '{} = "{}"\n'.format( + setting, gettext(getattr(config, setting))) + else: + settings = \ + settings + '{} = {}\n'.format( + setting, gettext(getattr(config, setting))) info['settings'] = settings diff --git a/web/pgadmin/about/static/js/about.js b/web/pgadmin/about/static/js/about.js index 4dfa6b149..63a09c8a0 100644 --- a/web/pgadmin/about/static/js/about.js +++ b/web/pgadmin/about/static/js/about.js @@ -45,11 +45,26 @@ define( }, hooks:{ onshow:function(){ + var self = this; var container = $(this.elements.footer).find('button:not([disabled])'); commonUtils.findAndSetFocus(container); + $('#copy_textarea').on('click', function(){ + //Copy the server configuration details + let textarea = document.getElementById('about-textarea'); + textarea.select(); + document.execCommand('copy'); + $('#copy_textarea').text('Copied'); + }); + + $(this.elements.resizeHandle).on('click', function(){ + // Set the height of the Textarea + var height = self.elements.dialog.scrollHeight - 300; + if (height < 0) + height = self.elements.dialog.scrollHeight - 150; + $('#about-textarea').css({'height':height}); + }); }, }, - prepare:function() { this.setContent(this.message); }, diff --git a/web/pgadmin/about/templates/about/index.html b/web/pgadmin/about/templates/about/index.html index a3c6d0c2d..e7810a6b7 100644 --- a/web/pgadmin/about/templates/about/index.html +++ b/web/pgadmin/about/templates/about/index.html @@ -38,7 +38,10 @@ <div class="col-sm-3"><b>{{ _('Server Configuration') }}</b></div> </div> <div class="row"> - <div class="col-sm-9"><textarea rows="7" cols="85" style="width:120%; height: auto; white-space: pre-wrap;" readonly>{{ info.settings|safe }}</textarea></div> + <div class="col-sm-9"> + <textarea id="about-textarea" rows="7" cols="150" style="position: relative;width:101%; white-space: pre-wrap;" readonly>{{ info.settings|safe }}</textarea> + <button class="btn btn-secondary about-copy" id="copy_textarea" style="position:absolute;top:0;right:0;z-index:20;padding:0px;">Copy</button> + </div> </div> {% endif %} </div> ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-11 14:10 Akshay Joshi <[email protected]> parent: Pradip Parkale <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Akshay Joshi @ 2021-06-11 14:10 UTC (permalink / raw) To: Pradip Parkale <[email protected]>; +Cc: pgadmin-hackers Thanks, the patch applied. On Fri, Jun 11, 2021 at 7:20 PM Pradip Parkale < [email protected]> wrote: > Hi Akshay, > > Please find the attached patch for #6231.I have fixed all review comments > given in the team. > > On Fri, Jun 4, 2021 at 8:09 PM Dave Page <[email protected]> > wrote: > >> >> >> On Fri, Jun 4, 2021 at 3:14 PM Murtuza Zabuawala < >> [email protected]> wrote: >> >>> Hi Dave, >>> >>> On Fri, Jun 4, 2021 at 7:23 PM Dave Page <[email protected]> >>> wrote: >>> >>>> Hi >>>> >>>> On Fri, Jun 4, 2021 at 2:34 PM Murtuza Zabuawala < >>>> [email protected]> wrote: >>>> >>>>> Hello, >>>>> >>>>> I want to propose a suggestion here, If we can display configuration >>>>> data in category/tab like below then it will make sense for the user >>>>> (instead of dumping everthing in one single textbox randomly from >>>>> config file) >>>>> >>>>> SMTP >>>>> - config1=value1 >>>>> - config2=value2 >>>>> - config3=value3 ... >>>>> AUTHENTICATION >>>>> - KERBERSOE >>>>> - config1=value1 >>>>> - config2=value2 >>>>> - config3=value3 ... >>>>> - LDAP >>>>> - config1=value1 >>>>> - config2=value2 >>>>> - config3=value3 ... >>>>> SECURITY >>>>> - config1=value1 >>>>> - config2=value2 >>>>> - config3=value3 ... >>>>> >>>> >>>> It would, but it's not really worth the effort. This is really intended >>>> as debugging info the user can just copy/paste into an email to us. >>>> >>> >>> If it is for debugging purpose only then can we just place a "Copy >>> configuration" button and hide this textbox, by clicking on the button will >>> copy all the pgadmin4 configuration on the user's clipboard and can avoid >>> clutter from the about window. >>> >> >> It's still useful to read it occasionally IMHO. >> >> >>> >>> >>>> >>>>> >>>>> >>>>> Regards, >>>>> Murtuza >>>>> >>>>> On Fri, Jun 4, 2021 at 5:33 PM Pradip Parkale < >>>>> [email protected]> wrote: >>>>> >>>>>> Hi Akshay, >>>>>> >>>>>> Please find the updated patch. I have fixed the OS details issue for >>>>>> Linux, MacOS big sur. >>>>>> >>>>>> On Tue, Jun 1, 2021 at 8:48 PM Akshay Joshi < >>>>>> [email protected]> wrote: >>>>>> >>>>>>> Thanks, patch applied. >>>>>>> >>>>>>> On Tue, Jun 1, 2021 at 2:03 PM Pradip Parkale < >>>>>>> [email protected]> wrote: >>>>>>> >>>>>>>> Hi Akshay, >>>>>>>> >>>>>>>> Please find an updated patch. >>>>>>>> >>>>>>>> >>>>>>>> On Mon, May 24, 2021 at 4:45 PM Akshay Joshi < >>>>>>>> [email protected]> wrote: >>>>>>>> >>>>>>>>> Hi Pradip >>>>>>>>> >>>>>>>>> Following are the review comments: >>>>>>>>> >>>>>>>>> - Following labels should be changed >>>>>>>>> - Browser Details -> Browser >>>>>>>>> - OS -> Operating System >>>>>>>>> - Config DB -> pgAdmin Database File >>>>>>>>> >>>>>>>>> Done. >>>>>>>> >>>>>>>>> >>>>>>>>> - Server Configuration Text Area should be *readonly* and it >>>>>>>>> should have a "col-sm-9" class instead of "col-sm-3". >>>>>>>>> >>>>>>>>> Done. >>>>>>>> >>>>>>>>> >>>>>>>>> - If the user resizes the About dialog then instead of showing >>>>>>>>> blank space can we automatically resize the Server configuration text area? >>>>>>>>> >>>>>>>>> Done. >>>>>>>> >>>>>>>>> >>>>>>>>> - The height of the About dialog in the Server mode should be >>>>>>>>> less as we are not showing "Server Configuration". >>>>>>>>> >>>>>>>>> Done. >>>>>>>> >>>>>>>>> >>>>>>>>> - In Runtime, we should merge the 'Browser details' in 'NW.js >>>>>>>>> version' like *0.51.2 (Chromium 89.0.4389.114)* OR at least >>>>>>>>> prefix 'Chromium' before the version in the 'Browser details'. >>>>>>>>> >>>>>>>>> Done. >>>>>>>> >>>>>>>>> >>>>>>>>> - Found string difference in OS details for Runtime and >>>>>>>>> Desktop mode. >>>>>>>>> - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS X >>>>>>>>> 10.15.7" in Dekstop mode. >>>>>>>>> - Windows: "Win64" in Runtime, while "Windows 10" in >>>>>>>>> Desktop which also not correct, I am using "Windows Server 2016". >>>>>>>>> - Following issue found on Firefox (First Image) configuration >>>>>>>>> in a single line, Safari (Second image) too many scroll bars. >>>>>>>>> >>>>>>>>> Done. >>>>>>>> >>>>>>>>> [image: Firefox.png]. [image: Safari.png] >>>>>>>>> >>>>>>>>> On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < >>>>>>>>> [email protected]> wrote: >>>>>>>>> >>>>>>>>>> Hi Hackers, >>>>>>>>>> >>>>>>>>>> Please find the attached patch for #6231. I have added OS, NW.js, >>>>>>>>>> browser details, and some server configuration in the About pgAdmin pop-up. >>>>>>>>>> >>>>>>>>>> Server configuration won't be visible to the non-admin users in >>>>>>>>>> server mode. >>>>>>>>>> -- >>>>>>>>>> Thanks & Regards, >>>>>>>>>> Pradip Parkale >>>>>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> -- >>>>>>>>> *Thanks & Regards* >>>>>>>>> *Akshay Joshi* >>>>>>>>> *pgAdmin Hacker | Principal Software Architect* >>>>>>>>> *EDB Postgres <http://edbpostgres.com>* >>>>>>>>> >>>>>>>>> *Mobile: +91 976-788-8246* >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> Thanks & Regards, >>>>>>>> Pradip Parkale >>>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> *Thanks & Regards* >>>>>>> *Akshay Joshi* >>>>>>> *pgAdmin Hacker | Principal Software Architect* >>>>>>> *EDB Postgres <http://edbpostgres.com>* >>>>>>> >>>>>>> *Mobile: +91 976-788-8246* >>>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Thanks & Regards, >>>>>> Pradip Parkale >>>>>> Software Engineer | EnterpriseDB Corporation >>>>>> >>>>> >>>> >>>> -- >>>> Dave Page >>>> VP, Chief Architect, Database Infrastructure >>>> Blog: https://www.enterprisedb.com/dave-page >>>> Twitter: @pgsnake >>>> >>>> EDB: https://www.enterprisedb.com >>>> >>> >> >> -- >> Dave Page >> VP, Chief Architect, Database Infrastructure >> Blog: https://www.enterprisedb.com/dave-page >> Twitter: @pgsnake >> >> EDB: https://www.enterprisedb.com >> > > > -- > Thanks & Regards, > Pradip Parkale > Software Engineer | EnterpriseDB Corporation > -- *Thanks & Regards* *Akshay Joshi* *pgAdmin Hacker | Principal Software Architect* *EDB Postgres <http://edbpostgres.com>* *Mobile: +91 976-788-8246* Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-24 15:34 Pradip Parkale <[email protected]> parent: Akshay Joshi <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Pradip Parkale @ 2021-06-24 15:34 UTC (permalink / raw) To: Akshay Joshi <[email protected]>; +Cc: pgadmin-hackers Hi Akshay, Please find the attached patch.'Mail_Password' was visible in server configuration.I removed that now. On Fri, Jun 11, 2021 at 7:40 PM Akshay Joshi <[email protected]> wrote: > Thanks, the patch applied. > > On Fri, Jun 11, 2021 at 7:20 PM Pradip Parkale < > [email protected]> wrote: > >> Hi Akshay, >> >> Please find the attached patch for #6231.I have fixed all review comments >> given in the team. >> >> On Fri, Jun 4, 2021 at 8:09 PM Dave Page <[email protected]> >> wrote: >> >>> >>> >>> On Fri, Jun 4, 2021 at 3:14 PM Murtuza Zabuawala < >>> [email protected]> wrote: >>> >>>> Hi Dave, >>>> >>>> On Fri, Jun 4, 2021 at 7:23 PM Dave Page <[email protected]> >>>> wrote: >>>> >>>>> Hi >>>>> >>>>> On Fri, Jun 4, 2021 at 2:34 PM Murtuza Zabuawala < >>>>> [email protected]> wrote: >>>>> >>>>>> Hello, >>>>>> >>>>>> I want to propose a suggestion here, If we can display configuration >>>>>> data in category/tab like below then it will make sense for the user >>>>>> (instead of dumping everthing in one single textbox randomly from >>>>>> config file) >>>>>> >>>>>> SMTP >>>>>> - config1=value1 >>>>>> - config2=value2 >>>>>> - config3=value3 ... >>>>>> AUTHENTICATION >>>>>> - KERBERSOE >>>>>> - config1=value1 >>>>>> - config2=value2 >>>>>> - config3=value3 ... >>>>>> - LDAP >>>>>> - config1=value1 >>>>>> - config2=value2 >>>>>> - config3=value3 ... >>>>>> SECURITY >>>>>> - config1=value1 >>>>>> - config2=value2 >>>>>> - config3=value3 ... >>>>>> >>>>> >>>>> It would, but it's not really worth the effort. This is really >>>>> intended as debugging info the user can just copy/paste into an email to us. >>>>> >>>> >>>> If it is for debugging purpose only then can we just place a "Copy >>>> configuration" button and hide this textbox, by clicking on the button will >>>> copy all the pgadmin4 configuration on the user's clipboard and can avoid >>>> clutter from the about window. >>>> >>> >>> It's still useful to read it occasionally IMHO. >>> >>> >>>> >>>> >>>>> >>>>>> >>>>>> >>>>>> Regards, >>>>>> Murtuza >>>>>> >>>>>> On Fri, Jun 4, 2021 at 5:33 PM Pradip Parkale < >>>>>> [email protected]> wrote: >>>>>> >>>>>>> Hi Akshay, >>>>>>> >>>>>>> Please find the updated patch. I have fixed the OS details issue for >>>>>>> Linux, MacOS big sur. >>>>>>> >>>>>>> On Tue, Jun 1, 2021 at 8:48 PM Akshay Joshi < >>>>>>> [email protected]> wrote: >>>>>>> >>>>>>>> Thanks, patch applied. >>>>>>>> >>>>>>>> On Tue, Jun 1, 2021 at 2:03 PM Pradip Parkale < >>>>>>>> [email protected]> wrote: >>>>>>>> >>>>>>>>> Hi Akshay, >>>>>>>>> >>>>>>>>> Please find an updated patch. >>>>>>>>> >>>>>>>>> >>>>>>>>> On Mon, May 24, 2021 at 4:45 PM Akshay Joshi < >>>>>>>>> [email protected]> wrote: >>>>>>>>> >>>>>>>>>> Hi Pradip >>>>>>>>>> >>>>>>>>>> Following are the review comments: >>>>>>>>>> >>>>>>>>>> - Following labels should be changed >>>>>>>>>> - Browser Details -> Browser >>>>>>>>>> - OS -> Operating System >>>>>>>>>> - Config DB -> pgAdmin Database File >>>>>>>>>> >>>>>>>>>> Done. >>>>>>>>> >>>>>>>>>> >>>>>>>>>> - Server Configuration Text Area should be *readonly* and it >>>>>>>>>> should have a "col-sm-9" class instead of "col-sm-3". >>>>>>>>>> >>>>>>>>>> Done. >>>>>>>>> >>>>>>>>>> >>>>>>>>>> - If the user resizes the About dialog then instead of >>>>>>>>>> showing blank space can we automatically resize the Server configuration >>>>>>>>>> text area? >>>>>>>>>> >>>>>>>>>> Done. >>>>>>>>> >>>>>>>>>> >>>>>>>>>> - The height of the About dialog in the Server mode should be >>>>>>>>>> less as we are not showing "Server Configuration". >>>>>>>>>> >>>>>>>>>> Done. >>>>>>>>> >>>>>>>>>> >>>>>>>>>> - In Runtime, we should merge the 'Browser details' in 'NW.js >>>>>>>>>> version' like *0.51.2 (Chromium 89.0.4389.114)* OR at least >>>>>>>>>> prefix 'Chromium' before the version in the 'Browser details'. >>>>>>>>>> >>>>>>>>>> Done. >>>>>>>>> >>>>>>>>>> >>>>>>>>>> - Found string difference in OS details for Runtime and >>>>>>>>>> Desktop mode. >>>>>>>>>> - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS >>>>>>>>>> X 10.15.7" in Dekstop mode. >>>>>>>>>> - Windows: "Win64" in Runtime, while "Windows 10" in >>>>>>>>>> Desktop which also not correct, I am using "Windows Server 2016". >>>>>>>>>> - Following issue found on Firefox (First Image) >>>>>>>>>> configuration in a single line, Safari (Second image) too many scroll bars. >>>>>>>>>> >>>>>>>>>> Done. >>>>>>>>> >>>>>>>>>> [image: Firefox.png]. [image: Safari.png] >>>>>>>>>> >>>>>>>>>> On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < >>>>>>>>>> [email protected]> wrote: >>>>>>>>>> >>>>>>>>>>> Hi Hackers, >>>>>>>>>>> >>>>>>>>>>> Please find the attached patch for #6231. I have added OS, >>>>>>>>>>> NW.js, browser details, and some server configuration in the About pgAdmin >>>>>>>>>>> pop-up. >>>>>>>>>>> >>>>>>>>>>> Server configuration won't be visible to the non-admin users in >>>>>>>>>>> server mode. >>>>>>>>>>> -- >>>>>>>>>>> Thanks & Regards, >>>>>>>>>>> Pradip Parkale >>>>>>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> -- >>>>>>>>>> *Thanks & Regards* >>>>>>>>>> *Akshay Joshi* >>>>>>>>>> *pgAdmin Hacker | Principal Software Architect* >>>>>>>>>> *EDB Postgres <http://edbpostgres.com>* >>>>>>>>>> >>>>>>>>>> *Mobile: +91 976-788-8246* >>>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> -- >>>>>>>>> Thanks & Regards, >>>>>>>>> Pradip Parkale >>>>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> *Thanks & Regards* >>>>>>>> *Akshay Joshi* >>>>>>>> *pgAdmin Hacker | Principal Software Architect* >>>>>>>> *EDB Postgres <http://edbpostgres.com>* >>>>>>>> >>>>>>>> *Mobile: +91 976-788-8246* >>>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Thanks & Regards, >>>>>>> Pradip Parkale >>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>> >>>>>> >>>>> >>>>> -- >>>>> Dave Page >>>>> VP, Chief Architect, Database Infrastructure >>>>> Blog: https://www.enterprisedb.com/dave-page >>>>> Twitter: @pgsnake >>>>> >>>>> EDB: https://www.enterprisedb.com >>>>> >>>> >>> >>> -- >>> Dave Page >>> VP, Chief Architect, Database Infrastructure >>> Blog: https://www.enterprisedb.com/dave-page >>> Twitter: @pgsnake >>> >>> EDB: https://www.enterprisedb.com >>> >> >> >> -- >> Thanks & Regards, >> Pradip Parkale >> Software Engineer | EnterpriseDB Corporation >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > *pgAdmin Hacker | Principal Software Architect* > *EDB Postgres <http://edbpostgres.com>* > > *Mobile: +91 976-788-8246* > -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image [application/octet-stream] about.patch (1.6K, 5-about.patch) download | inline diff: diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py index 0076a8a93..51afeab98 100644 --- a/web/pgadmin/about/__init__.py +++ b/web/pgadmin/about/__init__.py @@ -91,7 +91,7 @@ def index(): 'SECRET_KEY', 'SECURITY_PASSWORD_SALT', 'SECURITY_PASSWORD_HASH', - 'ALLOWED_HOSTS' + 'ALLOWED_HOSTS', 'MAIL_PASSWORD', 'LDAP_BIND_PASSWORD', 'SECURITY_PASSWORD_HASH']: diff --git a/web/pgadmin/about/templates/about/index.html b/web/pgadmin/about/templates/about/index.html index e7810a6b7..f63ab9675 100644 --- a/web/pgadmin/about/templates/about/index.html +++ b/web/pgadmin/about/templates/about/index.html @@ -39,8 +39,8 @@ </div> <div class="row"> <div class="col-sm-9"> - <textarea id="about-textarea" rows="7" cols="150" style="position: relative;width:101%; white-space: pre-wrap;" readonly>{{ info.settings|safe }}</textarea> - <button class="btn btn-secondary about-copy" id="copy_textarea" style="position:absolute;top:0;right:0;z-index:20;padding:0px;">Copy</button> + <textarea id="about-textarea" rows="7" cols="150" style="position: relative;width:105%; white-space: pre-wrap;" readonly>{{ info.settings|safe }}</textarea> + <button class="btn btn-secondary about-copy" id="copy_textarea" style="position:absolute;top:0;right:0;z-index:20;">Copy</button> </div> </div> {% endif %} ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up @ 2021-06-25 06:09 Akshay Joshi <[email protected]> parent: Pradip Parkale <[email protected]> 0 siblings, 0 replies; 13+ messages in thread From: Akshay Joshi @ 2021-06-25 06:09 UTC (permalink / raw) To: Pradip Parkale <[email protected]>; +Cc: pgadmin-hackers Thanks, the patch applied. On Thu, Jun 24, 2021 at 9:04 PM Pradip Parkale < [email protected]> wrote: > Hi Akshay, > > Please find the attached patch.'Mail_Password' was visible in server > configuration.I removed that now. > > On Fri, Jun 11, 2021 at 7:40 PM Akshay Joshi < > [email protected]> wrote: > >> Thanks, the patch applied. >> >> On Fri, Jun 11, 2021 at 7:20 PM Pradip Parkale < >> [email protected]> wrote: >> >>> Hi Akshay, >>> >>> Please find the attached patch for #6231.I have fixed all review >>> comments given in the team. >>> >>> On Fri, Jun 4, 2021 at 8:09 PM Dave Page <[email protected]> >>> wrote: >>> >>>> >>>> >>>> On Fri, Jun 4, 2021 at 3:14 PM Murtuza Zabuawala < >>>> [email protected]> wrote: >>>> >>>>> Hi Dave, >>>>> >>>>> On Fri, Jun 4, 2021 at 7:23 PM Dave Page <[email protected]> >>>>> wrote: >>>>> >>>>>> Hi >>>>>> >>>>>> On Fri, Jun 4, 2021 at 2:34 PM Murtuza Zabuawala < >>>>>> [email protected]> wrote: >>>>>> >>>>>>> Hello, >>>>>>> >>>>>>> I want to propose a suggestion here, If we can display configuration >>>>>>> data in category/tab like below then it will make sense for the user >>>>>>> (instead of dumping everthing in one single textbox randomly from >>>>>>> config file) >>>>>>> >>>>>>> SMTP >>>>>>> - config1=value1 >>>>>>> - config2=value2 >>>>>>> - config3=value3 ... >>>>>>> AUTHENTICATION >>>>>>> - KERBERSOE >>>>>>> - config1=value1 >>>>>>> - config2=value2 >>>>>>> - config3=value3 ... >>>>>>> - LDAP >>>>>>> - config1=value1 >>>>>>> - config2=value2 >>>>>>> - config3=value3 ... >>>>>>> SECURITY >>>>>>> - config1=value1 >>>>>>> - config2=value2 >>>>>>> - config3=value3 ... >>>>>>> >>>>>> >>>>>> It would, but it's not really worth the effort. This is really >>>>>> intended as debugging info the user can just copy/paste into an email to us. >>>>>> >>>>> >>>>> If it is for debugging purpose only then can we just place a "Copy >>>>> configuration" button and hide this textbox, by clicking on the button will >>>>> copy all the pgadmin4 configuration on the user's clipboard and can avoid >>>>> clutter from the about window. >>>>> >>>> >>>> It's still useful to read it occasionally IMHO. >>>> >>>> >>>>> >>>>> >>>>>> >>>>>>> >>>>>>> >>>>>>> Regards, >>>>>>> Murtuza >>>>>>> >>>>>>> On Fri, Jun 4, 2021 at 5:33 PM Pradip Parkale < >>>>>>> [email protected]> wrote: >>>>>>> >>>>>>>> Hi Akshay, >>>>>>>> >>>>>>>> Please find the updated patch. I have fixed the OS details issue >>>>>>>> for Linux, MacOS big sur. >>>>>>>> >>>>>>>> On Tue, Jun 1, 2021 at 8:48 PM Akshay Joshi < >>>>>>>> [email protected]> wrote: >>>>>>>> >>>>>>>>> Thanks, patch applied. >>>>>>>>> >>>>>>>>> On Tue, Jun 1, 2021 at 2:03 PM Pradip Parkale < >>>>>>>>> [email protected]> wrote: >>>>>>>>> >>>>>>>>>> Hi Akshay, >>>>>>>>>> >>>>>>>>>> Please find an updated patch. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> On Mon, May 24, 2021 at 4:45 PM Akshay Joshi < >>>>>>>>>> [email protected]> wrote: >>>>>>>>>> >>>>>>>>>>> Hi Pradip >>>>>>>>>>> >>>>>>>>>>> Following are the review comments: >>>>>>>>>>> >>>>>>>>>>> - Following labels should be changed >>>>>>>>>>> - Browser Details -> Browser >>>>>>>>>>> - OS -> Operating System >>>>>>>>>>> - Config DB -> pgAdmin Database File >>>>>>>>>>> >>>>>>>>>>> Done. >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> - Server Configuration Text Area should be *readonly* and it >>>>>>>>>>> should have a "col-sm-9" class instead of "col-sm-3". >>>>>>>>>>> >>>>>>>>>>> Done. >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> - If the user resizes the About dialog then instead of >>>>>>>>>>> showing blank space can we automatically resize the Server configuration >>>>>>>>>>> text area? >>>>>>>>>>> >>>>>>>>>>> Done. >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> - The height of the About dialog in the Server mode should >>>>>>>>>>> be less as we are not showing "Server Configuration". >>>>>>>>>>> >>>>>>>>>>> Done. >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> - In Runtime, we should merge the 'Browser details' >>>>>>>>>>> in 'NW.js version' like *0.51.2 (Chromium 89.0.4389.114)* OR >>>>>>>>>>> at least prefix 'Chromium' before the version in the 'Browser details'. >>>>>>>>>>> >>>>>>>>>>> Done. >>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> - Found string difference in OS details for Runtime and >>>>>>>>>>> Desktop mode. >>>>>>>>>>> - OSX: "Intel Mac OS X 10_15_7" in Runtime, while "Mac OS >>>>>>>>>>> X 10.15.7" in Dekstop mode. >>>>>>>>>>> - Windows: "Win64" in Runtime, while "Windows 10" in >>>>>>>>>>> Desktop which also not correct, I am using "Windows Server 2016". >>>>>>>>>>> - Following issue found on Firefox (First Image) >>>>>>>>>>> configuration in a single line, Safari (Second image) too many scroll bars. >>>>>>>>>>> >>>>>>>>>>> Done. >>>>>>>>>> >>>>>>>>>>> [image: Firefox.png]. [image: Safari.png] >>>>>>>>>>> >>>>>>>>>>> On Fri, May 21, 2021 at 2:23 PM Pradip Parkale < >>>>>>>>>>> [email protected]> wrote: >>>>>>>>>>> >>>>>>>>>>>> Hi Hackers, >>>>>>>>>>>> >>>>>>>>>>>> Please find the attached patch for #6231. I have added OS, >>>>>>>>>>>> NW.js, browser details, and some server configuration in the About pgAdmin >>>>>>>>>>>> pop-up. >>>>>>>>>>>> >>>>>>>>>>>> Server configuration won't be visible to the non-admin users in >>>>>>>>>>>> server mode. >>>>>>>>>>>> -- >>>>>>>>>>>> Thanks & Regards, >>>>>>>>>>>> Pradip Parkale >>>>>>>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> -- >>>>>>>>>>> *Thanks & Regards* >>>>>>>>>>> *Akshay Joshi* >>>>>>>>>>> *pgAdmin Hacker | Principal Software Architect* >>>>>>>>>>> *EDB Postgres <http://edbpostgres.com>* >>>>>>>>>>> >>>>>>>>>>> *Mobile: +91 976-788-8246* >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> -- >>>>>>>>>> Thanks & Regards, >>>>>>>>>> Pradip Parkale >>>>>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> -- >>>>>>>>> *Thanks & Regards* >>>>>>>>> *Akshay Joshi* >>>>>>>>> *pgAdmin Hacker | Principal Software Architect* >>>>>>>>> *EDB Postgres <http://edbpostgres.com>* >>>>>>>>> >>>>>>>>> *Mobile: +91 976-788-8246* >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> Thanks & Regards, >>>>>>>> Pradip Parkale >>>>>>>> Software Engineer | EnterpriseDB Corporation >>>>>>>> >>>>>>> >>>>>> >>>>>> -- >>>>>> Dave Page >>>>>> VP, Chief Architect, Database Infrastructure >>>>>> Blog: https://www.enterprisedb.com/dave-page >>>>>> Twitter: @pgsnake >>>>>> >>>>>> EDB: https://www.enterprisedb.com >>>>>> >>>>> >>>> >>>> -- >>>> Dave Page >>>> VP, Chief Architect, Database Infrastructure >>>> Blog: https://www.enterprisedb.com/dave-page >>>> Twitter: @pgsnake >>>> >>>> EDB: https://www.enterprisedb.com >>>> >>> >>> >>> -- >>> Thanks & Regards, >>> Pradip Parkale >>> Software Engineer | EnterpriseDB Corporation >>> >> >> >> -- >> *Thanks & Regards* >> *Akshay Joshi* >> *pgAdmin Hacker | Principal Software Architect* >> *EDB Postgres <http://edbpostgres.com>* >> >> *Mobile: +91 976-788-8246* >> > > > -- > Thanks & Regards, > Pradip Parkale > Software Engineer | EnterpriseDB Corporation > -- *Thanks & Regards* *Akshay Joshi* *pgAdmin Hacker | Principal Software Architect* *EDB Postgres <http://edbpostgres.com>* *Mobile: +91 976-788-8246* Attachments: [image/png] Firefox.png (122.7K, 3-Firefox.png) download | view image [image/png] Safari.png (154.4K, 4-Safari.png) download | view image ^ permalink raw reply [nested|flat] 13+ messages in thread
end of thread, other threads:[~2021-06-25 06:09 UTC | newest] Thread overview: 13+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2021-05-21 08:52 [pgAdmin][RM6231]- Add OS, Browser details in pgAdmin About us pop-up Pradip Parkale <[email protected]> 2021-05-24 11:14 ` Akshay Joshi <[email protected]> 2021-06-01 08:32 ` Pradip Parkale <[email protected]> 2021-06-01 15:18 ` Akshay Joshi <[email protected]> 2021-06-04 12:03 ` Pradip Parkale <[email protected]> 2021-06-04 13:33 ` Murtuza Zabuawala <[email protected]> 2021-06-04 13:53 ` Dave Page <[email protected]> 2021-06-04 14:14 ` Murtuza Zabuawala <[email protected]> 2021-06-04 14:39 ` Dave Page <[email protected]> 2021-06-11 13:49 ` Pradip Parkale <[email protected]> 2021-06-11 14:10 ` Akshay Joshi <[email protected]> 2021-06-24 15:34 ` Pradip Parkale <[email protected]> 2021-06-25 06:09 ` Akshay Joshi <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox