From b4286e8aa3cce47a1c032b7fd716deb2fa6ea4cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20K=C3=B6ninger?= Date: Fri, 8 Apr 2022 13:34:41 +0200 Subject: [PATCH] fix(#1986): improve UX for JMX view (#2015) --- .../views/instances/jolokia/index.vue | 5 +- .../jolokia/m-bean-operation-invocation.vue | 10 +++- .../instances/jolokia/m-bean-operation.vue | 22 +++++++- .../frontend/views/instances/jolokia/utils.js | 52 +++++++++++++++++++ .../views/instances/jolokia/utils.spec.js | 36 +++++++++++++ 5 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/utils.js create mode 100644 spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/utils.spec.js diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/index.vue b/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/index.vue index 910741ad295..5040660d1ed 100644 --- a/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/index.vue +++ b/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/index.vue @@ -76,7 +76,8 @@
    • @@ -98,6 +99,7 @@ import {directive as onClickaway} from 'vue-clickaway2'; import mBeanAttributes from './m-bean-attributes'; import mBeanOperations from './m-bean-operations'; import {VIEW_GROUP} from '../../index'; +import {truncatePackageName} from '@/views/instances/jolokia/utils'; const getOperationName = (name, descriptor) => { const params = descriptor.args.map(arg => arg.type).join(','); @@ -151,6 +153,7 @@ export default { hasLoaded: false, error: null, domains: [], + truncatePackageName, selected: { domain: null, mBean: null, diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/m-bean-operation-invocation.vue b/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/m-bean-operation-invocation.vue index cd8fc28a2e9..ea1f1ad6c6c 100644 --- a/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/m-bean-operation-invocation.vue +++ b/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/m-bean-operation-invocation.vue @@ -19,7 +19,7 @@
    -
    +

    @@ -28,7 +28,7 @@
    @@ -214,3 +214,9 @@ }, } + + diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/m-bean-operation.vue b/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/m-bean-operation.vue index 57d2ea75c2d..f0e7dbc1504 100644 --- a/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/m-bean-operation.vue +++ b/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/m-bean-operation.vue @@ -17,8 +17,9 @@ + + diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/utils.js b/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/utils.js new file mode 100644 index 00000000000..a6ec08193aa --- /dev/null +++ b/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/utils.js @@ -0,0 +1,52 @@ +/* + * 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. + */ + +export function truncateJavaType(javaType) { + return javaType.replace(/java\.[^A-Z]*/g, ''); +} + +/** + * Truncates the given package name to the given length. + * + * It works similar to {@link https://logback.qos.ch/manual/layouts.html#conversionWord} + * + * @param javaType + * @param length + * @returns {string|*} + */ +export function truncatePackageName(javaType, length) { + const split = javaType.split('.'); + if (length > 0) { + const clazzName = split.pop(); + + let shortened; + for (let i = 0; i <= split.length; i++) { + shortened = [ + ...[...split].splice(0, i).map(p => p.charAt(0)), + ...[...split].splice(i), + clazzName + ].join('.'); + + if (shortened.length <= length) { + return shortened; + } + } + + return shortened; + } else { + return split?.pop(); + } +} diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/utils.spec.js b/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/utils.spec.js new file mode 100644 index 00000000000..7f754d4cac7 --- /dev/null +++ b/spring-boot-admin-server-ui/src/main/frontend/views/instances/jolokia/utils.spec.js @@ -0,0 +1,36 @@ +/* + * 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 {truncateJavaType, truncatePackageName} from '@/views/instances/jolokia/utils'; + +describe('utils.js', () => { + it('truncateJavaType', () => { + expect(truncateJavaType('java.lang.String')).toEqual('String'); + }); + + it.each` + length | expected + ${0} | ${'Bar'} + ${5} | ${'m.s.s.Bar'} + ${10} | ${'m.s.s.Bar'} + ${15} | ${'m.s.sample.Bar'} + ${16} | ${'m.sub.sample.Bar'} + ${26} | ${'mainPackage.sub.sample.Bar'} + `('truncatePackageName having length $length', ({expected, length}) => { + const result = truncatePackageName('mainPackage.sub.sample.Bar', length); + expect(result).toEqual(expected); + }); +});