Removing dynamic module loading and replacing it with static loading. Fixes #7492

Gets rid of all occurrences and usage of get_own_javascripts since it is no longer used.
This commit is contained in:
Aditya Toshniwal
2022-06-30 11:06:50 +05:30
committed by Akshay Joshi
parent e46468321d
commit cb635f6706
51 changed files with 490 additions and 550 deletions

View File

@@ -68,8 +68,6 @@ class PgAdminModule(Blueprint):
sub-modules at once.
"""
self.submodules = list(app.find_submodules(self.import_name))
super(PgAdminModule, self).register(app, options)
for module in self.submodules:
@@ -94,14 +92,6 @@ class PgAdminModule(Blueprint):
"""
return dict()
def get_own_javascripts(self):
"""
Returns:
list: the javascripts used by this module, not including
any script needed by the submodules.
"""
return []
def get_own_menuitems(self):
"""
Returns:
@@ -139,13 +129,6 @@ class PgAdminModule(Blueprint):
res.update(module.messages)
return res
@property
def javascripts(self):
javascripts = self.get_own_javascripts()
for module in self.submodules:
javascripts.extend(module.javascripts)
return javascripts
@property
def menu_items(self):
menu_items = self.get_own_menuitems()

View File

@@ -12,6 +12,21 @@ from abc import ABCMeta
from pgadmin.utils.dynamic_registry import create_registry_metaclass
@classmethod
def load_modules(cls, app=None):
submodules = []
from . import psycopg2 as module
submodules.append(module)
from . import abstract as module
submodules.append(module)
for module in submodules:
if "init_app" in module.__dict__.keys():
module.__dict__["init_app"](app)
DriverRegistry = create_registry_metaclass(
"DriverRegistry", __package__, decorate_as_module=True
"DriverRegistry", __package__, load_modules=load_modules,
decorate_as_module=True
)

View File

@@ -80,7 +80,8 @@ def __get_class_name(self, name, kwargs):
return name
def create_registry_metaclass(name, package, decorate_as_module=True):
def create_registry_metaclass(name, package, load_modules=__load_modules,
decorate_as_module=True):
class_params = {
# constructor
@@ -93,7 +94,7 @@ def create_registry_metaclass(name, package, decorate_as_module=True):
# Member functions
"get": __get,
"load_modules": __load_modules,
"load_modules": load_modules,
"_name_": name,
"_decorate_cls_name": __get_module_name
if decorate_as_module is True else __get_class_name,