Merge branch 'main' into global-search-ui-fixes

FlowFuse · Nov 21, 2024 · c9d124b · c9d124b
2 parents 56388aa + 9222adb
commit c9d124b
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 10 deletions.
diff --git a/forge/db/models/Application.js b/forge/db/models/Application.js
@@ -121,10 +121,12 @@ module.exports = {
                         include: includes
                     }
                     if (query) {
-                        queryObject.where = where(
-                            fn('lower', col('Application.name')),
-                            { [Op.like]: `%${query.toLowerCase()}%` }
-                        )
+                        queryObject.where = {
+                            [Op.or]: [
+                                where(fn('lower', col('Application.name')), { [Op.like]: `%${query.toLowerCase()}%` }),
+                                where(fn('lower', col('Application.description')), { [Op.like]: `%${query.toLowerCase()}%` })
+                            ]
+                        }
                     }
 
                     if (includeApplicationSummary) {

diff --git a/forge/db/models/Device.js b/forge/db/models/Device.js
@@ -315,10 +315,12 @@ module.exports = {
                     }
 
                     if (query) {
-                        queryObject.where[Op.and].push(where(
-                            fn('lower', col('Device.name')),
-                            { [Op.like]: `%${query.toLowerCase()}%` }
-                        ))
+                        queryObject.where[Op.and].push({
+                            [Op.or]: [
+                                where(fn('lower', col('Device.name')), { [Op.like]: `%${query.toLowerCase()}%` }),
+                                where(fn('lower', col('Device.type')), { [Op.like]: `%${query.toLowerCase()}%` })
+                            ]
+                        })
                     }
                     return this.getAll({}, queryObject.where)
                 },

diff --git a/test/unit/forge/routes/api/search_spec.js b/test/unit/forge/routes/api/search_spec.js
@@ -47,7 +47,7 @@ describe('Search API', function () {
         //  - [dev] "device-unassigned-abc"
         //  - [app] "Application AbC"
 
-        TestObjects.AppOne = await app.factory.createApplication({ name: 'Application One' }, TestObjects.BTeam)
+        TestObjects.AppOne = await app.factory.createApplication({ name: 'Application One', description: 'app-one-desc' }, TestObjects.BTeam)
 
         const ia1abc = await app.factory.createInstance({ name: 'instance-app-one-abc' }, TestObjects.AppOne, app.stack, app.template, app.projectType, { start: false })
         await app.factory.createInstance({ name: 'instance-app-one-def' }, TestObjects.AppOne, app.stack, app.template, app.projectType, { start: false })
@@ -59,7 +59,7 @@ describe('Search API', function () {
         await app.factory.createInstance({ name: 'instance-app-two-abc' }, TestObjects.AppTwo, app.stack, app.template, app.projectType, { start: false })
         await app.factory.createInstance({ name: 'instance-app-two-def' }, TestObjects.AppTwo, app.stack, app.template, app.projectType, { start: false })
         await app.factory.createDevice({ name: 'device-app-two-abc' }, TestObjects.BTeam, null, TestObjects.AppTwo)
-        await app.factory.createDevice({ name: 'device-app-two-def' }, TestObjects.BTeam, null, TestObjects.AppTwo)
+        await app.factory.createDevice({ name: 'device-app-two-def', type: 'device-type' }, TestObjects.BTeam, null, TestObjects.AppTwo)
 
         await app.factory.createDevice({ name: 'device-unassigned-abc' }, TestObjects.BTeam)
 
@@ -174,6 +174,26 @@ describe('Search API', function () {
         objects['Application AbC'].should.have.property('object', 'application')
     })
 
+    it('search includes application description', async function () {
+        // bob - team member
+        const response = await search({ team: TestObjects.BTeam.hashid, query: 'ne-deSC' }, TestObjects.tokens.bob)
+        response.statusCode.should.equal(200)
+        const result = response.json()
+        result.count.should.equal(1)
+        result.results.should.have.length(1)
+        result.results[0].should.have.property('object', 'application')
+    })
+
+    it('search includes device type', async function () {
+        // bob - team member
+        const response = await search({ team: TestObjects.BTeam.hashid, query: 'ice-Typ' }, TestObjects.tokens.bob)
+        response.statusCode.should.equal(200)
+        const result = response.json()
+        result.count.should.equal(1)
+        result.results.should.have.length(1)
+        result.results[0].should.have.property('object', 'device')
+    })
+
     it('search with blank query returns nothing', async function () {
         // bob - team member
         const response = await search({ team: TestObjects.BTeam.hashid, query: '' }, TestObjects.tokens.bob)