Added catch() on all loading functions and updated logo

dbrepo-ui/pages/semantic/index.vue

@@ -122,6 +122,9 @@ export default {
           })
           this.concepts = concepts
         })
+        .catch(() => {
+          this.loadingConcepts = false
+        })
         .finally(() => {
           this.loadingConcepts = false
         })
@@ -136,6 +139,9 @@ export default {
           })
           this.units = units
         })
+        .catch(() => {
+          this.loadingUnits = false
+        })
         .finally(() => {
           this.loadingUnits = false
         })

dbrepo-ui/pages/semantic/ontology/_ontology_id/index.vue

@@ -148,6 +148,9 @@ export default {
           this.ontology = ontology
           this.ontologyChangeDto = Object.assign({}, ontology)
         })
+        .catch(() => {
+          this.loading = false
+        })
         .finally(() => {
           this.loading = false
         })
@@ -159,6 +162,9 @@ export default {
           await this.$store.dispatch('reloadOntologies')
           await this.$router.push('/semantic/ontology')
         })
+        .catch(() => {
+          this.loadingDelete = false
+        })
         .finally(() => {
           this.loadingDelete = false
         })
@@ -176,6 +182,9 @@ export default {
           this.$store.dispatch('reloadOntologies')
           this.$toast.success('Successfully update ontology!')
         })
+        .catch(() => {
+          this.loading = false
+        })
         .finally(() => {
           this.loading = false
         })

dbrepo-ui/pages/signup.vue

@@ -121,6 +121,9 @@ export default {
         .catch(() => {
           this.loading = false
         })
+        .finally(() => {
+          this.loading = false
+        })
     },
     loadUsers () {
       this.loadingUsers = true
@@ -128,6 +131,9 @@ export default {
         .then((users) => {
           this.usernames = users.map(u => u.username)
         })
+        .catch(() => {
+          this.loadingUsers = false
+        })
         .finally(() => {
           this.loadingUsers = false
         })

dbrepo-ui/pages/user/authentication.vue

@@ -98,6 +98,9 @@ export default {
         .catch(() => {
           this.loadingUpdate = false
         })
+        .finally(() => {
+          this.loadingUpdate = false
+        })
     }
   }
 }

dbrepo-ui/pages/user/info.vue

@@ -169,6 +169,9 @@ export default {
           this.$toast.success('Successfully updated user information')
           this.reloadUser()
         })
+        .catch(() => {
+          this.loadingUpdate = false
+        })
         .finally(() => {
           this.loadingUpdate = false
         })

dbrepo-ui/server-middleware/index.js

-import config from '../dbrepo.config.json'
 const express = require('express')
-const multer = require('multer')
-const Minio = require('minio')
 const { buildQuery } = require('./query')
 const app = express()
 
 app.use(express.json())
 
-const minioClient = new Minio.Client({
-  endPoint: config.storage.endpoint,
-  port: config.storage.port,
-  useSSL: config.storage.useSsl,
-  accessKeyId: config.storage.accessKey.id,
-  secretAccessKey: config.storage.accessKey.secret
-})
-
 app.post('/query/build', (req, res) => {
   return res.json(buildQuery(req.body))
 })
 
-app.post('/upload', multer().single('file'), function (req, res) {
-  const { file } = req
-  try {
-    minioClient.putObject('dbrepo-upload', file.originalname, file.buffer, function (err, etag) {
-      if (err) {
-        console.error('Failed to upload file', err)
-        return res.sendStatus(403)
-      }
-      console.debug('Successfully uploaded file', etag)
-      file.etag = etag
-      return res.status(201).json(file)
-    })
-  } catch (err) {
-    console.error('Failed to upload file', err)
-    return res.sendStatus(403)
-  }
-})
-
 module.exports = app