Merge pull request #18 from ValtechMobility/dlcm/custom_error_views

add custom error views fix
ValtechMobility · Nov 27, 2023 · 4d021aa · 4d021aa
2 parents 2fc14b3 + d0e0025
commit 4d021aa
Show file tree

Hide file tree

Showing 6 changed files with 245 additions and 462 deletions.
diff --git a/superset-frontend/src/assets/staticPages/404.html b/superset-frontend/src/assets/staticPages/404.html
diff --git a/superset-frontend/src/assets/staticPages/404_custom.html b/superset-frontend/src/assets/staticPages/404_custom.html
diff --git a/superset-frontend/src/assets/staticPages/500.html b/superset-frontend/src/assets/staticPages/500.html
diff --git a/superset-frontend/src/assets/staticPages/500_custom.html b/superset-frontend/src/assets/staticPages/500_custom.html
diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
@@ -128,16 +128,16 @@ const plugins = [
 
   // static pages
   new HtmlWebpackPlugin({
-    template: './src/assets/staticPages/404_custom.html',
+    template: './src/assets/staticPages/404.html',
     inject: true,
     chunks: [],
-    filename: '404_custom.html',
+    filename: '404.html',
   }),
   new HtmlWebpackPlugin({
-    template: './src/assets/staticPages/500_custom.html',
+    template: './src/assets/staticPages/500.html',
     inject: true,
     chunks: [],
-    filename: '500_custom.html',
+    filename: '500.html',
   }),
 ];
 

diff --git a/superset/views/base.py b/superset/views/base.py
@@ -507,7 +507,7 @@ def show_http_exception(ex: HTTPException) -> FlaskResponse:
 def show_command_errors(ex: CommandException) -> FlaskResponse:
     logger.warning("CommandException", exc_info=True)
     if "text/html" in request.accept_mimetypes and not config["DEBUG"]:
-        path = resource_filename("superset", "static/assets/500_custom.html")
+        path = resource_filename("superset", "static/assets/500.html")
         return send_file(path, cache_timeout=0), 500
 
     extra = ex.normalized_messages() if isinstance(ex, CommandInvalidError) else {}
@@ -529,7 +529,7 @@ def show_command_errors(ex: CommandException) -> FlaskResponse:
 def show_unexpected_exception(ex: Exception) -> FlaskResponse:
     logger.exception(ex)
     if "text/html" in request.accept_mimetypes and not config["DEBUG"]:
-        path = resource_filename("superset", "static/assets/500_custom.html")
+        path = resource_filename("superset", "static/assets/500.html")
         return send_file(path, cache_timeout=0), 500
 
     return json_errors_response(