Use beta admin as default

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Current (in progress)
 
+- Use beta admin as default [#621](https://github.com/datagouv/udata-front/pull/621)
 - Fix following cache issue [#631](https://github.com/datagouv/udata-front/pull/631)
 - Add dataservice search to header [#622](https://github.com/datagouv/udata-front/pull/622)
 

udata_front/frontend/helpers.py

@@ -109,6 +109,20 @@ def in_url(*args, **kwargs):
     )
 
 
+@front.app_template_global()
+def beta_admin_url_for(path, fallback_path, **kwargs):
+    '''
+    A helper to route to the new admin if available.
+    If NEW_ADMIN_URL is defined, we build the target url pointing to it using `path`.
+    Else we route to the old admin using `fallback_path`.
+    Kwargs are forwarded as as params in the first case and as arguments of url_for in the seconde case.
+    '''
+    if current_app.config['NEW_ADMIN_URL']:
+        scheme, netloc, path, query, fragments = urlsplit(current_app.config['NEW_ADMIN_URL'] + path)
+        return urlunsplit((scheme, netloc, path, url_encode(kwargs), fragments))
+    return url_for('admin.index', path=fallback_path, **kwargs)
+
+
 @front.app_template_filter()
 @pass_context
 def placeholder(ctx, url, name='default', external=False):

udata_front/theme/gouvfr/templates/dataset/display.html

@@ -56,7 +56,7 @@
     <div class="fr-col-auto fr-ml-3v">
         <a
             class="fr-btn fr-btn--sm fr-btn--secondary fr-btn--secondary-warning-425 fr-icon-pencil-line fr-btn--icon-left"
-            href="{{ url_for('admin.index', path='dataset/{id}/'.format(id=dataset.id)) }}"
+            href="{{ beta_admin_url_for(path='datasets/{id}/'.format(id=dataset.id), fallback_path='dataset/{id}/'.format(id=dataset.id)) }}"
         >
             {{ _('Edit') }}
         </a>
@@ -359,7 +359,7 @@ <h2 class="fr-mt-4w fr-mb-1w subtitle subtitle--uppercase">
                             <p>
                                 <a
                                     class="fr-btn"
-                                    href="{{ url_for('admin.index', path='dataset/{id}/'.format(id=dataset.id)) }}"
+                                    href="{{ beta_admin_url_for(path='datasets/{id}/'.format(id=dataset.id), fallback_path='dataset/{id}/'.format(id=dataset.id)) }}"
                                 >
                                     {{ _('Add a file') }}
                                 </a>
@@ -399,7 +399,7 @@ <h2 class="subtitle subtitle--uppercase fr-col">{{ ngettext('%(num)d Reuse', '%(
                 {% if not read_only_mode %}
                     <div class="fr-col-12 fr-col-sm-6 fr-col-md-5 fr-col-lg-4 text-align-right">
                         <a class="fr-btn fr-btn--sm fr-btn--secondary fr-btn--secondary-grey-500 fr-icon-add-line fr-btn--icon-left"
-                            href="{{ url_for('admin.index', path='reuse/new/', **{'dataset_id': dataset.id}) }}">
+                            href="{{ beta_admin_url_for(path='reuses/new/', fallback_path='reuse/new/', **{'dataset_id': dataset.id}) }}">
                             {{ _('Add a reuse') }}
                         </a>
                     </div>
@@ -422,7 +422,7 @@ <h2 class="subtitle subtitle--uppercase fr-col">{{ ngettext('%(num)d Reuse', '%(
                     <p>
                         <a
                             class="fr-btn"
-                            href="{{ url_for('admin.index', path='reuse/new/', **{'dataset_id': dataset.id}) }}"
+                            href="{{ beta_admin_url_for(path='reuses/new/', fallback_path='reuse/new/', **{'dataset_id': dataset.id}) }}"
                         >
                             {{ _('Publish a reuse') }}
                         </a>

udata_front/theme/gouvfr/templates/header.html

@@ -7,9 +7,9 @@
     {'icon': 'fr-icon-database-line', 'label': _('A dataset'), 'url': url_for('beta.datasets-new')},
     {'icon': 'fr-icon-code-s-slash-line', 'label': _('An API'), 'url': url_for('beta.dataservices-new')},
     {'icon': 'fr-icon-line-chart-line', 'label': _('A reuse'), 'url': url_for('beta.reuses-new')},
-    {'icon': 'fr-icon-server-line', 'label': _('A harvester'), 'url': url_for('admin.index', path='harvester/new/')},
+    {'icon': 'fr-icon-server-line', 'label': _('A harvester'), 'url': beta_admin_url_for(path='harvesters/new', fallback_path='harvester/new/')},
     {'icon': 'fr-icon-government-line', 'label': _('An organization'), 'url': url_for('beta.organizations-new')},
-] + ([{'icon': 'fr-icon-article-line', 'label': _('A post'), 'url': url_for('admin.index', path='post/new/')}] if current_user.sysadmin else [])
+] + ([{'icon': 'fr-icon-article-line', 'label': _('A post'), 'url': beta_admin_url_for(path='posts/new/', fallback_path='post/new/')}] if current_user.sysadmin else [])
 %}
 
 <header role="banner" class="fr-header">
@@ -90,7 +90,7 @@
                                 </li>
                                 <li>
                                     <a
-                                        href="{{ url_for('admin.index') }}"
+                                        href="{{ url_for('beta.beta-admin') }}"
                                         class="fr-btn fr-icon-svg fr-icon--sm"
                                     >
                                         <span class="fr-mr-1w fr-grid-row">

udata_front/theme/gouvfr/templates/organization/display.html

@@ -51,7 +51,7 @@
 {% if can_edit %}
     <a
         class="fr-ml-2w fr-btn fr-btn--sm fr-btn--secondary fr-btn--secondary-grey-500 fr-icon-pencil-line fr-btn--icon-left"
-        href="{{ url_for('admin.index', path='organization/{id}/'.format(id=org.id)) }}"
+        href="{{ beta_admin_url_for(path='organizations/{id}/profile/'.format(id=org.id), fallback_path='organization/{id}/'.format(id=org.id)) }}"
     >
         {{ _('Modify organization') }}
     </a>

udata_front/theme/gouvfr/templates/user/base.html

@@ -47,7 +47,7 @@
     {% else %}
     <a
         class="fr-ml-2w fr-btn fr-btn--sm fr-btn--secondary fr-btn--secondary-warning-425 fr-icon-pencil-line fr-btn--icon-left"
-        href="{{ url_for('admin.index', path='me') }}"
+        href="{{ beta_admin_url_for(path='me/profile', fallback_path='me') }}"
     >
         {{ _('Edit') }}
     </a>