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

UI: Simple tag filtering #29333

Merged
merged 32 commits into from
Oct 21, 2024
Merged

UI: Simple tag filtering #29333

merged 32 commits into from
Oct 21, 2024

Conversation

shilman
Copy link
Member

@shilman shilman commented Oct 11, 2024

Closes #

QA

https://deploy-preview-234--storybook-frontpage.netlify.app/docs/8.4/writing-stories/tags#filtering-by-custom-tags

What I did

Design

image
Implementation

custom-tag-filter

  • Shows the play-fn built in tag (if any stories have play functions) but hides other "system" tags
  • Replace video placeholder with screenshot
  • Remove the URL updates
  • Show empty state when there are no user tags
  • Remove empty state in the built storybook
For later
  • Scrolling bug when you remove all tags
  • Add story and docs tags automatically
  • Add URL parameter serialization & deserialization
  • SVG masking for the "selected dot"

Checklist for Contributors

Testing

The changes in this PR are covered in the following automated tests:

  • stories
  • unit tests
  • integration tests
  • end-to-end tests

Manual testing

  • Start with a new Storybook without tags & try the filter
  • Add custom tags at the story, component, and project level & try the filter
  • Include special characters in tags such as symbols, unicode, emoji
  • Try text search in the sidebar & then filter by tags & vice versa

Documentation

  • Needs documentation

🦋 Canary release

This pull request has been released as version 0.0.0-pr-29333-sha-c7603f3d. Try it out in a new sandbox by running npx [email protected] sandbox or in an existing project with npx [email protected] upgrade.

More information
Published version 0.0.0-pr-29333-sha-c7603f3d
Triggered by @shilman
Repository storybookjs/storybook
Branch shilman/simple-tag-filter
Commit c7603f3d
Datetime Mon Oct 14 06:50:15 UTC 2024 (1728888615)
Workflow run 11322402774

To request a new release of this pull request, mention the @storybookjs/core team.

core team members can create a new canary release here or locally with gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=29333

name before after diff z %
createSize 0 B 0 B 0 B - -
generateSize 78.7 MB 78.7 MB 0 B 1.79 0%
initSize 147 MB 147 MB 3.77 kB 1.88 0%
diffSize 68.3 MB 68.3 MB 3.77 kB 1.87 0%
buildSize 6.79 MB 6.8 MB 3.67 kB 40.5 0.1%
buildSbAddonsSize 1.5 MB 1.5 MB 16 B 0.27 0%
buildSbCommonSize 195 kB 195 kB 0 B - 0%
buildSbManagerSize 1.83 MB 1.84 MB 3.66 kB 34.18 0.2%
buildSbPreviewSize 270 kB 270 kB 0 B -0.82 0%
buildStaticSize 0 B 0 B 0 B - -
buildPrebuildSize 3.8 MB 3.8 MB 3.67 kB 39.09 0.1%
buildPreviewSize 2.99 MB 2.99 MB 0 B -0.82 0%
testBuildSize 0 B 0 B 0 B - -
testBuildSbAddonsSize 0 B 0 B 0 B - -
testBuildSbCommonSize 0 B 0 B 0 B - -
testBuildSbManagerSize 0 B 0 B 0 B - -
testBuildSbPreviewSize 0 B 0 B 0 B - -
testBuildStaticSize 0 B 0 B 0 B - -
testBuildPrebuildSize 0 B 0 B 0 B - -
testBuildPreviewSize 0 B 0 B 0 B - -
name before after diff z %
createTime 13.1s 15.6s 2.5s 0.69 16.1%
generateTime 23.2s 20.1s -3s -149ms -0.37 -15.6%
initTime 16.2s 12.7s -3s -504ms -0.5 -27.6%
buildTime 8.2s 9.6s 1.4s 1.18 14.7%
testBuildTime 0ms 0ms 0ms - -
devPreviewResponsive 6.7s 5.2s -1s -539ms -1.3 🔰-29.3%
devManagerResponsive 4.2s 3.5s -702ms -1.14 -19.7%
devManagerHeaderVisible 573ms 480ms -93ms -1.14 -19.4%
devManagerIndexVisible 608ms 511ms -97ms -1.1 -19%
devStoryVisibleUncached 1.1s 834ms -321ms -0.88 -38.5%
devStoryVisible 606ms 512ms -94ms -1.12 -18.4%
devAutodocsVisible 569ms 418ms -151ms -1.21 -36.1%
devMDXVisible 509ms 436ms -73ms -1.1 -16.7%
buildManagerHeaderVisible 468ms 430ms -38ms -1.2 -8.8%
buildManagerIndexVisible 478ms 431ms -47ms -1.26 🔰-10.9%
buildStoryVisible 502ms 493ms -9ms -1.12 -1.8%
buildAutodocsVisible 466ms 421ms -45ms -0.83 -10.7%
buildMDXVisible 420ms 389ms -31ms -1.12 -8%

