fix: Moved expires_in field after scope in OAuth2 DatasourceForm

[abhijeetnardele24-hash]

Description

This PR moves the expires_in field right after the scope field in the OAuth2 datasource configuration form.

Previously, expires_in was placed at the very end of the form, which made it easy to miss since it was disconnected from the rest of the auth settings. Grouping them together improves the UX when setting up OAuth2.

Fixes #31059

Type of change

• UI/UX enhancement

How Has This Been Tested?

• Tested locally to ensure the expiresIn input correctly appears below the scope input only when the Authorization Code grant type is selected.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[github-actions]

Thanks for contributing to Appsmith!

Credential-free formatting, lint, type, and unit checks will run after GitHub's workflow approval. An Appsmith maintainer will start privileged integration tests or a deploy preview when needed.

No action is required from you while this PR has the awaiting-maintainer label.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Team

Run ID: cffdab7f-affc-4c5a-baaa-580b777f118a

📥 Commits

Reviewing files that changed from the base of the PR and between af38a79 and 2b61eb7.

📒 Files selected for processing (1)

• app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx

Included review availability: Your plan provides up to 10 included reviews per hour; 9 remain after this review.

---

Walkthrough

The OAuth2 form now renders authentication.expiresIn from the shared renderer. The field appears only for the Authorization Code grant type and appears earlier in the form.

Changes

OAuth2 form update

Layer / File(s)	Summary
Authorization Code expiration field app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx	The shared OAuth2 renderer checks the grant type before rendering the expiration input. The previous rendering from the Authorization Code renderer was removed.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk: ⚪ Minimal · up to 2b61e

The OAuth2 expiration field is now grouped directly after scope for Authorization Code datasources without changing its availability or stored field binding. No current merge-readiness risk is identified.

Suggested reviewers: amelia-c0n

Poem

The OAuth form finds its place,
Expiration joins the common space.
Authorization grants it show,
Client Credentials let it go.
A tidy field now flows in line.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Linked Issues check	✅ Passed	The implementation moves the expiresIn field after scope and limits it to the Authorization Code grant, which satisfies issue #31059.
Out of Scope Changes check	✅ Passed	The changes are limited to relocating and conditionally rendering the OAuth2 expiresIn field. No unrelated changes are identified.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 1…
Description check	✅ Passed	The description explains the UI change, provides motivation, references issue #31059, and documents local testing. It does not include the template's Communication section or explicitly select a valid…
Title check	✅ Passed	The title clearly identifies the primary change: moving the OAuth2 expires_in field after scope in the datasource form.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands.}