Merge pull request #1788 from hotosm/update-swagger-ui

update swagger ui

server/config.py

@@ -12,10 +12,10 @@ class EnvironmentConfig:
 
     # The base url the application is reachable
     APP_BASE_URL = os.getenv('TM_APP_BASE_URL', 'http://127.0.0.1:5000')
-    
+
     # The default tag used in the OSM changeset comment
     DEFAULT_CHANGESET_COMMENT = os.getenv('TM_DEFAULT_CHANGESET_COMMENT', None)
-    
+
     # The address to use as the sender on auto generated emails
     EMAIL_FROM_ADDRESS = os.getenv('TM_EMAIL_FROM_ADDRESS', None)
 
@@ -38,15 +38,15 @@ class EnvironmentConfig:
                                             f'@{POSTGRES_ENDPOINT}:' + \
                                                 f'{POSTGRES_PORT}' + \
                                                     f'/{POSTGRES_DB}'
-   
+
     # Logging settings
     LOG_LEVEL = os.getenv('TM_LOG_LEVEL', logging.DEBUG)
     LOG_DIR = os.getenv('TM_LOG_DIR', 'logs')
 
     # Mapper Level values represent number of OSM changesets
     MAPPER_LEVEL_INTERMEDIATE = os.getenv('TM_MAPPER_LEVEL_INTERMEDIATE', 250)
     MAPPER_LEVEL_ADVANCED = os.getenv('TM_MAPPER_LEVEL_ADVANCED', 500)
-    
+
     # Time to wait until task auto-unlock (e.g. '2h' or '7d' or '30m' or '1h30m')
     TASK_AUTOUNLOCK_AFTER = os.getenv('TM_TASK_AUTOUNLOCK_AFTER', '2h')
 
@@ -76,8 +76,7 @@ class EnvironmentConfig:
     }
 
     # Some more definitions (not overridable)
-    API_DOCS_URL = f'{APP_BASE_URL}/api-docs/swagger-ui/index.html?' + \
-                   f'url={APP_BASE_URL}/api/docs'
+    API_DOCS_URL = f'{APP_BASE_URL}/api/docs'
     SEND_FILE_MAX_AGE_DEFAULT = 0
     SQLALCHEMY_TRACK_MODIFICATIONS = False
     SQLALCHEMY_POOL_SIZE = 10

server/web/controller.py

@@ -38,7 +38,7 @@ def api():
     Route for API Docs welcome page
     """
     api_url = current_app.config['API_DOCS_URL']
-    return render_template('welcome.html', doc_link=api_url)
+    return render_template('swagger.html', doc_link=api_url)
 
 
 @main.route('/', defaults={'path': 'index.html'})