Polish

spring-boot-admin-server-ui/package-lock.json

@@ -11607,23 +11607,40 @@
       "dev": true
     },
     "style-loader": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.1.tgz",
-      "integrity": "sha512-NtlwQOHQvUgEKuPs4JoUMQUkML8UNMxLbXM2JAZerIQVVVMgO5VVRjYQA8zzkpBu/X2OnTt+5ZKe8IbGk5TjRA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.2.tgz",
+      "integrity": "sha512-FrLMGaOLVhS5pvoez3eJyc0ktchT1inEZziBSjBq1hHQBK3GFkF57Qd825DcrUhjaAWQk70MKrIl5bfjadR/Dg==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
-        "schema-utils": "0.4.3"
+        "schema-utils": "0.4.5"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.1.1.tgz",
+          "integrity": "sha1-l41Zf7wrfQ5aXD3esUmmgvKr+g4=",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "1.0.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz",
+          "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=",
+          "dev": true
+        },
         "schema-utils": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.3.tgz",
-          "integrity": "sha512-sgv/iF/T4/SewJkaVpldKC4WjSkz0JsOh2eKtxCPpCO1oR05+7MOF+H476HVRbLArkgA7j5TRJJ4p2jdFkUGQQ==",
+          "version": "0.4.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
+          "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
           "dev": true,
           "requires": {
-            "ajv": "5.2.3",
-            "ajv-keywords": "2.1.0"
+            "ajv": "6.1.1",
+            "ajv-keywords": "3.1.0"
           }
         }
       }

spring-boot-admin-server-ui/package.json

@@ -69,7 +69,7 @@
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "postcss-loader": "^2.1.0",
     "sass-loader": "^6.0.6",
-    "style-loader": "^0.20.1",
+    "style-loader": "^0.20.2",
     "url-loader": "^0.6.2",
     "vue-loader": "^14.1.1",
     "vue-svg-loader": "^0.5.0",

spring-boot-admin-server-ui/src/main/frontend/views/index.js

@@ -16,18 +16,7 @@
 
 import {view as aboutView} from './about';
 import {view as applicationView} from './applications';
