removing errors, building first prerelease for testing

src/main/index.ts

@@ -5,12 +5,10 @@ import url from 'url';
 import { app, BrowserWindow, Menu, Event } from 'electron';
 import is from 'electron-is';
 import { autoUpdater } from 'electron-updater';
-import installExtension, {
-  REACT_DEVELOPER_TOOLS,
-} from 'electron-devtools-installer';
+
 import './server/server';
 
-console.log(process.env.ELECTRON_WEBPACK_APP_SECRET_KEY);
+// console.log(process.env.ELECTRON_WEBPACK_APP_SECRET_KEY);
 
 app.commandLine.appendSwitch('ignore-certificate-errors');
 
@@ -19,9 +17,17 @@ console.log(path.resolve(__dirname, 'flmnhLogo.png'));
 export let win: BrowserWindow | null = null;
 
 app.on('ready', () => {
-  installExtension(REACT_DEVELOPER_TOOLS)
-    .then((name) => console.log(`Added Extension:  ${name}`))
-    .catch((err) => console.log('An error occurred: ', err));
+  if (is.dev()) {
+    const {
+      default: installExtension,
+      REACT_DEVELOPER_TOOLS,
+    } = require('electron-devtools-installer');
+    installExtension(REACT_DEVELOPER_TOOLS)
+      .then((name: any) => console.log(`Added Extension:  ${name}`))
+      .catch((err: any) =>
+        console.log('Failed to install React Developer Tools: ', err)
+      );
+  }
 
   const customMenu: any = Menu.getApplicationMenu()?.items.map((item: any) => {
     if (item.role === 'filemenu') {

src/main/server/server.ts

@@ -40,8 +40,6 @@ import { queriablesStats } from './endpoints/sql/utils/queriablesStats';
 import getTableLogs from './endpoints/sql/admin/getTableLogs';
 import logUpdate from './endpoints/sql/utils/logUpdate';
 import logDelete from './endpoints/sql/utils/logDelete';
-import { sendStatusToWindow } from '..';
-// import { win } from '..';
 
 require('dotenv').config();
 

src/renderer/components/Chart.tsx

@@ -3,14 +3,14 @@ import { Chart as GChart } from 'react-google-charts';
 import { useStore } from '../../stores';
 import Spinner from './ui/Spinner';
 
-function ChartError(props: any) {
-  console.log(props);
+// function ChartError(props: any) {
+//   console.log(props);
 
-  return <div>fff</div>;
-}
+//   return <div>fff</div>;
+// }
 
 export default function Chart() {
-  const allData = useStore((state) => state.queryData.data);
+  // const allData = useStore((state) => state.queryData.data);
 
   const { chartType, options } = useStore((state) => state.chartConfig);
 

src/renderer/components/TableCard.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import { TableStats } from '../types';
 import CreateDeleteTableModal from './modals/CreateDeleteTableModal';
 import CreateEditTableModal from './modals/CreateEditTableModal';
-import Button from './ui/Button';
 import Heading from './ui/Heading';
 
 import numeral from 'numeral';

src/renderer/components/forms/ChartConfigForm.tsx

@@ -13,11 +13,11 @@ type ChartConfigProps = {
   keys: string[];
 };
 
-function validateStringConstraint(value: any) {
+function validateStringConstraint(_value: any) {
   return true;
 }
 
-function validateNumberConstraint(value: any) {}
+// function validateNumberConstraint(_value: any) {}
 
 type AggregateProps = {
   fields: SelectOption[];

src/renderer/components/forms/ConditionalForm.tsx

@@ -16,7 +16,6 @@ import {
 } from '../utils/constants';
 import numberParser from 'number-to-words';
 import Text from '../ui/Text';
-import { values } from 'lodash';
 import Label from '../ui/Label';
 
 type ConditionalFormProps = {

src/renderer/components/modals/CreateAdminLogModal.tsx

@@ -7,50 +7,48 @@ import Modal from '../ui/Modal';
 import Tabs from '../ui/Tabs';
 import useKeyboard from '../utils/useKeyboard';
 import useToggle from '../utils/useToggle';
-import { Logs } from '../../../stores/index';
-import CopyButton from '../buttons/CopyButton';
-import clsx from 'clsx';
+import { Logs } from '../../../stores/table';
 
 // TODO: make this ADMIN SPECIFIC
 
-type LogProps = {
-  errors?: Logs;
-};
-
-function Log({ errors }: LogProps) {
-  const disabled = !errors || !errors.insert || !errors.insert.length;
-  // const clearErrors = useStore((state) => state.clearErrors);
-
-  return (
-    <div className="-mb-6">
-      <div className="mt-4 h-56 bg-gray-100 rounded-md overflow-scroll">
-        <div
-          className={clsx(
-            disabled && 'h-full',
-            'p-2 flex flex-col items-center justify-center'
-          )}
-        >
-          {/* {renderLog()} */}
-          <p>No errors exist in the log</p>
-        </div>
-      </div>
-
-      <div className="mt-3 flex space-x-2 items-center justify-end">
-        <Button
-          disabled={disabled}
-          variant="warning"
-          // onClick={() => clearErrors('')}
-        >
-          Clear
-        </Button>
-        <CopyButton
-          disabled={disabled}
-          value={JSON.stringify(errors?.insert, null, 2) ?? ''}
-        />
-      </div>
-    </div>
-  );
-}
+// type LogProps = {
+//   errors?: Logs;
+// };
+
+// function Log({ errors }: LogProps) {
+//   const disabled = !errors || !errors.insert || !errors.insert.length;
+//   // const clearErrors = useStore((state) => state.clearErrors);
+
+//   return (
+//     <div className="-mb-6">
+//       <div className="mt-4 h-56 bg-gray-100 rounded-md overflow-scroll">
+//         <div
+//           className={clsx(
+//             disabled && 'h-full',
+//             'p-2 flex flex-col items-center justify-center'
+//           )}
+//         >
+//           {/* {renderLog()} */}
+//           <p>No errors exist in the log</p>
+//         </div>
+//       </div>
+
+//       <div className="mt-3 flex space-x-2 items-center justify-end">
+//         <Button
+//           disabled={disabled}
+//           variant="warning"
+//           // onClick={() => clearErrors('')}
+//         >
+//           Clear
+//         </Button>
+//         <CopyButton
+//           disabled={disabled}
+//           value={JSON.stringify(errors?.insert, null, 2) ?? ''}
+//         />
+//       </div>
+//     </div>
+//   );
+// }
 
 type Props = {
   initialTab?: number;
@@ -84,10 +82,12 @@ export default function CreateAdminLogModal({
     switch (tab) {
       // User Operations
       case 0:
-        return <Log errors={errors} />;
+        // return <Log errors={errors} />;
+        return <div>TODO</div>;
       // table operations
       case 1:
-        return <Log errors={errors} />;
+        // return <Log errors={errors} />;
+        return <div>TODO</div>;
 
       default:
         return null;

src/renderer/components/modals/CreateDeleteTableModal.tsx

@@ -14,7 +14,9 @@ export default function CreateDeleteTableModal({ table }: Props) {
 
   const { deleteTable } = useQuery();
 
-  function handleDelete() {}
+  console.log(table, deleteTable);
+
+  // function handleDelete() {}
 
   return (
     <React.Fragment>

src/renderer/components/modals/CreateEditTableModal.tsx

@@ -16,7 +16,9 @@ export default function CreateEditTableModal({ table }: Props) {
 
   const { updateTable } = useQuery();
 
-  function handleEdit(values: Values) {}
+  function handleEdit(_values: Values) {}
+
+  console.log(updateTable, handleEdit);
 
   return (
     <React.Fragment>

src/renderer/components/modals/CreateSelectModal.tsx

@@ -36,7 +36,8 @@ export default function CreateSelectModal({ open, onClose }: Props) {
       value: values[`conditionalValue_${current}`],
     };
 
-    const { field, operator, value } = conditional;
+    // value can be destructed too
+    const { field, operator } = conditional;
 
     /**
  * 'IS NOT NULL',

src/renderer/components/modals/CreateSingleInsertModal.tsx

@@ -9,19 +9,19 @@ import Steps from '../ui/Steps';
 import useKeyboard from '../utils/useKeyboard';
 import CreateHelpModal from './CreateHelpModal';
 import CreateLogModal from './CreateLogModal';
-import axios from 'axios';
 import useQuery from '../utils/useQuery';
 
 type Props = {
   open: boolean;
   onClose(): void;
 };
 
-// TODO: will need this to be paginated, multistep form
 export default function CreateSingleInsertModal({ open, onClose }: Props) {
   const { insert } = useQuery();
   const [page, changePage] = useState(0);
 
+  console.log(insert);
+
   useKeyboard('Escape', () => {
     onClose();
   });
@@ -30,13 +30,14 @@ export default function CreateSingleInsertModal({ open, onClose }: Props) {
     console.log(values);
 
     const { databaseTable } = values;
+    console.log(databaseTable);
 
     delete values.databaseTable;
 
     const correctedArrays = arrayFieldsToString(values as Specimen);
     const correctedNulls = getSpecimenDefaults(correctedArrays);
 
-    console.log(correctedNulls);
+    console.log(correctedNulls, 'TODO UNCOMMENT');
 
     // await insert(databaseTable, correctedNulls);
   }
@@ -104,8 +105,6 @@ export default function CreateSingleInsertModal({ open, onClose }: Props) {
           </div>
         </Modal.Footer>
       </Modal>
-
-      {/* <Dropdown.Item text="Select" onClick={on} /> */}
     </React.Fragment>
   );
 }

src/renderer/components/ui/Table.tsx

@@ -5,7 +5,6 @@ import {
   AutoSizer,
   Column,
   Table as VTable,
-  TableRowProps,
   TableProps as VTableProps,
 } from 'react-virtualized';
 import useWindowDimensions from '../utils/useWindowDimensions';
@@ -43,7 +42,7 @@ function VirtualTable({
   ...props
 }: TableProps) {
   const { width } = useWindowDimensions();
-  const [sortingDirection, setSortingDirection] = useState<SortingConfig>();
+  const [sortingDirection] = useState<SortingConfig>();
 
   // TODO: this implementation won't hold after sorting
   function getRowStyle({ index }: { index: number }) {
@@ -183,13 +182,9 @@ function VirtualTable({
 
 function BasicTable({
   data,
-  activeIndex,
   headerClassName,
   headers,
-  loading,
-  sortable,
   containerClassname,
-  ...props
 }: TableProps) {
   function getHeaders() {
     return Array.from(headers).map((header) => {

src/renderer/components/utils/constants.ts

@@ -1,4 +1,3 @@
-import { GoogleChartType } from '../../types';
 import { countries } from '../../assets/countries';
 import { SelectOption } from '../ui/Select';
 

src/renderer/components/utils/useQuery.ts

@@ -8,7 +8,6 @@ import useExpiredSession from './useExpiredSession';
 import axios from 'axios';
 import { CountQueryReturn } from '../modals/CreateCountModal';
 import { User } from '../UsersTable';
-import insert from '../../../main/server/endpoints/sql/insert';
 // import { queriablesStats } from '../../../main/server/endpoints/sql/utils/queriablesStats';
 
 export default function useQuery() {
@@ -431,7 +430,7 @@ export default function useQuery() {
           return undefined;
         }
       },
-      async updateTable(table: string, updates: any) {},
+      async updateTable(_table: string, _updates: any) {},
     }),
     [query, selectedSpecimen]
   );

src/renderer/functions/util.ts

@@ -1,6 +1,5 @@
 import { Specimen } from '../types';
 import Qty from 'js-quantities'; //https://github.com/gentooboontoo/js-quantities
-import { validUnits } from '../components/utils/constants';
 
 export function sleep(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms));

src/renderer/pages/Admin.tsx

@@ -7,7 +7,6 @@ import Heading from '../components/ui/Heading';
 import TableCard from '../components/TableCard';
 import { TableStats } from '../types';
 import useQuery from '../components/utils/useQuery';
-import Badge from '../components/ui/Badge';
 import CreateCreateTableModal from '../components/modals/CreateCreateTableModal';
 
 function AdminHeader({ username }: { username?: string }) {