code cleanup

cityssm · Aug 17, 2023 · 2b23622 · 2b23622
1 parent d0eaeb5
commit 2b23622
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/bin/wwwProcess.ts b/bin/wwwProcess.ts
@@ -28,15 +28,15 @@ function onError(error: ServerError): void {
       debug('Requires elevated privileges')
       // eslint-disable-next-line n/no-process-exit
       process.exit(1)
-      // break;
+      // break
     }
 
     // eslint-disable-next-line no-fallthrough
     case 'EADDRINUSE': {
       debug('Port is already in use.')
       // eslint-disable-next-line n/no-process-exit
       process.exit(1)
-      // break;
+      // break
     }
 
     // eslint-disable-next-line no-fallthrough

diff --git a/database/getEnergyDataFiles.js b/database/getEnergyDataFiles.js
@@ -33,6 +33,10 @@ function getEnergyDataFiles(filters, options) {
         sql += ' and f.isFailed = ?';
         sqlParameters.push(filters.isFailed ? 1 : 0);
     }
+    if ((filters.searchString ?? '') !== '') {
+        sql += ' and (instr(f.originalFileName, ?) > 0)';
+        sqlParameters.push(filters.searchString);
+    }
     sql += ` group by ${groupByColumnNames}
     order by f.recordUpdate_timeMillis desc`;
     if (options.limit !== -1) {
@@ -72,7 +76,8 @@ export function getFailedEnergyDataFiles() {
 }
 export function getProcessedEnergyDataFiles(searchString) {
     return getEnergyDataFiles({
-        isProcessed: true
+        isProcessed: true,
+        searchString
     }, {
         includeAssetDetails: true,
         includeSystemFileAndFolder: false,

diff --git a/database/getEnergyDataFiles.ts b/database/getEnergyDataFiles.ts
@@ -10,6 +10,7 @@ interface GetEnergyDataFilesFilters {
   isPending?: boolean
   isProcessed?: boolean
   isFailed?: boolean
+  searchString?: string
 }
 
 interface GetEnergyDataFilesOptions {
@@ -69,6 +70,11 @@ function getEnergyDataFiles(
     sqlParameters.push(filters.isFailed ? 1 : 0)
   }
 
+  if ((filters.searchString ?? '') !== '') {
+    sql += ' and (instr(f.originalFileName, ?) > 0)'
+    sqlParameters.push(filters.searchString)
+  }
+
   sql += ` group by ${groupByColumnNames}
     order by f.recordUpdate_timeMillis desc`
 
@@ -129,7 +135,8 @@ export function getProcessedEnergyDataFiles(
 ): EnergyDataFile[] {
   return getEnergyDataFiles(
     {
-      isProcessed: true
+      isProcessed: true,
+      searchString
     },
     {
       includeAssetDetails: true,

diff --git a/public-typescript/data.js b/public-typescript/data.js
@@ -79,7 +79,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     parserClassSelectElement.append(optionElement);
                 }
             },
-            onshown(modalElement, closeModalFunction) {
+            onshown(modalElement) {
                 var _a;
                 bulmaJS.toggleHtmlClipped();
                 Emile.initializeAssetSelector({

diff --git a/public-typescript/data.ts b/public-typescript/data.ts
@@ -140,7 +140,7 @@ declare const cityssm: cityssmGlobal
           parserClassSelectElement.append(optionElement)
         }
       },
-      onshown(modalElement, closeModalFunction) {
+      onshown(modalElement) {
         bulmaJS.toggleHtmlClipped()
 
         Emile.initializeAssetSelector({

diff --git a/public/javascripts/data.min.js b/public/javascripts/data.min.js