]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 14e7347)
mgr/dashboard: REST API: OpenAPI docs require internet connection 30477/head
authorPatrick Seidensal <pseidensal@suse.com>
Thu, 19 Sep 2019 13:23:55 +0000 (15:23 +0200)
committerPatrick Seidensal <pseidensal@suse.com>
Fri, 20 Sep 2019 10:55:55 +0000 (12:55 +0200)
Fixes: https://tracker.ceph.com/issues/40027
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
src/pybind/mgr/dashboard/controllers/docs.py patch | blob | history
src/pybind/mgr/dashboard/frontend/angular.json patch | blob | history
src/pybind/mgr/dashboard/frontend/package-lock.json patch | blob | history
src/pybind/mgr/dashboard/frontend/package.json patch | blob | history

diff --git a/src/pybind/mgr/dashboard/controllers/docs.py b/src/pybind/mgr/dashboard/controllers/docs.py
index 4ba6e6d49c0d4b6c11a413b9f823e07f2f2a1bf5..ec5d3c10bc2aaac3c8a692ac352d34bec711a5ab 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/docs.py
+++ b/src/pybind/mgr/dashboard/controllers/docs.py
@@ -393,11 +393,8 @@ class Docs(BaseController):
         <head>
             <meta charset="UTF-8">
             <meta name="referrer" content="no-referrer" />
-            <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="//unpkg.com/swagger-ui-dist@3/swagger-ui.css" >
+                  href="/swagger-ui.css" >
             <style>
                 html
                 {{
@@ -419,7 +416,7 @@ class Docs(BaseController):
         </head>
         <body>
         <div id="swagger-ui"></div>
-        <script src="//unpkg.com/swagger-ui-dist@3/swagger-ui-bundle.js">
+        <script src="/swagger-ui-bundle.js">
         </script>
         <script>
             window.onload = function() {{
diff --git a/src/pybind/mgr/dashboard/frontend/angular.json b/src/pybind/mgr/dashboard/frontend/angular.json
index 9294173da0860e4a08aff2538a258b84f4208559..8d6834ca4955729c2f03783810aa91fbdbda7b7b 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/angular.json
+++ b/src/pybind/mgr/dashboard/frontend/angular.json
@@ -18,7 +18,17 @@
             "polyfills": "src/polyfills.ts",
             "assets": [
               "src/assets",
-              "src/favicon.ico"
+              "src/favicon.ico",
+              {
+                "glob": "**/swagger-ui.css",
+                "input": "node_modules/swagger-ui-dist",
+                "output": "."
+              },
+              {
+                "glob": "**/swagger-ui-bundle.js",
+                "input": "node_modules/swagger-ui-dist",
+                "output": "."
+              }
             ],
             "styles": [
               "node_modules/ngx-toastr/toastr.css",
diff --git a/src/pybind/mgr/dashboard/frontend/package-lock.json b/src/pybind/mgr/dashboard/frontend/package-lock.json
index 17b2028b680323725e10accf1da6bc92d8d319e7..4966c6b947c3dbf5645f743f34c1fc22d15dcb33 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/package-lock.json
+++ b/src/pybind/mgr/dashboard/frontend/package-lock.json
@@ -14358,6 +14358,11 @@
         "has-flag": "^3.0.0"
       }
     },
+    "swagger-ui-dist": {
+      "version": "3.23.10",
+      "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.23.10.tgz",
+      "integrity": "sha512-lK9oNNb9HAz2HJIg6+cYZszbYC/0CTm0nWi0XX2AjEbVgu43smbW2/h5zn7yAjYstPJBaYXkt5g6ABRpO/Ncfg=="
+    },
     "symbol-observable": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
diff --git a/src/pybind/mgr/dashboard/frontend/package.json b/src/pybind/mgr/dashboard/frontend/package.json
index 54bb37e10c11fba7904461cf4a1b8c53ddfb3f4d..3f9a92f6023b234f93bb48a726e5f7ec46b1cd3c 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/package.json
+++ b/src/pybind/mgr/dashboard/frontend/package.json
@@ -86,6 +86,7 @@
     "ngx-toastr": "10.0.4",
     "rxjs": "6.5.2",
     "rxjs-compat": "6.5.2",
+    "swagger-ui-dist": "3.23.10",
     "tslib": "1.9.3",
     "zone.js": "0.9.1"
   },
Unnamed repository; edit this file 'description' to name the repository.