global: implement support for tuples in the routes config (part of front page components refactor) #2243
Conversation
jennur
force-pushed
the
frontpage-components-refactor
branch
3 times, most recently
from
3695456
to
074590e
Compare
jennur
changed the title
jennur
force-pushed
the
frontpage-components-refactor
branch
from
074590e
to
ceefa23
Compare
jennur
force-pushed
the
frontpage-components-refactor
branch
2 times, most recently
from
e742abe
to
516e9d2
Compare
invenio_app_rdm/theme/views.py
Outdated
| def index(): | ||
| """Frontpage.""" | ||
| featured_communities = current_communities.service.featured_search( |
There was a problem hiding this comment.
what if an instance will not have feature communities in the home page? This extra search should be avoided in this case.
jennur
force-pushed
the
frontpage-components-refactor
branch
4 times, most recently
from
6332ea1
to
ce6ede4
Compare
invenio_app_rdm/theme/views.py
Outdated
| else: | ||
| return rule, name, default_view_func | ||
|
|
||
| blueprint.add_url_rule(*create_url_rule(rule=routes["index"], name="index", default_view_func=index)) |
There was a problem hiding this comment.
I think it makes sense to use the same way of constructing this for the rest of the routes i.e robots, help_search, help_statistics to be consistent...
There was a problem hiding this comment.
I added the name there because I couldn't specify which of the arguments were the view_func in add_url_rule through the other function (or is there a way?), so it was failing. But I can remove it from the function parameters and just add None in the return value?
invenio_app_rdm/theme/views.py
Outdated
| @@ -62,6 +74,8 @@ def init_menu(): | |||
| # | |||
| # Views | |||
| # | |||
|
|
|||
| @@ -2,6 +2,26 @@ | |||
| Invenio App RDM Transition Overrides | |||
| ***********************************************/ | |||
|
|
|||
| #carousel-slides { | |||
There was a problem hiding this comment.
there is no carousel anymore in invenio-app-rdm so maybe is better to move these in zenodo-rdm? Or are these changes needed for the existing macros?
There was a problem hiding this comment.
All the styling is for the macros and/or react component in invenio-communities. zenodo-rdm is just importing the macro from invenio-communities
jennur
force-pushed
the
frontpage-components-refactor
branch
3 times, most recently
from
061a97b
to
e4699d9
Compare
invenio_app_rdm/theme/views.py
Outdated
| if isinstance(rule, tuple): | ||
| path, view_func = rule | ||
|
|
||
| if view_func == None: |
There was a problem hiding this comment.
this can be removed as a tuple should always be used with a view_func
| @@ -18,6 +18,18 @@ | |||
| from invenio_i18n import lazy_gettext as _ | |||
| from invenio_users_resources.forms import NotificationsForm | |||
|
|
|||
| # Generate rule from string or tuple | |||
| def create_url_rule(rule, default_view_func): | |||
| if isinstance(rule, tuple): | |||
jennur
force-pushed
the
frontpage-components-refactor
branch
from
e4699d9
to
86eb277
Compare
jennur
force-pushed
the
frontpage-components-refactor
branch
from
86eb277
to
f709372
Compare
jennur
changed the title
addresses inveniosoftware/invenio-communities#874