diff --git a/src/components/browse/datatable.js b/src/components/instance/browse/datatable.js
similarity index 81%
rename from src/components/browse/datatable.js
rename to src/components/instance/browse/datatable.js
index 27c3ca882..2b2fd7fb4 100644
--- a/src/components/browse/datatable.js
+++ b/src/components/instance/browse/datatable.js
@@ -1,14 +1,13 @@
-import React, { useState, useContext } from 'react';
+import React, { useState } from 'react';
import ReactTable from 'react-table';
import { useHistory, useParams } from 'react-router';
import useAsyncEffect from 'use-async-effect';
import { Card, CardBody, Col, Row } from '@nio/ui-kit';
-import { HarperDBContext } from '../../providers/harperdb';
-import commaNumbers from '../../util/commaNumbers';
+import commaNumbers from '../../../util/commaNumbers';
+import queryInstance from '../../../util/queryInstance';
-export default ({ dataTableColumns, hashAttribute, onFilteredChange, filtered, onSortedChange, sorted, onPageChange, page }) => {
- const { queryHarperDB, refreshInstance, structure } = useContext(HarperDBContext);
+export default ({ dataTableColumns, hashAttribute, onFilteredChange, filtered, onSortedChange, sorted, onPageChange, page, auth, instance_id, refreshInstance, structure }) => {
const history = useHistory();
const { schema, table } = useParams();
@@ -37,7 +36,7 @@ export default ({ dataTableColumns, hashAttribute, onFilteredChange, filtered, o
try {
let countSQL = `SELECT count(*) as newTotalRecords FROM ${schema}.${table} `;
if (filtered.length) countSQL += `WHERE ${filtered.map((f) => ` \`${f.id}\` LIKE '%${f.value}%'`).join(' AND ')} `;
- [{ newTotalRecords }] = await queryHarperDB({ operation: 'sql', sql: countSQL });
+ [{ newTotalRecords }] = await queryInstance({ operation: 'sql', sql: countSQL }, auth);
newTotalPages = newTotalRecords && Math.ceil(newTotalRecords / pageSize);
} catch (e) {
// console.log('Failed to get row count');
@@ -48,7 +47,7 @@ export default ({ dataTableColumns, hashAttribute, onFilteredChange, filtered, o
if (filtered.length) dataSQL += `WHERE ${filtered.map((f) => ` \`${f.id}\` LIKE '%${f.value}%'`).join(' AND ')} `;
if (sorted.length) dataSQL += `ORDER BY \`${sorted[0].id}\` ${sorted[0].desc ? 'DESC' : 'ASC'}`;
dataSQL += ` LIMIT ${(page * pageSize) + pageSize} OFFSET ${page * pageSize}`;
- newData = await queryHarperDB({ operation: 'sql', sql: dataSQL });
+ newData = await queryInstance({ operation: 'sql', sql: dataSQL }, auth);
} catch (e) {
// console.log('Failed to get table data');
}
@@ -59,13 +58,13 @@ export default ({ dataTableColumns, hashAttribute, onFilteredChange, filtered, o
return setLoading(false);
};
- const handleRefreshClick = () => refreshInstance();
+ const handleRefreshClick = () => refreshInstance(Date.now());
- const handleNewRecordClick = () => history.push(`/browse/${schema}/${table}/add`);
+ const handleNewRecordClick = () => history.push(`/instances/${instance_id}/browse/${schema}/${table}/add`);
- const handleCSVUploadClick = () => history.push(`/browse/${schema}/${table}/csv`);
+ const handleCSVUploadClick = () => history.push(`/instances/${instance_id}/browse/${schema}/${table}/csv`);
- const handleRowClick = (newActiveRecord) => history.push(`/browse/${schema}/${table}/edit/${newActiveRecord[hashAttribute]}`);
+ const handleRowClick = (newActiveRecord) => history.push(`/instances/${instance_id}/browse/${schema}/${table}/edit/${newActiveRecord[hashAttribute]}`);
const handleFilterClick = () => { if (showFilter) onFilteredChange([]); toggleShowFilter(!showFilter); };
@@ -84,13 +83,13 @@ export default ({ dataTableColumns, hashAttribute, onFilteredChange, filtered, o
async () => {
if (autoRefresh) {
clearTimeout(dataRefreshTimeout);
- const [{ newTotalRecords }] = await queryHarperDB({
+ const [{ newTotalRecords }] = await queryInstance({
operation: 'sql',
sql: `SELECT count(*) as newTotalRecords FROM ${schema}.${table} `,
- });
+ }, auth);
if (newTotalRecords !== totalRecords) {
loadNewData(false);
- setTimeout(() => refreshInstance(), 100);
+ setTimeout(() => refreshInstance(Date.now()), 100);
}
dataRefreshTimeout = setTimeout(() => setLastUpdate(Date.now()), dataRefreshInterval);
}
@@ -104,7 +103,7 @@ export default ({ dataTableColumns, hashAttribute, onFilteredChange, filtered, o
- {schema}
+ {schema}
{table && `> ${table} > `}
{loading ? (
@@ -123,7 +122,7 @@ export default ({ dataTableColumns, hashAttribute, onFilteredChange, filtered, o
-
+
{
+export default ({ auth, structure, network, refreshInstance }) => {
const history = useHistory();
- const { schema, table, action } = useParams();
- const { structure } = useContext(HarperDBContext);
+ const { instance_id, schema, table, action } = useParams();
+
const [filtered, onFilteredChange] = useState([]);
const [sorted, onSortedChange] = useState([]);
const [page, onPageChange] = useState(0);
@@ -31,15 +31,15 @@ export default () => {
useEffect(() => {
switch (true) {
case (!schemas && history.location.pathname !== '/browse'):
- history.push('/browse');
+ history.push(`/instances/${instance_id}/browse`);
break;
case (schemas && schemas.length && !schema):
case (schemas && schemas.length && schema && !schemas.includes(schema)):
- history.push(`/browse/${schemas[0]}`);
+ history.push(`/instances/${instance_id}/browse/${schemas[0]}`);
break;
case (tables && tables.length && !table):
case (tables && tables.length && table && !tables.includes(table)):
- history.push(`/browse/${schema}/${tables[0]}`);
+ history.push(`/instances/${instance_id}/browse/${schema}/${tables[0]}`);
break;
default:
break;
@@ -52,22 +52,39 @@ export default () => {
{ schema && (
)}
{ schema && table && action === 'csv' && activeTable ? (
-
+
) : schema && table && action && activeTable ? (
) : schema && table && activeTable ? (
{
sorted={sorted}
onPageChange={onPageChange}
page={page}
+ auth={auth}
+ instance_id={instance_id}
+ refreshInstance={refreshInstance}
+ structure={structure}
/>
) : (
<>
diff --git a/src/components/browse/jsonviewer.js b/src/components/instance/browse/jsonviewer.js
similarity index 80%
rename from src/components/browse/jsonviewer.js
rename to src/components/instance/browse/jsonviewer.js
index 4bfd6457c..9e08b1261 100644
--- a/src/components/browse/jsonviewer.js
+++ b/src/components/instance/browse/jsonviewer.js
@@ -1,27 +1,26 @@
-import React, { useState, useContext } from 'react';
+import React, { useState } from 'react';
import JSONInput from 'react-json-editor-ajrm';
import locale from 'react-json-editor-ajrm/locale/en';
import { Button, Card, CardBody, Col, Form, Row } from '@nio/ui-kit';
import { useHistory, useParams } from 'react-router';
import useAsyncEffect from 'use-async-effect';
-import { HarperDBContext } from '../../providers/harperdb';
+import queryInstance from '../../../util/queryInstance';
-export default ({ newEntityColumns, hashAttribute }) => {
- const { queryHarperDB, refreshInstance } = useContext(HarperDBContext);
+export default ({ newEntityColumns, hashAttribute, instance_id, refreshInstance, auth }) => {
const history = useHistory();
const { schema, table, hash, action } = useParams();
const [rowValue, setRowValue] = useState({});
useAsyncEffect(async () => {
if (action === 'edit') {
- const rowData = await queryHarperDB({
+ const rowData = await queryInstance({
operation: 'search_by_hash',
schema,
table,
hash_values: [hash],
get_attributes: ['*'],
- });
+ }, auth);
setRowValue(rowData[0]);
} else {
setRowValue(newEntityColumns);
@@ -32,34 +31,34 @@ export default ({ newEntityColumns, hashAttribute }) => {
e.preventDefault();
if (!action) return false;
- await queryHarperDB({
+ await queryInstance({
operation: action === 'edit' ? 'update' : 'insert',
schema,
table,
records: [rowValue],
- });
- refreshInstance();
- return history.push(`/browse/${schema}/${table}`);
+ }, auth);
+ refreshInstance(Date.now());
+ return history.push(`/instances/${instance_id}/browse/${schema}/${table}`);
};
const deleteRecord = async (e) => {
e.preventDefault();
if (!action) return false;
- await queryHarperDB({
+ await queryInstance({
operation: 'delete',
schema,
table,
hash_values: [hash],
- });
- refreshInstance();
- return history.push(`/browse/${schema}/${table}`);
+ }, auth);
+ refreshInstance(Date.now());
+ return history.push(`/instances/${instance_id}/browse/${schema}/${table}`);
};
return (
<>
{schema} {table && '>'} {table} {action === 'add' ? '> add new' : hash ? `> ${hash}` : ''}
-
+