Mini refactoring

client/src/pages/Event/Step4/MaterialsList/index.js

@@ -1,5 +1,6 @@
 import Config from '@/config/globalConfig';
 import formatAmount from '@/utils/formatAmount';
+import isValidInteger from '@/utils/isValidInteger';
 import MaterialsFilter from '@/components/MaterialsFilters/MaterialsFilters.vue';
 import SwitchToggle from '@/components/SwitchToggle/SwitchToggle.vue';
 import Quantity from './Quantity/Quantity.vue';
@@ -34,26 +35,6 @@ export default {
 
     const hasMaterial = this.initialList.length > 0;
 
-    const initFilters = {
-      onlySelected: hasMaterial,
-    };
-
-    if (this.$route.query.park) {
-      initFilters.park = this.$route.query.park;
-    }
-
-    if (this.$route.query.category) {
-      initFilters.category = this.$route.query.category;
-    }
-
-    if (this.$route.query.subCategory) {
-      initFilters.subCategory = this.$route.query.subCategory;
-    }
-
-    if (this.$route.query.tags) {
-      initFilters.tags = JSON.parse(this.$route.query.tags);
-    }
-
     return {
       error: null,
       renderId: 1,
@@ -78,7 +59,7 @@ export default {
           amount: 'MaterialsList__amount',
           actions: 'MaterialsList__actions',
         },
-        initFilters,
+        initFilters: this.getFilters(),
         customFilters: [
           {
             name: 'park',
@@ -129,6 +110,30 @@ export default {
       }
     },
 
+    getFilters() {
+      const filters = {
+        onlySelected: this.showSelectedOnly,
+      };
+
+      if (this.$route.query.park && isValidInteger(this.$route.query.park)) {
+        filters.park = parseInt(this.$route.query.park, 10);
+      }
+
+      if (this.$route.query.category) {
+        filters.category = this.$route.query.category;
+      }
+
+      if (this.$route.query.subCategory) {
+        filters.subCategory = this.$route.query.subCategory;
+      }
+
+      if (this.$route.query.tags) {
+        filters.tags = JSON.parse(this.$route.query.tags);
+      }
+
+      return filters;
+    },
+
     handleToggleSelectedOnly(newValue) {
       this.$refs.DataTable.setCustomFilters({ onlySelected: newValue });
       this.$refs.DataTable.setLimit(

client/src/utils/isValidInteger.js

@@ -0,0 +1,8 @@
+const isValidInteger = (value) => {
+  if (typeof value === 'number') {
+    return !Number.isNaN(value) && Number.isInteger(parseFloat(value));
+  }
+  return /^-?[0-9]+$/.test(value);
+};
+
+export default isValidInteger;

client/tests/unit/utils/isValidInteger.spec.js

@@ -0,0 +1,21 @@
+import isValidInteger from '@/utils/isValidInteger';
+
+describe('isValidInteger', () => {
+  it('returns true when value is a valid integer', () => {
+    expect(isValidInteger(1)).toBe(true);
+    expect(isValidInteger(-55555)).toBe(true);
+    expect(isValidInteger('10')).toBe(true);
+    expect(isValidInteger('10546')).toBe(true);
+    expect(isValidInteger('-10')).toBe(true);
+  });
+
+  it('returns false when value is not a valid integer', () => {
+    expect(isValidInteger(10.5)).toBe(false);
+    expect(isValidInteger(-10.5)).toBe(false);
+    expect(isValidInteger('10.65')).toBe(false);
+    expect(isValidInteger('foo 10')).toBe(false);
+    expect(isValidInteger('Infinity')).toBe(false);
+    expect(isValidInteger(Infinity)).toBe(false);
+    expect(isValidInteger('10 546')).toBe(false);
+  });
+});