-import sbaInstancesAuditevents from './instances/auditevents';
-import sbaInstancesDetails from './instances/details';
-import sbaInstancesEnv from './instances/env';
-import sbaInstancesFlyway from './instances/flyway';
-import sbaInstancesTrace from './instances/httptrace';
-import sbaInstancesJolokia from './instances/jolokia';
-import sbaInstancesLiquibase from './instances/liquibase';
-import sbaInstancesLogfile from './instances/logfile';
-import sbaInstancesLoggers from './instances/loggers';
-import sbaInstancesSessions from './instances/sessions';
-import sbaInstancesShell from './instances/shell';
-import sbaInstancesThreaddump from './instances/threaddump';
+import instanceViews from './instances';
 import {view as journalView} from './journal';
 
 export default router => {
@@ -60,104 +49,7 @@ export default router => {
   views.register(applicationView);
   views.register(journalView);
   views.register(aboutView);
-  views.register({
-    path: '/instances/:instanceId', component: sbaInstancesShell, props: true,
-    children: [{
-      path: '', component: sbaInstancesDetails, props: true, name: 'instance/details'
-    }, {
-      path: 'env', component: sbaInstancesEnv, props: true, name: 'instance/env'
-    }, {
-      path: 'logfile', component: sbaInstancesLogfile, props: true, name: 'instance/logfile'
-    }, {
-      path: 'loggers', component: sbaInstancesLoggers, props: true, name: 'instance/loggers'
-    }, {
-      path: 'jolokia', component: sbaInstancesJolokia, props: true, name: 'instance/jolokia'
-    }, {
-      path: 'httptrace', component: sbaInstancesTrace, props: true, name: 'instance/httptrace'
-    }, {
-      path: 'auditevents', component: sbaInstancesAuditevents, props: true, name: 'instance/auditevents'
-    }, {
-      path: 'sessions', component: sbaInstancesSessions, props: true, name: 'instance/sessions'
-    }, {
-      path: 'liquibase', component: sbaInstancesLiquibase, props: true, name: 'instance/liquibase'
-    }, {
-      path: 'flyway', component: sbaInstancesFlyway, props: true, name: 'instance/flyway'
-    }, {
-      path: 'threaddump', component: sbaInstancesThreaddump, props: true, name: 'instance/threaddump'
-    }]
-  });
-  views.register({
-    name: 'instance/details',
-    handle: 'Details',
-    order: 0
-  });
-  views.register({
-    name: 'instance/env',
-    handle: 'Environment',
-    order: 100,
-    isActive: ({instance}) => instance.hasEndpoint('env')
-  });
-  views.register({
-    name: 'instance/logfile',
-    handle: 'Logfile',
-    order: 200,
-    isActive: ({instance}) => instance.hasEndpoint('logfile')
-  });
-  views.register({
-    name: 'instance/loggers',
-    handle: 'Loggers',
-    order: 300,
-    isActive: ({instance}) => instance.hasEndpoint('loggers')
-  });
-  views.register({
-    name: 'instance/jolokia',
-    handle: 'JMX',
-    order: 350,
-    isActive: ({instance}) => instance.hasEndpoint('jolokia')
-  });
-  views.register({
-    name: 'instance/threaddump',
-    handle: 'Threads',
-    order: 400,
-    isActive: ({instance}) => instance.hasEndpoint('threaddump')
-  });
-  views.register({
-    name: 'instance/httptrace',
-    handle: 'Http Traces',
-    order: 500,
-    isActive: ({instance}) => instance.hasEndpoint('httptrace')
-  });
-  views.register({
-    name: 'instance/auditevents',
-    handle: 'Audit Log',
-    order: 600,
-    isActive: ({instance}) => instance.hasEndpoint('auditevents')
-  });
-  views.register({
-    name: 'instance/sessions',
-    handle: 'Sessions',
-    order: 700,
-    isActive: ({instance}) => instance.hasEndpoint('sessions')
-  });
-  views.register({
-    name: 'instance/heapdump',
-    href: params => `instances/${params.instanceId}/actuator/heapdump`,
-    handle: 'Heapdump',
-    order: 800,
-    isActive: ({instance}) => instance.hasEndpoint('heapdump')
-  });
-  views.register({
-    name: 'instance/liquibase',
-    handle: 'Liquibase',
-    order: 900,
-    isActive: ({instance}) => instance.hasEndpoint('liquibase')
-  });
-  views.register({
-    name: 'instance/flyway',
-    handle: 'Flyway',
-    order: 900,
-    isActive: ({instance}) => instance.hasEndpoint('flyway')
-  });
+  instanceViews.forEach(views.register);
 
   router.addRoutes([{path: '/', redirect: {name: 'applications'}}]);
 

spring-boot-admin-server-ui/src/main/frontend/views/instances/index.js

+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import sbaInstancesAuditevents from './auditevents';
+import sbaInstancesDetails from './details';
+import sbaInstancesEnv from './env';
+import sbaInstancesFlyway from './flyway';
+import sbaInstancesTrace from './httptrace';
+import sbaInstancesJolokia from './jolokia';
+import sbaInstancesLiquibase from './liquibase';
+import sbaInstancesLogfile from './logfile';
+import sbaInstancesLoggers from './loggers';
+import sbaInstancesSessions from './sessions';
+import sbaInstancesShell from './shell';
+import sbaInstancesThreaddump from './threaddump';
+
+export default [{
+  path: '/instances/:instanceId', component: sbaInstancesShell, props: true,
+  children: [{
+    path: '', component: sbaInstancesDetails, props: true, name: 'instance/details'
+  }, {
+    path: 'env', component: sbaInstancesEnv, props: true, name: 'instance/env'
+  }, {
+    path: 'logfile', component: sbaInstancesLogfile, props: true, name: 'instance/logfile'
+  }, {
+    path: 'loggers', component: sbaInstancesLoggers, props: true, name: 'instance/loggers'
+  }, {
+    path: 'jolokia', component: sbaInstancesJolokia, props: true, name: 'instance/jolokia'
+  }, {
+    path: 'httptrace', component: sbaInstancesTrace, props: true, name: 'instance/httptrace'
+  }, {
+    path: 'auditevents', component: sbaInstancesAuditevents, props: true, name: 'instance/auditevents'
+  }, {
+    path: 'sessions', component: sbaInstancesSessions, props: true, name: 'instance/sessions'
+  }, {
+    path: 'liquibase', component: sbaInstancesLiquibase, props: true, name: 'instance/liquibase'
+  }, {
+    path: 'flyway', component: sbaInstancesFlyway, props: true, name: 'instance/flyway'
+  }, {
+    path: 'threaddump', component: sbaInstancesThreaddump, props: true, name: 'instance/threaddump'
+  }]
+}, {
+  name: 'instance/details',
+  handle: 'Details',
+  order: 0
+}, {
+  name: 'instance/env',
+  handle: 'Environment',
+  order: 100,
+  isActive: ({instance}) => instance.hasEndpoint('env')
+}, {
+  name: 'instance/logfile',
+  handle: 'Logfile',
+  order: 200,
+  isActive: ({instance}) => instance.hasEndpoint('logfile')
+}, {
+  name: 'instance/loggers',
+  handle: 'Loggers',
+  order: 300,
+  isActive: ({instance}) => instance.hasEndpoint('loggers')
+}, {
+  name: 'instance/jolokia',
+  handle: 'JMX',
+  order: 350,
+  isActive: ({instance}) => instance.hasEndpoint('jolokia')
+}, {
+  name: 'instance/threaddump',
+  handle: 'Threads',
+  order: 400,
+  isActive: ({instance}) => instance.hasEndpoint('threaddump')
+}, {
+  name: 'instance/httptrace',
+  handle: 'Http Traces',
+  order: 500,
+  isActive: ({instance}) => instance.hasEndpoint('httptrace')
+}, {
+  name: 'instance/auditevents',
+  handle: 'Audit Log',
+  order: 600,
+  isActive: ({instance}) => instance.hasEndpoint('auditevents')
+}, {
+  name: 'instance/sessions',
+  handle: 'Sessions',
+  order: 700,
+  isActive: ({instance}) => instance.hasEndpoint('sessions')
+}, {
+  name: 'instance/heapdump',
+  href: params => `instances/${params.instanceId}/actuator/heapdump`,
+  handle: 'Heapdump',
+  order: 800,
+  isActive: ({instance}) => instance.hasEndpoint('heapdump')
+}, {
+  name: 'instance/liquibase',
+  handle: 'Liquibase',
+  order: 900,
+  isActive: ({instance}) => instance.hasEndpoint('liquibase')
+}, {
+  name: 'instance/flyway',
+  handle: 'Flyway',
+  order: 900,
+  isActive: ({instance}) => instance.hasEndpoint('flyway')
+}];