Upgrade swagger-ui to 3.0.10

omod/src/main/webapp/apiDocs.jsp

@@ -1,49 +1,109 @@
 <%@ include file="/WEB-INF/template/include.jsp"%>
 <%@ include file="/WEB-INF/template/header.jsp"%>
 
+<%-- See swagger-ui-3.0.10/dist/index.html on how to load swagger ui --%>
+
 <script type="text/javascript">
   var $ = jQuery; // required because the legacy UI uses jQuery.noConflict() and Swagger requires the $ variable
 </script>
 
-<link rel="icon" type="image/png" href="<openmrs:contextPath/>/moduleResources/webservices/rest/js/swagger-ui/dist/images/favicon-32x32.png" sizes="32x32" />
-<link rel="icon" type="image/png" href="<openmrs:contextPath/>/moduleResources/webservices/rest/js/swagger-ui/dist/images/favicon-16x16.png" sizes="16x16" />
-
-<link href="<openmrs:contextPath/>/moduleResources/webservices/rest/js/swagger-ui/dist/css/reset.css" media="screen" rel="stylesheet" type="text/css"/>
-<link href="<openmrs:contextPath/>/moduleResources/webservices/rest/js/swagger-ui/dist/css/screen.css" media="screen" rel="stylesheet" type="text/css"/>
-
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/jquery.slideto.min.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/jquery.wiggle.min.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/jquery.ba-bbq.min.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/handlebars-2.0.0.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/js-yaml.min.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/lodash.min.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/backbone-min.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/swagger-ui.min.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/highlight.9.1.0.pack.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/highlight.9.1.0.pack_extended.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/jsoneditor.min.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/marked.js"/>
-<openmrs:htmlInclude file="/moduleResources/webservices/rest/js/swagger-ui/dist/lib/swagger-oauth.js"/>
+<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet"/>
+<link rel="stylesheet" type="text/css" href="<openmrs:contextPath/>/moduleResources/webservices/rest/js/swagger-ui-3.0.10/swagger-ui.css" >
+<link rel="icon" type="image/png" href="<openmrs:contextPath/>/moduleResources/webservices/rest/js/swagger-ui-3.0.10/favicon-32x32.png" sizes="32x32" />
+<link rel="icon" type="image/png" href="<openmrs:contextPath/>/moduleResources/webservices/rest/js/swagger-ui-3.0.10/favicon-16x16.png" sizes="16x16" />
+
+
+<style>
+  html
+  {
+    box-sizing: border-box;
+    overflow: -moz-scrollbars-vertical;
+    overflow-y: scroll;
+  }
+  *,
+  *:before,
+  *:after
+  {
+    box-sizing: inherit;
+  }
+
+  body {
+    margin:0;
+    background: #fafafa;
+  }
+
+  /* remove when LUI-126 is fixed */
+  .swagger-ui .opblock-body pre * {
+    font-family: Source Code Pro, monospace;
+  }
+  .swagger-ui .response-col_description__inner span * {
+    font-family: Source Code Pro,monospace;
+  }
+  .swagger-ui .tab li * {
+    font-family:Titillium Web,sans-serif;
+  }
+  .error {
+    background-color: transparent;
+  }
+</style>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
+  <defs>
+    <symbol viewBox="0 0 20 20" id="unlocked">
+      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="locked">
+      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="close">
+      <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="large-arrow">
+      <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
+    </symbol>
 
+    <symbol viewBox="0 0 20 20" id="large-arrow-down">
+      <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
+    </symbol>
+
+
+    <symbol viewBox="0 0 24 24" id="jump-to">
+      <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 24 24" id="expand">
+      <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
+    </symbol>
+
+  </defs>
+</svg>
+
+<div id="swagger-ui"></div>
+
+<script src="${pageContext.request.contextPath}/moduleResources/webservices/rest/js/swagger-ui-3.0.10/swagger-ui-bundle.js"> </script>
+<script src="${pageContext.request.contextPath}/moduleResources/webservices/rest/js/swagger-ui-3.0.10/swagger-ui-standalone-preset.js"> </script>
 <openmrs:require privilege="Manage RESTWS" otherwise="/login.htm" redirect="/module/webservices/rest/settings.form" />
   <script type="text/javascript">
-    jQuery(document).ready(function() {
-      jQuery("#content").addClass("swagger-section ");
-        var swaggerUi = new SwaggerUi({
-          url:"${pageContext.request.contextPath}/module/webservices/rest/swagger.json",
-          dom_id:"swaggerDocumentation",
-          docExpansion: "none",
-          apisSorter: "alpha",
-          onFailure: function(data) {
-            console.log("Unable to Load SwaggerUI");
-            jQuery("#swaggerError").innerHTML = "Error Loading Swagger UI";
-          },
-          validatorUrl: null
-        });
-      swaggerUi.load();
-    });
+      window.onload = function() {
+          const ui = SwaggerUIBundle({
+              url: "${pageContext.request.contextPath}/module/webservices/rest/swagger.json",
+              validatorUrl: null,
+              dom_id: '#swagger-ui',
+              presets: [
+                  SwaggerUIBundle.presets.apis,
+                  SwaggerUIStandalonePreset
+              ],
+              plugins: [
+                  SwaggerUIBundle.plugins.DownloadUrl
+              ],
+              layout: "StandaloneLayout"
+          });
+
+          window.ui = ui
+      };
 </script>
 
-<div id="swaggerDocumentation" class="swagger-ui-wrap">
-  <img src="<openmrs:contextPath/>/moduleResources/webservices/rest/js/swagger-ui/dist/images/inprogress.gif" style="display: block; margin-left: auto; margin-right: auto;"/>
-<div id="swaggerError" ></div>
+<%@ include file="/WEB-INF/template/footer.jsp"%>
+