Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mongodb] Fix null error and limit parameter #433

Merged
merged 1 commit into from
Sep 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/plugin-mongodb/src/components/page/BsonPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ const BsonPreview: React.FunctionComponent<IBsonPreviewProps> = ({ data }: IBson
const renderDocument = (document: string): string => {
try {
return toExtendedJson(document);
} catch (error) {
return error.toString();
} catch (err) {
return err.toString();
}
};

Expand Down
2 changes: 1 addition & 1 deletion plugins/plugin-mongodb/src/components/page/QueryPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const QueryPage: React.FunctionComponent<IQueryPageProps> = ({ instance }: IQuer
navigate(
`${location.pathname}?query=${encodeURIComponent(opts.query)}&operation=${
opts.operation
}&sort=${encodeURIComponent(opts.sort)}`,
}&sort=${encodeURIComponent(opts.sort)}&limit=${opts.limit}`,
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
FormSelectOption,
TextInput,
} from '@patternfly/react-core';
import React, { useState } from 'react';
import React, { FormEvent, useState } from 'react';

import { IQueryOptions, TQueryOperation } from '../../utils/interfaces';
import { Toolbar, ToolbarItem } from '@kobsio/shared';
Expand All @@ -31,14 +31,15 @@ const QueryPageToolbar: React.FunctionComponent<IQueryPageToolbarProps> = ({
sort: options.sort,
});

const changeOptions = (): void => {
const changeOptions = (e: FormEvent): void => {
e.preventDefault();
setOptions({ limit: state.limit, operation: state.operation, query: state.query, sort: state.sort });
};

return (
<Toolbar usePageInsets={true}>
<ToolbarItem grow={true}>
<Form isHorizontal={true}>
<Form isHorizontal={true} onSubmit={changeOptions}>
<FormGroup label="Operation" fieldId="operation">
<FormSelect
value={state.operation}
Expand Down
10 changes: 5 additions & 5 deletions plugins/plugin-mongodb/src/components/panel/FindDocument.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ const FindDocument: React.FunctionComponent<IFindDocumentProps> = ({

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const getFilter = (value: any): string => {
if (value instanceof ObjectId) return `{"_id": ObjectId("${value.toString()}")}`;
if (value instanceof ObjectID) return `{"_id": ObjectID("${value.toString()}")}`;
return `{"_id": "${value.toString()}"}`;
if (value instanceof ObjectId) return `{"_id": ObjectId("${value?.toString() ?? 'null'}")}`;
if (value instanceof ObjectID) return `{"_id": ObjectID("${value?.toString() ?? 'null'}")}`;
return `{"_id": "${value?.toString() ?? 'null'}"}`;
};

const defaultActions = [
Expand All @@ -53,7 +53,7 @@ const FindDocument: React.FunctionComponent<IFindDocumentProps> = ({
expand={{ isExpanded: isExpanded, onToggle: (): void => setIsExpanded(!isExpanded), rowIndex: 0 }}
/>
<Td className="pf-u-text-wrap pf-u-text-break-word" dataLabel="ID">
<TableText wrapModifier="nowrap">{document['_id'].toString()}</TableText>
<TableText wrapModifier="nowrap">{document['_id']?.toString() ?? 'null'}</TableText>
</Td>
<Td className="pf-u-text-wrap pf-u-text-break-word" dataLabel="Document">
<div className="kobsio-mongodb-document-preview">
Expand All @@ -62,7 +62,7 @@ const FindDocument: React.FunctionComponent<IFindDocumentProps> = ({
.map((key) => (
<span key={key} className="pf-u-mr-sm pf-u-mb-sm">
<span className="pf-u-background-color-200 pf-u-p-xs">{key}:</span>
<span className="pf-u-p-xs"> {document[key].toString()}</span>
<span className="pf-u-p-xs"> {document[key]?.toString() ?? 'null'}</span>
</span>
))}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const FindDocumentDetails: React.FunctionComponent<IFindDocumentDetailsProps> =
.filter((key) => key !== '_id')
.map((key) => (
<FindDocumentDetailsTree
key={document[key].toString()}
key={document[key]?.toString() ?? 'null'}
documentKey={key}
documentValue={document[key]}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const FindDocumentDetailsTree: React.FunctionComponent<IFindDocumentDetailsTreeP
return (
<Td className="pf-u-text-wrap pf-u-text-break-word" dataLabel="Value">
<TableText wrapModifier="nowrap">
{value.toString()}
{value?.toString() ?? 'null'}
<small className="pf-u-ml-sm"> ({getTypeName(value)})</small>
</TableText>
</Td>
Expand All @@ -96,7 +96,7 @@ const FindDocumentDetailsTree: React.FunctionComponent<IFindDocumentDetailsTreeP
{Object.keys(value).map((key) => (
<span key={key} className="pf-u-mr-sm pf-u-mb-sm">
<span className="pf-u-background-color-200 pf-u-p-xs">{key}:</span>
<span className="pf-u-p-xs"> {value[key].toString()}</span>
<span className="pf-u-p-xs"> {value[key]?.toString() ?? 'null'}</span>
</span>
))}
</div>
Expand All @@ -110,7 +110,7 @@ const FindDocumentDetailsTree: React.FunctionComponent<IFindDocumentDetailsTreeP
return (
<Td className="pf-u-text-wrap pf-u-text-break-word" dataLabel="Value">
<TableText wrapModifier="nowrap">
{value.toString()}
{value?.toString() ?? 'null'}
<small className="pf-u-ml-sm"> ({getTypeName(value)})</small>
</TableText>
</Td>
Expand All @@ -127,7 +127,11 @@ const FindDocumentDetailsTree: React.FunctionComponent<IFindDocumentDetailsTreeP
</Tr>
</Thead>
{Object.keys(value).map((key) => (
<FindDocumentDetailsTree key={value[key].toString()} documentKey={key} documentValue={value[key]} />
<FindDocumentDetailsTree
key={value[key]?.toString() ?? 'null'}
documentKey={key}
documentValue={value[key]}
/>
))}
</TableComposable>
);
Expand All @@ -146,7 +150,7 @@ const FindDocumentDetailsTree: React.FunctionComponent<IFindDocumentDetailsTreeP
}
/>
<Td className="pf-u-text-wrap pf-u-text-break-word" dataLabel="Key">
<TableText wrapModifier="nowrap">{documentKey.toString()}</TableText>
<TableText wrapModifier="nowrap">{documentKey?.toString() ?? 'null'}</TableText>
</Td>
{formatValue(documentValue)}
</Tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const FindDocuments: React.FunctionComponent<IFindDocumentsProps> = ({
</Thead>
{documents.map((document) => (
<FindDocument
key={document['_id'].toString()}
key={document['_id']?.toString() ?? 'null'}
instance={instance}
collectionName={collectionName}
document={document}
Expand Down