Merge pull request #428 from dfpc-coe/tab-icons

Data Package Import
dfpc-coe · Nov 25, 2024 · 4fcd75e · 4fcd75e
2 parents 47ee6ab + a2ece6d
commit 4fcd75e
Show file tree

Hide file tree

Showing 26 changed files with 2,262 additions and 2,024 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/routes/import.ts b/api/routes/import.ts
@@ -270,6 +270,7 @@ export default async function router(schema: Schema, config: Config) {
         query: Type.Object({
             limit: Default.Limit,
             page: Default.Page,
+            filter: Default.Filter,
             order: Default.Order,
             sort: Type.Optional(Type.String({default: 'created', enum: Object.keys(Import) })),
             mode: Type.Optional(Type.Enum(ImportModeEnum)),
@@ -291,6 +292,7 @@ export default async function router(schema: Schema, config: Config) {
                 where: sql`
                     (${Param(req.query.mode)}::TEXT IS NULL OR ${Param(req.query.mode)}::TEXT = mode)
                     AND (${Param(req.query.mode_id)}::TEXT IS NULL OR ${Param(req.query.mode_id)}::TEXT = mode_id)
+                    AND (${Param(req.query.filter)}::TEXT IS NULL OR ${Param(req.query.filter)}::TEXT ~* name)
                     AND username = ${user.email}
                 `
             });

diff --git a/api/web/package-lock.json b/api/web/package-lock.json
diff --git a/api/web/package.json b/api/web/package.json
@@ -11,10 +11,10 @@
         "lint": "eslint ./src/"
     },
     "dependencies": {
-        "@tak-ps/vue-tabler": "^3.58.0",
         "@sinclair/typebox": "^0.34.0",
         "@tabler/core": "^1.0.0-beta16",
         "@tabler/icons-vue": "^3.0.0",
+        "@tak-ps/vue-tabler": "^3.58.0",
         "@turf/bbox": "^7.1.0",
         "@turf/boolean-point-in-polygon": "^7.1.0",
         "@turf/boolean-touches": "^7.1.0",
@@ -28,7 +28,7 @@
         "dropzone": "^6.0.0-beta.2",
         "floating-vue": "^2.0.0-beta.17",
         "jsonata": "^2.0.4",
-        "maplibre-gl": "^5.0.0-pre.3",
+        "maplibre-gl": "^5.0.0-pre.7",
         "moment": "^2.29.3",
         "p12-pem": "^1.0.5",
         "phone": "^3.1.42",
@@ -42,12 +42,13 @@
         "vue": "^3.2.31",
         "vue-mention": "^2.0.0-alpha.3",
         "vue-router": "^4.0.14",
-        "vue3-apexcharts": "^1.4.1",
+        "vue3-apexcharts": "1.7.0",
         "ws": "^8.11.0"
     },
     "devDependencies": {
         "@babel/eslint-parser": "^7.17.0",
         "@tak-ps/node-cot": "^12.5.1",
+        "@types/sortablejs": "^1.15.8",
         "@vitejs/plugin-vue": "^5.0.0",
         "babel-preset-vite": "^1.1.3",
         "eslint": "^9.0.0",
@@ -57,7 +58,8 @@
         "vite": "^5.0.0",
         "vite-plugin-babel": "^1.2.0",
         "vite-plugin-pwa": "^0.21.0",
-        "vue-tsc": "^2.0.3"
+        "vue-tsc": "2.0.29",
+        "typescript": "5.6.2"
     },
     "browserslist": [
         "> 1%",