Skip to content

Merge releases/r10.0 into develop (Hamza's r10.0 changes, ahead of the production release) - #374

Merged
MusaMisto merged 12 commits into
releases/r10.0-developfrom
musa/sync-r10.0-into-develop
Oct 12, 2026
Merged

MusaMisto merged 12 commits into
releases/r10.0-developfrom
musa/sync-r10.0-into-develop

Conversation

@MusaMisto

Copy link
Copy Markdown
Member

r10.0 has six commits that went there directly and never reached develop (#352, #354, #356, #367, #369):

  • the Exchanges property-filter fix (with its integration tests);
  • the Refresh button and its loading state;
  • SW-Bus 10.0.2 and 10.0.3;
  • the chart's default / route.

Merging develop into r10.0 for the first production deploy conflicts with them. Done naively, it would drop them. This PR merges r10.0 into develop first, keeping both sides, so the promotion afterwards is clean.

@hamza @samer, please review the Exchanges parts: Hamza's fixes are ported into Samer's redesign.

How each conflict was resolved

File Resolution
XchangeFilters.cs Develop's retry, scheduled-retry, aggregated and error-text filters, then r10.0's PromotedPropertyKey filter. The key filter has to come before the PromotedPropertiesRaw loop, which searches inside that key's value; that part merged cleanly.
exchanges.ts r10.0's key-apart property terms (PromotedPropertyKey:1:<key> + PromotedPropertiesRaw:4:<value>), then develop's four new filters. Develop's QueryBar already keeps propertyKey and property as separate URL parameters and labels the chip "contains", so it matches the new server semantics without further change.
ExchangesPage.tsx Develop's redesigned page, with r10.0's two UI changes ported into it. Refresh is now a button in the Live control, beside Pause, labelled "Refresh". It reloads the list, the counts and the chart together, so they never disagree. A filter or page change, or Refresh, dims the list under a loading bar (aria-busy); the background live ticks don't. Whitespace-insensitive: +42/−4.
SW.Bitween.Web.csproj Develop's OpenTelemetry packages with SimplyWorks.Bus 10.0.3. The other projects and Bus.RabbitMqExtensions took 10.0.3 without conflict, so every project is on 10.0.3.
docs/configuration.md Both new sections (InitialAdminPassword, Bus:OnInvalidUserToken).
docs/deployment.md Develop's probe text, which describes the chart this branch ships.

docs/operations.md describes Refresh in the Live control, beside Pause.

Checked

  • tsc -b and oxlint are clean.
  • vitest: 108 files, 688 tests pass, including two new ones:
    • Refresh asks again for the list and the counts while paused;
    • a picked property is sent apart from its value.
  • Locally on Node 26, vitest needs NODE_OPTIONS=--no-experimental-webstorage: Node's own localStorage shadows jsdom's. CI uses Node 22.
  • The backend is compiled by this PR's .NET check.
  • Hamza's PromotedPropertySearchTests and the other promoted-property integration tests are running separately against this merge; results will be added here.

MusaMisto and others added 12 commits October 11, 2026 14:02
The Ingress exposed only /api and /swagger, so the admin SPA at / stayed
on whatever else served the host unless every deployment remembered to
add it. A deployment that tried (`ingress.path=/api, /`) found that
`ingress.path` is ignored whenever `ingress.paths` is set, which it
always is by default.

ingress.paths now defaults to [/api, /swagger, /], and ingress.path, the
fallback for an empty list, is / too. Gateway mode already routes / and
renders unchanged.
…10.0

Chart: route / by default, alongside /api and /swagger (r10.0)
…lter

Exchanges: property filter matches any part of the picked property's value
…h-button

Exchanges: add a Refresh button
Brings Hamza's six commits that went straight to r10.0 (#352, #354, #356,
#367, #369) into develop, so develop can be promoted to r10.0 without
dropping them.

Conflicts, resolved keeping both sides:
- XchangeFilters.cs: develop's retry, scheduled-retry, aggregated and
  error-text filters, then r10.0's PromotedPropertyKey filter, which has to
  come before the value loop that searches inside that key's value.
- exchanges.ts: r10.0's key-apart property terms, then develop's four new
  filters.
- ExchangesPage.tsx: develop's redesigned page. r10.0's Refresh button and
  loading state are ported into it: Refresh sits in the Live control and
  reloads the list, counts and chart at once; a filter or page change, or
  Refresh, dims the list under a loading bar, while the background live ticks
  don't.
- SW.Bitween.Web.csproj: develop's OpenTelemetry packages with r10.0's
  SimplyWorks.Bus 10.0.3. The other three projects took 10.0.3 without
  conflict.
- docs/configuration.md: both new sections.
- docs/deployment.md: develop's probe text, which describes the chart this
  branch ships.

Two component tests added: Refresh asks again for the list and the counts
while paused, and a picked property is sent apart from its value.
@coderabbitai

coderabbitai Bot commented Oct 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

🗂️ Base branches to auto review (8)
  • ^main$
  • ^master$
  • ^staging$
  • ^development$
  • ^gigstaging$
  • ^develop$
  • ^releases$
  • ^releases/r10.0$

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration
  • Configuration used: Repository: simplify9/coderabbit/.coderabbit.yaml
  • Review profile: ASSERTIVE
  • Plan: Advanced
  • Run ID: 64be0df5-dbcc-48d2-8de5-68f3d018cf50

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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.

@MusaMisto
MusaMisto merged commit 736f612 into releases/r10.0-develop Oct 12, 2026
4 checks passed
@MusaMisto

Copy link
Copy Markdown
Member Author

Full .NET run against this merge (throwaway branch, since deleted): unit 799 passed, 7 skipped; integration 723 passed, 0 failed. That includes Hamza's PromotedPropertySearchTests and LongPromotedValuesTests.

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