Polish Contribution

Author: joshiste

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

@@ -41,7 +41,7 @@ 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 {faMapMarker} from '@fortawesome/free-solid-svg-icons/faMapMarker';
+import {faMapMarkerAlt} from '@fortawesome/free-solid-svg-icons/faMapMarkerAlt';
 import {faFilter} from '@fortawesome/free-solid-svg-icons/faFilter';
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
 
@@ -69,7 +69,7 @@ library.add(
   faWrench,
   faAngleDoubleRight,
   faSearch,
-  faMapMarker,
+  faMapMarkerAlt,
   faFilter,
 //regular,
   farTimesCircle,

spring-boot-admin-server-ui/src/main/frontend/components/sba-confirm-button.vue

@@ -42,6 +42,7 @@
         } else {
           const width = this.$el.getBoundingClientRect().width;
           this.$el.style.width = `${width}px`;
+          event.stopPropagation();
         }
         this.confirm = !this.confirm;
       }

spring-boot-admin-server-ui/src/main/frontend/components/sba-panel.vue

@@ -82,7 +82,7 @@
     &__header--sticky {
       position: sticky;
       background-color: $white;
-      z-index: 1000;
+      z-index: 10;
     }
   }
 </style>

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

@@ -127,7 +127,7 @@ class Instance {
     });
   }
 
-  async fetchGlobalFiltersData() {
+  async fetchGatewayGlobalFilters() {
     return this.axios.get(uri`actuator/gateway/globalfilters`, {
       headers: {'Accept': actuatorMimeTypes}
     });
@@ -139,19 +139,19 @@ class Instance {
     });
   }
 
-  async fetchRoutesData() {
+  async fetchGatewayRoutes() {
     return this.axios.get(uri`actuator/gateway/routes`, {
       headers: {'Accept': actuatorMimeTypes}
     });
   }
 
-  async deleteRoute(routeId) {
+  async deleteGatewayRoute(routeId) {
     return this.axios.delete(uri`actuator/gateway/routes/${routeId}`, {
       headers: {'Accept': actuatorMimeTypes}
     });
   }
 
-  async clearRoutesCache() {
+  async refreshGatewayRoutesCache() {
     return this.axios.post(uri`actuator/gateway/refresh`, {
       headers: {'Accept': actuatorMimeTypes}
     });

spring-boot-admin-server-ui/src/main/frontend/views/instances/env/env-manager.vue

@@ -16,7 +16,7 @@
 
 <template>
   <div class="box">
-    <h1 class="is-size-5">
+    <h1 class="is-size-6">
       Environment Manager
     </h1>
     <datalist id="allPropertyNames">

spring-boot-admin-server-ui/src/main/frontend/views/instances/gateway/add-route.vue

@@ -0,0 +1,137 @@
+<!--
+  - 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.
+  -->
+
+<template>
+  <div>
+    <div v-if="error" class="message is-danger">
+      <div class="message-body">
+        <strong>
+          <font-awesome-icon class="has-text-warning" icon="exclamation-triangle" />
+          Adding route failed.
+        </strong>
+        <p v-text="error.message" />
+      </div>
+    </div>
+
+    <div class="field">
+      <label class="label" for="routeId">
+        Id
+      </label>
+      <p class="control">
+        <input class="input" id="routeId" v-model="routeId" required>
+      </p>
+    </div>
+
+    <div class="field">
+      <label class="label" for="order">
+        Order
+      </label>
+      <p class="control">
+        <input class="input" id="order" placeholder="0" v-model="routeOrder" type="number">
+      </p>
+    </div>
+
+    <div class="field">
+      <label class="label" for="predicates">
+        Predicates
+      </label>
+      <p class="control">
+        <textarea rows="4" class="textarea" id="predicates" placeholder="[]" v-model="routePredicates" required />
+      </p>
+    </div>
+
+    <div class="field">
+      <label class="label" for="filters">
+        Filters
+      </label>
+      <p class="control">
+        <textarea rows="4" class="textarea" id="filters" placeholder="[]" v-model="routeFilters" />
+      </p>
+    </div>
+
+    <div class="field">
+      <label class="label" for="routeUri">
+        URI
+      </label>
+      <p class="control">
+        <input class="input" id="routeUri" placeholder="http://example.com" v-model="routeUri" required>
+      </p>
+    </div>
+
+    <div class="field is-grouped is-grouped-right">
+      <div class="control">
+        <button class="button is-primary" :disabled="!isAddingRoutePossible" @click="addRoute">
+          Add route
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Instance from '@/services/instance';
+  import {from} from '@/utils/rxjs';
+
+  export default {
+    props: {
+      instance: {
+        type: Instance,
+        required: true
+      }
+    },
+    data: () => ({
+      error: null,
+      routeId: null,
+      routePredicates: null,
+      routeFilters: null,
+      routeUri: null,
+      routeOrder: null
+    }),
+    computed: {
+      isAddingRoutePossible() {
+        return this.routeId && this.routePredicates && this.routeUri;
+      }
+    },
+    methods: {
+      addRoute() {
+        const vm = this;
+        const newRoute = {
+          id: vm.routeId,
+          predicates: vm.routePredicates ? JSON.parse(vm.routePredicates) : undefined,
+          filters: vm.routeFilters ? JSON.parse(vm.routeFilters) : [],
+          uri: vm.routeUri,
+          order: vm.routeOrder || 0
+        };
+        from(vm.instance.addGatewayRoute(newRoute))
+          .subscribe({
+            complete: () => {
+              vm.routeId = null;
+              vm.routePredicates = null;
+              vm.routeFilters = null;
+              vm.routeUri = null;
+              vm.routeOrder = null;
+              vm.error = null;
+              setTimeout(() => vm.$emit('route-added'), 2500);
+            },
+            error: error => {
+              this.error = error;
+            }
+          });
+      }
+    }
+  }
+</script>
+