Преглед на файлове

HUE-7760 [jb] ADLS browser submenu is missing on hue3 UI

jdesjean преди 8 години
родител
ревизия
31c639fe0c
променени са 2 файла, в които са добавени 18 реда и са изтрити 1 реда
  1. 15 1
      desktop/core/src/desktop/templates/common_header.mako
  2. 3 0
      desktop/core/src/desktop/views.py

+ 15 - 1
desktop/core/src/desktop/templates/common_header.mako

@@ -260,7 +260,7 @@ ${ hueIcons.symbols() }
   <ul class="nav nav-pills">
     <li class="divider-vertical"></li>
     % if 'filebrowser' in apps:
-      % if not is_s3_enabled:
+      % if not is_s3_enabled and not is_adls_enabled:
       <li class="hide1380">
         <a title="${_('Manage HDFS')}" data-rel="navigator-tooltip" href="/${apps['filebrowser'].display_name}">
           <i class="fa fa-file"></i>&nbsp;${_('File Browser')}&nbsp;
@@ -275,9 +275,16 @@ ${ hueIcons.symbols() }
             <li><a href="/${apps['filebrowser'].display_name}">
               <i class="fa fa-fw fa-file" style="vertical-align: middle"></i>${_('HDFS Browser')}</a>
             </li>
+            % if is_s3_enabled:
             <li><a href="/${apps['filebrowser'].display_name}/view=S3A://">
               <i class="fa fa-fw fa-cubes" style="vertical-align: middle"></i>${_('S3 Browser')}</a>
             </li>
+            % endif
+            % if is_adls_enabled:
+            <li><a href="/${apps['filebrowser'].display_name}/view=adl:/">
+              <span class="fa fa-fw" style="font-size:20px;vertical-align: middle;"><svg class="hi"><use xlink:href='#hi-adls'></use></svg></span>${_('ADLS Browser')}</a>
+            </li>
+            % endif
           </ul>
         </li>
       % endif
@@ -293,6 +300,13 @@ ${ hueIcons.symbols() }
           </a>
         % endif
       </li>
+      <li class="hideMoreThan1380">
+        % if is_adls_enabled:
+          <a title="${_('ADLS Browser')}" data-rel="navigator-tooltip" href="/${apps['filebrowser'].display_name}/view=adl:/">
+            <span style="font-size:15px;vertical-align: middle;"><svg class="hi"><use xlink:href='#hi-adls'></use></svg></span>
+          </a>
+        % endif
+      </li>
     % endif
     % if 'jobbrowser' in apps:
       <% from jobbrowser.conf import ENABLE_V2 %>

+ 3 - 0
desktop/core/src/desktop/views.py

@@ -39,6 +39,7 @@ from django.views.decorators.http import require_POST
 import django.views.debug
 
 from aws.conf import is_enabled as is_s3_enabled, has_s3_access
+from azure.conf import is_adls_enabled, has_adls_access
 
 import desktop.conf
 import desktop.log.log_buffer
@@ -74,6 +75,7 @@ def hue(request):
     'apps': apps,
     'other_apps': other_apps,
     'is_s3_enabled': is_s3_enabled() and has_s3_access(request.user),
+    'is_adls_enabled': is_adls_enabled() and has_adls_access(request.user),
     'is_ldap_setup': 'desktop.auth.backend.LdapBackend' in desktop.conf.AUTH.BACKEND.get(),
     'leaflet': {
       'layer': desktop.conf.LEAFLET_TILE_LAYER.get(),
@@ -471,6 +473,7 @@ def commonheader(title, section, user, request=None, padding="90px", skip_topbar
     'is_demo': desktop.conf.DEMO_ENABLED.get(),
     'is_ldap_setup': 'desktop.auth.backend.LdapBackend' in desktop.conf.AUTH.BACKEND.get(),
     'is_s3_enabled': is_s3_enabled() and has_s3_access(user),
+    'is_adls_enabled': is_adls_enabled() and has_adls_access(request.user),
     'banner_message': get_banner_message(request)
   })