Greptile Summary

This PR introduces a simple tag filtering feature to the Storybook UI, enhancing the sidebar's functionality for filtering stories based on tags.

  • Added new TagsFilter and TagsFilterPanel components in /code/core/src/manager/components/sidebar/
  • Updated Sidebar component to integrate tag filtering and remove 'Create New Story' button
  • Implemented logic to filter stories based on selected tags using experimental_setFilter in TagsFilter.tsx
  • Renamed STATIC_FILTER to TAG_FILTERS in common-manager.ts for consistency
  • Added new stories for TagsFilter and TagsFilterPanel components to showcase different states

Copy link

nx-cloud bot commented Oct 11, 2024

☁️ Nx Cloud Report

CI is running/has finished running commands for commit 816e595. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

📂 See all runs for this CI Pipeline Execution


✅ Successfully ran 1 target

Sent with 💌 from NxCloud.

@shilman shilman force-pushed the shilman/simple-tag-filter branch from d7baa28 to e8a505c Compare October 12, 2024 01:55
@shilman shilman force-pushed the shilman/simple-tag-filter branch from 3acf141 to 2b53b6e Compare October 12, 2024 01:58
@shilman shilman changed the title UI WIP UI: Simple tag filtering Oct 12, 2024
@shilman shilman mentioned this pull request Oct 12, 2024
14 tasks
Copy link
Contributor

@Sidnioulz Sidnioulz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤩 it's looking great!

I have a feeling that some users will want to filter by entry type (docs only or stories only). Do you reckon it could make sense, in a separate branch, to expose them as tags (type:story and type:docs) like you expose play-fn?

import { TagsFilter } from './TagsFilter';

const meta = {
component: TagsFilter,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you have to put the title explicitly to get these components to land in the same sidebar entry as the other Sidebar components?

image vs image

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want our Storybooks to use auto-title as much as possible. I'll move the other stories over in a separate PR.

code/core/src/manager/components/sidebar/Sidebar.tsx Outdated Show resolved Hide resolved
@shilman shilman marked this pull request as ready for review October 12, 2024 13:39
Copy link
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

9 file(s) reviewed, 16 comment(s)
Edit PR Review Bot Settings | Greptile

Comment on lines 25 to 28
// we can filter out the primary story, but we still want to show autodocs
(tags.includes('dev') || item.type === 'docs') &&
tags.filter((tag) => excludeTags[tag]).length === 0
tags.filter((tag) => staticExcludeTags[tag]).length === 0
);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Consider extracting this logic into a separate function for better readability

Comment on lines +135 to +136
const isDevelopment = global.CONFIG_TYPE === 'DEVELOPMENT';
const isRendererReact = global.STORYBOOK_RENDERER === 'react';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Consider using environment variables or a configuration file for these global flags

code/core/src/manager/components/sidebar/Sidebar.tsx Outdated Show resolved Hide resolved
<WithTooltip
placement="bottom"
trigger="click"
onVisibleChange={setExpanded}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: The onVisibleChange prop is set to setExpanded, but expanded state is not used anywhere in the component. Consider removing this state if it's not needed.

Comment on lines +9 to +12
toggleTag: fn(),
api: {
getDocsUrl: () => 'https://storybook.js.org/docs/',
} as any,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Consider using a more specific type for the api object instead of 'any'

toggleTag,
}: TagsFilterPanelProps) => {
const theme = useTheme();
const userTags = allTags.filter((tag) => tag === 'play-fn' || !BUILT_IN_TAGS.has(tag)).toSorted();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Consider using Array.prototype.sort() instead of .toSorted() for better browser compatibility

return {
id,
title: tag,
right: <input type="checkbox" id={id} name={id} value={tag} checked={checked} />,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Consider using a controlled component for the checkbox

Comment on lines +26 to +29
// FIXME: This is the actual `index.json` index where the `index` below
// is actually the stories hash. We should fix this up and make it consistent.
// eslint-disable-next-line @typescript-eslint/naming-convention
internal_index,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Consider renaming 'internal_index' to a more descriptive name like 'indexJson' for clarity

@shilman shilman self-assigned this Oct 14, 2024
Copy link
Contributor

@kylegach kylegach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the docs updates!

docs/writing-stories/tags.mdx Outdated Show resolved Hide resolved
docs/writing-stories/tags.mdx Outdated Show resolved Hide resolved
docs/writing-stories/tags.mdx Show resolved Hide resolved
@shilman shilman force-pushed the shilman/simple-tag-filter branch from e7ba7f5 to 7a90232 Compare October 19, 2024 10:42
Copy link
Contributor

@JReinhold JReinhold left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ✨

@shilman shilman merged commit f75cf71 into next Oct 21, 2024
54 of 57 checks passed
@shilman shilman deleted the shilman/simple-tag-filter branch October 21, 2024 12:38
@github-actions github-actions bot mentioned this pull request Oct 21, 2024
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants