Pārlūkot izejas kodu

HUE-8962 [core] Remove the embedded mode from API

Romain 6 gadi atpakaļ
vecāks
revīzija
1b7773eaad

+ 0 - 4
desktop/conf.dist/hue.ini

@@ -28,10 +28,6 @@
   http_host=0.0.0.0
   http_port=8888
 
-  # Choose whether the Hue pages are embedded or not. This will improve the rendering of Hue when added inside a
-  # container element.
-  ## is_embedded=false
-
   # A comma-separated list of available Hue load balancers
   ## hue_load_balancer=
 

+ 0 - 4
desktop/conf/pseudo-distributed.ini.tmpl

@@ -32,10 +32,6 @@
   http_host=0.0.0.0
   http_port=8000
 
-  # Choose whether the Hue pages are embedded or not. This will improve the rendering of Hue when added inside a
-  # container element.
-  ## is_embedded=false
-
   # A comma-separated list of available Hue load balancers
   ## hue_load_balancer=
 

+ 0 - 7
desktop/core/src/desktop/conf.py

@@ -1584,13 +1584,6 @@ ENABLE_SQL_SYNTAX_CHECK = Config(
   help=_('Choose whether to enable SQL syntax check or not.')
 )
 
-IS_EMBEDDED = Config(
-  key='is_embedded',
-  default=False,
-  type=coerce_bool,
-  help=_('Choose whether Hue is embedded or not.')
-)
-
 EDITOR_AUTOCOMPLETE_TIMEOUT = Config(
   key='editor_autocomplete_timeout',
   type=int,

+ 2 - 4
desktop/core/src/desktop/middleware.py

@@ -49,7 +49,7 @@ from hadoop import cluster
 
 import desktop.views
 import desktop.conf
-from desktop.conf import IS_EMBEDDED
+from desktop.auth.backend import is_admin
 from desktop.context_processors import get_app_name
 from desktop.lib import apputil, i18n, fsmanager
 from desktop.lib.django_util import JsonResponse, render, render_json
@@ -349,9 +349,7 @@ class LoginAndPermissionMiddleware(object):
       response[MIDDLEWARE_HEADER] = 'LOGIN_REQUIRED'
       return response
     else:
-      if IS_EMBEDDED.get():
-        return HttpResponseForbidden()
-      elif request.GET.get('is_embeddable'):
+      if request.GET.get('is_embeddable'):
         return JsonResponse({'url': "%s?%s=%s" % (settings.LOGIN_URL, REDIRECT_FIELD_NAME, urlquote('/hue' + request.get_full_path().replace('is_embeddable=true', '').replace('&&','&')))}) # Remove embeddable so redirect from & to login works. Login page is not embeddable
       else:
         return HttpResponseRedirect("%s?%s=%s" % (settings.LOGIN_URL, REDIRECT_FIELD_NAME, urlquote(request.get_full_path())))

+ 6 - 5
desktop/core/src/desktop/models.py

@@ -48,7 +48,8 @@ from kafka.conf import has_kafka
 from notebook.conf import SHOW_NOTEBOOKS, get_ordered_interpreters
 
 from desktop import appmanager
-from desktop.conf import get_clusters, CLUSTER_ID, IS_MULTICLUSTER_ONLY, IS_EMBEDDED, IS_K8S_ONLY
+from desktop.auth.backend import is_admin
+from desktop.conf import get_clusters, CLUSTER_ID, IS_MULTICLUSTER_ONLY, IS_K8S_ONLY
 from desktop.lib import fsmanager
 from desktop.lib.i18n import force_unicode
 from desktop.lib.exceptions_renderable import PopupException
@@ -1774,7 +1775,7 @@ class ClusterConfig(object):
         'page': '/filebrowser/' + (not self.user.is_anonymous() and 'view=' + urllib_quote(self.user.get_home_directory().encode('utf-8'), safe=SAFE_CHARACTERS_URI_COMPONENTS) or '')
       })
 
-    if 'filebrowser' in self.apps and not IS_EMBEDDED.get() and fsmanager.is_enabled_and_has_access('s3a', self.user):
+    if 'filebrowser' in self.apps and fsmanager.is_enabled_and_has_access('s3a', self.user):
       interpreters.append({
         'type': 's3',
         'displayName': _('S3'),
@@ -1791,7 +1792,7 @@ class ClusterConfig(object):
         'tooltip': _('ADLS'),
         'page': '/filebrowser/view=' + urllib_quote('adl:/'.encode('utf-8'), safe=SAFE_CHARACTERS_URI_COMPONENTS)
       })
-      
+
     if 'filebrowser' in self.apps and fsmanager.is_enabled_and_has_access('abfs', self.user):
       interpreters.append({
         'type': 'abfs',
@@ -1849,7 +1850,7 @@ class ClusterConfig(object):
         'page': '/hbase/'
       })
 
-    if 'security' in self.apps and not IS_EMBEDDED.get():
+    if 'security' in self.apps:
       interpreters.append({
         'type': 'security',
         'displayName': _('Security'),
@@ -1858,7 +1859,7 @@ class ClusterConfig(object):
         'page': '/security/hive'
       })
 
-    if 'indexer' in self.apps and 'filebrowser' in self.apps and self.user.has_hue_permission(action="access:importer", app="indexer") and not IS_EMBEDDED.get():
+    if 'indexer' in self.apps and 'filebrowser' in self.apps and self.user.has_hue_permission(action="access:importer", app="indexer"):
       interpreters.append({
         'type': 'importer',
         'displayName': _('Importer'),