Skip to content

Conversation

@DarkPhoenix2704
Copy link
Member

Change Summary

Disable end Date support for createdAt, updatedAt, Formula

Change type

  • fix: (bug fix for the user, not a fix to a build script)

@dosubot dosubot bot added the size:L This PR changes 100-499 lines, ignoring generated files. label Nov 28, 2024
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Nov 28, 2024

📝 Walkthrough

Walkthrough

The changes in this pull request focus on the ViewCreate.vue and Range.vue components, primarily enhancing the logic for calendar range selection and AI view creation. Key updates include broadening the conditions for enabling/disabling calendar range selection, modifying conditional rendering based on the isEeUI variable, refining error handling, and improving AI integration logic. Additionally, there are general refactorings for better readability and maintainability of the code.

Changes

File Path Change Summary
packages/nc-gui/components/dlg/ViewCreate.vue Updated calendar range selection logic to include UITypes.CreatedTime, UITypes.LastModifiedTime, and UITypes.Formula. Modified conditional rendering for end date selection based on isEeUI. Refined error handling and AI integration logic.
packages/nc-gui/components/smartsheet/toolbar/Calendar/Range.vue Adjusted isDisabled computed property to include additional UITypes. Restructured template for end date button rendering based on isEeUI. Improved dropdown visibility handling and overall control flow.

Possibly related PRs

  • Feat: support createdAt, updatedAt, formula for calendar #8904: This PR supports CreatedAt, UpdatedAt, and Formula fields for calendar views, which relates to the changes in the main PR that broaden the calendar range logic to include additional UITypes.
  • fix: calendar followups #9901: This PR enhances the ViewCreate.vue component with new methods and properties related to calendar ranges, which directly connects to the changes made in the main PR regarding calendar range selection logic.

Suggested labels

🐛 Type: Bug, size:M, lgtm

Suggested reviewers

  • dstala
  • pranavxc

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 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.

@dosubot dosubot bot added the 🐛 Type: Bug Something is broken or incorrect unexpectedly. label Nov 28, 2024
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: 2

🧹 Outside diff range and nitpick comments (4)
packages/nc-gui/components/smartsheet/toolbar/Calendar/Range.vue (2)

282-282: Verify disabled state conditions

The disabled state for the end date selector combines multiple conditions. Consider extracting these conditions into a computed property for better maintainability.

+const isEndDateDisabled = computed(() => !range.fk_from_column_id || isLocked || isDisabled)
-                  :disabled="!range.fk_from_column_id || isLocked || isDisabled"
+                  :disabled="isEndDateDisabled"

254-321: Consider unifying EE and non-EE UI behaviors

The current implementation shows different behaviors for EE and non-EE versions:

  • Non-EE: Shows a button with tooltip
  • EE: Shows a select dropdown

Consider unifying these behaviors to maintain consistency across versions, while still respecting the disabled state for specific field types.

packages/nc-gui/components/dlg/ViewCreate.vue (2)

538-540: Refactor condition for readability and maintainability

Consider simplifying the condition within the isDisabled computed property for better readability:

Apply this diff to refactor the code:

-    [UITypes.DateTime, UITypes.CreatedTime, UITypes.LastModifiedTime, UITypes.Formula].includes(
-      viewSelectFieldOptions.value.find((f) => f.value === form.calendar_range[0]?.fk_from_column_id)?.uidt,
-    ) && !isRangeEnabled.value
+    const selectedUidt = viewSelectFieldOptions.value.find(
+      (f) => f.value === form.calendar_range[0]?.fk_from_column_id
+    )?.uidt
+    const disabledUidts = [
+      UITypes.DateTime,
+      UITypes.CreatedTime,
+      UITypes.LastModifiedTime,
+      UITypes.Formula,
+    ]
+    return disabledUidts.includes(selectedUidt) && !isRangeEnabled.value

This refactor extracts variables and arrays for clarity.


1059-1059: Remove duplicate line numbering

It appears that line 1059 is numbered twice in the annotations. This may cause confusion when referencing specific lines in the code review.

Please adjust the line numbering to reflect the correct lines for clarity.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 6f87fc3 and 76a838f.

📒 Files selected for processing (2)
  • packages/nc-gui/components/dlg/ViewCreate.vue (2 hunks)
  • packages/nc-gui/components/smartsheet/toolbar/Calendar/Range.vue (2 hunks)
🔇 Additional comments (2)
packages/nc-gui/components/smartsheet/toolbar/Calendar/Range.vue (1)

148-150: LGTM: Correctly implements end date disabling for specified field types

The implementation properly extends the disabled state to include CreatedTime, LastModifiedTime, and Formula field types, which aligns with the PR objectives.

packages/nc-gui/components/dlg/ViewCreate.vue (1)

538-540: Ensure isDisabled logic correctly reflects feature availability

The condition for isDisabled now includes additional UITypes (UITypes.CreatedTime, UITypes.LastModifiedTime, UITypes.Formula). Verify that this change aligns with the intended functionality of disabling the calendar range selection for these field types.

To confirm that the logic correctly disables the calendar range when necessary, ensure that the viewSelectFieldOptions contain the expected uidt values and that isRangeEnabled reflects the feature toggle accurately.

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Nov 28, 2024
@github-actions
Copy link
Contributor

github-actions bot commented Nov 28, 2024

Uffizzi Preview deployment-58655 was deleted.

@DarkPhoenix2704 DarkPhoenix2704 self-assigned this Nov 28, 2024
@DarkPhoenix2704 DarkPhoenix2704 merged commit 74f1765 into develop Nov 29, 2024
22 of 70 checks passed
@DarkPhoenix2704 DarkPhoenix2704 deleted the nc-disable-enddate branch November 29, 2024 03:14
This was referenced Dec 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm This PR has been approved by a maintainer size:L This PR changes 100-499 lines, ignoring generated files. 🐛 Type: Bug Something is broken or incorrect unexpectedly.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants