Re: Re : [BUG #4943]

Hi,

"add more variables to the response along with info and use those in the
front end"
i have already implemented that , but am still failing (7)  test cases
particularly in the databases/extensions tests(5).
i had run regression tests for browser node.(and all it's sub directories).
Please check the patch attached.

On Tue, Dec 10, 2019 at 6:34 PM Aditya Toshniwal <
[email protected]> wrote:

> [please use reply all to reply]
>
> You can add more variables to the response along with info and use those
> in the front end.
>
> On Tue, Dec 10, 2019, 18:24 Karan Takalkar <[email protected]> wrote:
>
>> Hi
>>
>> I had been naively modifying jason response of connect function in
>> databases __init__.py, later realized there are a lot of dependencies on it
>> and most of regression tests use:
>> if db_con["info"] == "Database connected.": .
>>
>> I am now modifying the Alertify.success script* directly responsible for
>> the popup, i could append the database name in the message but am having
>> trouble finding the *variable to supply server name.*
>> The file and location of function is :
>> *
>> (web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
>> line 523)
>>
>> the message should be:
>> Alertify.success("(?server_name_variable?}+'/'+data.label+' - '+res.info
>> ")
>>
>> data.label contains database name
>> res.info is the jason response coming from databases __init__.py connect
>> function ; which is "Database connected."
>>
>> On Mon, Dec 9, 2019 at 8:35 PM Aditya Toshniwal <
>> [email protected]> wrote:
>>
>>> Hi Karan,
>>>
>>> Kindly add a hyphen between the message and names, create a patch to
>>> pgAdmin hackers(check cc).
>>> Kindly also run the test cases and pep8 before sending.
>>>
>>> On Mon, Dec 9, 2019, 20:17 Karan Takalkar <[email protected]> wrote:
>>>
>>>> I have updated the success message.
>>>> Please check the screenshots attached.
>>>> Should i make a patch?
>>>>
>>>> Regards,
>>>> Karan
>>>>
>>>> On Mon, 9 Dec, 2019, 3:25 PM Aditya Toshniwal, <
>>>> [email protected]> wrote:
>>>>
>>>>> ++pgadmin-hackers
>>>>>
>>>>> Hi Karan,
>>>>>
>>>>> It is good to know that you're contributing.
>>>>> I would suggest {server name}/{db name} as name instead of did is
>>>>> better for UX. You can get the db name from conn object and server name
>>>>> using the sid (refer
>>>>> - web/pgadmin/browser/server_groups/servers/__init__.py)
>>>>>
>>>>>
>>>>> On Mon, Dec 9, 2019 at 3:11 PM Karan Takalkar <[email protected]>
>>>>> wrote:
>>>>>
>>>>>> Hi,
>>>>>>
>>>>>> I have been working on #4943 ("Database connected" success message
>>>>>> itself is not enough) added by you on pgAdmin4 issues.
>>>>>> I want to know what details of database should be included in success
>>>>>> message.(i have added 'did')
>>>>>>
>>>>>> The success message can be modified by altering json response in the
>>>>>> connect method in file
>>>>>> PGADMIN_SRC/web/pgadmin/browser/server_groups/servers/databases/__init__.py.
>>>>>> please have a look at the screenshots attached.
>>>>>>
>>>>>> original:
>>>>>> info=_( "Database connected.")
>>>>>> new:
>>>>>> info=_("Postgres version/{0} Database connected.".format(did))
>>>>>>
>>>>>> Regards,
>>>>>> Karan
>>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Thanks and Regards,
>>>>> Aditya Toshniwal
>>>>> Sr. Software Engineer | EnterpriseDB India | Pune
>>>>> "Don't Complain about Heat, Plant a TREE"
>>>>>
>>>>

diff --git a/web/pgadmin/browser/server_groups/servers/databases/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/__init__.py
index 26fd5ccac..a07dcaf16 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/__init__.py
@@ -30,6 +30,7 @@ from pgadmin.utils.ajax import make_json_response, \
     make_response as ajax_response, internal_server_error, unauthorized
 from pgadmin.utils.driver import get_driver
 from pgadmin.tools.sqleditor.utils.query_history import QueryHistory
+from pgadmin.model import Server
 
 
 class DatabaseModule(CollectionNodeModule):
@@ -468,7 +469,9 @@ class DatabaseView(PGChildNodeView):
                 info=_("Database connected."),
                 data={
                     'icon': 'pg-icon-database',
-                    'connected': True
+                    'connected': True,
+                    'svr':  Server.query.filter_by(id=sid)[0].name,
+                    'db': conn.db
                 }
             )
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
index ab0df6939..43029ce90 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
@@ -520,7 +520,7 @@ define('pgadmin.node.database', [
                 tree.addIcon(item, {icon: data.icon});
               }
 
-              Alertify.success(res.info);
+              Alertify.success(res.data.svr+'/'+res.data.db+' - '+res.info);
               obj.trigger('connected', obj, item, data);
               pgBrowser.Events.trigger(
                 'pgadmin:database:connected', item, data