diff --git a/.github/workflows/add-pr-to-project.yml b/.github/workflows/add-pr-to-project.yml index 0563c78..021cfc3 100644 --- a/.github/workflows/add-pr-to-project.yml +++ b/.github/workflows/add-pr-to-project.yml @@ -52,7 +52,7 @@ jobs: } catch (error) { console.error('Failed to add PR to project:', error.message); - + // If it fails because it's already in the project, that's fine if (error.message.includes('already exists')) { console.log('PR already in project'); diff --git a/.github/workflows/deploy-demo-preview-smart.yml b/.github/workflows/deploy-demo-preview-smart.yml index 83c260d..cc11b0e 100644 --- a/.github/workflows/deploy-demo-preview-smart.yml +++ b/.github/workflows/deploy-demo-preview-smart.yml @@ -221,8 +221,8 @@ jobs: issue_number: prNumber }); - const botComment = comments.data.find(comment => - comment.user.type === 'Bot' && + const botComment = comments.data.find(comment => + comment.user.type === 'Bot' && comment.body.includes('Demo Preview Ready!') ); @@ -300,10 +300,10 @@ jobs: console.log(`Updating project "${project.title}"`); // Find the Preview URL field - const previewUrlField = project.fields.nodes.find(f => + const previewUrlField = project.fields.nodes.find(f => f.name === 'Preview URL' && f.dataType === 'TEXT' ); - + if (!previewUrlField) { console.log('Preview URL field not found in project'); continue; @@ -331,7 +331,7 @@ jobs: fieldId: previewUrlField.id, value: { text: previewUrl } }); - + console.log(`โœ… Updated Preview URL field to: ${previewUrl}`); } } catch (error) { diff --git a/.github/workflows/manual-preview-control.yml b/.github/workflows/manual-preview-control.yml index 328fea5..072d78f 100644 --- a/.github/workflows/manual-preview-control.yml +++ b/.github/workflows/manual-preview-control.yml @@ -12,7 +12,7 @@ permissions: jobs: handle-preview-command: if: | - github.event.issue.pull_request && + github.event.issue.pull_request && (contains(github.event.comment.body, '/preview') || contains(github.event.comment.body, '/skip-preview')) runs-on: ubuntu-latest steps: @@ -31,7 +31,7 @@ jobs: repo, username: commenter }); - + if (['admin', 'write'].includes(permissionLevel.permission)) { core.setOutput('has-permission', 'true'); } else { @@ -65,7 +65,7 @@ jobs: issue_number: issueNumber, labels: ['deploy-preview'] }); - + // Remove skip-preview if present try { await github.rest.issues.removeLabel({ @@ -75,14 +75,14 @@ jobs: name: 'skip-preview' }); } catch (e) {} - + await github.rest.issues.createComment({ owner: context.repo.owner, repo: context.repo.repo, issue_number: issueNumber, body: '๐Ÿš€ Preview deployment triggered! The preview will be ready in a few minutes.' }); - + } else if (comment.includes('/skip-preview')) { // Add skip-preview label await github.rest.issues.addLabels({ @@ -91,7 +91,7 @@ jobs: issue_number: issueNumber, labels: ['skip-preview'] }); - + // Remove deploy-preview if present try { await github.rest.issues.removeLabel({ @@ -101,7 +101,7 @@ jobs: name: 'deploy-preview' }); } catch (e) {} - + await github.rest.issues.createComment({ owner: context.repo.owner, repo: context.repo.repo, diff --git a/.github/workflows/update-preview-url-field.yml b/.github/workflows/update-preview-url-field.yml index 5653276..52a37ba 100644 --- a/.github/workflows/update-preview-url-field.yml +++ b/.github/workflows/update-preview-url-field.yml @@ -96,10 +96,10 @@ jobs: console.log(`Updating project "${project.title}"`); // Find the Preview URL field - const previewUrlField = project.fields.nodes.find(f => + const previewUrlField = project.fields.nodes.find(f => f.name === 'Preview URL' && f.dataType === 'TEXT' ); - + if (!previewUrlField) { console.log('Preview URL field not found in project'); continue; @@ -127,7 +127,7 @@ jobs: fieldId: previewUrlField.id, value: { text: previewUrl } }); - + console.log(`โœ… Updated Preview URL field to: ${previewUrl}`); } } catch (error) { @@ -203,13 +203,13 @@ jobs: }); const projectItems = projectData.repository.pullRequest?.projectItems?.nodes || []; - + for (const projectItem of projectItems) { const project = projectItem.project; - const previewUrlField = project.fields.nodes.find(f => + const previewUrlField = project.fields.nodes.find(f => f.name === 'Preview URL' && f.dataType === 'TEXT' ); - + if (!previewUrlField) continue; // Clear the field @@ -234,7 +234,7 @@ jobs: fieldId: previewUrlField.id, value: { text: "" } }); - + console.log('โœ… Cleared Preview URL field'); } } catch (error) { diff --git a/.gitignore b/.gitignore index ee0a8dc..4984bdb 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,8 @@ dist-ssr # Testing coverage .vitest-cache +test-results/ +playwright-report/ # Deployment dist-demo @@ -38,7 +40,8 @@ dist-demo ryans_notes/ # Screenshots and temporary files -# *.png - Removed to allow hero screenshot +# *.png - Removed to allow hero screenshot in demo assets +screenshots/ simple-test.html clause copy.md clause*.md diff --git a/README.md b/README.md index d46396f..6efc388 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ๐ŸŽ‰ **Pre-release: Modular Architecture with Minimal Bundle Size!** -A collection of powerful, tree-shakeable React components for AG Grid (v33.3.0+) that enhance your data grid with advanced filtering and state management capabilities. Start with just 25KB or add features as needed. +A collection of powerful, headless React components for AG Grid (v33.3.0+) built on top of Headless UI. Enhance your data grid with advanced filtering and state management capabilities while maintaining complete control over styling. Tree-shakeable architecture lets you use only what you need. ๐Ÿ“– **[Full Documentation โ†’](./docs/)** ๐Ÿš€ **[Live Demo โ†’](https://demo.rozich.net/ag-grid-react-components/)** @@ -38,6 +38,17 @@ A component that displays active filters as removable pills: - **Filter Types**: Handles date, text, and set filters - **Customizable**: Style with CSS classes +### ๐Ÿ’พ Saved Views Management + +Complete saved views system with categories and defaults: + +- **Save Views**: Save filters-only or full grid state +- **Categories**: Organize views with custom categories +- **Default View**: Set a default view that loads on startup +- **Import/Export**: Share views between users +- **Management UI**: Full CRUD operations on saved views +- **Grid Reset**: Reset to default view or factory settings + ### ๐Ÿ”— URL State Persistence Comprehensive grid state persistence with URL synchronization: @@ -51,27 +62,19 @@ Comprehensive grid state persistence with URL synchronization: ## ๐Ÿ“ฆ Installation -Choose your installation based on your needs: - -### Minimal Installation (25KB) - ```bash # Install the complete package (tree-shakeable) npm install ag-grid-react-components ``` -### With React DatePicker (65KB) +### Optional Dependencies ```bash -# Install with peer dependencies for date picker -npm install ag-grid-react-components react-datepicker -``` +# For enhanced date picker UI (adds ~40KB) +npm install react-datepicker -### Full Installation (85KB) - -```bash -# Install with all optional dependencies -npm install ag-grid-react-components react-datepicker lz-string +# For URL compression support (adds ~20KB) +npm install lz-string ``` ## ๐Ÿ“‹ Requirements @@ -138,16 +141,21 @@ function App() { return (
- - - + {/* Filter toolbar */} +
+ + + +
+ + setFilterModel(gridApi?.getFilterModel() || {})} rowData={rowData} />
); } @@ -252,6 +260,35 @@ const QuickFilterDropdown = createQuickFilterDropdown(); /> ``` +### Saved Views Dropdown + +Complete saved views management with categories: + +```typescript +import { SavedViewsDropdown } from "ag-grid-react-components"; + + { + console.log('Applied view:', view); + }} +/> +``` + +This single component provides: + +- Dropdown to select saved views +- Three-dots menu with actions +- Save/manage views modals +- Import/export functionality +- Default view support +- Grid reset options + +See [Saved Views Documentation](./docs/SAVEDVIEWS_API.md) for full API. + ### Grid State Persistence ```typescript @@ -537,16 +574,73 @@ const customOptions = [ ### Styling -The components use CSS modules and can be customized via CSS variables: +All components are **headless** - they ship with no styles, giving you complete control over appearance while providing excellent accessibility through Headless UI. + +#### Option 1: Tailwind CSS (Used in Demo) + +Our demo showcases styling with Tailwind CSS: + +```tsx + + + +``` + +See the [Tailwind Styling Guide](./docs/TAILWIND_STYLING_EXAMPLES.md) for examples. + +#### Option 2: Custom CSS ```css -:root { - --agrc-primary: #2563eb; - --agrc-border: #e5e7eb; - --agrc-hover: #f3f4f6; +/* Your custom styles */ +.my-dropdown { + background: white; + border: 1px solid #e5e7eb; + border-radius: 6px; } + +.my-input { + width: 100%; + padding: 0.5rem; + border: 1px solid #d1d5db; +} +``` + +```tsx + +``` + +#### Option 3: CSS-in-JS + +```tsx +import styled from "styled-components"; + +// Style the components with your CSS-in-JS solution +; ``` +## ๐ŸŽจ Styling Philosophy + +We ship **zero CSS** - you have complete control: + +1. **Headless by Design**: No built-in styles or opinions +2. **Built on Headless UI**: Accessible, keyboard-navigable components +3. **Framework Agnostic**: Use CSS, Sass, Tailwind, CSS-in-JS, etc. +4. **Demo Uses Tailwind**: Shows one way to style components + +This approach ensures: + +- No style conflicts with your design system +- Smaller bundle size (no unused CSS) +- Complete customization freedom +- Built-in accessibility features + ## ๐Ÿงช Testing Components are thoroughly tested with: diff --git a/V2_HEADLESS_MIGRATION_PLAN.md b/V2_HEADLESS_MIGRATION_PLAN.md new file mode 100644 index 0000000..81373e8 --- /dev/null +++ b/V2_HEADLESS_MIGRATION_PLAN.md @@ -0,0 +1,352 @@ +# V2.0 Headless Components Migration Plan + +## Current State Analysis + +### CSS Files in Components (2,491 lines total) + +1. **QuickFilterDropdown** - 642 lines (QuickFilterDropdown.module.css) +2. **FilterPresetManagerV2** - 464 lines (FilterPresetManager.module.css) +3. **FilterPresetActions** - 378 lines (FilterPresetActions.module.css) +4. **PresetSelector** - 214 lines (components/PresetSelector.module.css) +5. **DateInputs** - 194 lines (components/DateInputs.module.css) +6. **SavedFiltersDropdown** - 167 lines (SavedFiltersDropdown.module.css) +7. **ActiveFilters** - 107 lines (ActiveFilters.module.css) +8. **FilterActions** - 79 lines (components/FilterActions.module.css) +9. **FilterModeToggle** - 76 lines (components/FilterModeToggle.module.css) +10. **PresetMenu** - 72 lines (components/PresetMenu.module.css) +11. **FilterTypeSelector** - 63 lines (components/FilterTypeSelector.module.css) +12. **DateFilter** - 35 lines (DateFilter.module.css) + +### Additional Styles in src/index.css + +- `.ag-grid-date-filter` classes with Tailwind utilities +- Toggle buttons, inputs, filter buttons, error messages +- ~43 lines of component-specific styles + +### Total CSS to Remove: ~2,534 lines + +## Components Affected + +1. **QuickFilterDropdown** - Dropdown for quick filter presets +2. **DateFilter/RelativeDateFilter** - Date filtering components +3. **ActiveFilters** - Display of active filters +4. **FilterPresetManagerV2** - Preset management +5. **FilterPresetActions** - Preset action buttons +6. **SavedFiltersDropdown** - Saved filters dropdown +7. All sub-components of the above + +## Migration Strategy + +### Phase 1: API Design (Week 1) + +- Design consistent API pattern for all components +- Choose between: + - Option A: `classNames` object prop + - Option B: Render props for each element + - Option C: Compound components with context + - Option D: Hybrid approach + +### Phase 2: Component Refactoring (Weeks 2-3) + +- Start with leaf components (smallest first) +- Work up to complex components +- Maintain backward compatibility with deprecation warnings + +### Phase 3: Demo Migration (Week 4) + +- Move all CSS to demo application +- Create example implementations for: + - Tailwind CSS + - CSS Modules + - Styled Components + - Plain CSS + +### Phase 4: Documentation (Week 5) + +- Migration guide with before/after examples +- Styling cookbook +- Best practices guide +- Update all component docs + +### Phase 5: Testing & Release (Week 6) + +- Update all tests +- E2E testing +- Beta release +- Gather feedback + +## Proposed API Design + +### Option A: ClassNames Object (Recommended) + +```tsx +interface QuickFilterDropdownProps { + // ... other props + classNames?: { + container?: string; + trigger?: string; + triggerActive?: string; + dropdown?: string; + dropdownOpen?: string; + searchInput?: string; + optionsList?: string; + option?: string; + optionSelected?: string; + optionHighlighted?: string; + emptyState?: string; + divider?: string; + // ... etc + }; +} +``` + +**Pros:** + +- Easy to implement +- Familiar pattern (used by React Select, etc.) +- Good TypeScript support +- Allows partial styling + +**Cons:** + +- Can get verbose for complex components +- Limited flexibility for custom structure + +### Option B: Render Props + +```tsx +interface QuickFilterDropdownProps { + // ... other props + renderTrigger?: (props: TriggerProps) => ReactNode; + renderOption?: (props: OptionProps) => ReactNode; + renderEmptyState?: () => ReactNode; + // ... etc +} +``` + +**Pros:** + +- Maximum flexibility +- Full control over structure +- Can optimize rendering + +**Cons:** + +- More complex to implement +- Steeper learning curve +- Can break component logic if misused + +### Option C: Compound Components + +```tsx + + Select Filter + + Option 1 + + +``` + +**Pros:** + +- Most flexible +- Composable +- Natural React patterns + +**Cons:** + +- Complete rewrite needed +- Breaking change for all users +- More complex implementation + +### Option D: Hybrid Approach + +- Use `classNames` by default +- Add render props for advanced customization +- Provide unstyled primitive components + +## Implementation Order + +1. **DateFilter Components** (Simplest) + + - FilterModeToggle + - FilterTypeSelector + - FilterActions + - DateInputs + - DateFilter (parent) + +2. **ActiveFilters** (Medium complexity) + + - Single component + - Clear styling patterns + +3. **QuickFilterDropdown** (Complex) + + - Most CSS to remove + - Portal rendering + - Keyboard navigation + +4. **FilterPreset Components** (Most complex) + - FilterPresetManagerV2 + - FilterPresetActions + - SavedFiltersDropdown + - Multiple sub-components + +## Breaking Changes + +### Before (v1.x) + +```tsx +import { QuickFilterDropdown } from "ag-grid-react-components"; +// Styles included automatically + +; +``` + +### After (v2.0) + +```tsx +import { QuickFilterDropdown } from "ag-grid-react-components"; +import "my-app/styles/quick-filter-dropdown.css"; // User provides styles + +; +``` + +## Migration Path + +### 1. Deprecation Warnings (v1.9) + +- Add console warnings when CSS is used +- Provide migration guide link +- Keep existing CSS but mark deprecated + +### 2. Opt-in Headless (v1.10) + +- Add `unstyled` prop to components +- When true, skip CSS module imports +- Allow gradual migration + +### 3. Full Headless (v2.0) + +- Remove all CSS files +- Remove style imports +- Require className props + +## Style Migration Examples + +### Example: Migrating QuickFilterDropdown + +#### Current (with CSS modules) + +```tsx +// No styling needed - included automatically + +``` + +#### Tailwind Migration + +```tsx + +``` + +#### CSS Modules Migration + +```css +/* QuickFilter.module.css */ +.trigger { + display: inline-flex; + align-items: center; + gap: 0.5rem; + padding: 0.5rem 1rem; + background: white; + border: 1px solid #e5e7eb; + border-radius: 0.375rem; +} + +.trigger:hover { + background: #f9fafb; +} +``` + +```tsx +import styles from "./QuickFilter.module.css"; + +; +``` + +## Success Criteria + +1. **Zero CSS in components** - No .css files, no style imports +2. **Full user control** - Users can style every element +3. **TypeScript support** - Full typing for className props +4. **Documentation** - Complete migration guide +5. **Examples** - Working demos with multiple styling approaches +6. **Performance** - Smaller bundle size +7. **Accessibility** - Maintain ARIA attributes + +## Risks and Mitigations + +### Risk 1: User Frustration + +**Mitigation:** + +- Provide complete style templates +- Create interactive migration tool +- Offer community support + +### Risk 2: Breaking Existing Apps + +**Mitigation:** + +- Clear deprecation path +- Codemod for automatic migration +- Extended v1.x support + +### Risk 3: Increased Complexity + +**Mitigation:** + +- Excellent documentation +- Video tutorials +- Common patterns library + +## Timeline + +- **Week 1**: API design and approval +- **Week 2-3**: Component implementation +- **Week 4**: Demo migration +- **Week 5**: Documentation +- **Week 6**: Testing and beta +- **Week 7-8**: Community feedback +- **Week 9**: v2.0 release + +## Next Steps + +1. Review and approve API design +2. Create proof of concept with DateFilter +3. Get community feedback +4. Begin implementation diff --git a/api/data-generator.js b/api/data-generator.js index c3d01b5..91b4a8d 100644 --- a/api/data-generator.js +++ b/api/data-generator.js @@ -91,6 +91,60 @@ function getFullDataset() { return cachedData; } +// Helper function to convert relative date expressions to actual dates +function parseRelativeDateExpression(expression) { + if (!expression || typeof expression !== "string") return null; + + const today = new Date(); + today.setHours(0, 0, 0, 0); + + // Handle relative expressions + if (expression === "Today") { + return today; + } + + if (expression === "StartOfMonth") { + return new Date(today.getFullYear(), today.getMonth(), 1); + } + + if (expression === "EndOfMonth") { + return new Date(today.getFullYear(), today.getMonth() + 1, 0); + } + + if (expression === "StartOfYear") { + return new Date(today.getFullYear(), 0, 1); + } + + if (expression === "EndOfYear") { + return new Date(today.getFullYear(), 11, 31); + } + + // Handle Today+X or Today-X format + const todayPlusMinusMatch = expression.match(/^Today([+-])(\d+)([dmy])$/); + if (todayPlusMinusMatch) { + const [, operator, value, unit] = todayPlusMinusMatch; + const date = new Date(today); + const num = parseInt(value, 10) * (operator === "-" ? -1 : 1); + + switch (unit) { + case "d": + date.setDate(date.getDate() + num); + break; + case "m": + date.setMonth(date.getMonth() + num); + break; + case "y": + date.setFullYear(date.getFullYear() + num); + break; + } + return date; + } + + // If not a relative expression, try to parse as date + const parsed = new Date(expression); + return isNaN(parsed.getTime()) ? null : parsed; +} + // Apply filters to the dataset function applyFilters(data, filterModel) { if (!filterModel || Object.keys(filterModel).length === 0) { @@ -107,26 +161,39 @@ function applyFilters(data, filterModel) { ) { const dateValue = new Date(row[field]); + // Check if we have relative expressions + let dateFrom = filter.dateFrom; + let dateTo = filter.dateTo; + + if (filter.expressionFrom) { + dateFrom = parseRelativeDateExpression(filter.expressionFrom); + } else if (dateFrom) { + dateFrom = new Date(dateFrom); + } + + if (filter.expressionTo) { + dateTo = parseRelativeDateExpression(filter.expressionTo); + } else if (dateTo) { + dateTo = new Date(dateTo); + } + if (filter.type === "equals") { - const filterDate = new Date(filter.dateFrom); - if (dateValue.toDateString() !== filterDate.toDateString()) + if (!dateFrom) return false; + if (dateValue.toDateString() !== dateFrom.toDateString()) return false; } else if (filter.type === "notEqual") { - const filterDate = new Date(filter.dateFrom); - if (dateValue.toDateString() === filterDate.toDateString()) + if (!dateFrom) return false; + if (dateValue.toDateString() === dateFrom.toDateString()) return false; } else if (filter.type === "lessThan" || filter.type === "before") { - const filterDate = new Date(filter.dateFrom); - if (dateValue >= filterDate) return false; + if (!dateFrom) return false; + if (dateValue >= dateFrom) return false; } else if (filter.type === "greaterThan" || filter.type === "after") { - const filterDate = new Date(filter.dateFrom); - if (dateValue <= filterDate) return false; + if (!dateFrom) return false; + if (dateValue <= dateFrom) return false; } else if (filter.type === "inRange") { - const startDate = filter.dateFrom ? new Date(filter.dateFrom) : null; - const endDate = filter.dateTo ? new Date(filter.dateTo) : null; - - if (startDate && dateValue < startDate) return false; - if (endDate && dateValue > endDate) return false; + if (dateFrom && dateValue < dateFrom) return false; + if (dateTo && dateValue > dateTo) return false; } } // Handle text filters diff --git a/demo-screenshot.png b/demo-screenshot.png deleted file mode 100644 index 977c73d..0000000 Binary files a/demo-screenshot.png and /dev/null differ diff --git a/docs/COMPONENT_MAPPING.md b/docs/COMPONENT_MAPPING.md new file mode 100644 index 0000000..af787f6 --- /dev/null +++ b/docs/COMPONENT_MAPPING.md @@ -0,0 +1,245 @@ +# Component Mapping & Usage Guide + +## All Components Overview + +| Component | Purpose | Current Headless UI | Recommended Headless UI | Used in Demo | +| ----------------------- | ----------------------------- | ------------------------ | ----------------------------------------------- | ----------------------------------------- | +| **ActiveFilters** | Display active filter pills | None | `Disclosure` (for grouping) | โœ… Client & Server demos | +| **CategorySelector** | Dropdown with search & create | `Combobox` โœ… | `Combobox` | โœ… In SaveViewModal & ViewManagementModal | +| **DateFilter** | AG Grid date filter | None | `RadioGroup`/`Tab` for mode, `Field` for inputs | โœ… Column definitions | +| **RelativeDateFilter** | Relative date expressions | None | None (AG Grid specific) | โŒ Legacy component | +| **QuickFilterDropdown** | Filter preset dropdown | None | `Listbox` | โœ… Client & Server demos | +| **SavedViewsDropdown** | Saved views selector | Orchestrator | `Popover` for panel | โœ… Client & Server demos | +| **ViewManagementMenu** | Three-dots menu | `Menu` โœ… | `Menu` | โœ… Via SavedViewsDropdown | +| **ViewManagementModal** | Manage views dialog | `Dialog` โœ… | `Dialog` | โœ… Via ViewManagementMenu | +| **SaveViewModal** | Save view dialog | `Dialog` + `Fieldset` โœ… | `Dialog` + `Fieldset` | โœ… Via ViewManagementMenu | +| **GridResetButton** | Reset grid button | None | `Dialog` for confirmation | โœ… Via ViewManagementMenu | +| **FilterPresetManager** | Manage filter presets | None | `Menu` for dropdowns | โœ… In demo toolbar | + +## Detailed Component Mapping + +### 1. ActiveFilters + +- **What it does**: Shows removable filter pills +- **Headless UI**: Not needed (simple display component) +- **Demo usage**: + ```tsx + // In components-showcase-complete.tsx + + ``` + +### 2. CategorySelector + +- **What it does**: Searchable dropdown with "create new" option +- **Headless UI**: `Combobox` (perfect fit) +- **Demo usage**: + ```tsx + // In SaveViewModal + + ``` + +### 3. DateFilter + +- **What it does**: AG Grid custom date filter +- **Headless UI**: None (too AG Grid specific) +- **Demo usage**: + ```tsx + // In column definitions + { + field: 'dateCreated', + filter: 'agDateColumnFilter', + filterParams: { + filterComponent: AGGridFilterWrapper + } + } + ``` + +### 4. QuickFilterDropdown + +- **What it does**: Dropdown for filter presets +- **Headless UI**: `Listbox` or `Combobox` +- **Demo usage**: + ```tsx + + ``` + +### 5. SavedViewsDropdown + +- **What it does**: Orchestrates view management components +- **Headless UI**: N/A (uses other components) +- **Demo usage**: + ```tsx + + ``` + +### 6. ViewManagementMenu + +- **What it does**: Dropdown menu with actions +- **Headless UI**: `Menu` (perfect fit) +- **Demo usage**: Used internally by SavedViewsDropdown + +### 7. ViewManagementModal + +- **What it does**: Modal to manage saved views +- **Headless UI**: `Dialog` (perfect fit) +- **Demo usage**: Opened via ViewManagementMenu + +### 8. SaveViewModal + +- **What it does**: Modal to save current view +- **Headless UI**: `Dialog` (perfect fit) +- **Demo usage**: Opened via ViewManagementMenu + +### 9. GridResetButton + +- **What it does**: Button to reset grid state +- **Headless UI**: None (simple button) +- **Demo usage**: Action in ViewManagementMenu + +## Components That Should Use Headless UI + +### โœ… Definitely Convert + +1. **CategorySelector** โ†’ `Combobox` +2. **ViewManagementMenu** โ†’ `Menu` +3. **ViewManagementModal** โ†’ `Dialog` +4. **SaveViewModal** โ†’ `Dialog` + +### ๐Ÿค” Maybe Convert + +1. **QuickFilterDropdown** โ†’ `Combobox` or `Listbox` + - Has AG Grid specific logic + - Could benefit from better accessibility + +### โŒ Keep Custom + +1. **ActiveFilters** - Simple display component +2. **DateFilter** - AG Grid filter component +3. **SavedViewsDropdown** - Orchestrator component +4. **GridResetButton** - Simple button + +## Demo Architecture + +``` +components-showcase-complete.tsx +โ”œโ”€โ”€ Uses TailwindStyledComponents +โ”‚ โ”œโ”€โ”€ QuickFilterDropdown +โ”‚ โ”œโ”€โ”€ ActiveFilters +โ”‚ โ””โ”€โ”€ SavedViewsDropdown +โ”‚ โ”œโ”€โ”€ ViewManagementMenu +โ”‚ โ”œโ”€โ”€ ViewManagementModal +โ”‚ โ”‚ โ””โ”€โ”€ CategorySelector +โ”‚ โ””โ”€โ”€ SaveViewModal +โ”‚ โ””โ”€โ”€ CategorySelector +โ””โ”€โ”€ Grid Configuration + โ””โ”€โ”€ DateFilter (via AGGridFilterWrapper) +``` + +## Tailwind CSS in Demo + +The demo applies Tailwind styles via: + +1. **CSS @apply directives** in `tailwind-overrides.css` +2. **Direct Tailwind classes** on wrapper components +3. **Headless components** remain unstyled + +This showcases that users can: + +- Use any CSS framework +- Apply Tailwind utilities +- Keep components headless + +## Headless UI Components Usage + +### Currently Implemented + +1. **SaveViewModal with Fieldset** โœ… + + ```tsx + import { Dialog, Fieldset, Field, Label, Input, Textarea, Legend } from "@headlessui/react"; + ``` + + - Uses semantic form structure with Fieldset + - Better accessibility for form groups + - Proper field associations + +2. **CategorySelector with Combobox** โœ… + + ```tsx + import { Combobox, Transition } from "@headlessui/react"; + ``` + + - Searchable dropdown with create option + - Built-in keyboard navigation + - Automatic filtering + +3. **ViewManagementMenu with Menu** โœ… + ```tsx + import { Menu, Transition } from "@headlessui/react"; + ``` + - Accessible dropdown menu + - Keyboard navigation + - Focus management + +### Recommended Implementations + +#### High Priority + +1. **QuickFilterDropdown โ†’ Listbox** + - Current: Custom dropdown with manual focus management + - Benefit: Built-in keyboard navigation and ARIA support +2. **DateFilter Mode Toggle โ†’ RadioGroup** + + - Current: Custom toggle buttons + - Benefit: Proper radio semantics and keyboard navigation + +3. **SavedViewsDropdown Panel โ†’ Popover** + - Current: Custom portal implementation + - Benefit: Better positioning and focus trap + +#### Medium Priority + +4. **Date Range Inputs โ†’ Field Components** + + ```tsx + + + + Select the start date for filtering + + ``` + +5. **GridResetButton Confirmation โ†’ Dialog** + - Replace `window.confirm()` with styled Dialog + - Better UX and consistent styling + +#### Low Priority + +6. **ActiveFilters โ†’ Disclosure** + + - Add collapsible sections for grouped filters + - Better organization with many active filters + +7. **Filter Type Selector โ†’ Listbox** + - Replace native ` setFilterType(e.target.value as DateFilterType)} + className={className} + data-component="date-filter-type-selector" + data-testid="date-filter-type-selector" + {...props} + > + + + + + + + ); +}); + +TypeSelector.displayName = "DateFilter.TypeSelector"; + +// Mode toggle container +export const ModeToggle = forwardRef< + HTMLDivElement, + React.HTMLAttributes +>(({ children, ...props }, ref) => { + return ( +
+ {children} +
+ ); +}); + +ModeToggle.displayName = "DateFilter.ModeToggle"; + +// Mode button +interface ModeButtonProps + extends React.ButtonHTMLAttributes { + mode: DateFilterMode; +} + +export const ModeButton = forwardRef( + ({ mode, children, className, ...props }, ref) => { + const { mode: currentMode, setMode } = useDateFilterContext(); + const isActive = currentMode === mode; + + return ( + + ); + }, +); + +ModeButton.displayName = "DateFilter.ModeButton"; + +// Relative section container +export const RelativeSection = forwardRef< + HTMLDivElement, + React.HTMLAttributes +>(({ children, style, ...props }, ref) => { + const { mode } = useDateFilterContext(); + const isVisible = mode === "relative"; + + return ( +
+ {children} +
+ ); +}); + +RelativeSection.displayName = "DateFilter.RelativeSection"; + +// Relative input +export const RelativeInput = forwardRef< + HTMLInputElement, + React.InputHTMLAttributes +>(({ className, onChange, ...props }, ref) => { + const { relativeValue, setRelativeValue, errorMessage } = + useDateFilterContext(); + const hasError = !!errorMessage && relativeValue !== ""; + + return ( + { + setRelativeValue(e.target.value); + onChange?.(e); + }} + aria-invalid={hasError} + data-invalid={hasError} + className={className} + data-component="date-filter-expression-input" + data-testid="date-filter-relative-input" + {...props} + /> + ); +}); + +RelativeInput.displayName = "DateFilter.RelativeInput"; + +// Absolute section container +export const AbsoluteSection = forwardRef< + HTMLDivElement, + React.HTMLAttributes +>(({ children, style, ...props }, ref) => { + const { mode, filterType } = useDateFilterContext(); + const isVisible = mode === "absolute"; + const showEndDate = filterType === "inRange"; + + return ( +
+
{children}
+
+ ); +}); + +AbsoluteSection.displayName = "DateFilter.AbsoluteSection"; + +// Start date input +export const StartDateInput = forwardRef< + HTMLInputElement, + React.InputHTMLAttributes +>(({ className, onChange, ...props }, ref) => { + const { startDate, setStartDate } = useDateFilterContext(); + + return ( + { + const date = e.target.value ? new Date(e.target.value) : null; + setStartDate(date); + onChange?.(e); + }} + className={className} + data-component="date-filter-date-input" + data-testid="date-filter-start-date" + {...props} + /> + ); +}); + +StartDateInput.displayName = "DateFilter.StartDateInput"; + +// End date input +export const EndDateInput = forwardRef< + HTMLDivElement, + React.HTMLAttributes +>(({ className, children, style, ...props }, ref) => { + const { endDate, setEndDate, filterType } = useDateFilterContext(); + const isVisible = filterType === "inRange"; + + if (!isVisible) return null; + + return ( +
+ { + const date = e.target.value ? new Date(e.target.value) : null; + setEndDate(date); + }} + className={className} + data-component="date-filter-date-input" + data-testid="date-filter-end-date" + /> +
+ ); +}); + +EndDateInput.displayName = "DateFilter.EndDateInput"; + +// Help text +export const HelpText = forwardRef< + HTMLParagraphElement, + React.HTMLAttributes +>(({ children, ...props }, ref) => { + const { mode, errorMessage } = useDateFilterContext(); + + if (!children) return null; + + return ( +

+ {children} +

+ ); +}); + +HelpText.displayName = "DateFilter.HelpText"; + +// Error message +export const ErrorMessage = forwardRef< + HTMLParagraphElement, + React.HTMLAttributes +>(({ children, ...props }, ref) => { + const { errorMessage, relativeValue, mode } = useDateFilterContext(); + + if (!errorMessage && (!relativeValue || mode !== "relative")) return null; + + return ( +

+ {children || errorMessage || "Invalid date format"} +

+ ); +}); + +ErrorMessage.displayName = "DateFilter.ErrorMessage"; + +// Actions container +export const Actions = forwardRef< + HTMLDivElement, + React.HTMLAttributes +>(({ children, ...props }, ref) => { + return ( +
+ {children} +
+ ); +}); + +Actions.displayName = "DateFilter.Actions"; + +// Apply button +export const ApplyButton = forwardRef< + HTMLButtonElement, + React.ButtonHTMLAttributes +>(({ children, onClick, disabled, ...props }, ref) => { + const { applyFilter, isValid, hasChanges } = useDateFilterContext(); + const isDisabled = disabled || !isValid || !hasChanges; + + return ( + + ); +}); + +ApplyButton.displayName = "DateFilter.ApplyButton"; + +// Reset button +export const ResetButton = forwardRef< + HTMLButtonElement, + React.ButtonHTMLAttributes +>(({ children, onClick, ...props }, ref) => { + const { resetFilter } = useDateFilterContext(); + + return ( + + ); +}); + +ResetButton.displayName = "DateFilter.ResetButton"; diff --git a/src/components/DateFilter/context.tsx b/src/components/DateFilter/context.tsx new file mode 100644 index 0000000..1f53a17 --- /dev/null +++ b/src/components/DateFilter/context.tsx @@ -0,0 +1,208 @@ +import React, { + createContext, + useContext, + useState, + useCallback, + useMemo, +} from "react"; +import { DateFilterModel, DateFilterType, DateFilterMode } from "../interfaces"; +import { parseRelativeDate } from "./utils"; + +export interface DateFilterContextValue { + // Model state + model: DateFilterModel | null; + setModel: (model: DateFilterModel | null) => void; + + // UI state + mode: DateFilterMode; + setMode: (mode: DateFilterMode) => void; + filterType: DateFilterType; + setFilterType: (type: DateFilterType) => void; + relativeValue: string; + setRelativeValue: (value: string) => void; + startDate: Date | null; + setStartDate: (date: Date | null) => void; + endDate: Date | null; + setEndDate: (date: Date | null) => void; + + // Validation state + isValid: boolean; + errorMessage: string; + + // Actions + applyFilter: () => void; + resetFilter: () => void; + hasChanges: boolean; + + // Config + dateParser?: (value: string) => Date | null; +} + +const DateFilterContext = createContext( + undefined, +); + +export function useDateFilterContext() { + const context = useContext(DateFilterContext); + if (!context) { + throw new Error( + "useDateFilterContext must be used within DateFilterProvider", + ); + } + return context; +} + +interface DateFilterProviderProps { + children: React.ReactNode; + model: DateFilterModel | null; + setModel: (model: DateFilterModel | null) => void; + applyFilter: () => void; + resetFilter: () => void; + dateParser?: (value: string) => Date | null; +} + +export function DateFilterProvider({ + children, + model, + setModel, + applyFilter: onApplyFilter, + resetFilter: onResetFilter, + dateParser, +}: DateFilterProviderProps) { + // Initialize state from model + const [mode, setMode] = useState(() => + model?.dateFrom && model.dateFrom.includes("-") ? "relative" : "absolute", + ); + + const [filterType, setFilterType] = useState( + () => model?.filterType || "equals", + ); + + const [relativeValue, setRelativeValue] = useState(() => + model?.filterType === "inRange" && model?.dateFrom?.includes("-") + ? model.dateFrom + : "", + ); + + const [startDate, setStartDate] = useState(() => { + if (!model?.dateFrom || model.dateFrom.includes("-")) return null; + const date = new Date(model.dateFrom); + return isNaN(date.getTime()) ? null : date; + }); + + const [endDate, setEndDate] = useState(() => { + if (!model?.dateTo) return null; + const date = new Date(model.dateTo); + return isNaN(date.getTime()) ? null : date; + }); + + const [errorMessage, setErrorMessage] = useState(""); + + // Validation + const isValid = useMemo(() => { + if (mode === "relative") { + if (!relativeValue) return false; + const parsed = parseRelativeDate(relativeValue); + return parsed !== null; + } else { + if (filterType === "inRange") { + return startDate !== null && endDate !== null; + } + return startDate !== null; + } + }, [mode, relativeValue, filterType, startDate, endDate]); + + // Check if there are changes + const hasChanges = useMemo(() => { + if (!model) return isValid; + + if (filterType !== model.filterType) return true; + + if (mode === "relative") { + return relativeValue !== model.dateFrom; + } else { + const modelStartDate = model.dateFrom ? new Date(model.dateFrom) : null; + const modelEndDate = model.dateTo ? new Date(model.dateTo) : null; + + if (filterType === "inRange") { + return ( + startDate?.getTime() !== modelStartDate?.getTime() || + endDate?.getTime() !== modelEndDate?.getTime() + ); + } + return startDate?.getTime() !== modelStartDate?.getTime(); + } + }, [model, mode, filterType, relativeValue, startDate, endDate, isValid]); + + // Apply filter + const applyFilter = useCallback(() => { + if (!isValid) return; + + let newModel: DateFilterModel; + + if (mode === "relative") { + newModel = { + filterType, + dateFrom: relativeValue, + dateTo: filterType === "inRange" ? relativeValue : undefined, + }; + } else { + newModel = { + filterType, + dateFrom: startDate?.toISOString() || "", + dateTo: filterType === "inRange" ? endDate?.toISOString() : undefined, + }; + } + + setModel(newModel); + onApplyFilter(); + }, [ + isValid, + mode, + filterType, + relativeValue, + startDate, + endDate, + setModel, + onApplyFilter, + ]); + + // Reset filter + const resetFilter = useCallback(() => { + setMode("relative"); + setFilterType("equals"); + setRelativeValue(""); + setStartDate(null); + setEndDate(null); + setErrorMessage(""); + setModel(null); + onResetFilter(); + }, [setModel, onResetFilter]); + + const contextValue: DateFilterContextValue = { + model, + setModel, + mode, + setMode, + filterType, + setFilterType, + relativeValue, + setRelativeValue, + startDate, + setStartDate, + endDate, + setEndDate, + isValid, + errorMessage, + applyFilter, + resetFilter, + hasChanges, + dateParser, + }; + + return ( + + {children} + + ); +} diff --git a/src/components/DateFilter/hooks/useGridFilter.ts b/src/components/DateFilter/hooks/useGridFilter.ts new file mode 100644 index 0000000..def7a2e --- /dev/null +++ b/src/components/DateFilter/hooks/useGridFilter.ts @@ -0,0 +1,37 @@ +import { useState, useCallback, useEffect } from "react"; +import { IFilterParams } from "ag-grid-community"; +import { DateFilterModel } from "../../interfaces"; + +export function useGridFilter(filterParams: IFilterParams) { + const [model, setModel] = useState(null); + + const applyFilter = useCallback(() => { + if (filterParams.filterChangedCallback) { + filterParams.filterChangedCallback(); + } + }, [filterParams]); + + const resetFilter = useCallback(() => { + setModel(null); + applyFilter(); + }, [applyFilter]); + + const isFilterActive = useCallback(() => { + return model !== null && model.dateFrom !== null; + }, [model]); + + // Notify AG Grid when model changes + useEffect(() => { + if (filterParams.onModelChange) { + filterParams.onModelChange(model); + } + }, [model, filterParams]); + + return { + model, + setModel, + applyFilter, + resetFilter, + isFilterActive, + }; +} diff --git a/src/components/DateFilter/index.tsx b/src/components/DateFilter/index.tsx index 732d34a..e4a000d 100644 --- a/src/components/DateFilter/index.tsx +++ b/src/components/DateFilter/index.tsx @@ -1,524 +1,184 @@ -import React, { useCallback, useMemo } from "react"; -import { useGridFilter } from "ag-grid-react"; -import { IRowNode, IFilter } from "ag-grid-community"; -import { format } from "date-fns"; - -import { DateFilterParams, DateFilterModel } from "./types"; -import { logger } from "../../utils/logger"; - -import { - FilterModeToggle, - FilterTypeSelector, - TextDateInput, - RelativeExpressionInput, - FilterActions, -} from "./components"; - -import { useFilterState, useFilterValidation } from "./hooks"; -import { useDebouncedValidation } from "./hooks/useDebouncedValidation"; -import { withErrorBoundary, useErrorHandler } from "./utils/withErrorBoundary"; - -import styles from "./DateFilter.module.css"; - -const DEFAULT_DATE_FORMAT = "yyyy-MM-dd"; - -const DateFilterComponent = React.forwardRef( - (props, ref) => { - const dateFormat = props.dateFormat || DEFAULT_DATE_FORMAT; - const { handleError } = useErrorHandler(); - const filterRef = React.useRef(null); - - // Destructure props for useCallback dependencies - const { - filterChangedCallback, - onModelChange, - dateParser, - getValue, - rangeInclusive, - model: initialModel, - defaultMode, - } = props; - - // Use custom hooks for state management - const filterState = useFilterState(initialModel, defaultMode); - - // Filter type changes are now properly managed - const validation = useFilterValidation({ - filterType: filterState.filterType, - filterMode: filterState.filterMode, - absoluteDateFrom: filterState.absoluteDateFrom, - absoluteDateTo: filterState.absoluteDateTo, - expressionFrom: filterState.expressionFrom, - expressionTo: filterState.expressionTo, - fromExpressionValid: filterState.fromExpressionValid, - toExpressionValid: filterState.toExpressionValid, - }); - - // Use debounced validation for better performance (300ms delay) - useDebouncedValidation({ - expressionFrom: filterState.expressionFrom, - expressionTo: filterState.expressionTo, - filterMode: filterState.filterMode, - onFromValidityChange: filterState.setFromExpressionValid, - onToValidityChange: filterState.setToExpressionValid, - onToErrorChange: filterState.setToExpressionError, - validateToExpression: validation.validateToExpression, - debounceDelay: 300, // 300ms debounce for optimal UX - }); - - // Parse cell values to date - const parseValue = useCallback( - (value: unknown): Date | null => { - if (dateParser) { - return dateParser(value); - } - - if (value instanceof Date) { - return value; - } - - if (typeof value === "string" || typeof value === "number") { - const date = new Date(value); - return isNaN(date.getTime()) ? null : date; - } - - return null; - }, - [dateParser], - ); - - // Build current filter model - const currentModel = useMemo((): DateFilterModel | null => { - if (!validation.isFilterValid) return null; - - const model: DateFilterModel = { - type: filterState.filterType, - mode: filterState.filterMode, - }; - - if (filterState.filterMode === "absolute") { - model.dateFrom = filterState.absoluteDateFrom; - if (filterState.filterType === "inRange") { - model.dateTo = filterState.absoluteDateTo; - } - } else { - model.expressionFrom = filterState.expressionFrom; - if (filterState.filterType === "inRange") { - model.expressionTo = filterState.expressionTo; - } - } - - // Add inclusivity settings - prefer state values, then model values, then prop defaults - model.fromInclusive = - filterState.fromInclusive ?? rangeInclusive?.from ?? false; - model.toInclusive = - filterState.toInclusive ?? rangeInclusive?.to ?? false; - - return model; - }, [ - validation.isFilterValid, - filterState.filterType, - filterState.filterMode, - filterState.absoluteDateFrom, - filterState.absoluteDateTo, - filterState.expressionFrom, - filterState.expressionTo, - filterState.fromInclusive, - filterState.toInclusive, - rangeInclusive?.from, - rangeInclusive?.to, - ]); - - // Filter implementation - const doesFilterPass = useCallback( - ({ node }: { node: IRowNode }) => { - if (!validation.isFilterValid || !currentModel) { - return true; - } - - const cellValue = getValue(node); - const cellDate = parseValue(cellValue); - - if (!cellDate) { - return false; - } - - // Normalize dates for comparison (remove time component) - const normalizedCellDate = new Date(cellDate); - normalizedCellDate.setHours(0, 0, 0, 0); - - let normalizedDateFrom = null; - if (validation.effectiveDateFrom) { - normalizedDateFrom = new Date(validation.effectiveDateFrom); - normalizedDateFrom.setHours(0, 0, 0, 0); - } - - let normalizedDateTo = null; - if (validation.effectiveDateTo) { - normalizedDateTo = new Date(validation.effectiveDateTo); - normalizedDateTo.setHours(0, 0, 0, 0); - } - - // Get inclusivity settings from current model (which already includes filter state and prop defaults) - const fromInclusive = currentModel?.fromInclusive ?? false; - const toInclusive = currentModel?.toInclusive ?? false; - - switch (filterState.filterType) { +import React, { forwardRef, useImperativeHandle } from "react"; +import { IDoesFilterPassParams, IFilterParams } from "ag-grid-community"; +import { DateFilterProvider } from "./context"; +import { DateFilterModel } from "../interfaces"; +import * as Components from "./components"; +import { useGridFilter } from "./hooks/useGridFilter"; + +export interface DateFilterProps extends IFilterParams { + children?: React.ReactNode; + dateParser?: (value: string) => Date | null; + className?: string; +} + +export interface DateFilterCompound { + (props: DateFilterProps): React.ReactElement; + Root: typeof Components.Root; + TypeSelector: typeof Components.TypeSelector; + ModeToggle: typeof Components.ModeToggle; + ModeButton: typeof Components.ModeButton; + RelativeSection: typeof Components.RelativeSection; + RelativeInput: typeof Components.RelativeInput; + AbsoluteSection: typeof Components.AbsoluteSection; + StartDateInput: typeof Components.StartDateInput; + EndDateInput: typeof Components.EndDateInput; + HelpText: typeof Components.HelpText; + ErrorMessage: typeof Components.ErrorMessage; + Actions: typeof Components.Actions; + ApplyButton: typeof Components.ApplyButton; + ResetButton: typeof Components.ResetButton; +} + +const DateFilterComponent = forwardRef((props, ref) => { + const { children, ...filterParams } = props; + + // Use the AG Grid filter hook + const { model, setModel, applyFilter, resetFilter, isFilterActive } = + useGridFilter(filterParams); + + // Implement AG Grid filter interface + useImperativeHandle( + ref, + () => ({ + isFilterActive: () => isFilterActive(), + + doesFilterPass: (params: IDoesFilterPassParams) => { + if (!isFilterActive()) return true; + + const value = filterParams.getValue(params.node); + if (value == null) return false; + + const date = value instanceof Date ? value : new Date(value); + if (isNaN(date.getTime())) return false; + + const filterModel = model as DateFilterModel; + + switch (filterModel.filterType) { case "equals": - return normalizedDateFrom - ? normalizedCellDate.getTime() === normalizedDateFrom.getTime() + return filterModel.dateFrom + ? date.toDateString() === + new Date(filterModel.dateFrom).toDateString() : false; case "notEqual": - return normalizedDateFrom - ? normalizedCellDate.getTime() !== normalizedDateFrom.getTime() + return filterModel.dateFrom + ? date.toDateString() !== + new Date(filterModel.dateFrom).toDateString() : true; - case "after": - if (!normalizedDateFrom) return false; - return fromInclusive - ? normalizedCellDate.getTime() >= normalizedDateFrom.getTime() - : normalizedCellDate.getTime() > normalizedDateFrom.getTime(); case "before": - if (!normalizedDateFrom) return false; - return toInclusive - ? normalizedCellDate.getTime() <= normalizedDateFrom.getTime() - : normalizedCellDate.getTime() < normalizedDateFrom.getTime(); - case "inRange": { - // Handle open-ended ranges - if (!normalizedDateFrom && !normalizedDateTo) return false; - - // Only start date (open-ended to future) - if (normalizedDateFrom && !normalizedDateTo) { - return fromInclusive - ? normalizedCellDate.getTime() >= normalizedDateFrom.getTime() - : normalizedCellDate.getTime() > normalizedDateFrom.getTime(); - } - - // Only end date (open-ended from past) - if (!normalizedDateFrom && normalizedDateTo) { - return toInclusive - ? normalizedCellDate.getTime() <= normalizedDateTo.getTime() - : normalizedCellDate.getTime() < normalizedDateTo.getTime(); - } - - // Both dates present - if (!normalizedDateFrom || !normalizedDateTo) return false; - const afterStart = fromInclusive - ? normalizedCellDate.getTime() >= normalizedDateFrom.getTime() - : normalizedCellDate.getTime() > normalizedDateFrom.getTime(); - const beforeEnd = toInclusive - ? normalizedCellDate.getTime() <= normalizedDateTo.getTime() - : normalizedCellDate.getTime() < normalizedDateTo.getTime(); - return afterStart && beforeEnd; - } + return filterModel.dateFrom + ? date < new Date(filterModel.dateFrom) + : false; + case "after": + return filterModel.dateFrom + ? date > new Date(filterModel.dateFrom) + : false; + case "inRange": + if (!filterModel.dateFrom || !filterModel.dateTo) return false; + return ( + date >= new Date(filterModel.dateFrom) && + date <= new Date(filterModel.dateTo) + ); default: return true; } }, - [ - validation.isFilterValid, - currentModel, - getValue, - parseValue, - validation.effectiveDateFrom, - validation.effectiveDateTo, - filterState.filterType, - ], - ); - // Event handlers - Simplified since validation is now debounced - const handleExpressionFromChange = useCallback( - (value: string) => { - filterState.setExpressionFrom(value); - // Validation is handled by useDebouncedValidation hook with 300ms delay - }, - [filterState], - ); + getModel: () => model, - const handleExpressionToChange = useCallback( - (value: string) => { - filterState.setExpressionTo(value); - // Validation is handled by useDebouncedValidation hook with 300ms delay + setModel: (newModel: DateFilterModel | null) => { + setModel(newModel); }, - [filterState], - ); - - const applyFilter = useCallback(() => { - logger.debug( - "[DateFilter] applyFilter called with currentModel:", - currentModel, - ); - if (onModelChange) { - onModelChange(currentModel); - } - if (filterChangedCallback) { - filterChangedCallback(); - } - logger.debug("Applied filter:", currentModel); - }, [onModelChange, filterChangedCallback, currentModel]); - const handleKeyDown = useCallback( - (e: React.KeyboardEvent) => { - if (e.key === "Enter" && validation.isFilterValid) { - e.preventDefault(); - applyFilter(); - } + getModelAsString: () => { + if (!model) return ""; + const filterModel = model as DateFilterModel; + return filterModel.filterType || ""; }, - [validation.isFilterValid, applyFilter], - ); - - const resetFilter = useCallback(() => { - try { - filterState.resetState(); - if (onModelChange) { - onModelChange(null); - } - if (filterChangedCallback) { - filterChangedCallback(); - } - logger.debug("Reset filter"); - } catch (error) { - logger.error("Failed to reset filter", { - error: error instanceof Error ? error.message : String(error), - }); - handleError(error instanceof Error ? error : new Error(String(error))); - } - }, [filterState, onModelChange, filterChangedCallback, handleError]); - - const getModel = useCallback(() => { - if (!currentModel) return null; - - // Ensure dates are serializable for AG Grid - const serializableModel = { - ...currentModel, - dateFrom: - currentModel.dateFrom instanceof Date - ? currentModel.dateFrom.toISOString() - : currentModel.dateFrom, - dateTo: - currentModel.dateTo instanceof Date - ? currentModel.dateTo.toISOString() - : currentModel.dateTo, - }; - - return serializableModel; - }, [currentModel]); - - const setModel = useCallback( - (model: DateFilterModel | null) => { - logger.debug("[DateFilter] setModel called with:", model); - - // Set a global flag for testing - if (typeof window !== "undefined") { - ( - window as Window & { setModelWasCalled?: boolean } - ).setModelWasCalled = true; - } - - if (!model) { - resetFilter(); - return; - } - // Deserialize dates if they are ISO strings - const deserializedModel = { - ...model, - dateFrom: - model.dateFrom && typeof model.dateFrom === "string" - ? new Date(model.dateFrom) - : model.dateFrom, - dateTo: - model.dateTo && typeof model.dateTo === "string" - ? new Date(model.dateTo) - : model.dateTo, - }; - - filterState.initializeFromModel(deserializedModel); - - logger.debug("Filter state initialized from model:", model); - - // IMPORTANT: For programmatic filter changes (like from QuickFilterDropdown), - // we need to ensure the grid is notified immediately - if (onModelChange) { - onModelChange(model); - } - - // Use requestAnimationFrame to ensure state updates have been processed - // before triggering the filter changed callback - requestAnimationFrame(() => { - if (filterChangedCallback) { - filterChangedCallback(); - } - }); + destroy: () => { + // Cleanup if needed }, - [resetFilter, filterState, filterChangedCallback, onModelChange], - ); - - const isFilterActive = useCallback(() => { - const active = validation.isFilterValid && currentModel !== null; - return active; - }, [validation.isFilterValid, currentModel]); - - const destroy = useCallback(() => { - // Clean up when destroyed - }, []); - - // Register with AG Grid - const callbacks = useMemo( - () => ({ - doesFilterPass, - getModelAsString: () => { - if (!currentModel) return ""; - - if (currentModel.mode === "absolute") { - if (currentModel.type === "inRange") { - const fromStr = currentModel.dateFrom - ? format(currentModel.dateFrom, dateFormat) - : ""; - const toStr = currentModel.dateTo - ? format(currentModel.dateTo, dateFormat) - : ""; - return `${fromStr} to ${toStr}`; - } - return currentModel.dateFrom - ? format(currentModel.dateFrom, dateFormat) - : ""; - } else { - if (currentModel.type === "inRange") { - return `${currentModel.expressionFrom || ""} to ${currentModel.expressionTo || ""}`; - } - return currentModel.expressionFrom || ""; - } - }, - getModel, - setModel, - onNewRowsLoaded: () => { - // Handle new rows if needed - }, - // AG Grid v33 requires this to know when the filter is active - isFilterActive, - // Log when callbacks are destroyed - destroy, - }), - [ - doesFilterPass, - currentModel, - dateFormat, - getModel, - setModel, - isFilterActive, - destroy, - ], - ); - - useGridFilter(callbacks); - - // Handle model changes from props (when AG Grid creates new instance) - React.useEffect(() => { - // Only reinitialize if we have a model and it's different from current state - if (initialModel) { - filterState.initializeFromModel(initialModel); - } - }, [initialModel, filterState]); - - // Model is handled during initial state creation in useFilterState - // No ongoing synchronization to avoid state conflicts - - // Expose component instance for AG Grid to handle popup positioning - React.useImperativeHandle( - ref, - () => ({ - // Include all the filter methods from callbacks - doesFilterPass: callbacks.doesFilterPass, - getModel: callbacks.getModel, - setModel: callbacks.setModel, - isFilterActive: callbacks.isFilterActive, - afterGuiAttached: () => { - // Method called after the filter is attached to the DOM - // This helps AG Grid position popups correctly - }, - }), - [callbacks], - ); + }), + [model, setModel, isFilterActive, filterParams], + ); + if (!children) { + // Default structure for backward compatibility return ( -
- - - - -
- {filterState.filterMode === "absolute" ? ( - - ) : ( - - )} -
- - -
+ + + + + Relative + + + Absolute + + + + + + Examples: -7d (7 days ago), today, last week, +3m (3 months from + now) + + + + + + + + + Apply + Reset + + + ); - }, -); - -DateFilterComponent.displayName = "DateFilterComponent"; - -// Wrap the component with error boundary -const DateFilter = withErrorBoundary(DateFilterComponent, { - componentName: "DateFilter", - onError: (error, errorInfo) => { - logger.error("DateFilter Error Boundary", { - error: error.message, - stack: error.stack, - componentStack: errorInfo.componentStack, - }); - }, + } + + return ( + + {children} + + ); }); -// For debugging - export the raw component -export const DateFilterRaw = DateFilterComponent; +DateFilterComponent.displayName = "DateFilter"; + +// Create the compound component +const DateFilter = DateFilterComponent as unknown as DateFilterCompound; + +// Attach all sub-components +DateFilter.Root = Components.Root; +DateFilter.TypeSelector = Components.TypeSelector; +DateFilter.ModeToggle = Components.ModeToggle; +DateFilter.ModeButton = Components.ModeButton; +DateFilter.RelativeSection = Components.RelativeSection; +DateFilter.RelativeInput = Components.RelativeInput; +DateFilter.AbsoluteSection = Components.AbsoluteSection; +DateFilter.StartDateInput = Components.StartDateInput; +DateFilter.EndDateInput = Components.EndDateInput; +DateFilter.HelpText = Components.HelpText; +DateFilter.ErrorMessage = Components.ErrorMessage; +DateFilter.Actions = Components.Actions; +DateFilter.ApplyButton = Components.ApplyButton; +DateFilter.ResetButton = Components.ResetButton; + +// Mark as AG Grid component +(DateFilter as any).__AG_GRID_COMPONENT = true; export default DateFilter; +export { DateFilter }; diff --git a/src/components/DateFilter/utils.ts b/src/components/DateFilter/utils.ts new file mode 100644 index 0000000..6f23501 --- /dev/null +++ b/src/components/DateFilter/utils.ts @@ -0,0 +1,19 @@ +import { parseDateExpression } from "../../utils/dateExpressionParser"; + +export function parseRelativeDate(expression: string): Date | null { + const result = parseDateExpression(expression); + return result.isValid ? result.resolvedDate : null; +} + +export function formatDateForInput(date: Date | null): string { + if (!date) return ""; + return date.toISOString().split("T")[0]; +} + +export function validateDateRange( + startDate: Date | null, + endDate: Date | null, +): boolean { + if (!startDate || !endDate) return false; + return startDate <= endDate; +} diff --git a/src/components/FilterPresetManager/FilterPresetManager.module.css b/src/components/FilterPresetManager/FilterPresetManager.module.css new file mode 100644 index 0000000..254d62f --- /dev/null +++ b/src/components/FilterPresetManager/FilterPresetManager.module.css @@ -0,0 +1,572 @@ +.container { + display: inline-flex; + align-items: center; + gap: 0.5rem; +} + +.selector { + flex: 0 1 auto; +} + +.menu { + flex: 0 0 auto; +} + +/* Action buttons */ +.actions { + display: inline-flex; + gap: 0.5rem; + align-items: center; +} + +.saveButton, +.manageButton { + display: inline-flex; + align-items: center; + gap: 0.375rem; + padding: 0.25rem 0.75rem; + font-size: 0.75rem; + font-weight: 500; + border: 1px solid rgb(156, 163, 175, 0.3); + border-radius: 0.375rem; + background: transparent; + color: rgb(156, 163, 175); + cursor: pointer; + transition: all 0.2s ease; + white-space: nowrap; +} + +.saveButton:hover, +.manageButton:hover { + background-color: rgb(156, 163, 175, 0.1); + border-color: rgb(156, 163, 175, 0.5); + color: rgb(209, 213, 219); +} + +.saveButton:focus, +.manageButton:focus { + outline: 2px solid rgb(99, 102, 241, 0.5); + outline-offset: 2px; +} + +/* Modal overlay */ +.modalOverlay { + position: fixed; + inset: 0; + background: rgb(0, 0, 0, 0.5); + backdrop-filter: blur(2px); + display: flex; + align-items: center; + justify-content: center; + z-index: 1000; + padding: 1rem; +} + +/* Modal container */ +.modal { + background: #1f2937; + border: 1px solid rgb(255, 255, 255, 0.1); + border-radius: 0.5rem; + box-shadow: + 0 20px 25px -5px rgb(0, 0, 0, 0.5), + 0 10px 10px -5px rgb(0, 0, 0, 0.3); + max-width: 32rem; + width: 100%; + max-height: 80vh; + display: flex; + flex-direction: column; + color: #e2e8f0; +} + +.modalHeader { + display: flex; + align-items: center; + justify-content: space-between; + padding: 1.25rem 1.5rem; + border-bottom: 1px solid rgb(255, 255, 255, 0.1); +} + +.modalHeader h3 { + margin: 0; + font-size: 1.125rem; + font-weight: 600; +} + +.closeButton { + background: none; + border: none; + font-size: 1.5rem; + width: 2rem; + height: 2rem; + display: flex; + align-items: center; + justify-content: center; + border-radius: 0.25rem; + cursor: pointer; + color: #6b7280; + transition: all 0.15s ease; +} + +.closeButton:hover { + background: rgb(255, 255, 255, 0.1); + color: #f3f4f6; +} + +.modalBody { + padding: 1.5rem; + overflow-y: auto; +} + +/* Save form */ +.saveForm { + display: flex; + flex-direction: column; + gap: 1rem; +} + +.input { + padding: 0.625rem 0.875rem; + border: 1px solid rgb(255, 255, 255, 0.2); + border-radius: 0.375rem; + font-size: 0.875rem; + background: rgb(0, 0, 0, 0.3); + color: #e2e8f0; + transition: all 0.15s ease; +} + +.input:focus { + outline: none; + border-color: #3b82f6; + box-shadow: 0 0 0 3px rgb(59, 130, 246, 0.1); +} + +.primaryButton { + padding: 0.625rem 1.25rem; + background: #3b82f6; + color: white; + border: none; + border-radius: 0.375rem; + font-size: 0.875rem; + font-weight: 500; + cursor: pointer; + transition: all 0.15s ease; +} + +.primaryButton:hover:not(:disabled) { + background: #2563eb; +} + +.primaryButton:disabled { + opacity: 0.5; + cursor: not-allowed; +} + +/* Manage content */ +.manageContent { + display: flex; + flex-direction: column; + gap: 1.5rem; +} + +.presetList { + display: flex; + flex-direction: column; + gap: 0.5rem; + max-height: 20rem; + overflow-y: auto; +} + +.emptyMessage { + text-align: center; + color: #6b7280; + padding: 2rem 0; + margin: 0; +} + +.presetItem { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0.75rem 1rem; + border: 1px solid rgb(255, 255, 255, 0.1); + border-radius: 0.375rem; + transition: all 0.15s ease; +} + +.presetItem:hover { + background: rgb(255, 255, 255, 0.05); + border-color: rgb(255, 255, 255, 0.2); +} + +.presetInfo { + display: flex; + justify-content: space-between; + align-items: center; + flex: 1; + gap: 1rem; +} + +.presetInfo > div { + display: flex; + flex-direction: column; + gap: 0.125rem; +} + +.presetName { + font-weight: 500; + font-size: 0.875rem; +} + +.presetCategory { + font-size: 0.75rem; + color: #3b82f6; + font-weight: 500; +} + +.presetDate { + font-size: 0.75rem; + color: #6b7280; +} + +.presetActions { + display: flex; + gap: 0.5rem; + align-items: center; +} + +.applyButton { + padding: 0.375rem 0.75rem; + background: transparent; + color: #3b82f6; + border: 1px solid #3b82f6; + border-radius: 0.25rem; + font-size: 0.75rem; + font-weight: 500; + cursor: pointer; + transition: all 0.15s ease; +} + +.applyButton:hover { + background: #3b82f6; + color: white; +} + +.deleteButton { + padding: 0.375rem; + background: transparent; + border: none; + border-radius: 0.25rem; + color: #ef4444; + cursor: pointer; + transition: all 0.15s ease; + display: flex; + align-items: center; + justify-content: center; +} + +.deleteButton:hover { + background: rgb(239, 68, 68, 0.1); +} + +.editButton { + padding: 0.375rem; + background: transparent; + border: none; + border-radius: 0.25rem; + color: #3b82f6; + cursor: pointer; + transition: all 0.15s ease; + display: flex; + align-items: center; + justify-content: center; +} + +.editButton:hover { + background: rgb(59, 130, 246, 0.1); +} + +/* Edit form */ +.editForm { + display: flex; + flex: 1; + gap: 0.5rem; + align-items: center; +} + +.editInput { + flex: 1; + padding: 0.375rem 0.75rem; + background: rgb(0, 0, 0, 0.2); + border: 1px solid rgb(255, 255, 255, 0.2); + border-radius: 0.25rem; + color: white; + font-size: 0.875rem; +} + +.editInput:focus { + outline: 2px solid rgb(99, 102, 241, 0.5); + outline-offset: 2px; + border-color: rgb(99, 102, 241); +} + +.editSelect { + padding: 0.375rem 0.75rem; + background: rgb(0, 0, 0, 0.2); + border: 1px solid rgb(255, 255, 255, 0.2); + border-radius: 0.25rem; + color: white; + font-size: 0.875rem; + min-width: 100px; +} + +.editSelect:focus { + outline: 2px solid rgb(99, 102, 241, 0.5); + outline-offset: 2px; + border-color: rgb(99, 102, 241); +} + +.editActions { + display: flex; + gap: 0.375rem; +} + +.editActions .saveButton { + padding: 0.375rem 0.75rem; + background: #3b82f6; + color: white; + border: none; + border-radius: 0.25rem; + font-size: 0.75rem; + font-weight: 500; + cursor: pointer; + transition: all 0.15s ease; +} + +.editActions .saveButton:hover:not(:disabled) { + background: #2563eb; +} + +.editActions .saveButton:disabled { + opacity: 0.5; + cursor: not-allowed; +} + +.cancelButton { + padding: 0.375rem 0.75rem; + background: transparent; + color: #e2e8f0; + border: 1px solid rgb(255, 255, 255, 0.2); + border-radius: 0.25rem; + font-size: 0.75rem; + font-weight: 500; + cursor: pointer; + transition: all 0.15s ease; +} + +.cancelButton:hover { + background: rgb(255, 255, 255, 0.1); + border-color: rgb(255, 255, 255, 0.3); +} + +/* Import/Export */ +.importExport { + display: flex; + gap: 0.75rem; + padding-top: 1rem; + border-top: 1px solid rgb(255, 255, 255, 0.1); +} + +.secondaryButton { + flex: 1; + display: inline-flex; + align-items: center; + justify-content: center; + gap: 0.375rem; + padding: 0.5rem 0.875rem; + border: 1px solid rgb(255, 255, 255, 0.2); + border-radius: 0.375rem; + background: transparent; + color: #e2e8f0; + font-size: 0.875rem; + font-weight: 500; + cursor: pointer; + transition: all 0.15s ease; +} + +.secondaryButton:hover { + background: rgb(255, 255, 255, 0.1); + border-color: rgb(255, 255, 255, 0.3); +} + +/* Scrollbar styling */ +.presetList::-webkit-scrollbar { + width: 6px; +} + +.presetList::-webkit-scrollbar-track { + background: rgb(0, 0, 0, 0.05); + border-radius: 3px; +} + +.presetList::-webkit-scrollbar-thumb { + background: rgb(0, 0, 0, 0.2); + border-radius: 3px; +} + +.presetList::-webkit-scrollbar-thumb:hover { + background: rgb(0, 0, 0, 0.3); +} + +/* Form groups */ +.formGroup { + display: flex; + flex-direction: column; + gap: 0.375rem; +} + +.label { + font-size: 0.875rem; + font-weight: 500; + color: #d1d5db; +} + +.textarea { + padding: 0.625rem 0.875rem; + border: 1px solid rgb(255, 255, 255, 0.2); + border-radius: 0.375rem; + font-size: 0.875rem; + background: rgb(0, 0, 0, 0.3); + color: #e2e8f0; + transition: all 0.15s ease; + resize: vertical; + min-height: 4rem; +} + +.textarea:focus { + outline: none; + border-color: #3b82f6; + box-shadow: 0 0 0 3px rgb(59, 130, 246, 0.1); +} + +.checkboxLabel { + display: flex; + align-items: center; + gap: 0.5rem; + font-size: 0.875rem; + color: #d1d5db; + cursor: pointer; +} + +.checkbox { + width: 1rem; + height: 1rem; + cursor: pointer; +} + +/* Category selector */ +.categorySelector { + position: relative; +} + +.inputWrapper { + position: relative; + display: flex; + align-items: center; +} + +.dropdownIcon { + position: absolute; + right: 0.75rem; + pointer-events: none; + font-size: 0.75rem; + color: #6b7280; +} + +.dropdown { + position: absolute; + top: 100%; + left: 0; + right: 0; + margin-top: 0.25rem; + background: #1f2937; + border: 1px solid rgb(255, 255, 255, 0.2); + border-radius: 0.375rem; + box-shadow: 0 10px 15px -3px rgb(0, 0, 0, 0.5); + max-height: 20rem; + overflow-y: auto; + z-index: 10001; +} + +.dropdownOption { + padding: 0.5rem 0.75rem; + cursor: pointer; + transition: all 0.15s ease; + font-size: 0.875rem; +} + +.dropdownOption:hover, +.highlighted { + background: rgb(255, 255, 255, 0.1); +} + +.createOption { + display: flex; + align-items: center; + gap: 0.5rem; + border-bottom: 1px solid rgb(255, 255, 255, 0.1); + font-weight: 500; + color: #3b82f6; +} + +.createIcon { + font-size: 1rem; +} + +.noResults { + padding: 0.5rem 0.75rem; + color: #6b7280; + font-style: italic; + font-size: 0.75rem; +} + +.createForm { + padding: 0.75rem; +} + +.createActions { + display: flex; + gap: 0.5rem; + justify-content: flex-end; +} + +.smallButton { + padding: 0.375rem 0.75rem; + background: #3b82f6; + color: white; + border: none; + border-radius: 0.25rem; + font-size: 0.75rem; + font-weight: 500; + cursor: pointer; + transition: all 0.15s ease; +} + +.smallButton:hover:not(:disabled) { + background: #2563eb; +} + +.smallButton:disabled { + opacity: 0.5; + cursor: not-allowed; +} + +.error { + color: #ef4444; + font-size: 0.75rem; + margin-bottom: 0.5rem; +} + +/* Edit form in manage modal */ +.editCategorySelector { + flex: 1; +} diff --git a/src/components/FilterPresetManager/components/ImportExportModal.tsx b/src/components/FilterPresetManager/components/ImportExportModal.tsx new file mode 100644 index 0000000..fa189c3 --- /dev/null +++ b/src/components/FilterPresetManager/components/ImportExportModal.tsx @@ -0,0 +1,137 @@ +import React, { useCallback } from "react"; +import { createPortal } from "react-dom"; +import type { FilterPreset } from "../types"; +import styles from "../FilterPresetManager.module.css"; + +interface ImportExportModalProps { + gridId: string; + presets: FilterPreset[]; + onPresetsChange: (presets: FilterPreset[]) => void; + onClose: () => void; +} + +export const ImportExportModal: React.FC = ({ + gridId, + presets, + onPresetsChange, + onClose, +}) => { + const handleExport = useCallback(() => { + const dataStr = JSON.stringify( + { + gridId, + presets, + exportedAt: new Date().toISOString(), + version: "1.0", + }, + null, + 2, + ); + const dataUri = `data:application/json;charset=utf-8,${encodeURIComponent(dataStr)}`; + + const link = document.createElement("a"); + link.href = dataUri; + link.download = `filter-views-${gridId}-${new Date().toISOString().split("T")[0]}.json`; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + onClose(); + }, [gridId, presets, onClose]); + + const handleImport = useCallback( + (event: React.ChangeEvent) => { + const file = event.target.files?.[0]; + if (!file) return; + + const reader = new FileReader(); + reader.onload = (e) => { + try { + const data = JSON.parse(e.target?.result as string); + + // Validate the import + if (data.gridId && data.gridId !== gridId) { + alert( + `These presets are for grid "${data.gridId}" but you're importing to "${gridId}". ` + + "The presets may not work correctly.", + ); + } + + if (Array.isArray(data.presets)) { + const merged = [...presets]; + data.presets.forEach((preset: FilterPreset) => { + if (!merged.find((p) => p.name === preset.name)) { + merged.push({ + ...preset, + id: `${gridId}-${Date.now()}-${Math.random()}`, + createdAt: new Date(preset.createdAt), + }); + } + }); + onPresetsChange(merged); + alert(`Imported ${data.presets.length} views successfully!`); + onClose(); + } + } catch (error) { + console.error("Failed to import presets:", error); + alert("Failed to import views. Please check the file format."); + } + }; + reader.readAsText(file); + }, + [gridId, presets, onPresetsChange, onClose], + ); + + return createPortal( +
+
e.stopPropagation()}> +
+

