Răsfoiți Sursa

HUE-8542 [frontend] Polish cloud cluster and require multi cluster mode to be on

Romain Rigaux 7 ani în urmă
părinte
comite
49ca1ba18b

+ 2 - 2
desktop/core/src/desktop/templates/hue.mako

@@ -18,7 +18,7 @@
   from django.utils.translation import ugettext as _
 
   from desktop import conf
-  from desktop.conf import IS_EMBEDDED, DEV_EMBEDDED, IS_MULTICLUSTER_ONLY
+  from desktop.conf import IS_EMBEDDED, DEV_EMBEDDED, IS_MULTICLUSTER_ONLY, has_multi_cluster
   from desktop.views import _ko, commonshare, login_modal
   from desktop.lib.i18n import smart_unicode
   from desktop.models import PREFERENCE_IS_WELCOME_TOUR_SEEN, ANALYTIC_DB, hue_version
@@ -185,7 +185,7 @@ ${ hueIcons.symbols() }
         </a>
 
         <a class="brand" data-bind="hueLink: '/home/'" href="javascript: void(0);" title="${_('Documents')}">
-          % if IS_MULTICLUSTER_ONLY.get():
+          % if IS_MULTICLUSTER_ONLY.get() and has_multi_cluster():
             <img src="${ static('desktop/art/cloudera-altus.svg') }" style="height: 28px; width: 140px; margin-top: -6px">
           % else:
             <svg style="height: 24px; width: 120px;"><use xlink:href="#hi-logo"></use></svg>

+ 87 - 48
desktop/core/src/desktop/templates/ko_components/ko_multi_cluster_sidebar.mako

@@ -117,63 +117,102 @@ from desktop.views import _ko
           label: '${ _('Data Assistant') }',
           icon: 'altus-icon altus-adb-query',
           items: [{
-            label: '${ _('Editor') }',
-            url: '/editor?type=impala'
-          },{
-            label: '${ _('Catalog') }',
-            url: '/metastore/tables'
-          },{
-            label: '${ _('Dashboard') }',
-            url: '/dashboard/new_search'
-          },{
-            label: '${ _('Scheduler') }',
-            url: '/oozie/editor/workflow/new/'
-          }]
+              label: '${ _('Editor') }',
+              url: '/editor?type=impala'
+            },{
+              label: '${ _('Catalog') }',
+              url: '/metastore/tables'
+            },{
+              label: '${ _('Files') }',
+              url: '/filebrowser/view=S3A://'
+            },{
+              label: '${ _('Dashboard') }',
+              url: '/dashboard/new_search'
+            },{
+              label: '${ _('Scheduler') }',
+              url: '/oozie/editor/workflow/new/'
+            },{
+              label: '${ _('Importer') }',
+              url: '/indexer/importer'
+            }
+          ]
         }, {
           label: '${ _('Data Science') }',
           url: '/',
           icon: 'altus-icon altus-ds'
-        }]
+        }, {
+          label: '${ _('Customer 360') }',
+          url: '/',
+          icon: 'fa fa-vcard-o'
+        }
+      ]
+      }, {
+        label: '${ _('Admin') }',
+        items: [{
+            label: '${ _('Environments') }',
+            url: '/',
+            icon: 'altus-icon altus-environment'
+          },{
+            label: '${ _('IAM') }',
+            url: 'https://console.altus.cloudera.com/iam/index.html',
+            icon: 'altus-icon altus-iam',
+            items: [{
+                label: '${ _('User') }',
+                url: 'https://console.altus.cloudera.com/iam/index.html#/users'
+              },{
+                label: '${ _('Groups') }',
+                url: 'https://console.altus.cloudera.com/iam/index.html#/groups'
+              }
+            ]
+          }
+        ]
+      }, {
+        label: '${ _('Storage') }',
+        items: [{
+            label: '${ _('SDX Catalog') }',
+            url: '/',
+            icon: 'altus-icon altus-sdx'
+          },{
+            label: '${ _('Streaming') }',
+            url: '/',
+            icon: 'fa fa-sitemap'
+          },{
+            label: '${ _('Operational DB') }',
+            url: '/',
+            icon: 'altus-icon altus-adb',
+            items: [{
+                label: '${ _('Kudu') }',
+                url: '/'
+              },{
+                label: '${ _('HBase') }',
+                url: '/'
+              }
+            ]
+          }
+        ]
       }, {
         label: '${ _('Compute') }',
         items: [{
-          label: '${ _('Data Warehouse') }',
-          icon: 'altus-icon altus-dashboard',
-          items: [{
-            label: '${ _('Clusters') }',
+            label: '${ _('Data Warehouse') }',
+            icon: 'altus-icon altus-dashboard',
             url: '/'
-          }]
-        },{
-          label: '${ _('Data Engineering') }',
-          icon: 'altus-icon altus-de',
-          items: [{
-            label: '${ _('Clusters') }',
-            url: '/'
-          },{
-            label: '${ _('Jobs') }',
+          }, {
+            label: '${ _('Data Engineering') }',
+            icon: 'altus-icon altus-de',
+            items: [{
+                label: '${ _('Clusters') }',
+                url: '/'
+              },{
+                label: '${ _('Jobs') }',
+                url: '/'
+              }
+            ]
+          }, {
+            label: '${ _('Scheduling') }',
+            icon: 'altus-icon altus-workload',
             url: '/'
-          }]
-        }]
-      },
-        {
-        label: '${ _('Admin') }',
-        items: [{
-          label: '${ _('Environments') }',
-          url: '/',
-          icon: 'altus-icon altus-environment'
-        },{
-          label: '${ _('SDX Namespaces') }',
-          url: '/',
-          icon: 'altus-icon altus-sdx'
-        },{
-          label: '${ _('IAM') }',
-          url: '/',
-          icon: 'altus-icon altus-iam'
-        },{
-          label: '${ _('Support') }',
-          url: '/',
-          icon: 'fa fa-question'
-        }]
+          }
+        ]
       }
         ##  , {
         ##    label: '${ _('Icons') }',