Merge pull request #320 from dfpc-coe/filter

Filter Layers
dfpc-coe · Sep 4, 2024 · e75174e · e75174e
2 parents f006c2a + 8980e4a
commit e75174e
Show file tree

Hide file tree

Showing 4 changed files with 145 additions and 93 deletions.
diff --git a/api/lib/models/Layer.ts b/api/lib/models/Layer.ts
@@ -48,6 +48,25 @@ export default class LayerModel extends Modeler<typeof Layer> {
         super(pool, Layer);
     }
 
+    async tasks(): Promise<string[]> {
+        const pgres = await this.pool
+            .select({
+                task: Layer.task
+            })
+            .from(Layer)
+
+        if (pgres.length === 0) {
+            return []
+        } else {
+            const taskSet: Set<string> = new Set();
+            for (const t of pgres) {
+                taskSet.add(t.task.replace(/-v\d+\.\d+\.\d+/, ''))
+            }
+
+            return Array.from(taskSet);
+        }
+    }
+
     async augmented_list(query: GenericListInput = {}): Promise<GenericList<Static<typeof AugmentedLayer>>> {
         const order = query.order && query.order === 'desc' ? desc : asc;
         const orderBy = order(query.sort ? this.key(query.sort) : this.requiredPrimaryKey());

diff --git a/api/routes/internal.ts b/api/routes/internal.ts
@@ -25,11 +25,13 @@ export default async function router(schema: Schema, config: Config) {
             order: Default.Order,
             sort: Type.Optional(Type.String({default: 'created', enum: Object.keys(Layer)})),
             filter: Default.Filter,
+            task: Type.Optional(Type.String()),
             data: Type.Optional(Type.Integer({ minimum: 1 })),
             connection: Type.Optional(Type.Integer({ minimum: 1 })),
         }),
         res: Type.Object({
             total: Type.Integer(),
+            tasks: Type.Array(Type.String()),
             status: Type.Object({
                 healthy: Type.Integer(),
                 alarm: Type.Integer(),
@@ -50,6 +52,7 @@ export default async function router(schema: Schema, config: Config) {
                     name ~* ${req.query.filter}
                     AND (${Param(req.query.connection)}::BIGINT IS NULL OR ${Param(req.query.connection)}::BIGINT = layers.connection)
                     AND (${Param(req.query.data)}::BIGINT IS NULL OR ${Param(req.query.data)}::BIGINT = layers.data)
+                    AND (${Param(req.query.task)}::TEXT IS NULL OR Starts_With(layers.task, ${Param(req.query.task)}::TEXT))
                 `
             });
 
@@ -65,6 +68,7 @@ export default async function router(schema: Schema, config: Config) {
             res.json({
                 status,
                 total: list.total,
+                tasks: await config.models.Layer.tasks(),
                 items: list.items.map((layer) => {
                     return {
                         status: alarms.get(layer.id) || 'unknown',