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

Move ItemsTable components to a higher-level folder #41952

Merged
merged 1 commit into from
Apr 30, 2024
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
import BulkActions from "metabase/collections/components/BulkActions";
import CollectionEmptyState from "metabase/collections/components/CollectionEmptyState";
import ItemsTable from "metabase/collections/components/ItemsTable";
import PinnedItemOverview from "metabase/collections/components/PinnedItemOverview";
import Header from "metabase/collections/containers/CollectionHeader";
import type {
Expand All @@ -18,6 +17,11 @@ import type {
UploadFile,
} from "metabase/collections/types";
import { isPersonalCollectionChild } from "metabase/collections/utils";
import { ItemsTable } from "metabase/components/ItemsTable";
import {
Sort,
type SortingOptions,
} from "metabase/components/ItemsTable/BaseItemsTable";
import PaginationControls from "metabase/components/PaginationControls";
import ItemsDragLayer from "metabase/containers/dnd/ItemsDragLayer";
import CS from "metabase/css/core/index.css";
Expand All @@ -35,7 +39,6 @@ import type {
CollectionItem,
} from "metabase-types/api";

import { Sort, type SortingOptions } from "../BaseItemsTable";
import type { CollectionOrTableIdProps } from "../ModelUploadModal";
import { ModelUploadModal } from "../ModelUploadModal";
import UploadOverlay from "../UploadOverlay";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import type { HTMLAttributes, PropsWithChildren } from "react";
import { t } from "ttag";

import CheckBox from "metabase/core/components/CheckBox";
import type Database from "metabase-lib/v1/metadata/Database";
import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";

import type {
CreateBookmark,
DeleteBookmark,
OnCopy,
OnMove,
OnToggleSelectedWithItem,
} from "../types";
} from "metabase/collections/types";
import CheckBox from "metabase/core/components/CheckBox";
import type Database from "metabase-lib/v1/metadata/Database";
import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";

import {
BulkSelectWrapper,
Expand Down Expand Up @@ -112,7 +111,7 @@ const defaultItemRenderer = ({ item, ...props }: ItemRendererProps) => {
);
};

const BaseItemsTable = ({
export const BaseItemsTable = ({
databases,
bookmarks,
createBookmark,
Expand Down Expand Up @@ -222,6 +221,3 @@ const BaseItemsTable = ({
};

BaseItemsTable.Item = BaseTableItem;

// eslint-disable-next-line import/no-default-export
export default BaseItemsTable;
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type { CollectionItem } from "metabase-types/api";
import { createMockCollection } from "metabase-types/api/mocks";

import type { BaseItemsTableProps } from "./BaseItemsTable";
import BaseItemsTable from "./BaseItemsTable";
import { BaseItemsTable } from "./BaseItemsTable";

const timestamp = "2021-06-03T19:46:52.128";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ import moment from "moment-timezone"; // eslint-disable-line no-restricted-impor
import { useCallback } from "react";

import ActionMenu from "metabase/collections/components/ActionMenu";
import type {
CreateBookmark,
DeleteBookmark,
OnCopy,
OnDrop,
OnMove,
OnToggleSelectedWithItem,
} from "metabase/collections/types";
import DateTime from "metabase/components/DateTime";
import EntityItem from "metabase/components/EntityItem";
import type { Edit } from "metabase/components/LastEditInfoLabel/LastEditInfoLabel";
Expand All @@ -15,15 +23,6 @@ import { PLUGIN_MODERATION } from "metabase/plugins";
import type Database from "metabase-lib/v1/metadata/Database";
import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";

import type {
CreateBookmark,
DeleteBookmark,
OnCopy,
OnDrop,
OnMove,
OnToggleSelectedWithItem,
} from "../types";

import {
DescriptionIcon,
EntityIconCheckBox,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import CS from "metabase/css/core/index.css";
import type { CollectionItem } from "metabase-types/api";

import type { BaseItemsTableProps } from "./BaseItemsTable";
import BaseItemsTable from "./BaseItemsTable";
import { BaseItemsTable } from "./BaseItemsTable";
import type { BaseTableItemProps } from "./BaseTableItem";
import { ItemsTableRoot } from "./ItemsTable.styled";

Expand All @@ -22,7 +22,7 @@ const Item = ({
);
};

const ItemsTable = ({
export const ItemsTable = ({
items,
...props
}: { items: CollectionItem[] } & BaseItemsTableProps) => {
Expand All @@ -41,6 +41,3 @@ const ItemsTable = ({
</div>
);
};

// eslint-disable-next-line import/no-default-export
export default ItemsTable;
1 change: 1 addition & 0 deletions frontend/src/metabase/components/ItemsTable/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { ItemsTable } from "./ItemsTable";
2 changes: 1 addition & 1 deletion frontend/src/metabase/containers/dnd/ItemsDragLayer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { Component } from "react";
import { DragLayer } from "react-dnd";
import _ from "underscore";

import BaseItemsTable from "metabase/collections/components/BaseItemsTable";
import PinnedItemCard from "metabase/collections/components/PinnedItemCard";
import BodyComponent from "metabase/components/BodyComponent";
import { BaseItemsTable } from "metabase/components/ItemsTable/BaseItemsTable";

// NOTE: our version of react-hot-loader doesn't play nice with react-dnd's DragLayer,
// so we exclude files named `*DragLayer.jsx` in webpack.config.js
Expand Down