feat: handling sqlite connection more gracefully

dashpresshq · Sep 25, 2022 · b9a4688 · b9a4688
1 parent 5ec7385
commit b9a4688
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
   ],
   "bin": "./bin/hadmean",
   "dependencies": {
-    "@hadmean/bacteria": "^0.0.1",
+    "@hadmean/bacteria": "^0.0.3",
     "@hadmean/chromista": "^1.0.28",
     "@hadmean/protozoa": "^1.0.8",
     "@types/cryptr": "^4.0.1",

diff --git a/src/backend/lib/connection/db.ts b/src/backend/lib/connection/db.ts
@@ -43,6 +43,7 @@ const make = (credentials: IDataSourceCredentials | string) => {
       user: credentials.user,
       password: credentials.password,
       host: credentials.host,
+      filename: credentials.filename,
       port: credentials.port,
       ssl: credentials.ssl,
     },

diff --git a/src/frontend/views/setup/Credentials/Form.tsx b/src/frontend/views/setup/Credentials/Form.tsx
@@ -23,7 +23,9 @@ export function CredentialsSetupForm({
         port: Object.values(DATA_SOURCES_CONFIG)[0].port,
       }}
       render={({ handleSubmit, submitting, pristine, form, values }) => {
-        const dataSourceConfig = DATA_SOURCES_CONFIG[values.dataSourceType];
+        const dataSourceConfig = DATA_SOURCES_CONFIG[values.dataSourceType] || {
+          fields: [],
+        };
         return (
           <form onSubmit={handleSubmit}>
             <Field
@@ -102,10 +104,10 @@ export function CredentialsSetupForm({
               </Field>
             )}
 
-            {dataSourceConfig.fields.includes("path") && (
-              <Field name="path" validateFields={[]} type="checkbox">
+            {dataSourceConfig.fields.includes("filename") && (
+              <Field name="filename" validateFields={[]}>
                 {({ input, meta }) => (
-                  <FormInput label="Path" meta={meta} input={input} />
+                  <FormInput label="File Name" meta={meta} input={input} />
                 )}
               </Field>
             )}

diff --git a/src/shared/types/data-sources.ts b/src/shared/types/data-sources.ts
@@ -11,14 +11,14 @@ export type IDataSourceCredentials = {
   host: string;
   user: string;
   password: string;
-  path: string;
+  filename: string;
   schemaNames: string[];
   database: string;
   port: number;
   ssl: boolean;
 };
 
-const DATABASE_FIELDS: Array<keyof IDBCredentials> = [
+const DATABASE_FIELDS: Array<keyof IDataSourceCredentials> = [
   "host",
   "user",
   "password",
@@ -47,6 +47,6 @@ export const DATA_SOURCES_CONFIG: Record<
     port: 3306,
   },
   [SupportedDataSources.Sqlite]: {
-    fields: ["path"],
+    fields: ["filename"],
   },
 };
diff --git a/yarn.lock b/yarn.lock
@@ -1431,10 +1431,10 @@
   resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@hadmean/bacteria@^0.0.1":
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/@hadmean/bacteria/-/bacteria-0.0.1.tgz"
-  integrity sha512-amcxl7M8LyU4ps12MryklhcdT6IO8lgiPbGNFSrsYEagHs8L9ZsjFyEa6eHsUbbQ8t9oIQTcCjqukGcpUNf7sA==
+"@hadmean/bacteria@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@hadmean/bacteria/-/bacteria-0.0.3.tgz#3092fc320d6d3cbdfa591c7448152baf1f91068a"
+  integrity sha512-pRe1qHYY9axN5v03zYJeXyIdxyCcX4SqKejqtgdMD1smyaa/sD7/KNu0zinoingrvYp0UByusDDieAK+IzLkXA==
   dependencies:
     "@types/fs-extra" "^9.0.13"
     "@types/mssql" "^8.0.3"