Modal table now presents data

js/app.js

@@ -34,7 +34,7 @@ import FileLoadManager from "./widgets/fileLoadManager.js"
 import FileLoadWidget from "./widgets/fileLoadWidget.js"
 import * as Utils from './widgets/utils.js'
 import Globals from "./globals.js"
-import {createGenomeWidgets, initializeGenomeWidgets, loadGenome} from './genomeWidgets.js'
+import {createGenomeWidgets, initializeGenomeWidgets, loadGenome} from './widgets/genomeWidgets.js'
 import {createShareWidgets, shareWidgetConfigurator} from './shareWidgets.js'
 import {sessionURL} from './shareHelper.js'
 import {createSaveImageWidget} from './saveImageWidget.js'

js/widgets/genarkDatasourceConfigurator.js

@@ -1,6 +1,17 @@
 
 // accession	assembly	scientific name	common name	taxonId	GenArk clade
-import {genarkParser} from "./utils/genarkParser.js"
+import {genarkParser} from "./genarkParser.js"
+
+const genarkColumns =
+    [
+        'accession',
+        'assembly',
+        'scientificName',
+        'commonName',
+        'taxonId',
+        'genArkClade',
+
+    ]
 
 function genarkDatasourceConfigurator() {
 
@@ -9,27 +20,19 @@ function genarkDatasourceConfigurator() {
     return {
         isJSON: false,
         url,
-        columns:
-            [
-                'accession',
-                'assembly',
-                'scientific name',
-                'common name',
-                'taxonId',
-                'GenArk clade',
-
-            ],
+        columns: genarkColumns,
         columnDefs:
             {
                 accession: {title: 'Accession'},
                 assembly: {title: 'Assembly'},
-                'scientific name': {title: 'Scientific Name'},
-                'common name': {title: 'Common Name'},
+                scientificName: {title: 'Scientific Name'},
+                commonName: {title: 'Common Name'},
+                genArkClade: {title: 'GenArk clade'},
             },
 
         parser: genarkParser
 
     }
 }
 
-export {genarkDatasourceConfigurator}
+export {genarkDatasourceConfigurator, genarkColumns}

js/widgets/genarkParser.js

@@ -0,0 +1,32 @@
+import { genarkColumns } from "./genarkDatasourceConfigurator.js"
+
+const genarkParser =
+    {
+        parse: string => {
+            const lines = string.split('\n')
+
+            // columns
+            // const headerLines = lines.filter(line => line.startsWith('#'))
+            // const columns = headerLines.pop().split('\t')
+            // const cooked = columns.shift().split('').filter(char => (/[a-zA-Z]/).test(char)).join('')
+            // columns.unshift(cooked)
+
+            // records
+            let dataLines = lines.filter(line => !line.startsWith('#')).map(line => line.split(`\t`))
+            dataLines = dataLines.filter(tokens => 6 === tokens.length)
+
+            const records = []
+            for (const tokens of dataLines) {
+                const record = {}
+                for (let i = 0; i < tokens.length; i++) {
+                    record[ genarkColumns[ i ] ] = tokens[ i ]
+                }
+
+                records.push(record)
+            }
+
+            return records
+        }
+    };
+
+export { genarkParser }

js/genomeWidgets.js → js/widgets/genomeWidgets.js

@@ -24,14 +24,14 @@
  * THE SOFTWARE.
  */
 
-import {ModalTable, GenericDataSource} from '../node_modules/data-modal/src/index.js'
-import Globals from "./globals.js"
-import AlertSingleton from "./widgets/alertSingleton.js"
-import {createURLModal} from "./widgets/urlModal.js"
-import FileLoadManager from "./widgets/fileLoadManager.js"
-import FileLoadWidget from "./widgets/fileLoadWidget.js"
-import * as Utils from './widgets/utils.js'
-import {genarkDatasourceConfigurator} from "./widgets/genarkDatasourceConfigurator.js"
+import {ModalTable, GenericDataSource} from '../../node_modules/data-modal/src/index.js'
+import Globals from "../globals.js"
+import AlertSingleton from "./alertSingleton.js"
+import {createURLModal} from "./urlModal.js"
+import FileLoadManager from "./fileLoadManager.js"
+import FileLoadWidget from "./fileLoadWidget.js"
+import * as Utils from './utils.js'
+import {genarkDatasourceConfigurator} from "./genarkDatasourceConfigurator.js"
 
 const MAX_CUSTOM_GENOMES = 10