Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix]: Update Select Components in manual time modal #3609

Merged
merged 2 commits into from
Feb 15, 2025

Conversation

Innocent-Akim
Copy link
Contributor

@Innocent-Akim Innocent-Akim commented Feb 13, 2025

  • Replace SelectItems with CustomSelect component
  • Standardize select styling across teams, tasks and reasons
  • Fix value handling for team and task selection
  • Remove unused SelectItems import

Description

Please include a summary of the changes and the related issues.

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented on my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings

Previous screenshots

Screen.Recording.2025-02-12.at.1.24.10.PM.mov

Please add here videos or images of the previous status

Current screenshots

Summary by CodeRabbit

  • Style
    • Adjusted card layout in the productivity view with increased minimum height.
    • Refined the visual formatting of loading indicators in the timesheet view.
  • New Features
    • Replaced the previous selection control with a custom select interface in the manual time modal for improved team, task, and reason selection.

- Replace SelectItems with CustomSelect component
- Standardize select styling across teams, tasks and reasons
- Fix value handling for team and task selection
- Remove unused SelectItems import
Copy link
Contributor

coderabbitai bot commented Feb 13, 2025

Walkthrough

This pull request introduces several styling updates across three components. The ProductivityTable component now uses a larger minimum height for its Card element. In the CompactTimesheetComponent, class names for the loading spinner and its container have been reordered. The AddManualTimeModal component has replaced the SelectItems component with a CustomSelect component for team, task, and reason selection, accompanied by minor layout adjustments.

Changes

File(s) Change Summary
apps/web/app/[locale]/…/ProductivityTable.tsx
apps/web/app/[locale]/…/CompactTimesheetComponent.tsx
Updated styling: increased minimum height of Card in ProductivityTable and reordered className strings in CompactTimesheetComponent (no impact on functionality).
apps/web/lib/features/…/add-manual-time-modal.tsx Replaced SelectItems with CustomSelect for selections in the modal and made minor layout/styling adjustments.

Possibly related PRs

Suggested labels

Improvement, UI/UX

Suggested reviewers

  • evereq
  • EverTechDevOps

Poem

I’m a little rabbit, hopping through the code,
Styling changes abound, a new aesthetic load.
The card grows with pride, the spinner spins anew,
CustomSelect now leads the way, making dreams come true.
With every line a hop, our UI feels so light,
Celebrating these tweaks from morning till night!
🐰✨

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

apps/web/lib/features/manual-time/add-manual-time-modal.tsx

Oops! Something went wrong! :(

ESLint: 8.46.0

ESLint couldn't find the config "next/core-web-vitals" to extend from. Please check that the name of the config is correct.

The config "next/core-web-vitals" was referenced from the config file in "/apps/web/.eslintrc.json".

If you still have problems, please stop by https://eslint.org/chat/help to chat with the team.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🔭 Outside diff range comments (1)
apps/web/lib/features/manual-time/add-manual-time-modal.tsx (1)

192-198: ⚠️ Potential issue

Remove debug console.log statements.

Debug logging statements should be removed before merging to production.

  const handleSelectedValuesChange = (values: { [key: string]: Item | null }) => {
-    console.log(values);
  };

  const handleChange = (field: string, selectedItem: Item | null) => {
-    console.log(`Field: ${field}, Selected Item:`, selectedItem);
  };
🧹 Nitpick comments (1)
apps/web/lib/features/manual-time/add-manual-time-modal.tsx (1)

330-340: Add error handling for CustomSelect components.

While the CustomSelect implementations are consistent, they lack error handling for failed selections. Consider adding error states and user feedback.

  <CustomSelect
    valueKey="id"
    defaultValue={activeTeam?.id ?? ''}
    classNameGroup="max-h-[40vh] dark:!text-white "
    ariaLabel="teams"
    className="w-full border-gray-300 dark:border-slate-600 dark:text-white"
    options={teams || []}
    onChange={(value) => {
+     try {
        setTeam(value.id);
+     } catch (error) {
+       setErrorMsg('Failed to select team. Please try again.');
+     }
    }}
+   onError={(error) => setErrorMsg('Failed to load teams. Please try again.')}
  />

Also applies to: 348-358, 377-385

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between ebb12bd and 22aa48f.

📒 Files selected for processing (3)
  • apps/web/app/[locale]/dashboard/app-url/components/ProductivityTable.tsx (1 hunks)
  • apps/web/app/[locale]/timesheet/[memberId]/components/CompactTimesheetComponent.tsx (2 hunks)
  • apps/web/lib/features/manual-time/add-manual-time-modal.tsx (11 hunks)
✅ Files skipped from review due to trivial changes (1)
  • apps/web/app/[locale]/dashboard/app-url/components/ProductivityTable.tsx
🧰 Additional context used
🧠 Learnings (1)
apps/web/lib/features/manual-time/add-manual-time-modal.tsx (1)
Learnt from: Innocent-Akim
PR: ever-co/ever-teams#3208
File: apps/web/app/[locale]/timesheet/components/TimesheetFilter.tsx:30-35
Timestamp: 2024-11-12T14:06:02.202Z
Learning: In the `TimesheetFilter` component, the `Add Time` button does not need to use the `AddManualTimeModal` component, as per the user's decision.
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: Codacy Static Code Analysis
  • GitHub Check: deploy
🔇 Additional comments (3)
apps/web/app/[locale]/timesheet/[memberId]/components/CompactTimesheetComponent.tsx (1)

5-5: LGTM! Class name reordering maintains functionality.

The reordering of class names in both the LoadingSpinner and ImageWithLoader components is a clean-up change that doesn't affect the component's behavior.

Also applies to: 32-32

apps/web/lib/features/manual-time/add-manual-time-modal.tsx (2)

5-5: LGTM! Import changes align with component updates.

The import changes correctly support the replacement of SelectItems with CustomSelect.

Also applies to: 21-21


172-180: LGTM! Employee selection is properly configured.

The employee selection field is correctly implemented with:

  • Proper conditional rendering
  • Translation support
  • Required field validation

- Remove unnecessary || [] conditions from CustomSelect options
- Clean up options handling for teams, tasks, and reasons selects
- Improve code clarity by removing redundant array conversions
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (4)
apps/web/lib/features/manual-time/add-manual-time-modal.tsx (4)

172-179: Consider adding type safety to field configurations.

While the employee field configuration is well-structured, consider creating a type for the field configuration to ensure type safety and maintainability.

type FieldConfig = {
  label: string;
  placeholder: string;
  isRequired: boolean;
  valueKey: string;
  displayKey: string;
  element: 'Project' | 'Employee' | 'Task';
};

192-198: Remove console.log statements before deployment.

Development logs should be removed from production code.

  const handleSelectedValuesChange = (values: { [key: string]: Item | null }) => {
-   console.log(values);
  };

  const handleChange = (field: string, selectedItem: Item | null) => {
-   console.log(`Field: ${field}, Selected Item:`, selectedItem);
  };

330-340: Consider extracting common CustomSelect configuration.

The CustomSelect components share similar configurations. Consider extracting the common configuration to reduce duplication and improve maintainability.

const commonSelectConfig = {
  classNameGroup: "max-h-[40vh] dark:!text-white",
  className: "w-full border-gray-300 dark:border-slate-600 dark:text-white"
};

// Usage
<CustomSelect
  {...commonSelectConfig}
  valueKey="id"
  defaultValue={activeTeam?.id ?? ''}
  ariaLabel="teams"
  options={teams}
  onChange={(value) => setTeam(value.id)}
/>

Also applies to: 348-358, 377-385


93-101: Enhance error handling for form submission.

The current error handling is basic. Consider implementing more specific error messages and handling edge cases.

if (!date) {
  setErrorMsg(t('errors.DATE_REQUIRED'));
  return;
}
if (!startTime) {
  setErrorMsg(t('errors.START_TIME_REQUIRED'));
  return;
}
if (!endTime) {
  setErrorMsg(t('errors.END_TIME_REQUIRED'));
  return;
}
if (!team) {
  setErrorMsg(t('errors.TEAM_REQUIRED'));
  return;
}
if (!taskId) {
  setErrorMsg(t('errors.TASK_REQUIRED'));
  return;
}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 22aa48f and dff43a6.

📒 Files selected for processing (1)
  • apps/web/lib/features/manual-time/add-manual-time-modal.tsx (11 hunks)
🧰 Additional context used
🧠 Learnings (1)
apps/web/lib/features/manual-time/add-manual-time-modal.tsx (1)
Learnt from: Innocent-Akim
PR: ever-co/ever-teams#3208
File: apps/web/app/[locale]/timesheet/components/TimesheetFilter.tsx:30-35
Timestamp: 2024-11-12T14:06:02.202Z
Learning: In the `TimesheetFilter` component, the `Add Time` button does not need to use the `AddManualTimeModal` component, as per the user's decision.
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: Codacy Static Code Analysis
  • GitHub Check: deploy
🔇 Additional comments (2)
apps/web/lib/features/manual-time/add-manual-time-modal.tsx (2)

5-5: LGTM! Import changes align with component updates.

The removal of SelectItems and addition of CustomSelect imports align with the PR objectives.

Also applies to: 21-21


41-161: LGTM! State management is well-structured.

The component maintains clean state management with proper separation of concerns.

@evereq evereq merged commit b9f2a96 into develop Feb 15, 2025
13 checks passed
@evereq evereq deleted the fix/manual-time-select-components branch February 15, 2025 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Adjust the data in the Dropdown located in the Add Time Modal.
2 participants