Skip to content

Merge stable into develop - #10056

Closed
infrahub-github-bot-app[bot] wants to merge 11 commits into
developfrom
stable
Closed

Merge stable into develop#10056
infrahub-github-bot-app[bot] wants to merge 11 commits into
developfrom
stable

Conversation

@infrahub-github-bot-app

@infrahub-github-bot-app infrahub-github-bot-app Bot commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Merging stable into develop after merging pull request #10043.

Review in cubic

dependabot Bot and others added 5 commits July 27, 2026 07:30
Bumps the uv group with 1 update in the / directory: [gitpython](https://github.com/gitpython-developers/GitPython).


Updates `gitpython` from 3.1.52 to 3.1.54
- [Release notes](https://github.com/gitpython-developers/GitPython/releases)
- [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES)
- [Commits](gitpython-developers/GitPython@3.1.52...3.1.54)

---
updated-dependencies:
- dependency-name: gitpython
  dependency-version: 3.1.54
  dependency-type: direct:production
  dependency-group: uv
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update python_sdk to version v1.22.2 against stable
update the cypher query for get_node_field_summaries() to only check
objects that are part of the diff instead of erroneously including
objects with the same UUID from different diffs
…updates (#10043)

Bumps the npm_and_yarn group with 1 update in the /frontend/app directory: [react-router](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router).
Bumps the npm_and_yarn group with 2 updates in the /frontend/packages/plugins/template directory: [brace-expansion](https://github.com/juliangruber/brace-expansion) and [postcss](https://github.com/postcss/postcss).


Updates `react-router` from 7.18.0 to 8.3.0
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/react-router@8.3.0/packages/react-router)

Updates `brace-expansion` from 1.1.16 to 5.0.8
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](juliangruber/brace-expansion@v1.1.16...v5.0.8)

Updates `postcss` from 8.5.15 to 8.5.23
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.5.15...8.5.23)

Updates `esbuild` from 0.25.2 to 0.25.12
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG-2025.md)
- [Commits](evanw/esbuild@v0.25.2...v0.25.12)

---
updated-dependencies:
- dependency-name: react-router
  dependency-version: 8.3.0
  dependency-type: direct:production
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 5.0.8
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: postcss
  dependency-version: 8.5.23
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: esbuild
  dependency-version: 0.25.12
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@infrahub-github-bot-app
infrahub-github-bot-app Bot requested review from a team as code owners July 28, 2026 08:17
@polmichel polmichel self-assigned this Jul 28, 2026
@polmichel
polmichel marked this pull request as draft July 28, 2026 08:45
pa-lem and others added 2 commits July 28, 2026 16:36
Relationship selectors in object forms now honor the `common_parent` schema
property: options are filtered to peers that share the same parent as the value
picked for the referenced relationship in the same form, instead of listing
every peer.

- Add useCommonParentFilter hook: watches the sibling common_parent field and
  derives a single-hop `<X>__ids` filter (plus a matching RelationshipInput
  parent shape).
- Apply across the many, node, generic, and hierarchical relationship fields.
- Hide the manual parent picker on cardinality-one fields when common_parent is
  set, since the parent is then driven by the sibling field.

Keep the selection consistent with the filter so it can't be bypassed:
- Clear the current selection when the chosen parent changes (a peer valid under
  the old parent no longer satisfies the constraint).
- Pre-fill the inline "Add new" create form with the chosen parent, so a peer
  created there satisfies the constraint instead of being an escape hatch.
- Keep the filter applied on UUID searches (opt-in), and drop the hierarchical
  "Explore" tree tab, which browses a different axis and can't honor the filter.

Fixes IFC-1646.

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
fix: skip merged branches during git repository sync

A git branch mapping to a merged (read-only) Infrahub branch caused
collect_pending_imports to issue a CoreRepositoryUpdate, which the graph
rejects for merged branches. The unhandled error aborted the entire sync
flow on every cron cycle, so no branches or repositories synced at all.

Branches in a terminal status are now skipped during collection, letting
the remaining branches and repositories sync as normal.

Also:
- Add a regression test covering the merged-branch case.
- Stub sdk.branch.all() in the git conftest, shared by the sync tests and
  the lock-scope test. The skip introduces a branch.all() call on the
  sync path, which the dummy SDK requester answers with an empty payload
  and raises KeyError: 'Branch'.
- Add a changelog fragment.

Fixes #9931
@ogenstad ogenstad closed this Jul 29, 2026
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.

7 participants