Merging Upstream #43
Open
Merging Upstream #43
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nism - Add refreshData method to SearchPage for reloading search results - Update SearchResults and SearchDeleteButtons to support data refresh after deletion - Remove unnecessary console.log statements - Simplify delete logic in SearchDeleteButtons
- Create LiveViewOverlay to provide user guidance during live view mode - Implement hover and click interactions for the overlay - Add zIndex adjustments in MainTimelineChart - Remove debug console logs from ItemsTable - Integrate LiveViewOverlay into TimelinePage
- Add SumItem type to MetricTiles.utils for better type checking - Update LineChart to improve time scaling and remove unnecessary variables - Enhance SummaryCalendar utility to handle edge cases with date conversion - Modify OnlineChart utility to handle empty arrays and improve type safety - Add null checks and type assertions in TrayList and other components - Remove unused variables and improve type handling across multiple files
- Extract TableButtonsProps interface to TrackItemTable.utils - Add defaultTableButtonsProps for consistent default values - Update SearchResults, TrackItemTable, and related components to use new props structure - Remove redundant type definitions and improve component interfaces - Simplify prop passing and reduce code duplication
Issues/282
- Add TypeScript interface for TimeLeft in time.util.ts - Create OnlineChartTooltipLabel component for custom chart tooltips - Simplify OnlineChart label rendering - Improve type safety and code readability
- Enhance tooltip with time elapsed since track item end - Import shortTime utility function - Calculate and display time ago for each track item - Improve tooltip information readability
Issues/187
- Replace Knex and Objection with Drizzle ORM for database operations - Update database schema and migration strategy - Refactor services to use Drizzle query methods - Add new Drizzle configuration and migration scripts - Improve type safety and database interaction - Remove legacy Objection model files - Update database connection and initialization logic
- Update AppTrackItemJob to handle null checks and prevent potential errors - Modify StateManager to add null check for current track item - Enhance SettingsService with default settings and improved error handling - Rename getRawTrackItem to getRawTrackItem2 in trackItem.api - Adjust tsconfig to remove strict local and parameter checks
- Change track items schema to use timestamp_ms for beginDate and endDate - Modify state-manager to work with Date objects instead of ISO strings - Update track-item-service to convert date strings to Date objects in queries - Remove unnecessary logging in findAllDayItems method - Refactor import order in task-analyser
- Simplify date type handling in BackgroundUtils and StateManager - Update package.json database generation script - Modify Drizzle schema to use integer type for dates - Remove unnecessary date conversion logic - Generate new database migration
…ervices - Convert Date objects to timestamps in background services and jobs - Update TrackItemRaw interface to use number for beginDate and endDate - Modify type annotations and date conversion logic across multiple files - Ensure consistent timestamp handling in Drizzle ORM schema - Generate new database migration with updated schema
- Add checks for existing Knex migration and application tables - Implement logic to handle migration state during database connection - Create drizzle_migrations table if not exists - Mark initial migration as applied for existing databases - Remove legacy Knex migration tables - Improve logging and error handling during database setup
- Add performance pragmas and optimizations to SQLite database connection - Implement prepared statements for common database queries - Add indexes to improve query performance on TrackItems and Settings tables - Enhance schema with unique constraints and non-nullable fields - Update migration to reflect schema improvements - Refactor track-item-service to use prepared statements and transactions
- Add comprehensive type definitions for prepared statements - Implement type-safe prepared statement utility function - Introduce executeBatch utility for efficient bulk operations - Improve SQLite connection configuration with additional performance pragmas - Add more granular and optimized query prepared statements - Enhance transaction handling with immediate mode
- Remove debug console.log statements in findAllDayItems method - Clean up redundant data retrieval and logging - Simplify method implementation by removing unnecessary data fetching
- Update SearchResults and ItemsTable components to use consistent data property names - Modify SearchPage to simplify data fetching and state management - Update TrackItemService to improve total duration calculation - Adjust API and interface types for more consistent data structure - Remove unnecessary state variables and simplify search logic
- Modify TrackItemTable component to use sumTotal prop - Ensure consistency with recent data handling refactors
… improve type safety - Remove prepared statements from db.ts and runInTransaction utility - Update TrackItemService to use Drizzle ORM methods directly - Simplify database interactions with native Drizzle query methods - Add default work settings in SettingsService - Improve error handling and type consistency in service layer
# Conflicts: # electron/package.json # electron/pnpm-lock.yaml # electron/tsconfig.json
- Update package.json to use Vite, Electron Renderer, and TypeScript ESLint - Remove webpack, ts-loader, and other legacy build dependencies - Update build and development scripts - Adjust Vite configuration to handle external modules - Upgrade TypeScript and related development dependencies - Simplify project configuration and build process
…bility - Update package.json postinstall script to run electron-rebuild - Ensure native module compatibility with Electron runtime - Simplify native dependency rebuilding during project setup
- Remove redundant JSON parsing in settings service methods - Add development mode configuration for separate app data path - Enhance Vite configuration with migration file copying - Add fs-extra as a development dependency - Simplify settings retrieval and JSON string generation
- Add `destroy()` method to AppManager to close database connection - Implement `cleanupBackgroundJob()` to clear background job interval - Update app quit and will-quit event handlers to properly clean up resources
…tests - Eliminated the unused DateTime import from luxon in the watchForBreakNotification.utils.test.ts file to clean up the code. - This change enhances code clarity and maintains consistency in the test suite.
Issues/338-floating-box
- Updated the ItemsTable component to calculate subtotal using differenceInMilliseconds for improved accuracy. - Refactored the TrackItemTable component to directly filter items based on the visible timerange and calculate total duration accordingly. - Removed unused variables to streamline the code and enhance clarity.
- Added a new method `positionTrayWindow` in the WindowManager class to enhance the positioning of the tray window on macOS when "auto-hide" is enabled. - Implemented an interval to continuously adjust the window position based on the tray's location, preventing flickering and ensuring proper alignment. - Cleaned up the `setTrayWindow` method by delegating the positioning logic to the new method for better code organization and clarity.
- Introduced a new setting in the AppForm component to enable tray positioning for the auto-hide menu bar on macOS. - Added corresponding getter and setter functions in the settings API to manage the new configuration. - Updated the WindowManager to improve tray window positioning based on the new setting, enhancing user experience on macOS.
- Updated the condition for checking auto-updates to ensure it only triggers when the application is online, enhancing the reliability of the update process. - This change improves the overall user experience by preventing unnecessary update checks when the application is offline.
- Updated package.json to increment the version from 4.0.19 to 4.0.20, reflecting the latest changes and improvements in the application.
Issues/336
… are not in order, only one is cleaned up
- Implemented a new test case in `watchAndSetAppTrackItem.test.ts` to verify that app tracking ends correctly when the state changes to IDLE or OFFLINE. - Enhanced logging in `watchAndSetAppTrackItem.ts` and `watchForIdleState.ts` to improve debugging and error handling. - Updated logger names for clarity in `watchAndSetLogTrackItem.ts` and `watchAndSetAppTrackItem.ts`. - Improved the insert log message in `trackItem.db.ts` to provide more context during item insertion.
9apr weird timeline bugs
- Updated package.json to increment the version from 4.0.21 to 4.0.22. - Added performance optimizations in index.ts by enabling hardware acceleration and adjusting command line switches. - Modified window-manager.ts to disable background throttling and enable preferred size mode for improved window management. - Adjusted throttle timing for window resize and move events to enhance responsiveness. - Set cache size in db.ts to improve database performance.
- Updated package.json to increment the version from 4.0.21 to 4.0.22, reflecting the latest changes and improvements in the application. - Upgraded electron-builder from 25.1.8 to 26.0.12 for enhanced build capabilities.
- Updated electron-builder.yml to set maximum compression and specify supported languages. - Improved performance settings in index.ts by adding various command line switches for GPU acceleration, memory optimization, and background process management. - Refactored webPreferences in window-manager.ts to use a common configuration for consistency and maintainability.
Issues/344
- Replaced service calls in API.ts with dbClient methods for better database management. - Updated vite.config.ts to utilize the latest electron and renderer plugins for improved build performance. - Introduced new utility functions in background.utils.ts for handling ongoing track items. - Refactored various services to streamline database operations and enhance code maintainability. - Removed deprecated settings and app-setting services to simplify the codebase.
… interactions - Introduced vitest.setup.ts for mocking Electron modules to facilitate testing. - Updated existing mocks in tests to ensure consistent behavior across different test files. - Refactored database client imports to use the new dbClient module for better organization. - Created worker.testUtils.ts to provide a mock implementation for worker threads. - Enhanced test utilities to support in-memory database operations and improve test isolation.
Issues/344
- Added a new exportFile function to handle exporting track items in CSV or JSON format. - Updated the API to utilize the new export functionality, replacing the previous findAndExportAllItems method. - Refactored related database queries to streamline the export process and improve code organization.
- Introduced recentDaysCount property to DataSettingsI for enhanced configuration. - Updated default data settings in RootContext and settings-service to include recentDaysCount. - Ensured proper merging of default and fetched settings in fetchDataSettings function.
Settings refactor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.