Add filter for application list

This filter allows to filter by name, url, tags or version and will only
display the instances matching the filter.

closes #998

Author: joshiste

spring-boot-admin-server-ui/src/main/frontend/components/font-awesome-icon.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -19,6 +19,7 @@ import {faGithub} from '@fortawesome/free-brands-svg-icons/faGithub';
 import {faGitter} from '@fortawesome/free-brands-svg-icons/faGitter';
 import {faStackOverflow} from '@fortawesome/free-brands-svg-icons/faStackOverflow';
 import {faTimesCircle as farTimesCircle} from '@fortawesome/free-regular-svg-icons/faTimesCircle';
+import {faAngleDoubleRight} from '@fortawesome/free-solid-svg-icons/faAngleDoubleRight';
 import {faBan} from '@fortawesome/free-solid-svg-icons/faBan';
 import {faBell} from '@fortawesome/free-solid-svg-icons/faBell';
 import {faBellSlash} from '@fortawesome/free-solid-svg-icons/faBellSlash';
@@ -27,22 +28,21 @@ import {faCheck} from '@fortawesome/free-solid-svg-icons/faCheck';
 import {faDownload} from '@fortawesome/free-solid-svg-icons/faDownload';
 import {faExclamation} from '@fortawesome/free-solid-svg-icons/faExclamation';
 import {faExclamationTriangle} from '@fortawesome/free-solid-svg-icons/faExclamationTriangle';
+import {faFilter} from '@fortawesome/free-solid-svg-icons/faFilter';
 import {faHeartbeat} from '@fortawesome/free-solid-svg-icons/faHeartbeat';
 import {faHome} from '@fortawesome/free-solid-svg-icons/faHome';
+import {faMapMarkerAlt} from '@fortawesome/free-solid-svg-icons/faMapMarkerAlt';
 import {faMinusCircle} from '@fortawesome/free-solid-svg-icons/faMinusCircle';
 import {faPencilAlt} from '@fortawesome/free-solid-svg-icons/faPencilAlt';
 import {faQuestionCircle} from '@fortawesome/free-solid-svg-icons/faQuestionCircle';
+import {faSearch} from '@fortawesome/free-solid-svg-icons/faSearch';
 import {faSignOutAlt} from '@fortawesome/free-solid-svg-icons/faSignOutAlt';
 import {faStepBackward} from '@fortawesome/free-solid-svg-icons/faStepBackward';
 import {faStepForward} from '@fortawesome/free-solid-svg-icons/faStepForward';
 import {faTimesCircle} from '@fortawesome/free-solid-svg-icons/faTimesCircle';
 import {faTrash} from '@fortawesome/free-solid-svg-icons/faTrash';
 import {faUserCircle} from '@fortawesome/free-solid-svg-icons/faUserCircle';
 import {faWrench} from '@fortawesome/free-solid-svg-icons/faWrench';
