Add Private Data List

dfpc-coe · Feb 7, 2024 · bb7947d · bb7947d
1 parent 18ba0d5
commit bb7947d
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 11 deletions.
diff --git a/api/package.json b/api/package.json
@@ -9,7 +9,7 @@
         "build": "tsc --outDir . && rm ./routes/*.ts",
         "prod": "NODE_OPTIONS='--max-old-space-size=6144' forever index.js",
         "lint": "eslint index.ts lib/**.ts test/**.ts",
-        "loaddb": "echo 'DROP DATABASE tak_ps_etl' | psql && echo 'CREATE DATABASE tak_ps_etl' | psql && psql tak_ps_etl < wftak-staging-etl-latest.dump",
+        "loaddb": "echo 'DROP DATABASE tak_ps_etl' | psql && echo 'CREATE DATABASE tak_ps_etl' | psql && psql tak_ps_etl < coe-etl-latest.dump",
         "dev": "nodemon -i schema/ -i web/ --esm index.ts --noevents --nosinks --nometrics --unsafe"
     },
     "repository": {

diff --git a/api/routes/data.ts b/api/routes/data.ts
@@ -12,6 +12,34 @@ import DataMission from '../lib/data-mission.js';
 import { AuthResourceAccess } from '@tak-ps/blueprint-login';
 
 export default async function router(schema: any, config: Config) {
+    await schema.get('/data', {
+        private: true,
+        name: 'Internal List Data',
+        group: 'Data',
+        auth: 'user',
+        description: `
+            Used by the frontend UI to list data packages that the user can visualize
+        `,
+        query: 'req.query.ListData.json',
+        res: 'res.ListData.json'
+    }, async (req: AuthRequest, res: Response) => {
+        try {
+            await Auth.is_auth(config.models, req);
+
+            const list = await config.models.Data.list({
+                limit: Number(req.query.limit),
+                page: Number(req.query.page),
+                order: String(req.query.order),
+                sort: String(req.query.sort),
+                where: sql`name ~* ${req.query.filter}`
+            });
+
+            res.json(list);
+        } catch (err) {
+            return Err.respond(err, res);
+        }
+    });
+
     await schema.get('/data/:dataid', {
         private: true,
         name: 'Internal Get Data',

diff --git a/api/schema/profile_overlays/id.json b/api/schema/profile_overlays/id.json
@@ -1,5 +1,5 @@
 {
     "type": "number",
     "description": "",
-    "$comment": "int4"
+    "$comment": "int8"
 }
diff --git a/api/schema/profile_overlays/mode.json b/api/schema/profile_overlays/mode.json
@@ -1,5 +1,5 @@
 {
     "type": "string",
     "description": "",
-    "$comment": "varchar"
+    "$comment": "text"
 }
diff --git a/api/schema/profile_overlays/name.json b/api/schema/profile_overlays/name.json
@@ -1,5 +1,5 @@
 {
     "type": "string",
     "description": "",
-    "$comment": "varchar"
+    "$comment": "text"
 }
diff --git a/api/schema/profile_overlays/opacity.json b/api/schema/profile_overlays/opacity.json
@@ -1,5 +1,5 @@
 {
     "type": "number",
     "description": "",
-    "$comment": "int4"
+    "$comment": "float8"
 }
diff --git a/api/schema/profile_overlays/type.json b/api/schema/profile_overlays/type.json
@@ -1,5 +1,5 @@
 {
     "type": "string",
     "description": "",
-    "$comment": "varchar"
+    "$comment": "text"
 }
diff --git a/api/schema/profile_overlays/url.json b/api/schema/profile_overlays/url.json
@@ -1,5 +1,5 @@
 {
     "type": "string",
     "description": "",
-    "$comment": "varchar"
+    "$comment": "text"
 }
diff --git a/api/schema/profile_overlays/username.json b/api/schema/profile_overlays/username.json
@@ -1,5 +1,8 @@
 {
-    "type": "string",
+    "type": [
+        "string",
+        "null"
+    ],
     "description": "",
-    "$comment": "varchar"
+    "$comment": "text"
 }
diff --git a/api/web/src/components/CloudTAK/Menu/Datas.vue b/api/web/src/components/CloudTAK/Menu/Datas.vue
@@ -166,7 +166,7 @@ export default {
                     a.visible = false;
                 } else {
                     a.visible = true;
-                    const url = window.stdurl(`/api/data/${this.data.id}/asset/${a.visualized}/tile`);
+                    const url = window.stdurl(`/api/connection/${this.data.connection}/data/${this.data.id}/asset/${a.visualized}/tile`);
                     url.searchParams.append('token', localStorage.token);
 
                     await this.createOverlay(id, url, a)
@@ -241,7 +241,7 @@ export default {
         },
         fetchAssetList: async function() {
             this.loading = true;
-            const url = window.stdurl(`/api/data/${this.data.id}/asset`);
+            const url = window.stdurl(`/api/connection/${this.data.connection}/data/${this.data.id}/asset`);
             if (this.query && this.paging.filter) url.searchParams.append('filter', this.paging.filter);
             url.searchParams.append('limit', this.paging.limit);
             url.searchParams.append('page', this.paging.page);