Created category model, closes #76

jsbroks · Feb 9, 2019 · f479768 · f479768
1 parent e0a3f2f
commit f479768
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 18 deletions.
diff --git a/app/api/categories.py b/app/api/categories.py
@@ -1,5 +1,6 @@
 from flask_restplus import Namespace, Resource, reqparse
 from flask_login import login_required, current_user
+from mongoengine.errors import NotUniqueError
 
 from ..util.pagination_util import Pagination
 from ..util import query_util
@@ -37,7 +38,7 @@ def post(self):
         supercategory = args.get('supercategory')
         metadata = args.get('metadata', {})
         color = args.get('color')
-
+        
         try:
             category = CategoryModel(
                 name=name,
@@ -46,8 +47,8 @@ def post(self):
                 metadata=metadata
             )
             category.save()
-        except (ValueError, TypeError) as e:
-            return {'message': str(e)}, 400
+        except NotUniqueError as e:
+            return {'message': 'Category already exists. Check the undo tab to fully delete the category.'}, 400
 
         return query_util.fix_ids(category)
 

diff --git a/client/src/models/categories.js b/client/src/models/categories.js
@@ -0,0 +1,16 @@
+import axios from "axios";
+
+const baseURL = "/api/category/";
+
+export default {
+  allData(params) {
+    return axios.get(baseURL + "data", {
+      params: {
+        ...params
+      }
+    });
+  },
+  create(create) {
+    return axios.post(baseURL, { ...create });
+  }
+};
diff --git a/client/src/views/Categories.vue b/client/src/views/Categories.vue
@@ -146,7 +146,9 @@
 </template>
 
 <script>
-import axios from "axios";
+import toastrs from "@/mixins/toastrs";
+
+import Category from "@/models/categories";
 import CategoryCard from "@/components/cards/CategoryCard";
 import Pagination from "@/components/Pagination";
 
@@ -155,6 +157,7 @@ import { mapMutations } from "vuex";
 export default {
   name: "Categories",
   components: { CategoryCard, Pagination },
+  mixins: [toastrs],
   data() {
     return {
       categoryCount: 0,
@@ -178,13 +181,10 @@ export default {
       page = page || this.page;
       this.page = page;
 
-      axios
-        .get("/api/category/data", {
-          params: {
-            page: page,
-            limit: this.limit
-          }
-        })
+      Category.allData({
+        page: page,
+        limit: this.limit
+      })
         .then(response => {
           this.categories = response.data.categories;
           this.page = response.data.pagination.page;
@@ -196,13 +196,18 @@ export default {
     createCategory() {
       if (this.createName.length < 1) return;
 
-      axios
-        .post("/api/category/", {
-          name: this.createName
-        })
+      Category.create({
+        name: this.createName
+      })
         .then(() => {
           this.createName = "";
           this.updatePage();
+        })
+        .catch(error => {
+          this.axiosReqestError(
+            "Creating Category",
+            error.response.data.message
+          );
         });
     },
     previousPage() {

diff --git a/client/src/views/Dataset.vue b/client/src/views/Dataset.vue
@@ -410,8 +410,8 @@ export default {
     queryAnnotated() {
       let showAnnotated = this.panel.showAnnotated;
       let showNotAnnotated = this.panel.showNotAnnotated;
-      
-      if (showAnnotated && showNotAnnotated) return null
+
+      if (showAnnotated && showNotAnnotated) return null;
       if (!showAnnotated && !showNotAnnotated) return " ";
 
       return showAnnotated;
@@ -446,7 +446,9 @@ export default {
     }
   },
   watch: {
-    queryAnnotated() { this.updatePage() },
+    queryAnnotated() {
+      this.updatePage();
+    },
     folders() {
       this.updatePage();
     },