Import/Export Filter Views

+ +
+
+
+

+ Export all {presets.length} saved views or import views from a + file. +

+
+ + +
+
+
+
+
, + document.body, + ); +}; diff --git a/src/components/FilterPresetManager/components/ManagePresetsModal.tsx b/src/components/FilterPresetManager/components/ManagePresetsModal.tsx new file mode 100644 index 0000000..37b2958 --- /dev/null +++ b/src/components/FilterPresetManager/components/ManagePresetsModal.tsx @@ -0,0 +1,201 @@ +import React, { useState } from "react"; +import { createPortal } from "react-dom"; +import type { FilterPreset } from "../types"; +import { CategorySelector } from "../../CategorySelector/index"; +import styles from "../FilterPresetManager.module.css"; + +interface ManagePresetsModalProps { + presets: FilterPreset[]; + onPresetsChange: (presets: FilterPreset[]) => void; + onClose: () => void; + allowedCategories?: string[]; +} + +export const ManagePresetsModal: React.FC = ({ + presets, + onPresetsChange, + onClose, + allowedCategories, +}) => { + const [editingId, setEditingId] = useState(null); + const [editName, setEditName] = useState(""); + const [editCategory, setEditCategory] = useState(""); + + const handleDelete = (id: string) => { + if (confirm("Delete this view?")) { + onPresetsChange(presets.filter((p) => p.id !== id)); + } + }; + + const handleEdit = (preset: FilterPreset) => { + setEditingId(preset.id); + setEditName(preset.name); + setEditCategory(preset.category || ""); + }; + + const handleSaveEdit = () => { + if (editingId && editName.trim()) { + onPresetsChange( + presets.map((p) => + p.id === editingId + ? { + ...p, + name: editName.trim(), + category: editCategory.trim() || undefined, + updatedAt: new Date(), + } + : p, + ), + ); + setEditingId(null); + setEditName(""); + setEditCategory(""); + } + }; + + const handleCancelEdit = () => { + setEditingId(null); + setEditName(""); + setEditCategory(""); + }; + + const existingCategories = Array.from( + new Set(presets.map((p) => p.category).filter(Boolean) as string[]), + ); + + return createPortal( +
+
e.stopPropagation()}> +
+

Manage Saved Views

+ +
+
+
+ {presets.length === 0 ? ( +

No saved views yet

+ ) : ( +
+ {presets.map((preset) => ( +
+ {editingId === preset.id ? ( + // Edit mode +
+ setEditName(e.target.value)} + onKeyDown={(e) => { + if (e.key === "Enter") handleSaveEdit(); + if (e.key === "Escape") handleCancelEdit(); + }} + placeholder="View name..." + autoFocus + /> + +
+ + +
+
+ ) : ( + // View mode + <> +
+
+ + {preset.name} + + {preset.category && ( + + {preset.category} + + )} +
+ + {new Date(preset.createdAt).toLocaleDateString()} + +
+
+ + +
+ + )} +
+ ))} +
+ )} +
+
+
+
, + document.body, + ); +}; diff --git a/src/components/FilterPresetManager/components/PresetMenu.module.css b/src/components/FilterPresetManager/components/PresetMenu.module.css new file mode 100644 index 0000000..5f20e4e --- /dev/null +++ b/src/components/FilterPresetManager/components/PresetMenu.module.css @@ -0,0 +1,72 @@ +.trigger { + display: inline-flex; + align-items: center; + justify-content: center; + width: 36px; + height: 36px; + padding: 0; + background: transparent; + border: 1px solid rgb(156, 163, 175, 0.3); + border-radius: 0.375rem; + color: #94a3b8; + cursor: pointer; + transition: all 0.2s ease; +} + +.trigger:hover { + background: rgb(156, 163, 175, 0.1); + border-color: rgb(156, 163, 175, 0.5); + color: #e2e8f0; +} + +.trigger:focus { + outline: 2px solid rgb(99, 102, 241, 0.5); + outline-offset: 2px; +} + +.menu { + background: #1f2937; + border: 1px solid rgb(255, 255, 255, 0.1); + border-radius: 0.5rem; + box-shadow: 0 10px 25px -5px rgb(0, 0, 0, 0.5); + padding: 0.5rem; + min-width: 200px; +} + +.menuItem { + display: flex; + align-items: center; + gap: 0.75rem; + width: 100%; + padding: 0.5rem 0.75rem; + background: transparent; + border: none; + border-radius: 0.375rem; + color: #e2e8f0; + font-size: 0.875rem; + text-align: left; + cursor: pointer; + transition: all 0.15s ease; + white-space: nowrap; +} + +.menuItem:hover { + background: rgb(255, 255, 255, 0.05); +} + +.menuItem svg { + width: 16px; + height: 16px; + flex-shrink: 0; + color: #94a3b8; +} + +.menuItem:hover svg { + color: #e2e8f0; +} + +.divider { + height: 1px; + background: rgb(255, 255, 255, 0.1); + margin: 0.25rem 0; +} diff --git a/src/components/FilterPresetManager/components/PresetMenu.tsx b/src/components/FilterPresetManager/components/PresetMenu.tsx new file mode 100644 index 0000000..e07d337 --- /dev/null +++ b/src/components/FilterPresetManager/components/PresetMenu.tsx @@ -0,0 +1,295 @@ +import React, { useState, useCallback, useRef, useEffect } from "react"; +import { createPortal } from "react-dom"; +import type { PresetMenuProps, FilterPreset } from "../types"; +import { SavePresetModal } from "./SavePresetModal"; +import { ManagePresetsModal } from "./ManagePresetsModal"; +import { ImportExportModal } from "./ImportExportModal"; +import styles from "./PresetMenu.module.css"; + +export const PresetMenu: React.FC = ({ + api, + gridId, + presets, + onPresetsChange, + maxPresets = 50, + allowedCategories, + className = "", +}) => { + const [isOpen, setIsOpen] = useState(false); + const [activeModal, setActiveModal] = useState< + "save" | "manage" | "import-export" | null + >(null); + const [menuPosition, setMenuPosition] = useState<{ + top: number; + left: number; + } | null>(null); + + const triggerRef = useRef(null); + const menuRef = useRef(null); + + // Check if there are active filters + const hasActiveFilters = useCallback(() => { + const filterModel = api.getFilterModel(); + return filterModel && Object.keys(filterModel).length > 0; + }, [api]); + + // Calculate menu position + const calculateMenuPosition = useCallback(() => { + if (!triggerRef.current) return null; + + const rect = triggerRef.current.getBoundingClientRect(); + const viewportHeight = window.innerHeight; + const viewportWidth = window.innerWidth; + const menuHeight = 200; // Approximate + const menuWidth = 200; // Approximate + + let top = rect.bottom + 4; + let left = rect.left; + + // Adjust for viewport boundaries + if (top + menuHeight > viewportHeight) { + top = rect.top - menuHeight - 4; + } + + if (left + menuWidth > viewportWidth) { + left = rect.right - menuWidth; + } + + return { top, left }; + }, []); + + // Update position when menu opens + useEffect(() => { + if (isOpen) { + const position = calculateMenuPosition(); + setMenuPosition(position); + } + }, [isOpen, calculateMenuPosition]); + + // Handle click outside + useEffect(() => { + const handleClickOutside = (event: MouseEvent) => { + const target = event.target as Node; + const isClickInside = + triggerRef.current?.contains(target) || + menuRef.current?.contains(target); + + if (!isClickInside) { + setIsOpen(false); + } + }; + + if (isOpen) { + document.addEventListener("mousedown", handleClickOutside); + return () => { + document.removeEventListener("mousedown", handleClickOutside); + }; + } + }, [isOpen]); + + // Handle save preset + const handleSavePreset = useCallback( + ( + name: string, + description?: string, + category?: string, + isDefault?: boolean, + ) => { + const newPreset: FilterPreset = { + id: `${gridId}-${Date.now()}`, + name, + description, + category, + filterModel: api.getFilterModel(), + createdAt: new Date(), + isDefault, + }; + + // Check max presets limit + if (presets.length >= maxPresets) { + alert( + `Maximum of ${maxPresets} presets reached. Please delete some presets first.`, + ); + return; + } + + onPresetsChange([...presets, newPreset]); + setActiveModal(null); + setIsOpen(false); + }, + [api, gridId, presets, onPresetsChange, maxPresets], + ); + + // Handle menu item clicks + const handleMenuItemClick = useCallback( + (action: "save" | "manage" | "export" | "import") => { + setIsOpen(false); + + switch (action) { + case "save": + setActiveModal("save"); + break; + case "manage": + setActiveModal("manage"); + break; + case "export": + case "import": + setActiveModal("import-export"); + break; + } + }, + [], + ); + + const menuContent = ( +
+ {hasActiveFilters() && ( + <> + +
+ + )} + + {presets.length > 0 && ( + + )} + + + + {presets.length > 0 && ( + + )} +
+ ); + + return ( + <> + + + {isOpen && menuPosition && createPortal(menuContent, document.body)} + + {/* Modals */} + {activeModal === "save" && ( + setActiveModal(null)} + existingCategories={ + allowedCategories || [ + ...new Set( + presets.map((p) => p.category).filter(Boolean) as string[], + ), + ] + } + /> + )} + + {activeModal === "manage" && ( + setActiveModal(null)} + allowedCategories={allowedCategories} + /> + )} + + {activeModal === "import-export" && ( + setActiveModal(null)} + /> + )} + + ); +}; diff --git a/src/components/FilterPresetManager/components/PresetSelector.module.css b/src/components/FilterPresetManager/components/PresetSelector.module.css new file mode 100644 index 0000000..427504d --- /dev/null +++ b/src/components/FilterPresetManager/components/PresetSelector.module.css @@ -0,0 +1,214 @@ +/* Trigger button */ +.trigger { + display: inline-flex; + align-items: center; + justify-content: space-between; + gap: 0.5rem; + padding: 0.375rem 0.75rem; + min-width: 160px; + background: transparent; + border: 1px solid rgb(156, 163, 175, 0.3); + border-radius: 0.375rem; + color: #e2e8f0; + font-size: 0.875rem; + font-weight: 500; + cursor: pointer; + transition: all 0.2s ease; + white-space: nowrap; +} + +.trigger:hover { + background: rgb(156, 163, 175, 0.1); + border-color: rgb(156, 163, 175, 0.5); +} + +.trigger:focus { + outline: 2px solid rgb(99, 102, 241, 0.5); + outline-offset: 2px; +} + +.triggerIcon { + flex-shrink: 0; + color: #94a3b8; +} + +.triggerText { + flex: 1; + text-align: left; + overflow: hidden; + text-overflow: ellipsis; +} + +.triggerChevron { + flex-shrink: 0; + transition: transform 0.2s ease; + color: #94a3b8; +} + +.triggerChevron.open { + transform: rotate(180deg); +} + +/* Dropdown */ +.dropdown { + background: #1f2937; + border: 1px solid rgb(255, 255, 255, 0.1); + border-radius: 0.5rem; + box-shadow: 0 10px 25px -5px rgb(0, 0, 0, 0.5); + overflow: hidden; + max-height: 320px; + display: flex; + flex-direction: column; +} + +.searchContainer { + padding: 0.75rem; + border-bottom: 1px solid rgb(255, 255, 255, 0.1); +} + +.searchInput { + width: 100%; + padding: 0.5rem 0.75rem; + background: rgb(0, 0, 0, 0.3); + border: 1px solid rgb(255, 255, 255, 0.2); + border-radius: 0.375rem; + color: #e2e8f0; + font-size: 0.875rem; + transition: all 0.2s ease; +} + +.searchInput::placeholder { + color: #6b7280; +} + +.searchInput:focus { + outline: none; + border-color: #3b82f6; + box-shadow: 0 0 0 3px rgb(59, 130, 246, 0.1); +} + +.presetList { + flex: 1; + overflow-y: auto; + padding: 0.5rem; +} + +.clearButton { + display: flex; + align-items: center; + gap: 0.5rem; + width: 100%; + padding: 0.5rem 0.75rem; + background: transparent; + border: none; + border-radius: 0.375rem; + color: #94a3b8; + font-size: 0.875rem; + text-align: left; + cursor: pointer; + transition: all 0.15s ease; +} + +.clearButton:hover { + background: rgb(255, 255, 255, 0.05); + color: #e2e8f0; +} + +.clearButton.active { + background: rgb(59, 130, 246, 0.2); + color: #93bbfc; +} + +.clearButton svg { + width: 16px; + height: 16px; + flex-shrink: 0; +} + +.divider { + height: 1px; + background: rgb(255, 255, 255, 0.1); + margin: 0.5rem 0; +} + +.emptyMessage { + padding: 2rem 1rem; + text-align: center; + color: #6b7280; + font-size: 0.875rem; +} + +.categoryGroup { + margin-bottom: 0.75rem; +} + +.categoryGroup:last-child { + margin-bottom: 0; +} + +.categoryHeader { + padding: 0.25rem 0.5rem; + font-size: 0.75rem; + font-weight: 600; + color: #94a3b8; + text-transform: uppercase; + letter-spacing: 0.05em; +} + +.presetItem { + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + padding: 0.5rem 0.75rem; + background: transparent; + border: none; + border-radius: 0.375rem; + color: #e2e8f0; + font-size: 0.875rem; + text-align: left; + cursor: pointer; + transition: all 0.15s ease; +} + +.presetItem:hover { + background: rgb(255, 255, 255, 0.05); +} + +.presetItem.selected { + background: rgb(59, 130, 246, 0.2); + color: #93bbfc; +} + +.presetName { + font-weight: 500; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + flex: 1; +} + +.presetDate { + font-size: 0.75rem; + color: #6b7280; + margin-left: 0.5rem; + flex-shrink: 0; +} + +/* Scrollbar */ +.presetList::-webkit-scrollbar { + width: 6px; +} + +.presetList::-webkit-scrollbar-track { + background: rgb(0, 0, 0, 0.1); +} + +.presetList::-webkit-scrollbar-thumb { + background: rgb(255, 255, 255, 0.2); + border-radius: 3px; +} + +.presetList::-webkit-scrollbar-thumb:hover { + background: rgb(255, 255, 255, 0.3); +} diff --git a/src/components/FilterPresetManager/components/PresetSelector.tsx b/src/components/FilterPresetManager/components/PresetSelector.tsx new file mode 100644 index 0000000..a78d7fd --- /dev/null +++ b/src/components/FilterPresetManager/components/PresetSelector.tsx @@ -0,0 +1,258 @@ +import React, { + useState, + useCallback, + useMemo, + useEffect, + useRef, +} from "react"; +import { createPortal } from "react-dom"; +import type { PresetSelectorProps, FilterPreset } from "../types"; +import styles from "./PresetSelector.module.css"; + +export const PresetSelector: React.FC = ({ + api, + presets, + onPresetSelect, + placeholder = "My Views", + className = "", +}) => { + const [isOpen, setIsOpen] = useState(false); + const [searchQuery, setSearchQuery] = useState(""); + const [selectedPresetId, setSelectedPresetId] = useState(null); + const [dropdownPosition, setDropdownPosition] = useState<{ + top: number; + left: number; + width: number; + } | null>(null); + + const triggerRef = useRef(null); + const dropdownRef = useRef(null); + + // Group presets by category + const groupedPresets = useMemo(() => { + const groups: Record = {}; + + const sortedPresets = [...presets].sort((a, b) => { + // Default presets first + if (a.isDefault && !b.isDefault) return -1; + if (!a.isDefault && b.isDefault) return 1; + + // Then by order + if (a.order !== undefined && b.order !== undefined) { + return a.order - b.order; + } + + // Then by name + return a.name.localeCompare(b.name); + }); + + sortedPresets.forEach((preset) => { + const category = preset.category || "Uncategorized"; + if (!groups[category]) { + groups[category] = []; + } + groups[category].push(preset); + }); + + return groups; + }, [presets]); + + // Filter presets based on search + const filteredGroups = useMemo(() => { + if (!searchQuery) return groupedPresets; + + const filtered: Record = {}; + const query = searchQuery.toLowerCase(); + + Object.entries(groupedPresets).forEach(([category, presetList]) => { + const matchingPresets = presetList.filter( + (preset) => + preset.name.toLowerCase().includes(query) || + (preset.category?.toLowerCase() || "").includes(query), + ); + + if (matchingPresets.length > 0) { + filtered[category] = matchingPresets; + } + }); + + return filtered; + }, [groupedPresets, searchQuery]); + + // Calculate dropdown position + const calculateDropdownPosition = useCallback(() => { + if (!triggerRef.current) return null; + + const rect = triggerRef.current.getBoundingClientRect(); + const viewportHeight = window.innerHeight; + const spaceBelow = viewportHeight - rect.bottom; + const spaceAbove = rect.top; + const dropdownHeight = 320; + + let top = rect.bottom + 4; + if (spaceBelow < dropdownHeight && spaceAbove > spaceBelow) { + top = rect.top - dropdownHeight - 4; + } + + return { + top, + left: rect.left, + width: Math.max(rect.width, 240), + }; + }, []); + + // Handle preset selection + const handlePresetSelect = useCallback( + (preset: FilterPreset) => { + api.setFilterModel(preset.filterModel); + setSelectedPresetId(preset.id); + setIsOpen(false); + setSearchQuery(""); + onPresetSelect(preset); + }, + [api, onPresetSelect], + ); + + // Update position when dropdown opens + useEffect(() => { + if (isOpen) { + const position = calculateDropdownPosition(); + setDropdownPosition(position); + } + }, [isOpen, calculateDropdownPosition]); + + // Handle click outside + useEffect(() => { + const handleClickOutside = (event: MouseEvent) => { + const target = event.target as Node; + const isClickInside = + triggerRef.current?.contains(target) || + dropdownRef.current?.contains(target); + + if (!isClickInside) { + setIsOpen(false); + setSearchQuery(""); + } + }; + + if (isOpen) { + document.addEventListener("mousedown", handleClickOutside); + return () => { + document.removeEventListener("mousedown", handleClickOutside); + }; + } + }, [isOpen]); + + // Get display text + const displayText = useMemo(() => { + if (selectedPresetId) { + const preset = presets.find((p) => p.id === selectedPresetId); + return preset?.name || placeholder; + } + return placeholder; + }, [selectedPresetId, presets, placeholder]); + + const dropdownContent = ( +
+
+ setSearchQuery(e.target.value)} + onClick={(e) => e.stopPropagation()} + autoFocus + /> +
+ +
+ {/* Grouped presets */} + {Object.keys(filteredGroups).length === 0 ? ( +
+ {searchQuery ? "No matching views" : "No saved views yet"} +
+ ) : ( + Object.entries(filteredGroups).map(([category, presetList]) => ( +
+
{category}
+ {presetList.map((preset) => ( + + ))} +
+ )) + )} +
+
+ ); + + return ( + <> + + + {isOpen && + dropdownPosition && + createPortal(dropdownContent, document.body)} + + ); +}; diff --git a/src/components/FilterPresetManager/components/SavePresetModal.tsx b/src/components/FilterPresetManager/components/SavePresetModal.tsx new file mode 100644 index 0000000..75b446a --- /dev/null +++ b/src/components/FilterPresetManager/components/SavePresetModal.tsx @@ -0,0 +1,133 @@ +import React, { useState } from "react"; +import { createPortal } from "react-dom"; +import { CategorySelector } from "../../CategorySelector/index"; +import styles from "../FilterPresetManager.module.css"; + +interface SavePresetModalProps { + onSave: ( + name: string, + description?: string, + category?: string, + isDefault?: boolean, + ) => void; + onClose: () => void; + existingCategories: string[]; +} + +export const SavePresetModal: React.FC = ({ + onSave, + onClose, + existingCategories, +}) => { + const [name, setName] = useState(""); + const [description, setDescription] = useState(""); + const [category, setCategory] = useState(""); + const [isDefault, setIsDefault] = useState(false); + + const handleSave = () => { + if (name.trim()) { + onSave( + name.trim(), + description.trim() || undefined, + category || undefined, + isDefault, + ); + } + }; + + return createPortal( +
+
e.stopPropagation()}> +
+

Save Filter View

+ +
+
+
+
+ + setName(e.target.value)} + onKeyDown={(e) => e.key === "Enter" && handleSave()} + autoFocus + /> +
+ +
+ +