From 04420f1dd340634b3af32bf45f5421990cbbb2ff Mon Sep 17 00:00:00 2001 From: Tanish Manku Date: Tue, 27 May 2025 00:51:14 -0700 Subject: [PATCH] Port FilterButtons --- .../reusable/FilterButtons/FilterButtons.mdx | 14 -------- .../FilterButtons/FilterButtons.stories.tsx | 36 ------------------- .../reusable/FilterButtons/index.ts | 1 - .../app/src/components/reusable/index.ts | 1 - .../CharactersComboTabs/subtabAnimations.tsx | 3 +- .../CharactersComboTabs/subtabCharacters.tsx | 5 ++- .../CharactersComboTabs/subtabExpressions.tsx | 3 +- .../SidePanelTabs/tabComps/CreaturesTab.tsx | 5 +-- .../SidePanelTabs/tabComps/ObjectsTab.tsx | 3 +- .../comps/SidePanelTabs/tabComps/SetsTab.tsx | 3 +- .../common/src/lib/enums/AssetFilterOption.ts | 6 ++++ frontend/libs/common/src/lib/enums/index.ts | 1 + frontend/libs/components/button/src/index.ts | 1 + .../button/src/lib}/FilterButtons.tsx | 2 +- 14 files changed, 16 insertions(+), 68 deletions(-) delete mode 100644 frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.mdx delete mode 100644 frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.stories.tsx delete mode 100644 frontend/apps/editor3d/app/src/components/reusable/FilterButtons/index.ts create mode 100644 frontend/libs/common/src/lib/enums/AssetFilterOption.ts rename frontend/{apps/editor3d/app/src/components/reusable/FilterButtons => libs/components/button/src/lib}/FilterButtons.tsx (94%) diff --git a/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.mdx b/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.mdx deleted file mode 100644 index 925bd37d0f..0000000000 --- a/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.mdx +++ /dev/null @@ -1,14 +0,0 @@ -import { Canvas, Meta } from '@storybook/blocks'; - -import * as FilterButtonsStories from './FilterButtons.stories'; - - - -# Three buttons which appear at the top of some of the media tabs. - -The value can be set to Featured - -Mine - -or Bookmarked - diff --git a/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.stories.tsx b/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.stories.tsx deleted file mode 100644 index 6bb20048a4..0000000000 --- a/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.stories.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import type { Meta, StoryObj } from "@storybook/react"; -import { FilterButtons } from "./FilterButtons"; -import { withActions } from "@storybook/addon-actions/decorator"; -import { AssetFilterOption } from "~/enums"; - -const meta: Meta = { - component: FilterButtons, - parameters: { - actions: { - handles: ["click"], - }, - }, - decorators: [withActions], -}; - -type Story = StoryObj; - -export const Featured: Story = { - render: () => ( - null} value={AssetFilterOption.FEATURED} /> - ), -}; - -export const Mine: Story = { - render: () => ( - null} value={AssetFilterOption.MINE} /> - ), -}; - -export const Bookmarked: Story = { - render: () => ( - null} value={AssetFilterOption.BOOKMARKED} /> - ), -}; - -export default meta; diff --git a/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/index.ts b/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/index.ts deleted file mode 100644 index e1b80c96a1..0000000000 --- a/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./FilterButtons"; diff --git a/frontend/apps/editor3d/app/src/components/reusable/index.ts b/frontend/apps/editor3d/app/src/components/reusable/index.ts index 63731458a4..80badcdedb 100644 --- a/frontend/apps/editor3d/app/src/components/reusable/index.ts +++ b/frontend/apps/editor3d/app/src/components/reusable/index.ts @@ -1,4 +1,3 @@ -export * from "./FilterButtons"; export * from "./InputVector"; export * from "./NumberInput"; export * from "./Pagination"; diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabAnimations.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabAnimations.tsx index 974f51ed59..3505b12eba 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabAnimations.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabAnimations.tsx @@ -8,12 +8,11 @@ import { MediaFileAnimationType, } from "~/enums"; import { - Button, - FilterButtons, Pagination, SearchFilter, UploadModal, } from "~/components"; +import { Button, FilterButtons } from "@storyteller/ui-button"; import { ItemElements } from "~/pages/PageEnigma/comps/SidePanelTabs/sharedComps"; import { isAnyStatusFetching } from "../../utilities"; import { diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabCharacters.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabCharacters.tsx index 56cb6a5b36..bc4d7ea978 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabCharacters.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabCharacters.tsx @@ -10,12 +10,11 @@ import { } from "~/enums"; import { MediaItem } from "~/pages/PageEnigma/models"; import { - Button, - FilterButtons, Pagination, SearchFilter, UploadModal, } from "~/components"; +import { Button, FilterButtons } from "@storyteller/ui-button"; import { ItemElements } from "~/pages/PageEnigma/comps/SidePanelTabs/sharedComps"; import { isAnyStatusFetching } from "../../utilities"; import { @@ -109,7 +108,7 @@ export const CharactersTab = ({ ? fetchFeaturedObjects : undefined : nextUserObjects && - nextUserObjects.current !== nextUserObjects.total_page_count + nextUserObjects.current !== nextUserObjects.total_page_count ? () => fetchUserObjects(nextUserObjects.current) : undefined; diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabExpressions.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabExpressions.tsx index 4fd7da04fc..e6ff9dacc0 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabExpressions.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CharactersComboTabs/subtabExpressions.tsx @@ -6,12 +6,11 @@ import { MediaFileAnimationType, } from "~/enums"; import { - Button, - FilterButtons, Pagination, SearchFilter, UploadModal, } from "~/components"; +import { Button, FilterButtons } from "@storyteller/ui-button"; import { ItemElements } from "~/pages/PageEnigma/comps/SidePanelTabs/sharedComps"; import { isAnyStatusFetching } from "../../utilities"; import { diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CreaturesTab.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CreaturesTab.tsx index a00c881de5..ae5f9b54a2 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CreaturesTab.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/CreaturesTab.tsx @@ -13,15 +13,12 @@ import { ItemElements, } from "~/pages/PageEnigma/comps/SidePanelTabs/sharedComps"; import { - FilterButtons, SearchFilter, Pagination, UploadModal3D, } from "~/components"; -import { - Button -} from "@storyteller/ui-button" +import { Button, FilterButtons } from "@storyteller/ui-button" import { isAnyStatusFetching } from "../utilities"; import { diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/ObjectsTab.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/ObjectsTab.tsx index d47c7e01d4..072196998c 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/ObjectsTab.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/ObjectsTab.tsx @@ -14,12 +14,11 @@ import { ItemElements, } from "~/pages/PageEnigma/comps/SidePanelTabs/sharedComps"; import { - Button, - FilterButtons, SearchFilter, Pagination, UploadModal3D, } from "~/components"; +import { Button, FilterButtons } from "@storyteller/ui-button" import { isAnyStatusFetching } from "../utilities"; import { useUserObjects, diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/SetsTab.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/SetsTab.tsx index 64d1d96bc2..c2d0fa7365 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/SetsTab.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/comps/SidePanelTabs/tabComps/SetsTab.tsx @@ -12,11 +12,10 @@ import { } from "~/enums"; import { - Button, - FilterButtons, SearchFilter, UploadModal3D, } from "~/components"; +import { Button, FilterButtons } from "@storyteller/ui-button" import { TabTitle, diff --git a/frontend/libs/common/src/lib/enums/AssetFilterOption.ts b/frontend/libs/common/src/lib/enums/AssetFilterOption.ts new file mode 100644 index 0000000000..dfc97ea3be --- /dev/null +++ b/frontend/libs/common/src/lib/enums/AssetFilterOption.ts @@ -0,0 +1,6 @@ +export enum AssetFilterOption { + ALL, + FEATURED, + MINE, + BOOKMARKED, +} diff --git a/frontend/libs/common/src/lib/enums/index.ts b/frontend/libs/common/src/lib/enums/index.ts index 2b644167d1..0865e3e89f 100644 --- a/frontend/libs/common/src/lib/enums/index.ts +++ b/frontend/libs/common/src/lib/enums/index.ts @@ -3,3 +3,4 @@ export * from "./Queue"; export * from "./UploaderStates"; export * from "./Hotkeys"; export * from "./Toaster"; +export * from "./AssetFilterOption"; diff --git a/frontend/libs/components/button/src/index.ts b/frontend/libs/components/button/src/index.ts index 346650a31c..225b6ce063 100644 --- a/frontend/libs/components/button/src/index.ts +++ b/frontend/libs/components/button/src/index.ts @@ -1,2 +1,3 @@ export * from "./lib/button"; export * from "./lib/ToggleButton"; +export * from "./lib/FilterButtons"; diff --git a/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.tsx b/frontend/libs/components/button/src/lib/FilterButtons.tsx similarity index 94% rename from frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.tsx rename to frontend/libs/components/button/src/lib/FilterButtons.tsx index f17c6139ac..2a0086bf01 100644 --- a/frontend/apps/editor3d/app/src/components/reusable/FilterButtons/FilterButtons.tsx +++ b/frontend/libs/components/button/src/lib/FilterButtons.tsx @@ -1,4 +1,4 @@ -import { AssetFilterOption } from "~/enums"; +import { AssetFilterOption } from "@storyteller/common"; interface Props { onClick: (button: AssetFilterOption) => void;