@@ -138,7 +139,7 @@ export default {
return {
id: null,
tab: "failures",
- service: null,
+ service: {},
authenticated: false,
ready: false,
data: null,
@@ -219,19 +220,22 @@ export default {
}]
}
},
- created() {
- this.service = this.$route.params.service
+ async created() {
this.id = this.$route.params.id
- if (!this.service) {
- this.getService(this.id)
+ let service;
+ if (this.isInt(this.id)) {
+ service = this.$store.getters.serviceById(this.id)
+ } else {
+ service = this.$store.getters.serviceByPermalink(this.id)
}
+ await this.getService(service)
},
mounted() {
},
methods: {
- async getService(id) {
- this.service = await Api.service(id)
+ async getService(s) {
+ this.service = await Api.service(s.id)
await this.chartHits()
await this.serviceFailures()
},
diff --git a/frontend/src/store.js b/frontend/src/store.js
index 7e8a9a3f..a09e1617 100644
--- a/frontend/src/store.js
+++ b/frontend/src/store.js
@@ -44,8 +44,8 @@ export default new Vuex.Store({
serviceById: (state) => (id) => {
return state.services.find(s => s.id === id)
},
- serviceByName: (state) => (name) => {
- return state.services.find(s => s.name === name)
+ serviceByPermalink: (state) => (permalink) => {
+ return state.services.find(s => s.permalink === permalink)
},
servicesInGroup: (state) => (id) => {
return state.services.filter(s => s.group_id === id)
@@ -57,7 +57,7 @@ export default new Vuex.Store({
return state.groups.find(g => g.id === id)
},
cleanGroups: (state) => () => {
- return state.groups.filter(g => g.name !== '')
+ return state.groups.filter(g => g.name !== 'Empty Group')
},
userById: (state) => (id) => {
return state.users.find(u => u.id === id)
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index aa475150..3692f6a1 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -3551,6 +3551,11 @@ flat-cache@^2.0.1:
rimraf "2.6.3"
write "1.0.3"
+flatpickr@^4.6.1:
+ version "4.6.3"
+ resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.3.tgz#15a8b76b6e34e3a072861250503a5995b9d3bc60"
+ integrity sha512-007VucCkqNOMMb9ggRLNuJowwaJcyOh4sKAFcdGfahfGc7JQbf94zSzjdBq/wVyHWUEs5o3+idhFZ0wbZMRmVQ==
+
flatted@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
@@ -7940,6 +7945,13 @@ vue-eslint-parser@^4.0.2:
esquery "^1.0.1"
lodash "^4.17.11"
+vue-flatpickr-component@^8.1.5:
+ version "8.1.5"
+ resolved "https://registry.yarnpkg.com/vue-flatpickr-component/-/vue-flatpickr-component-8.1.5.tgz#a7a7978d0034c8e44cf1527442d100c0655882fb"
+ integrity sha512-whrR+WM7fWyHW+1ZxCx7uVSuOlTeZXEMzhsgcILXGxIzQxr5uX5RlS5amLXdGGSSVf+zukrb6MvYit/uIkhk3Q==
+ dependencies:
+ flatpickr "^4.6.1"
+
vue-hot-reload-api@^2.3.0:
version "2.3.4"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
diff --git a/handlers/routes.go b/handlers/routes.go
index c5a662a6..d0cd2d9f 100644
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -94,6 +94,7 @@ func Router() *mux.Router {
// API SERVICE Routes
r.Handle("/api/services", scoped(apiAllServicesHandler)).Methods("GET")
r.Handle("/api/services", authenticated(apiCreateServiceHandler, false)).Methods("POST")
+ r.Handle("/api/services_test", authenticated(apiTestServiceHandler, false)).Methods("POST")
r.Handle("/api/services/{id}", scoped(apiServiceHandler)).Methods("GET")
r.Handle("/api/reorder/services", authenticated(reorderServiceHandler, false)).Methods("POST")
r.Handle("/api/services/{id}/running", authenticated(apiServiceRunningHandler, false)).Methods("POST")
diff --git a/handlers/services.go b/handlers/services.go
index b13f1871..3ff74636 100644
--- a/handlers/services.go
+++ b/handlers/services.go
@@ -147,6 +147,24 @@ func apiCreateServiceHandler(w http.ResponseWriter, r *http.Request) {
sendJsonAction(newService, "create", w, r)
}
+func apiTestServiceHandler(w http.ResponseWriter, r *http.Request) {
+ var service *types.Service
+ decoder := json.NewDecoder(r.Body)
+ err := decoder.Decode(&service)
+ if err != nil {
+ sendErrorJson(err, w, r)
+ return
+ }
+
+ newService := core.ReturnService(service)
+ _, err = newService.Create(true)
+ if err != nil {
+ sendErrorJson(err, w, r)
+ return
+ }
+ sendJsonAction(newService, "create", w, r)
+}
+
func apiServiceUpdateHandler(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
service := core.SelectService(utils.ToInt(vars["id"]))