update swagger ui (#1711)

ConduitIO · Jul 18, 2024 · fab3ab9 · fab3ab9
1 parent 203aeb7
commit fab3ab9
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 69 deletions.
diff --git a/pkg/web/openapi/README.md b/pkg/web/openapi/README.md
@@ -2,13 +2,13 @@
 
 This directory contains an abbreviated copy of the following repository:
 
-* `swagger-ui` - https://github.com/swagger-api/swagger-ui 91858cc811d3cddb45ef604365e2c88cd96e4ca0 (LICENSE, dist/)
+* `swagger-ui` - https://github.com/swagger-api/swagger-ui 8e6824cb452ae4b268f45f5203575194217c6653 (LICENSE, dist/)
 
 The `swagger-ui` directory contains HTML, Javascript, and CSS assets that dynamically generate Swagger documentation
 from a Swagger-compliant API definition in [api.swagger.json](./swagger-ui/api/v1/api.swagger.json) file.
 That file is auto-generated by running `make proto` in the root of this repository. The static assets are copied
 from [this dist folder](https://github.com/swagger-api/swagger-ui/tree/master/dist) of the swagger-ui project. After
-copying, [`index.html`](./swagger-ui/index.html) is edited to load the swagger file from the local server instead of the
-default petstore.
+copying, [`swagger-initializer.js`](./swagger-ui/swagger-initializer.js) is edited to load the swagger file from the
+local server instead of the default petstore. All `*.js.map` files are removed to decrease the size of the binary.
 
 See the [LICENSE](./swagger-ui/LICENSE) file for applicable license terms.
diff --git a/pkg/web/openapi/swagger-ui/index.css b/pkg/web/openapi/swagger-ui/index.css
@@ -0,0 +1,16 @@
+html {
+    box-sizing: border-box;
+    overflow: -moz-scrollbars-vertical;
+    overflow-y: scroll;
+}
+
+*,
+*:before,
+*:after {
+    box-sizing: inherit;
+}
+
+body {
+    margin: 0;
+    background: #fafafa;
+}
diff --git a/pkg/web/openapi/swagger-ui/index.html b/pkg/web/openapi/swagger-ui/index.html
@@ -5,56 +5,15 @@
     <meta charset="UTF-8">
     <title>Swagger UI</title>
     <link rel="stylesheet" type="text/css" href="./swagger-ui.css" />
+    <link rel="stylesheet" type="text/css" href="index.css" />
     <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
     <link rel="icon" type="image/png" href="./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;
-      }
-    </style>
   </head>
 
   <body>
     <div id="swagger-ui"></div>
-
     <script src="./swagger-ui-bundle.js" charset="UTF-8"> </script>
     <script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
-    <script>
-    window.onload = function() {
-      // Begin Swagger UI call region
-      const ui = SwaggerUIBundle({
-        url: "./api/v1/api.swagger.json",
-        dom_id: '#swagger-ui',
-        deepLinking: true,
-        presets: [
-          SwaggerUIBundle.presets.apis,
-          SwaggerUIStandalonePreset.slice(1) // remove top bar
-        ],
-        plugins: [
-          SwaggerUIBundle.plugins.DownloadUrl
-        ],
-        layout: "StandaloneLayout"
-      });
-      // End Swagger UI call region
-
-      window.ui = ui;
-    };
-  </script>
+    <script src="./swagger-initializer.js" charset="UTF-8"> </script>
   </body>
 </html>
diff --git a/pkg/web/openapi/swagger-ui/oauth2-redirect.html b/pkg/web/openapi/swagger-ui/oauth2-redirect.html
@@ -13,7 +13,7 @@
         var isValid, qp, arr;
 
         if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
+            qp = window.location.hash.substring(1).replace('?', '&');
         } else {
             qp = location.search.substring(1);
         }
@@ -38,7 +38,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
                 });
             }
 
@@ -58,7 +58,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
                 });
             }
         } else {
@@ -67,9 +67,13 @@
         window.close();
     }
 
-    window.addEventListener('DOMContentLoaded', function () {
-      run();
-    });
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
 </script>
 </body>
 </html>
diff --git a/pkg/web/openapi/swagger-ui/swagger-initializer.js b/pkg/web/openapi/swagger-ui/swagger-initializer.js
@@ -0,0 +1,18 @@
+window.onload = function() {
+  //<editor-fold desc="Changeable Configuration Block">
+
+  // the following lines will be replaced by docker/configurator, when it runs in a docker-container
+  window.ui = SwaggerUIBundle({
+    url: "./api/v1/api.swagger.json",
+    dom_id: '#swagger-ui',
+    deepLinking: true,
+    presets: [
+      SwaggerUIBundle.presets.apis,
+    ],
+    plugins: [
+      SwaggerUIBundle.plugins.DownloadUrl
+    ],
+  });
+
+  //</editor-fold>
+};
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui-bundle.js b/pkg/web/openapi/swagger-ui/swagger-ui-bundle.js
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui-bundle.js.map b/pkg/web/openapi/swagger-ui/swagger-ui-bundle.js.map
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui-es-bundle-core.js b/pkg/web/openapi/swagger-ui/swagger-ui-es-bundle-core.js
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui-es-bundle-core.js.map b/pkg/web/openapi/swagger-ui/swagger-ui-es-bundle-core.js.map
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui-es-bundle.js b/pkg/web/openapi/swagger-ui/swagger-ui-es-bundle.js
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui-es-bundle.js.map b/pkg/web/openapi/swagger-ui/swagger-ui-es-bundle.js.map
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui-standalone-preset.js b/pkg/web/openapi/swagger-ui/swagger-ui-standalone-preset.js
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui-standalone-preset.js.map b/pkg/web/openapi/swagger-ui/swagger-ui-standalone-preset.js.map
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui.css b/pkg/web/openapi/swagger-ui/swagger-ui.css
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui.css.map b/pkg/web/openapi/swagger-ui/swagger-ui.css.map
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui.js b/pkg/web/openapi/swagger-ui/swagger-ui.js
diff --git a/pkg/web/openapi/swagger-ui/swagger-ui.js.map b/pkg/web/openapi/swagger-ui/swagger-ui.js.map