-import {faAngleDoubleRight} from '@fortawesome/free-solid-svg-icons/faAngleDoubleRight';
-import {faSearch} from '@fortawesome/free-solid-svg-icons/faSearch';
-import {faMapMarkerAlt} from '@fortawesome/free-solid-svg-icons/faMapMarkerAlt';
-import {faFilter} from '@fortawesome/free-solid-svg-icons/faFilter';
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
 
 library.add(

spring-boot-admin-server-ui/src/main/frontend/services/application.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -22,8 +22,8 @@ import sortBy from 'lodash/sortBy';
 import Instance from './instance';
 
 class Application {
-
-  constructor(name) {
+  constructor({name, instances, ...application}) {
+    Object.assign(this, application);
     this.name = name;
     this.axios = axios.create({
       baseURL: uri`applications/${this.name}/`
@@ -32,6 +32,14 @@ class Application {
       response => response,
       redirectOn401()
     );
+    this.instances = sortBy(instances.map(i => new Instance(i), [instance => instance.registration.healthUrl]));
+  }
+
+  filterInstances(predicate) {
+    return new Application({
+      ...this,
+      instances: this.instances.filter(predicate)
+    })
   }
 
   findInstance(instanceId) {
@@ -76,18 +84,10 @@ class Application {
     }
     const json = JSON.parse(data);
     if (json instanceof Array) {
-      const applications = json.map(Application._toApplication);
+      const applications = json.map(j => new Application(j));
       return sortBy(applications, [item => item.name]);
     }
-    return Application._toApplication(json);
-  }
-
-  static _toApplication(application) {
-    const instances = application.instances.map(instance => Object.assign(new Instance(instance.id), instance));
-    return Object.assign(new Application(application.name), {
-      ...application,
-      instances: sortBy(instances, [instance => instance.registration.healthUrl])
-    });
+    return new Application(json);
   }
 }
 

spring-boot-admin-server-ui/src/main/frontend/services/instance.js

@@ -30,7 +30,8 @@ const actuatorMimeTypes = [
 const isInstanceActuatorRequest = url => url.match(/^instances[/][^/]+[/]actuator([/].*)?$/);
 
 class Instance {
-  constructor(id) {
+  constructor({id, ...instance}) {
+    Object.assign(this, instance);
     this.id = id;
     this.axios = axios.create({
       baseURL: uri`instances/${this.id}/`,
@@ -86,7 +87,7 @@ class Instance {
   }
 
   async fetchEnv(name) {
-    return this.axios.get(uri`actuator/env/${name || '' }`, {
+    return this.axios.get(uri`actuator/env/${name || ''}`, {
       headers: {'Accept': actuatorMimeTypes}
     });
   }
@@ -171,7 +172,7 @@ class Instance {
   }
 
   async clearCache(name, cacheManager) {
-    return this.axios.delete(uri`actuator/caches/${name}` , {
+    return this.axios.delete(uri`actuator/caches/${name}`, {
       params: {'cacheManager': cacheManager},
       headers: {'Accept': actuatorMimeTypes}
     });
@@ -322,18 +323,16 @@ class Instance {
 
   static async get(id) {
     return axios.get(uri`instances/${id}`, {
-      transformResponse: Instance._toInstance
+      transformResponse(data) {
+        if (!data) {
+          return data;
+        }
+        const instance = JSON.parse(data);
+        return new Instance(instance);
+      }
     });
   }
 
-  static _toInstance(data) {
-    if (!data) {
-      return data;
-    }
-    const instance = JSON.parse(data);
-    return Object.assign(new Instance(instance.id), instance);
-  }
-
   static _toLoggers(data) {
     if (!data) {
       return data;

spring-boot-admin-server-ui/src/main/frontend/utils/collections.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -14,9 +14,17 @@
  * limitations under the License.
  */
 
-
 export const compareBy = mapper => (a, b) => {
   const valA = mapper(a);
   const valB = mapper(b);
   return valA > valB ? 1 : valA < valB ? -1 : 0;
 };
+
+export const anyValueMatches = (obj, predicate) => {
+  if (Array.isArray(obj)) {
+    return obj.some(e => anyValueMatches(e, predicate));
+  } else if (obj !== null && typeof obj === 'object') {
+    return anyValueMatches(Object.values(obj), predicate);
+  }
+  return predicate(obj);
+};

spring-boot-admin-server-ui/src/main/frontend/utils/collections.spec.js

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2014-2019 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 {anyValueMatches} from './collections';
+
+describe('anyValueMatches', () => {
+  it('should return predicate value', () => {
+    const predicate = jest.fn(() => true);
+    expect(anyValueMatches('test', predicate)).toBe(true);
+  });
+
+  it('should call predicate for string', () => {
+    const predicate = jest.fn();
+    anyValueMatches('test', predicate);
+    expect(predicate).toHaveBeenCalledWith('test');
+  });
+
+  it('should call predicate for number', () => {
+    const predicate = jest.fn();
+    anyValueMatches(1, predicate);
+    expect(predicate).toHaveBeenCalledWith(1);
+  });
+
+  it('should call predicate for boolean', () => {
+    const predicate = jest.fn();
+    anyValueMatches(true, predicate);
+    expect(predicate).toHaveBeenCalledWith(true);
+  });
+
+  it('should call predicate for null', () => {
+    const predicate = jest.fn();
+    anyValueMatches(null, predicate);
+    expect(predicate).toHaveBeenCalledWith(null);
+  });
+
+  it('should call predicate for undefined', () => {
+    const predicate = jest.fn();
+    anyValueMatches(undefined, predicate);
+    expect(predicate).toHaveBeenCalledWith(undefined);
+  });
+
+  it('should not call predicate for empty object', () => {
+    const predicate = jest.fn();
+    anyValueMatches({}, predicate);
+    expect(predicate).not.toHaveBeenCalled()
+  });
+
+  it('should not call predicate for empty array', () => {
+    const predicate = jest.fn();
+    anyValueMatches([], predicate);
+    expect(predicate).not.toHaveBeenCalled()
+  });
+
+  it('should not call predicate for elements in array', () => {
+    const predicate = jest.fn();
+    anyValueMatches(['test', 1, true, {value: 'nested-obj'}, ['nested-array'], [], {}], predicate);
+    expect(predicate).toHaveBeenNthCalledWith(1, 'test');
+    expect(predicate).toHaveBeenNthCalledWith(2, 1);
+    expect(predicate).toHaveBeenNthCalledWith(3, true);
+    expect(predicate).toHaveBeenNthCalledWith(4, 'nested-obj');
+    expect(predicate).toHaveBeenNthCalledWith(5, 'nested-array');
+  });
+});

spring-boot-admin-server-ui/src/main/frontend/views/applications/applications-list-item.vue

@@ -1,5 +1,5 @@
 <!--
-  - Copyright 2014-2018 the original author or authors.
+  - Copyright 2014-2019 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.
@@ -98,7 +98,7 @@
     },
     methods: {
       hasActiveNotificationFilter(object) {
-        return this.notificationFilters.findIndex(f => f.affects(object)) >= 0;
+        return this.notificationFilters.some(f => f.affects(object));
       }
     }
   }