= ({
+ indexes,
+ isWritable,
+ isReadonly,
+ isReadonlyView,
+ description,
+ error,
+ localAppRegistry,
+ onSortTable,
+}) => {
+ const onDeleteIndex = (name: string) => {
+ return localAppRegistry.emit('toggle-drop-index-modal', true, name);
+ };
+ return (
+
+
+
+
+ {!isReadonlyView && !error && (
+
+
+
+ )}
+
+ );
+};
+
+const mapState = ({
+ indexes,
+ isWritable,
+ isReadonly,
+ isReadonlyView,
+ description,
+ error,
+ appRegistry: { localAppRegistry },
+}: any) => ({
+ indexes,
+ isWritable,
+ isReadonly,
+ isReadonlyView,
+ description,
+ error,
+ localAppRegistry,
+});
+
+const mapDispatch = {
+ onSortTable: sortIndexes,
+};
+
+export default connect(mapState, mapDispatch)(Indexes as any);
diff --git a/packages/compass-indexes/src/components/name-column/index.js b/packages/compass-indexes/src/components/name-column/index.js
deleted file mode 100644
index 5d2fd30b7cd..00000000000
--- a/packages/compass-indexes/src/components/name-column/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import NameColumn from './name-column';
-export default NameColumn;
diff --git a/packages/compass-indexes/src/components/name-column/name-column.jsx b/packages/compass-indexes/src/components/name-column/name-column.jsx
deleted file mode 100644
index cf9c7d1f7bf..00000000000
--- a/packages/compass-indexes/src/components/name-column/name-column.jsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import {
- spacing,
- css,
- IndexIcon,
- BadgeVariant,
- Badge,
- Accordion,
-} from '@mongodb-js/compass-components';
-
-const keyListStyles = css({
- marginTop: spacing[1],
- marginBottom: spacing[1],
-});
-
-const keyItemStyles = css({
- paddingTop: spacing[1],
- paddingLeft: spacing[4],
-});
-
-class NameColumn extends PureComponent {
- static displayName = 'NameColumn';
-
- static propTypes = {
- index: PropTypes.object.isRequired,
- };
-
- render() {
- const indexName = this.props.index.name;
- const indexKeys = this.props.index.fields.serialize();
- return (
-
-
-
- {indexKeys.map(({ field, value }) => (
- -
-
- {field}
-
-
-
-
- ))}
-
-
- |
- );
- }
-}
-
-export default NameColumn;
diff --git a/packages/compass-indexes/src/components/property-column/index.js b/packages/compass-indexes/src/components/property-column/index.js
deleted file mode 100644
index 1e3d67f9e2e..00000000000
--- a/packages/compass-indexes/src/components/property-column/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import PropertyColumn from './property-column';
-export default PropertyColumn;
diff --git a/packages/compass-indexes/src/components/property-column/property-column.jsx b/packages/compass-indexes/src/components/property-column/property-column.jsx
deleted file mode 100644
index a8c507e1fbe..00000000000
--- a/packages/compass-indexes/src/components/property-column/property-column.jsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import getIndexHelpLink from '../../utils/index-link-helper';
-
-import {
- spacing,
- css,
- Tooltip,
- Body,
- Badge,
- BadgeVariant,
- Icon,
- Link,
- uiColors,
-} from '@mongodb-js/compass-components';
-
-const contentStyles = css({
- display: 'flex',
- gap: spacing[1],
-});
-
-const badgeStyles = css({
- gap: spacing[2],
-});
-
-const iconLinkStyles = css({
- lineHeight: 0,
- color: uiColors.white,
- span: {
- // LG uses backgroundImage instead of textDecoration
- backgroundImage: 'none !important',
- },
-});
-
-class PropertyColumn extends PureComponent {
- static displayName = 'PropertyColumn';
-
- static propTypes = {
- index: PropTypes.object.isRequired,
- openLink: PropTypes.func.isRequired,
- };
-
- _partialTooltip() {
- const { partialFilterExpression } = this.props.index.extra;
- return `partialFilterExpression: ${JSON.stringify(
- partialFilterExpression
- )}`;
- }
-
- _ttlTooltip() {
- const { expireAfterSeconds } = this.props.index.extra;
- return `expireAfterSeconds: ${expireAfterSeconds}`;
- }
-
- renderItemWithTooltip(text, link, tooltip) {
- return (
- (
-
- {children}
-
- {text}
-
-
-
-
-
- )}
- >
- {tooltip}
-
- );
- }
-
- renderCardinality() {
- const { cardinality } = this.props.index;
- if (cardinality !== 'compound') {
- return null;
- }
- return this.renderItemWithTooltip(
- cardinality,
- getIndexHelpLink('COMPOUND')
- );
- }
-
- renderProperty(prop) {
- const tooltip =
- prop === 'ttl'
- ? this._ttlTooltip()
- : prop === 'partial'
- ? this._partialTooltip()
- : null;
-
- return this.renderItemWithTooltip(
- prop,
- getIndexHelpLink(prop.toUpperCase()),
- tooltip
- );
- }
-
- render() {
- const properties = this.props.index.properties.map(
- this.renderProperty.bind(this)
- );
- return (
-
-
- {properties}
- {this.renderCardinality()}
-
- |
- );
- }
-}
-
-export default PropertyColumn;
diff --git a/packages/compass-indexes/src/components/size-column/index.js b/packages/compass-indexes/src/components/size-column/index.js
deleted file mode 100644
index 044cc84c4a4..00000000000
--- a/packages/compass-indexes/src/components/size-column/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import SizeColumn from './size-column';
-export default SizeColumn;
diff --git a/packages/compass-indexes/src/components/size-column/size-column.jsx b/packages/compass-indexes/src/components/size-column/size-column.jsx
deleted file mode 100644
index 9023ca4716f..00000000000
--- a/packages/compass-indexes/src/components/size-column/size-column.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import numeral from 'numeral';
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-
-import { Body, Tooltip } from '@mongodb-js/compass-components';
-
-/**
- * Component for the size column.
- */
-class SizeColumn extends PureComponent {
- static displayName = 'SizeColumn';
-
- static propTypes = {
- size: PropTypes.number.isRequired,
- relativeSize: PropTypes.number.isRequired,
- };
-
- _format(size) {
- const precision = size <= 1000 ? '0' : '0.0';
- return numeral(size).format(precision + ' b');
- }
-
- render() {
- const indexSize = this._format(this.props.size);
- const tooltip = `${this.props.relativeSize.toFixed(
- 2
- )}% compared to largest index`;
- return (
-
- (
-
- {children}
- {indexSize}
-
- )}
- >
- {tooltip}
-
- |
- );
- }
-}
-
-export default SizeColumn;
diff --git a/packages/compass-indexes/src/components/type-column/index.js b/packages/compass-indexes/src/components/type-column/index.js
deleted file mode 100644
index 01de3d8b138..00000000000
--- a/packages/compass-indexes/src/components/type-column/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import TypeColumn from './type-column';
-export default TypeColumn;
diff --git a/packages/compass-indexes/src/components/type-column/type-column.jsx b/packages/compass-indexes/src/components/type-column/type-column.jsx
deleted file mode 100644
index 88f13ae276d..00000000000
--- a/packages/compass-indexes/src/components/type-column/type-column.jsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import map from 'lodash.map';
-import pick from 'lodash.pick';
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import getIndexHelpLink from '../../utils/index-link-helper';
-import {
- spacing,
- css,
- Tooltip,
- Body,
- Badge,
- BadgeVariant,
- Icon,
- Link,
- uiColors,
-} from '@mongodb-js/compass-components';
-
-const badgeStyles = css({
- gap: spacing[2],
-});
-
-const iconLinkStyles = css({
- lineHeight: 0,
- color: uiColors.white,
- span: {
- // LG uses backgroundImage instead of textDecoration
- backgroundImage: 'none !important',
- },
-});
-
-/**
- * Component for the type column.
- */
-class TypeColumn extends PureComponent {
- static displayName = 'TypeColumn';
-
- static propTypes = {
- index: PropTypes.object.isRequired,
- openLink: PropTypes.func.isRequired,
- };
-
- canRenderTooltip() {
- return (
- ['text', 'wildcard', 'columnstore'].indexOf(this.props.index.type) !== -1
- );
- }
-
- renderTooltip() {
- const info = pick(this.props.index.extra, [
- 'weights',
- 'default_language',
- 'language_override',
- 'wildcardProjection',
- 'columnstoreProjection',
- ]);
- const items = map(info, (v, k) => {
- return {`${k}: ${JSON.stringify(v)}`};
- });
- return <>{items};
- }
-
- render() {
- const helpLink = getIndexHelpLink(this.props.index.type.toUpperCase());
- return (
-
- (
-
- {children}
-
- {this.props.index.type}
-
-
-
-
-
- )}
- >
- {this.renderTooltip()}
-
- |
- );
- }
-}
-
-export default TypeColumn;
diff --git a/packages/compass-indexes/src/components/usage-column/index.js b/packages/compass-indexes/src/components/usage-column/index.js
deleted file mode 100644
index f9017806f5f..00000000000
--- a/packages/compass-indexes/src/components/usage-column/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import UsageColumn from './usage-column';
-export default UsageColumn;
diff --git a/packages/compass-indexes/src/components/usage-column/usage-column.jsx b/packages/compass-indexes/src/components/usage-column/usage-column.jsx
deleted file mode 100644
index cafab04e2d6..00000000000
--- a/packages/compass-indexes/src/components/usage-column/usage-column.jsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import isUndefined from 'lodash.isundefined';
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-
-import { Tooltip, Body } from '@mongodb-js/compass-components';
-
-const NO_USAGE_STATS =
- 'Either the server does not support the $indexStats command' +
- 'or the user is not authorized to execute it.';
-
-class UsageColumn extends PureComponent {
- static displayName = 'UsageColumn';
-
- static propTypes = {
- usage: PropTypes.any,
- since: PropTypes.any,
- };
-
- tooltip() {
- if (isUndefined(this.props.usage)) {
- return NO_USAGE_STATS;
- }
- return `${this.props.usage} index hits since index creation or last\n server restart`;
- }
-
- renderSince() {
- if (isUndefined(this.props.since)) {
- return null;
- }
- return (
-
- (since
- {this.props.since ? this.props.since.toDateString() : 'N/A'})
-
- );
- }
-
- render() {
- const usage = isUndefined(this.props.usage) ? '0' : this.props.usage;
- const tooltip = this.tooltip();
- return (
-
- (
-
- {children}
-
- {usage} {this.renderSince()}
-
-
- )}
- >
- {tooltip}
-
- |
- );
- }
-}
-
-export default UsageColumn;
diff --git a/packages/compass-indexes/src/modules/indexes.js b/packages/compass-indexes/src/modules/indexes.js
index 62cd86139ec..53c6e9c5619 100644
--- a/packages/compass-indexes/src/modules/indexes.js
+++ b/packages/compass-indexes/src/modules/indexes.js
@@ -25,8 +25,8 @@ export const SORT_INDEXES = `${PREFIX}/indexes/SORT_INDEXES`;
* Default sortOrder
*/
export const DEFAULT = 'Name and Definition';
-export const ASC = 'fa-sort-asc';
-export const DESC = 'fa-sort-desc';
+export const ASC = 'asc';
+export const DESC = 'desc';
export const USAGE = 'Usage';
/**
@@ -171,21 +171,17 @@ export const loadIndexes = (indexes) => ({
indexes: indexes,
});
-/**
- * Action creator for sort indexes events.
- *
- * @param {Array} indexes - The raw indexes list.
- * @param {String} column - The column.
- * @param {String} order - The order.
- *
- * @returns {Object} The load indexes action.
- */
-export const sortIndexes = (indexes, column, order) => ({
- type: SORT_INDEXES,
- indexes: indexes,
- column: column,
- order: order,
-});
+export const sortIndexes = (column, order) => {
+ return (dispatch, getState) => {
+ const { indexes } = getState();
+ return dispatch({
+ type: SORT_INDEXES,
+ indexes,
+ column,
+ order,
+ });
+ };
+};
/**
* Load indexes from DB.
diff --git a/packages/compass-indexes/src/modules/indexes.spec.js b/packages/compass-indexes/src/modules/indexes.spec.js
index 8775ee56d8b..60d6fd1baf9 100644
--- a/packages/compass-indexes/src/modules/indexes.spec.js
+++ b/packages/compass-indexes/src/modules/indexes.spec.js
@@ -31,17 +31,33 @@ describe('indexes module', function () {
context('when the column is Usage', function () {
context('when sorting asc', function () {
it('returns the sorted indexes list', function () {
- expect(
- reducer(undefined, sortIndexes(defaultSort, USAGE, ASC))
- ).to.deep.equal(usageSort);
+ const dispatch = (args) => args;
+ const getState = () => {
+ return {
+ indexes: defaultSort,
+ };
+ };
+ const result = reducer(
+ undefined,
+ sortIndexes(USAGE, ASC)(dispatch, getState)
+ );
+ expect(result).to.deep.equal(usageSort);
});
});
context('when sorting desc', function () {
it('returns the sorted indexes list', function () {
- expect(
- reducer(undefined, sortIndexes(defaultSort, USAGE, DESC))
- ).to.deep.equal(usageSortDesc);
+ const dispatch = (args) => args;
+ const getState = () => {
+ return {
+ indexes: defaultSort,
+ };
+ };
+ const result = reducer(
+ undefined,
+ sortIndexes(USAGE, DESC)(dispatch, getState)
+ );
+ expect(result).to.deep.equal(usageSortDesc);
});
});
});
@@ -49,17 +65,33 @@ describe('indexes module', function () {
context('when the column is Name and Definition', function () {
context('when sorting asc', function () {
it('returns the sorted indexes list', function () {
- expect(
- reducer(undefined, sortIndexes(usageSort, DEFAULT, ASC))
- ).to.deep.equal(defaultSort);
+ const dispatch = (args) => args;
+ const getState = () => {
+ return {
+ indexes: usageSort,
+ };
+ };
+ const result = reducer(
+ undefined,
+ sortIndexes(DEFAULT, ASC)(dispatch, getState)
+ );
+ expect(result).to.deep.equal(defaultSort);
});
});
context('when sorting desc', function () {
it('returns the sorted indexes list', function () {
- expect(
- reducer(undefined, sortIndexes(usageSort, DEFAULT, DESC))
- ).to.deep.equal(defaultSortDesc);
+ const dispatch = (args) => args;
+ const getState = () => {
+ return {
+ indexes: usageSort,
+ };
+ };
+ const result = reducer(
+ undefined,
+ sortIndexes(DEFAULT, DESC)(dispatch, getState)
+ );
+ expect(result).to.deep.equal(defaultSortDesc);
});
});
});
@@ -84,7 +116,11 @@ describe('indexes module', function () {
describe('#sortIndexes', function () {
it('returns the action', function () {
- expect(sortIndexes([], 'Database Name', DESC)).to.deep.equal({
+ const dispatch = (x) => x;
+ const getState = () => ({ indexes: [] });
+ expect(
+ sortIndexes('Database Name', DESC)(dispatch, getState)
+ ).to.deep.equal({
type: SORT_INDEXES,
indexes: [],
column: 'Database Name',
diff --git a/packages/compass-indexes/src/modules/sort-column.spec.js b/packages/compass-indexes/src/modules/sort-column.spec.js
index b51d1390b31..6c5ad7e5541 100644
--- a/packages/compass-indexes/src/modules/sort-column.spec.js
+++ b/packages/compass-indexes/src/modules/sort-column.spec.js
@@ -7,9 +7,11 @@ describe('sort column module', function () {
describe('#reducer', function () {
context('when an action is provided', function () {
it('returns the new column', function () {
- expect(reducer(undefined, sortIndexes(null, 'Size', ''))).to.equal(
- 'Size'
- );
+ const dispatch = (x) => x;
+ const getState = () => ({});
+ expect(
+ reducer(undefined, sortIndexes('Size', '')(dispatch, getState))
+ ).to.equal('Size');
});
});
diff --git a/packages/compass-indexes/src/modules/sort-order.spec.js b/packages/compass-indexes/src/modules/sort-order.spec.js
index e0b4e9e6c4c..32dcec67430 100644
--- a/packages/compass-indexes/src/modules/sort-order.spec.js
+++ b/packages/compass-indexes/src/modules/sort-order.spec.js
@@ -7,9 +7,11 @@ describe('sort order module', function () {
describe('#reducer', function () {
context('when an action is provided', function () {
it('returns the new order', function () {
- expect(reducer(undefined, sortIndexes(null, '', 'desc'))).to.equal(
- 'desc'
- );
+ const dispatch = (x) => x;
+ const getState = () => ({});
+ expect(
+ reducer(undefined, sortIndexes('', 'desc')(dispatch, getState))
+ ).to.equal('desc');
});
});
diff --git a/packages/compass-indexes/src/plugin.jsx b/packages/compass-indexes/src/plugin.jsx
index 7759ba3b4b7..e3ecf97b314 100644
--- a/packages/compass-indexes/src/plugin.jsx
+++ b/packages/compass-indexes/src/plugin.jsx
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { Provider } from 'react-redux';
import PropTypes from 'prop-types';
-import Indexes from './components/indexes';
+import Indexes from './components/indexes/indexes';
class Plugin extends Component {
static displayName = 'IndexesPlugin';
diff --git a/packages/compass-indexes/src/utils/index-link-helper.ts b/packages/compass-indexes/src/utils/index-link-helper.ts
index 352833d6a05..f89aa579d2b 100644
--- a/packages/compass-indexes/src/utils/index-link-helper.ts
+++ b/packages/compass-indexes/src/utils/index-link-helper.ts
@@ -31,7 +31,6 @@ const HELP_URLS = {
* The function looks up index help links.
*
* @param {String} section - The name of the section to open.
- * @returns {String} - the link.
*/
export default function getIndexHelpLink(section: keyof typeof HELP_URLS) {
return HELP_URLS[section] || null;