Skip to content

fix: added fix for git pull issue for packages#41389

Merged
sondermanish merged 1 commit intoreleasefrom
fix/git-pull
Nov 17, 2025
Merged

fix: added fix for git pull issue for packages#41389
sondermanish merged 1 commit intoreleasefrom
fix/git-pull

Conversation

@sondermanish
Copy link
Contributor

@sondermanish sondermanish commented Nov 17, 2025

Description

Tip

Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team).

Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR.

Fixes #Issue Number
or
Fixes Issue URL

Warning

If no issue exists, please create an issue first, and check with the maintainers if the issue is valid.

Automation

/ok-to-test tags="@tag.Git"

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/19427681426
Commit: 0424207
Cypress dashboard.
Tags: @tag.Git
Spec:


Mon, 17 Nov 2025 12:08:48 UTC

Communication

Should the DevRel and Marketing teams inform users about this change?

  • Yes
  • No

Summary by CodeRabbit

  • Bug Fixes
    • Improved artifact data consistency during Git pull and publish operations, ensuring proper synchronization of artifact state across workflows.

@sondermanish sondermanish self-assigned this Nov 17, 2025
@sondermanish sondermanish requested a review from a team as a code owner November 17, 2025 11:14
@sondermanish sondermanish added the ok-to-test Required label for CI label Nov 17, 2025
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Nov 17, 2025

Walkthrough

The change modifies pullAndRehydrateArtifact to re-fetch the imported artifact from the data store by ID before publishing. Previously, the method published the artifact object directly after import; now it reloads it from storage to ensure a fresh instance is used for the publish operation.

Changes

Cohort / File(s) Summary
Git artifact rehydration
app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
Added flatMap step to re-fetch imported artifact from data store by ID (with null permission) before publishing

Sequence Diagram

sequenceDiagram
    participant Flow as Reactive Chain
    participant Import as importArtifact()
    participant DB as Data Store
    participant Publish as publishArtifact()

    Flow->>Import: Import branched artifact
    Import-->>Flow: Return imported artifact
    rect rgb(240, 248, 255)
        Note over Flow,DB: New re-fetch step
        Flow->>DB: getArtifactById(id, null)
        DB-->>Flow: Fresh artifact instance
    end
    Flow->>Publish: Publish re-fetched artifact
    Publish-->>Flow: Continue with analytics
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

  • Single file, single method modification
  • Straightforward reactive chain addition with clear intent
  • Verify the null permission parameter is intentional and appropriate for the re-fetch operation

Pre-merge checks and finishing touches

❌ Failed checks (1 warning)
Check name Status Explanation Resolution
Description check ⚠️ Warning The PR description lacks critical information: no issue reference (Fixes #...), no motivation or context explaining why the fix is needed, no dependencies listed, and no supporting documentation links. Add the issue number/URL being fixed, explain the git pull issue for packages (motivation/context), list any dependencies, and include relevant documentation links. Also verify the issue exists per the warning.
✅ Passed checks (2 passed)
Check name Status Explanation
Title check ✅ Passed The title refers to fixing a git pull issue for packages, which aligns with the code change that adds a re-fetch step in the git artifact import-publish flow.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch fix/git-pull

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions bot added the Bug Something isn't working label Nov 17, 2025
@github-actions
Copy link

Failed server tests

  • com.appsmith.server.helpers.UserUtilsTest#makeInstanceAdministrator_WhenUserAlreadyAdmin_MaintainsPermissionsSuccessfully

@sondermanish sondermanish merged commit 3788dee into release Nov 17, 2025
63 of 67 checks passed
@sondermanish sondermanish deleted the fix/git-pull branch November 17, 2025 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Bug Something isn't working ok-to-test Required label for CI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants