Fixes for tsc

eatonphil · eatonphil · commit f8599077ac73 · 2023-06-26T21:59:07.000-04:00
diff --git a/desktop/crud.ts b/desktop/crud.ts
@@ -62,7 +62,7 @@ export class GenericCrud<T extends { id: string }> {
         this.entity
       }" WHERE id = ${stubMaker()}`
     );
-    const row = stmt.get(id);
+    const row = stmt.get(id) as { data_json: string, position: number };
     if (!row) {
       return [null, -1];
     }
@@ -130,7 +130,7 @@ export const exportDestination = {};
 export const metadataCrud = {
   get(db: sqlite3.Database) {
     const stmt = db.prepare('SELECT * FROM ds_metadata');
-    const rows = stmt.all();
+    const rows = stmt.all() as Array<{key: string; value: string}>;
     const metadata: Record<string, string> = {};
     for (const row of rows) {
       metadata[row.key] = row.value;
diff --git a/desktop/secret.ts b/desktop/secret.ts
@@ -6,7 +6,7 @@ import {
   encodeBase64,
   encodeUTF8,
 } from 'tweetnacl-util';
-import { doOnEncryptFields, Encrypt } from '../shared/state';
+import { Encrypt, doOnEncryptFields } from '../shared/state';
 import { ensureFile } from './fs';
 
 function getSigningKeyPath(signingKeyPath?: string) {
diff --git a/desktop/store.ts b/desktop/store.ts
@@ -10,7 +10,6 @@ import {
   ConnectorInfo,
   DatabaseConnectorInfo,
   DatabasePanelInfo,
-  doOnEncryptFields,
   Encrypt,
   FilePanelInfo,
   FilterAggregatePanelInfo,
@@ -25,11 +24,12 @@ import {
   ProjectState,
   ServerInfo,
   TablePanelInfo,
+  doOnEncryptFields,
 } from '../shared/state';
 import { CODE_ROOT, DISK_ROOT, PROJECT_EXTENSION } from './constants';
 import {
-  connectorCrud,
   GenericCrud,
+  connectorCrud,
   metadataCrud,
   pageCrud,
   panelCrud,
@@ -147,7 +147,7 @@ export class Store {
   validateSQLiteDriver() {
     const memdb = new sqlite3.default(':memory:');
     const stmt = memdb.prepare('SELECT sqlite_version() AS version');
-    const row = stmt.get();
+    const row = stmt.get() as {version: string};
     if (!minSemver(row.version, '3.38.1')) {
       throw new Error(
         'Unsupported SQLite driver version: ' + JSON.stringify(row)
@@ -361,7 +361,7 @@ SELECT
 FROM ds_result o
 GROUP BY panel_id
 `);
-      const results = stmt.all();
+      const results = stmt.all() as Array<{panel_id: string; data_json: string}>;
 
       const resultPanelMap: Record<string, PanelResult> = {};
       for (const result of results) {
@@ -587,7 +587,7 @@ GROUP BY panel_id
         const getStmt = db.prepare(
           `SELECT id FROM ${panelCrud.entity} WHERE page_id = ?`
         );
-        const allExisting: Array<{ id: string }> = getStmt.all(data.pageId);
+        const allExisting = getStmt.all(data.pageId) as Array<{ id: string }>;
 
         // Then sort the existing ones based on the positions passed in
         allExisting.sort((a, b) => {
diff --git a/server/auth.ts b/server/auth.ts
@@ -1,10 +1,10 @@
 import express from 'express';
 import session from 'express-session';
 import {
-  Client as OpenIDClient,
-  generators,
   Issuer,
+  Client as OpenIDClient,
   TokenSet,
+  generators,
 } from 'openid-client';
 import passport from 'passport';
 import { App } from './app';
diff --git a/shared/state.ts b/shared/state.ts
@@ -180,8 +180,8 @@ export type SQLConnectorType =
   | 'postgres'
   | 'mysql'
   | 'sqlite'
-  | 'oracle'
-  | 'sqlserver'
+  //| 'oracle'
+  //| 'sqlserver'
   | 'presto'
   | 'clickhouse'
   | 'snowflake'
@@ -200,7 +200,7 @@ export type DatabaseConnectorInfoType =
   | SQLConnectorType
   | 'google-sheets'
   | 'airtable'
-  | 'mongo'
+  //| 'mongo'
   | 'elasticsearch'
   | 'splunk'
   | 'prometheus'
diff --git a/ui/Connector.tsx b/ui/Connector.tsx
@@ -1,10 +1,10 @@
 import { IconTrash } from '@tabler/icons';
 import * as React from 'react';
 import { ConnectorInfo, DatabaseConnectorInfo } from '../shared/state';
+import { DatabaseConnector } from './DatabaseConnector';
 import { Button } from './components/Button';
 import { Confirm } from './components/Confirm';
 import { Input } from './components/Input';
-import { DatabaseConnector } from './DatabaseConnector';
 
 export function Connector({
   connector,
diff --git a/ui/ConnectorList.tsx b/ui/ConnectorList.tsx
@@ -5,9 +5,9 @@ import {
   DatabaseConnectorInfoType,
   ProjectState,
 } from '../shared/state';
+import { Connector } from './Connector';
 import { Button } from './components/Button';
 import { Dropdown } from './components/Dropdown';
-import { Connector } from './Connector';
 import { VENDORS, VENDOR_GROUPS } from './connectors';
 
 function NewConnector({
diff --git a/ui/Editor.tsx b/ui/Editor.tsx
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { MODE_FEATURES } from '../shared/constants';
 import '../shared/polyfill';
-import { ErrorBoundary } from './components/ErrorBoundary';
 import { ConnectorList } from './ConnectorList';
 import { Footer } from './Footer';
 import { PageList } from './PageList';
 import { ServerList } from './ServerList';
 import { Sidebar } from './Sidebar';
-import { ProjectContext } from './state';
 import { Updates } from './Updates';
+import { ErrorBoundary } from './components/ErrorBoundary';
+import { ProjectContext } from './state';
 import { UrlStateContext } from './urlState';
 
 export function Editor() {
diff --git a/ui/Header.tsx b/ui/Header.tsx
@@ -2,8 +2,8 @@ import * as React from 'react';
 import { APP_NAME, MODE } from '../shared/constants';
 import '../shared/polyfill';
 import { DEFAULT_PROJECT } from '../shared/state';
-import { Link } from './components/Link';
 import { LocalStorageStore } from './ProjectStore';
+import { Link } from './components/Link';
 import { UrlStateContext } from './urlState';
 
 export function loadDefaultProject() {
diff --git a/ui/MakeSelectProject.tsx b/ui/MakeSelectProject.tsx
@@ -8,13 +8,13 @@ import {
   MakeProjectResponse,
 } from '../shared/rpc';
 import { ProjectState } from '../shared/state';
+import { Footer } from './Footer';
 import { asyncRPC } from './asyncRPC';
 import { Alert } from './components/Alert';
 import { Button } from './components/Button';
 import { Input } from './components/Input';
 import { Loading } from './components/Loading';
 import { Select } from './components/Select';
-import { Footer } from './Footer';
 import { SAMPLES } from './samples';
 
 export function MakeSelectProject() {
diff --git a/ui/Navigation.tsx b/ui/Navigation.tsx
@@ -1,4 +1,4 @@
-import { TablerIcon } from '@tabler/icons';
+import { Icon as TablerIcon } from '@tabler/icons';
 import React from 'react';
 import { Button } from './components/Button';
 import { DefaultView, UrlStateContext } from './urlState';
@@ -18,9 +18,8 @@ export function Navigation<View extends string = DefaultView>({
       {pages.map((page) => (
         <div
           key={page.title}
-          className={`navigation-item ${
-            view === page.endpoint ? 'navigation-item--active' : ''
-          }`}
+          className={`navigation-item ${view === page.endpoint ? 'navigation-item--active' : ''
+            }`}
           title={page.title}
         >
           <Button
diff --git a/ui/PageList.tsx b/ui/PageList.tsx
@@ -9,14 +9,14 @@ import {
   ProjectState,
   TablePanelInfo,
 } from '../shared/state';
-import { Button } from './components/Button';
-import { Confirm } from './components/Confirm';
-import { Input } from './components/Input';
 import { loadDefaultProject } from './Header';
 import { VISUAL_PANELS } from './Panel';
 import { PanelList } from './PanelList';
-import { PANEL_UI_DETAILS } from './panels';
 import { LocalStorageStore } from './ProjectStore';
+import { Button } from './components/Button';
+import { Confirm } from './components/Confirm';
+import { Input } from './components/Input';
+import { PANEL_UI_DETAILS } from './panels';
 
 export function makeReevalPanel(
   state: ProjectState,
diff --git a/ui/Panel.tsx b/ui/Panel.tsx
@@ -24,14 +24,14 @@ import { EVAL_ERRORS } from '../shared/errors';
 import log from '../shared/log';
 import { PanelInfo, PanelResult, ProgramPanelInfo } from '../shared/state';
 import { humanSize } from '../shared/text';
+import { DownloadPanel } from './DownloadPanel';
 import { panelRPC } from './asyncRPC';
 import { Alert } from './components/Alert';
 import { Button } from './components/Button';
 import { Confirm } from './components/Confirm';
 import { ErrorBoundary } from './components/ErrorBoundary';
 import { Highlight } from './components/Highlight';
 import { Input } from './components/Input';
-import { DownloadPanel } from './DownloadPanel';
 import { PANEL_UI_DETAILS } from './panels';
 import { ProjectContext } from './state';
 import { UrlStateContext } from './urlState';
diff --git a/ui/PanelList.tsx b/ui/PanelList.tsx
@@ -8,6 +8,7 @@ import {
   ProjectPage,
   TablePanelInfo,
 } from '../shared/state';
+import { Panel, VISUAL_PANELS } from './Panel';
 import { Button } from './components/Button';
 import { Dropdown } from './components/Dropdown';
 import { ErrorBoundary } from './components/ErrorBoundary';
@@ -16,7 +17,6 @@ import {
   orderedObjectFields,
   wellFormedGraphInput,
 } from './components/FieldPicker';
-import { Panel, VISUAL_PANELS } from './Panel';
 import { PANEL_GROUPS, PANEL_UI_DETAILS } from './panels';
 import { ProjectContext } from './state';
 import { UrlStateContext } from './urlState';
diff --git a/ui/ServerList.tsx b/ui/ServerList.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { ProjectState, ServerInfo } from '../shared/state';
-import { Button } from './components/Button';
 import { Server } from './Server';
+import { Button } from './components/Button';
 
 export function ServerList({
   state,
diff --git a/ui/Settings.tsx b/ui/Settings.tsx
@@ -10,14 +10,14 @@ import {
   UpdateSettingsResponse,
 } from '../shared/rpc';
 import { Settings as SettingsT } from '../shared/settings';
+import { Footer } from './Footer';
 import { asyncRPC } from './asyncRPC';
 import { Alert } from './components/Alert';
 import { Button } from './components/Button';
 import { FileInput } from './components/FileInput';
 import { FormGroup } from './components/FormGroup';
 import { Input } from './components/Input';
 import { Toggle } from './components/Toggle';
-import { Footer } from './Footer';
 
 export const SettingsContext = React.createContext<{
   state: SettingsT;
diff --git a/ui/app.tsx b/ui/app.tsx
@@ -6,16 +6,13 @@ import {
   IconHelp,
   IconLayoutDashboard,
   IconSettings,
-  TablerIcon,
+  Icon as TablerIcon,
 } from '@tabler/icons';
 import * as React from 'react';
 import { MODE, MODE_FEATURES } from '../shared/constants';
 import { LANGUAGES } from '../shared/languages';
 import '../shared/polyfill';
 import { Settings as SettingsT } from '../shared/settings';
-import { Button } from './components/Button';
-import { ErrorBoundary } from './components/ErrorBoundary';
-import { Loading } from './components/Loading';
 import { Editor } from './Editor';
 import { Footer } from './Footer';
 import { Header, loadDefaultProject } from './Header';
@@ -24,6 +21,9 @@ import { MakeSelectProject } from './MakeSelectProject';
 import { Navigation } from './Navigation';
 import { NotFound } from './NotFound';
 import { Settings, SettingsContext, useSettings } from './Settings';
+import { Button } from './components/Button';
+import { ErrorBoundary } from './components/ErrorBoundary';
+import { Loading } from './components/Loading';
 import { useShortcuts } from './shortcuts';
 import { ProjectContext, useProjectState } from './state';
 import { DefaultView, UrlStateContext, useUrlState } from './urlState';
@@ -32,7 +32,7 @@ if (MODE === 'browser') {
   Object.values(LANGUAGES).map(function processLanguageInit(l) {
     if (l.inMemoryInit) {
       // These can be really big, so run it out of band
-      setTimeout(function () {
+      setTimeout(function() {
         l.inMemoryInit();
       });
     }
@@ -84,11 +84,11 @@ export function defaultRoutes(): Routes {
     },
     MODE === 'server'
       ? {
-          endpoint: 'projects',
-          view: MakeSelectProject,
-          title: 'Switch project',
-          icon: IconFiles,
-        }
+        endpoint: 'projects',
+        view: MakeSelectProject,
+        title: 'Switch project',
+        icon: IconFiles,
+      }
       : null,
     {
       endpoint: 'settings',
diff --git a/ui/connectors/index.ts b/ui/connectors/index.ts
@@ -167,8 +167,8 @@ export const VENDOR_GROUPS: Array<{
     vendors: [
       'postgres',
       'mysql',
-      'sqlserver',
-      'oracle',
+      //'sqlserver',
+      //'oracle',
       'sqlite',
       'cockroach',
       'odbc',
@@ -184,7 +184,7 @@ export const VENDOR_GROUPS: Array<{
   },
   {
     group: 'Document',
-    vendors: ['elasticsearch', 'crate', 'mongo'],
+    vendors: ['elasticsearch', 'crate' /* , 'mongo' */],
   },
   {
     group: 'Time Series',
diff --git a/ui/panels/GraphPanel.tsx b/ui/panels/GraphPanel.tsx
@@ -10,17 +10,17 @@ import {
   PanelResult,
   TableColumn,
 } from '../../shared/state';
+import { SettingsContext } from '../Settings';
 import { Button } from '../components/Button';
 import {
-  allFields,
   FieldPicker,
+  allFields,
   unusedFields,
 } from '../components/FieldPicker';
 import { FormGroup } from '../components/FormGroup';
 import { PanelSourcePicker } from '../components/PanelSourcePicker';
 import { Radio } from '../components/Radio';
 import { NONE, Select } from '../components/Select';
-import { SettingsContext } from '../Settings';
 import { evalColumnPanel } from './TablePanel';
 import { PanelBodyProps, PanelDetailsProps, PanelUIDetails } from './types';
 
