fix: remove idParamRegex in favor of simpler id number checking

Signed-off-by: Alexander Trost <[email protected]>
fivenet-app · Dec 25, 2024 · 2a60ae7 · 2a60ae7
1 parent 16c6a6c
commit 2a60ae7
Show file tree

Hide file tree

Showing 18 changed files with 2,172 additions and 2,328 deletions.
diff --git a/app/pages/citizens/[id].vue b/app/pages/citizens/[id].vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/documents/[id]/edit.vue b/app/pages/documents/[id]/edit.vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/documents/[id]/index.vue b/app/pages/documents/[id]/index.vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/documents/templates/[id].vue b/app/pages/documents/templates/[id].vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/documents/templates/edit/[id].vue b/app/pages/documents/templates/edit/[id].vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/jobs/colleagues/[id].vue b/app/pages/jobs/colleagues/[id].vue
@@ -23,7 +23,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/jobs/colleagues/[id]/activity.vue b/app/pages/jobs/colleagues/[id]/activity.vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/jobs/colleagues/[id]/conduct.vue b/app/pages/jobs/colleagues/[id]/conduct.vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/jobs/colleagues/[id]/info.vue b/app/pages/jobs/colleagues/[id]/info.vue
@@ -20,7 +20,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/jobs/colleagues/[id]/qualifications.vue b/app/pages/jobs/colleagues/[id]/qualifications.vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/jobs/colleagues/[id]/timeclock.vue b/app/pages/jobs/colleagues/[id]/timeclock.vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/qualifications/[id]/edit.vue b/app/pages/qualifications/[id]/edit.vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/qualifications/[id]/exam/index.vue b/app/pages/qualifications/[id]/exam/index.vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/qualifications/[id]/index.vue b/app/pages/qualifications/[id]/index.vue
@@ -15,7 +15,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/pages/wiki/[job]/[id]/[[slug]].vue b/app/pages/wiki/[job]/[id]/[[slug]].vue
@@ -20,7 +20,7 @@ definePageMeta({
         if (typeof route.params.id !== 'string') {
             return false;
         }
-        return idParamRegex.test(route.params.id as string);
+        return !!(route.params.id && !isNaN(Number(route.params.id))) && Number(route.params.id) > -1;
     },
 });
 

diff --git a/app/utils/routes.ts b/app/utils/routes.ts
diff --git a/package.json b/package.json
@@ -21,22 +21,21 @@
     },
     "dependencies": {
         "@galexrt/nuxt-update": "1.0.1",
-        "@git-diff-view/vue": "0.0.22",
         "@iconify-json/flagpack": "1.2.2",
         "@iconify-json/mdi": "1.2.2",
-        "@iconify-json/simple-icons": "1.2.16",
+        "@iconify-json/simple-icons": "1.2.17",
         "@nuxt/content": "2.13.4",
         "@nuxt/fonts": "0.10.3",
         "@nuxt/ui-pro": "1.6.0",
-        "@nuxtjs/robots": "5.0.1",
+        "@nuxtjs/robots": "5.1.0",
         "@pinia/nuxt": "0.9.0",
         "@protobuf-ts/grpcweb-transport": "2.9.4",
         "@unovis/ts": "1.5.0",
         "@unovis/vue": "1.5.0",
         "@vue-leaflet/vue-leaflet": "0.10.1",
         "@zxcvbn-ts/core": "3.0.4",
         "browser-headers": "0.4.1",
-        "consola": "3.3.0",
+        "consola": "3.3.1",
         "date-fns": "4.1.0",
         "emoji-blast": "0.10.2",
         "google-protobuf": "3.21.4",
@@ -94,17 +93,17 @@
         "@types/splitpanes": "2.2.6",
         "@types/uuid": "10.0.0",
         "@types/zxcvbn": "4.4.5",
-        "@vueuse/core": "12.1.0",
-        "@vueuse/nuxt": "12.1.0",
-        "@vueuse/router": "12.1.0",
+        "@vueuse/core": "12.2.0",
+        "@vueuse/nuxt": "12.2.0",
+        "@vueuse/router": "12.2.0",
         "autoprefixer": "10.4.20",
         "cssnano": "7.0.6",
         "eslint": "9.17.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-prettier": "5.2.1",
         "eslint-plugin-vue": "9.32.0",
-        "nuxi": "3.17.1",
-        "nuxt": "3.14.1592",
+        "nuxi": "3.17.2",
+        "nuxt": "3.15.0",
         "nuxt-tiptap-editor": "2.1.4",
         "nuxt-typed-router": "3.7.2",
         "pinia-plugin-persistedstate": "4.2.0",
@@ -126,7 +125,7 @@
         "typescript": "5.7.2",
         "vue": "3.5.13",
         "vue-i18n-routing": "1.2.0",
-        "vue-tsc": "2.1.10"
+        "vue-tsc": "2.2.0"
     },
     "resolutions": {
         "@nuxt/ui": "2.19.1"