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/merge conflicts #1248

Merged
merged 2 commits into from
Sep 3, 2024
Merged

Fix/merge conflicts #1248

merged 2 commits into from
Sep 3, 2024

Conversation

Achintya-Chatterjee
Copy link
Member

Date: 3rd September 2024

Developer Name: @Achintya-Chatterjee


Issue Ticket Number

Description

  • Resolved merge conflict in src/components/taskDetails/index.tsx

Documentation Updated?

  • Yes
  • No

Under Feature Flag

  • Yes
  • No

Database Changes

  • Yes
  • No

Breaking Changes

  • Yes
  • No

Development Tested?

  • Yes
  • No

Screenshots

Screenshot 1

Test Coverage

Screenshot 1

Additional Notes

Achintya-Chatterjee and others added 2 commits August 22, 2024 02:13
* fix: assign text box alignment it would be be appearing where the name is

* feat: Update TaskDetails component and fix test for assignee input

- Updated TaskDetails component to include assignee input with a data-testid of 'assignee-input'.
- Modified the test for rendering the assignee dropdown to correctly identify the assignee input field using the updated test ID.
- Ensured the test checks for the presence of the assignee input field in edit mode.

* refactor: make the superuser to false on test files

* refactor: Reintroduce getExtensionRequestLink function to TaskDetails component

- Added back the getExtensionRequestLink function to handle the extension request URL generation.
- Updated the assignee handling in the render method to include suggestions for editing.
- Maintained the isEditing and isUserAuthorized checks for showing the assignee input field.
- Ensured the task extension request link is correctly generated and displayed in the Dates section.

* fix: Resolve duplicate input field and suggestion box issues in TaskDetails

- Fixed issue with duplicate input fields appearing in the Assignee section.
- Ensured the suggestion box appears correctly below the Assignee input field.
- Applied consistent styling to the Assignee input field and suggestion box.
- Linked the label to the input field using the  attribute.
- Refactored the Assignee input and suggestion box to use the Suggestions component properly.

* fix: classname to be more generic

* refactor: test cases to use those old values

* fix: Ensure consistent width for suggestion box and refactor styles

- Updated suggestion box styles to maintain a consistent width relative to the input field
- Ensured suggestion box width is set to 100% of its parent container
- Adjusted styles for better visual consistency

* Fix: Assignee text box alignment (#1225)

* fix: assign text box alignment it would be be appearing where the name is

* feat: Update TaskDetails component and fix test for assignee input

- Updated TaskDetails component to include assignee input with a data-testid of 'assignee-input'.
- Modified the test for rendering the assignee dropdown to correctly identify the assignee input field using the updated test ID.
- Ensured the test checks for the presence of the assignee input field in edit mode.

* refactor: make the superuser to false on test files

* refactor: Reintroduce getExtensionRequestLink function to TaskDetails component

- Added back the getExtensionRequestLink function to handle the extension request URL generation.
- Updated the assignee handling in the render method to include suggestions for editing.
- Maintained the isEditing and isUserAuthorized checks for showing the assignee input field.
- Ensured the task extension request link is correctly generated and displayed in the Dates section.

* fix: Resolve duplicate input field and suggestion box issues in TaskDetails

- Fixed issue with duplicate input fields appearing in the Assignee section.
- Ensured the suggestion box appears correctly below the Assignee input field.
- Applied consistent styling to the Assignee input field and suggestion box.
- Linked the label to the input field using the  attribute.
- Refactored the Assignee input and suggestion box to use the Suggestions component properly.

* fix: classname to be more generic

* refactor: test cases to use those old values

* fix: Ensure consistent width for suggestion box and refactor styles

- Updated suggestion box styles to maintain a consistent width relative to the input field
- Ensured suggestion box width is set to 100% of its parent container
- Adjusted styles for better visual consistency

* Corrected loading issue and extra space in standup submit (#1230)

Co-authored-by: Shubham Sharma <shbh541@gmail.com>

* fix: prevent Status field from being displayed twice in TaskDetails component

Refactored TaskDetails component to conditionally render either the TaskDropDown for editing or the Details component for viewing the status, ensuring the Status field is only displayed once depending on the editing state.

* fix: prevent Status field from being displayed twice in TaskDetails component

Refactored TaskDetails component to conditionally render either the TaskDropDown for editing or the Details component for viewing the status, ensuring the Status field is only displayed once depending on the editing state.

* Fix: Assignee text box alignment (#1225) (#1228) (#1234)

* Refactor else condition (#1240)

* Corrected loading issue and extra space in standup submit

* Fixed early return

---------

Co-authored-by: Shubham Sharma <shbh541@gmail.com>

---------

Co-authored-by: Amit Prakash <34869115+iamitprakash@users.noreply.github.com>
Co-authored-by: Shubham Sharma <68867418+skv93-coder@users.noreply.github.com>
Co-authored-by: Shubham Sharma <shbh541@gmail.com>
@Achintya-Chatterjee Achintya-Chatterjee self-assigned this Sep 3, 2024
Copy link

vercel bot commented Sep 3, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
status-app ✅ Ready (Inspect) Visit Preview 💬 Add feedback Sep 3, 2024 1:38pm

@Achintya-Chatterjee Achintya-Chatterjee mentioned this pull request Sep 3, 2024
10 tasks
@iamitprakash iamitprakash merged commit c0e1a94 into develop Sep 3, 2024
3 checks passed
@iamitprakash iamitprakash deleted the fix/merge-conflicts branch September 3, 2024 17:52
iamitprakash added a commit that referenced this pull request Sep 3, 2024
iamitprakash added a commit that referenced this pull request Sep 3, 2024
@Achintya-Chatterjee Achintya-Chatterjee restored the fix/merge-conflicts branch September 3, 2024 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants