@mixd-id/web-scaffold 0.1.230406152 → 0.1.230406153

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.230406152",
+  "version": "0.1.230406153",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/utils/listpage1.js

@@ -1,8 +1,8 @@
 const { Op } = module.parent.require('sequelize')
 const Sequelize = module.parent.require('sequelize')
-const dayjs = require("dayjs");
-const Exceljs = require("exceljs");
-const { getPresetSortWhereParams, ftWildcard } = require("./helpers");
+const dayjs = require("dayjs")
+const Exceljs = require("exceljs")
+const { getPresetSortWhereParams } = require("./helpers")
 
 let ListPage1 = {
 
@@ -32,25 +32,25 @@ let ListPage1 = {
     for(let i = 0 ; i < currentPreset.presets.length ; i++){
 
       Object.assign({
-        name: 'Default',
-        columns: [],
-        sorts: [],
-        filters: [],
-        summaries: [],
-      },
+          name: 'Default',
+          columns: [],
+          sorts: [],
+          filters: [],
+          summaries: [],
+        },
         currentPreset.presets[i])
 
       if(currentPreset.presets[i].summaries){
         for(let j = 0 ; j < currentPreset.presets[i].summaries.length ; j++){
 
           Object.assign({
-                map: {
-                  mapRadius: 16,
-                  mapType: "heatmap",
-                  zoom: 7
-                }
-              },
-              currentPreset.presets[i].summaries[j])
+              map: {
+                mapRadius: 16,
+                mapType: "heatmap",
+                zoom: 7
+              }
+            },
+            currentPreset.presets[i].summaries[j])
         }
       }
     }
@@ -110,6 +110,7 @@ let ListPage1 = {
   async loadSummary(params){
 
     if(!this.conn){
+      console.error('Unable to load summary, connection not found')
       return
     }
 
@@ -311,7 +312,7 @@ let ListPage1 = {
     const sheet = workbook.addWorksheet('Export ' + this.name);
     sheet.columns = columns
 
-    let where = []
+    let where = {}
     let replacements = []
     let order = [
       [ 'updatedAt', 'desc' ],
@@ -348,6 +349,14 @@ let ListPage1 = {
     }
     attributes = Object.keys(attributes)
 
+    if(preset.filters){
+      const { where:presetWhere } = this.getPresetFilterParams(preset)
+      where = {
+        ...where,
+        ...presetWhere
+      }
+    }
+
     if(preset.sorts){
       const { order:presetOrder } = this.getPresetSortParams(preset)
       if(presetOrder){
@@ -355,25 +364,21 @@ let ListPage1 = {
       }
     }
 
-    if(preset.search && this.matchAgainst){
-      where.push({
-        [Op.and]: Sequelize.literal(this.matchAgainst)
-      })
-      replacements.push(ftWildcard(preset.search))
-    }
-    else if(preset.filters){
-      const { where:presetWhere } = this.getPresetFilterParams(preset)
-      where.push(presetWhere)
+    if(preset.search){
+      const tableName = this.model.name
+      where = {
+        ...where,
+        [Op.and]: Sequelize.literal(`MATCH(\`${tableName}\`.tag) AGAINST (? IN BOOLEAN MODE)`)
+      }
+      replacements.push(preset.search)
     }
 
     if(this.downloadFilters){
-      where.push((await this.downloadFilters(params) ?? {}))
+      await this.downloadFilters(params, where)
     }
 
     const rows = await this.model.findAll({
-      where: {
-        [Op.and]: where
-      },
+      where,
       attributes: {
         ...attributes,
         include: attributeIncludes
@@ -433,7 +438,7 @@ let ListPage1 = {
 
     const { afterItem, itemsPerPage = this.itemsPerPage ?? 24 } = params
     const { preset = {} } = params
-    let where = []
+    let where = {}
     let replacements = []
     let order = [
       [ 'updatedAt', 'desc' ],
@@ -481,8 +486,19 @@ let ListPage1 = {
     }
     attributes = Object.keys(attributes)
 
+    if(preset.filters){
+      const { where:presetWhere } = this.getPresetFilterParams(preset, includes)
+      where = {
+        ...where,
+        ...presetWhere
+      }
+    }
+
     if(typeof this['loadFilters'] === 'function'){
-      where.push(await this['loadFilters'](params) ?? {})
+      where = {
+        ...where,
+        ...(await this['loadFilters'](params) ?? {})
+      }
     }
 
     if(preset.sorts){
@@ -492,27 +508,26 @@ let ListPage1 = {
       }
     }
 
-    if(preset.search && this.matchAgainst){
-      where.push({
-        [Op.and]: Sequelize.literal(this.matchAgainst)
-      })
-      replacements.push(ftWildcard(preset.search))
-    }
-    else if(preset.filters){
-      const { where:presetWhere } = this.getPresetFilterParams(preset, includes)
-      where.push(presetWhere)
+    if(preset.search){
+      const tableName = this.model.name
+      where = {
+        ...where,
+        [Op.and]: Sequelize.literal(`MATCH(\`${tableName}\`.tag) AGAINST (? IN BOOLEAN MODE)`)
+      }
+      replacements.push(preset.search)
     }
 
     if(afterItem){
       const sortWhere = getPresetSortWhereParams(order, afterItem)
-      where.push(sortWhere)
+      where = {
+        ...where,
+        ...sortWhere
+      }
     }
 
     let derivedSql
     let { rows:items, count } = await this.model.findAndCountAll({
-      where: {
-        [Op.and]: where
-      },
+      where,
       attributes: {
         ...attributes,
         include: attributeIncludes
@@ -1314,7 +1329,7 @@ let ListPage1 = {
       default:
         items.forEach((item) => {
           if(!('operator' in item) ||
-              ([ 'startsWith', 'endsWith', 'contains', '=' ].includes(item.operator) && !'value' in item))
+            ([ 'startsWith', 'endsWith', 'contains', '=' ].includes(item.operator) && !'value' in item))
             return
 
           const operator = item.operator

package/src/utils/listview.js

@@ -146,26 +146,31 @@ let ListView = {
     }
     attributes = Object.keys(attributes)
 
-    if(preset.sorts){
-      const { order:presetOrder } = this.getPresetSortParams(preset)
-      if(presetOrder){
-        order = presetOrder
+    if(preset.search && typeof this.searchFn === 'function'){
+      const { where:presetWhere, replacements:presetReplacements } = await this.searchFn(preset) ?? {}
+      if(presetWhere){
+        where.push(presetWhere)
+        replacements = replacements.concat(presetReplacements ?? [])
       }
     }
-
-    if(preset.search && this.matchAgainst){
-      where.push({
-        [Op.and]: Sequelize.literal(this.matchAgainst)
-      })
-      replacements.push(ftWildcard(preset.search))
-    }
     else if(preset.filters){
       const { where:presetWhere } = this.getPresetFilterParams(preset)
       where.push(presetWhere)
     }
 
-    if(this.downloadFilters){
-      where.push((await this.downloadFilters(params) ?? {}))
+    if(typeof this.filterFn === 'function'){
+      const { where:filterWhere, replacements:filterReplacements } = await this.filterFn(preset) ?? {}
+      if(filterWhere){
+        where.push(filterWhere)
+        replacements = replacements.concat(filterReplacements ?? [])
+      }
+    }
+
+    if(preset.sorts){
+      const { order:presetOrder } = this.getPresetSortParams(preset)
+      if(presetOrder){
+        order = presetOrder
+      }
     }
 
     const rows = await this.model.findAll({
@@ -276,19 +281,24 @@ let ListView = {
     }
     attributes = Object.keys(attributes)
 
-    if(preset.search && this.matchAgainst){
-      where.push({
-        [Op.and]: Sequelize.literal(this.matchAgainst)
-      })
-      replacements.push(ftWildcard(preset.search))
+    if(preset.search && typeof this.searchFn === 'function'){
+      const { where:presetWhere, replacements:presetReplacements } = await this.searchFn(preset) ?? {}
+      if(presetWhere){
+        where.push(presetWhere)
+        replacements = replacements.concat(presetReplacements ?? [])
+      }
     }
     else if(preset.filters){
       const { where:presetWhere } = this.getPresetFilterParams(preset, includes)
       where.push(presetWhere)
     }
 
-    if(typeof this['loadFilters'] === 'function'){
-      where.push(await this['loadFilters'](params) ?? {})
+    if(typeof this.filterFn === 'function'){
+      const { where:filterWhere, replacements:filterReplacements } = await this.filterFn(preset) ?? {}
+      if(filterWhere){
+        where.push(filterWhere)
+        replacements = replacements.concat(filterReplacements ?? [])
+      }
     }
 
     if(preset.sorts){