Skip to content

chore: merge beta into alpha - #974

Merged
jondricek merged 357 commits into
alphafrom
beta
Oct 9, 2026
Merged

chore: merge beta into alpha#974
jondricek merged 357 commits into
alphafrom
beta

Conversation

@jondricek

@jondricek jondricek commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

Summary

Bring upstream alpha up to date with beta, including the release-management UI and other accumulated frontend changes.

beta → alpha

Evidence

  • Before: alpha at ec2d553f has one unique empty commit (ci: build alpha); beta at 9ca12c20 has 357 commits absent from alpha. Alpha has no unique file changes to preserve.
    After: git merge-tree --write-tree alpha beta succeeds without conflicts, and the simulated merge's file tree exactly matches beta.
  • Branch comparison and merge simulation performed on October 9, 2026. Application tests were not run for this branch synchronization; PR checks provide CI validation.

Merge Danger

Door: two-way

The branch merge can be reverted, though published prereleases require separate handling.

Blast Radius: frontend

Updates alpha across 291 files. Merging triggers the alpha CI/release workflow and may publish an alpha prerelease and container image.

adpare and others added 30 commits May 17, 2026 13:58
@adpare
feat: add an option to preserve relationships
d5bb37c
@adpare
refactor: move deprecate to toolbar
6bce613
@clemiller
feat(navigation): add documentation sub-navigation
4e98c79
@clemiller
fix(navigation): collapse restricted nav groups when logged out
e5686ba
@clemiller
Merge pull request #856 from center-for-threat-informed-defense/777-n…
7f85813 
…avigation-overhaul

777 navigation overhaul
@adpare
test: update tests to match refactored behavior
6acf754
@adpare
chore: fix code identation
a859fb1
@adpare
chore: update deprecate icon
e98c82b
@clemiller
feat(header): improve account avatar trigger and menu
70b3ee1
@clemiller
feat(dashboard): add knowledge base overview charts
1c5a447
@clemiller
feat(navigation): show pending user account indicator
cca7030
@clemiller
Merge pull request #858 from center-for-threat-informed-defense/269-s…
2f58eaa 
…tatistics-dashboard

Navigation, Header & Dashboard Updates
@adpare
chore: remove unrevoke
a16d8db
@adpare
chore: fix identation
ad999a1
@dependabot
build(deps): bump tmp from 0.2.5 to 0.2.7
3bb52f2 
Bumps [tmp](https://github.com/raszi/node-tmp) from 0.2.5 to 0.2.7.
- [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
- [Commits](raszi/node-tmp@v0.2.5...v0.2.7)

---
updated-dependencies:
- dependency-name: tmp
  dependency-version: 0.2.7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@clemiller
Merge pull request #820 from center-for-threat-informed-defense/imple…
804c09d 
…ment-revoke

feat: use new revoke endpoint
@adpare
feat: add diff view to the release dashboard page
d1165d9
@dependabot
build(deps-dev): bump shell-quote from 1.8.3 to 1.8.4
b2eabc7 
Bumps [shell-quote](https://github.com/ljharb/shell-quote) from 1.8.3 to 1.8.4.
- [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md)
- [Commits](ljharb/shell-quote@v1.8.3...v1.8.4)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-version: 1.8.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@clemiller
Merge pull request #855 from center-for-threat-informed-defense/depen…
f81cfc1 
…dabot/npm_and_yarn/mermaid-11.15.0

build(deps): bump mermaid from 11.14.0 to 11.15.0
@clemiller
Merge pull request #865 from center-for-threat-informed-defense/depen…
4ace553 
…dabot/npm_and_yarn/shell-quote-1.8.4

build(deps-dev): bump shell-quote from 1.8.3 to 1.8.4
@clemiller
Merge pull request #848 from center-for-threat-informed-defense/depen…
1c4ccf7 
…dabot/npm_and_yarn/fast-uri-3.1.2

build(deps-dev): bump fast-uri from 3.1.0 to 3.1.2
@clemiller
Merge pull request #863 from center-for-threat-informed-defense/depen…
4e5f969 
…dabot/npm_and_yarn/tmp-0.2.7

build(deps): bump tmp from 0.2.5 to 0.2.7
@clemiller
Merge pull request #839 from center-for-threat-informed-defense/depen…
15d65ac 
…dabot/npm_and_yarn/main/commitlint/config-conventional-20.5.3

build(deps-dev): bump @commitlint/config-conventional from 20.5.0 to 20.5.3
@clemiller
Merge pull request #849 from center-for-threat-informed-defense/depen…
a2c2f96 
…dabot/npm_and_yarn/babel/plugin-transform-modules-systemjs-7.29.4

build(deps-dev): bump @babel/plugin-transform-modules-systemjs from 7.29.0 to 7.29.4
@dependabot
build(deps): bump qs and express
7aab801 
Bumps [qs](https://github.com/ljharb/qs) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together.

Updates `qs` from 6.15.1 to 6.15.2
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.15.1...v6.15.2)

Updates `express` from 4.22.1 to 4.22.2
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/v4.22.2/History.md)
- [Commits](expressjs/express@v4.22.1...v4.22.2)

---
updated-dependencies:
- dependency-name: express
  dependency-version: 4.22.2
  dependency-type: indirect
- dependency-name: qs
  dependency-version: 6.15.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
@clemiller
Merge pull request #860 from center-for-threat-informed-defense/depen…
d3976fa 
…dabot/npm_and_yarn/multi-f792d6d6d9

build(deps): bump qs and express
@dependabot
build(deps): bump the angular-ecosystem group across 1 directory with…
7b5330a 
… 11 updates

Bumps the angular-ecosystem group with 11 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [@angular/animations](https://github.com/angular/angular/tree/HEAD/packages/animations) | `19.2.21` | `19.2.25` |
| [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) | `19.2.21` | `19.2.25` |
| [@angular/compiler](https://github.com/angular/angular/tree/HEAD/packages/compiler) | `19.2.21` | `19.2.25` |
| [@angular/core](https://github.com/angular/angular/tree/HEAD/packages/core) | `19.2.21` | `19.2.25` |
| [@angular/forms](https://github.com/angular/angular/tree/HEAD/packages/forms) | `19.2.21` | `19.2.25` |
| [@angular/platform-browser](https://github.com/angular/angular/tree/HEAD/packages/platform-browser) | `19.2.21` | `19.2.25` |
| [@angular/platform-browser-dynamic](https://github.com/angular/angular/tree/HEAD/packages/platform-browser-dynamic) | `19.2.21` | `19.2.25` |
| [@angular/router](https://github.com/angular/angular/tree/HEAD/packages/router) | `19.2.21` | `19.2.25` |
| [@angular-devkit/build-angular](https://github.com/angular/angular-cli) | `19.2.24` | `19.2.27` |
| [@angular/cli](https://github.com/angular/angular-cli) | `19.2.24` | `19.2.27` |
| [@angular/compiler-cli](https://github.com/angular/angular/tree/HEAD/packages/compiler-cli) | `19.2.21` | `19.2.25` |



Updates `@angular/animations` from 19.2.21 to 19.2.25
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/v19.2.25/packages/animations)

Updates `@angular/common` from 19.2.21 to 19.2.25
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/v19.2.25/packages/common)

Updates `@angular/compiler` from 19.2.21 to 19.2.25
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/v19.2.25/packages/compiler)

Updates `@angular/core` from 19.2.21 to 19.2.25
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/v19.2.25/packages/core)

Updates `@angular/forms` from 19.2.21 to 19.2.25
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/v19.2.25/packages/forms)

Updates `@angular/platform-browser` from 19.2.21 to 19.2.25
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/v19.2.25/packages/platform-browser)

Updates `@angular/platform-browser-dynamic` from 19.2.21 to 19.2.25
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/v19.2.25/packages/platform-browser-dynamic)

Updates `@angular/router` from 19.2.21 to 19.2.25
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/v19.2.25/packages/router)

Updates `@angular-devkit/build-angular` from 19.2.24 to 19.2.27
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](angular/angular-cli@v19.2.24...v19.2.27)

Updates `@angular/cli` from 19.2.24 to 19.2.27
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md)
- [Commits](angular/angular-cli@v19.2.24...v19.2.27)

Updates `@angular/compiler-cli` from 19.2.21 to 19.2.25
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/v19.2.25/packages/compiler-cli)

---
updated-dependencies:
- dependency-name: "@angular-devkit/build-angular"
  dependency-version: 19.2.26
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
- dependency-name: "@angular/animations"
  dependency-version: 19.2.24
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
- dependency-name: "@angular/cli"
  dependency-version: 19.2.26
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
- dependency-name: "@angular/common"
  dependency-version: 19.2.24
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
- dependency-name: "@angular/compiler"
  dependency-version: 19.2.24
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
- dependency-name: "@angular/compiler-cli"
  dependency-version: 19.2.24
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
- dependency-name: "@angular/core"
  dependency-version: 19.2.24
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
- dependency-name: "@angular/forms"
  dependency-version: 19.2.24
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
- dependency-name: "@angular/platform-browser"
  dependency-version: 19.2.24
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
- dependency-name: "@angular/platform-browser-dynamic"
  dependency-version: 19.2.24
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
- dependency-name: "@angular/router"
  dependency-version: 19.2.24
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: angular-ecosystem
...

Signed-off-by: dependabot[bot] <support@github.com>
@clemiller
Merge pull request #864 from center-for-threat-informed-defense/depen…
bd9597e 
…dabot/npm_and_yarn/main/angular-ecosystem-d613f07ecf

build(deps): bump the angular-ecosystem group across 1 directory with 11 updates
@clemiller
Merge branch 'main' into next
0193bee
@clemiller
Merge branch 'next' into beta
4197fe4
jondricek and others added 26 commits September 21, 2026 13:23
@jondricek
Merge pull request #960 from mitre-attack/fix-relationship-creation
003fd34 
fix: enable saving of subtechnique-of relationships
@seansica
feat(release-tracks): expose draft component selection
60b3ac9
@seansica
Merge pull request #961 from mitre-attack/feat/virtual-track-draft-li…
6c14fda 
…fecycle

feat(release-tracks): expose draft component selection
@seansica
test(save-dialog): eliminate candidate enrollment timing race
160f5e7
@seansica
Merge pull request #962 from mitre-attack/feat/virtual-track-draft-li…
3f92d86 
…fecycle

test(save-dialog): eliminate candidate enrollment timing race
@seansica
feat(release-tracks): manage draft retention and release cleanup
dee66b3
@seansica
fix(release-tracks): correct preview composition and priority controls
592c087 
Preserve explicit component priorities and keep read-only composition cards, metadata, and retirement warnings contained.
@seansica
chore: merge upstream next into draft retention
8fd03ec
@seansica
feat(release-tracks): refine retention and auto-refresh history
73086a6 
Add request-scoped draft retention and edit-gated recurring policies. Provide exact history filters, filter-aware counters, visibility-aware automatic refresh, and dismissible cleanup notifications. Preserve upstream preview composition and priority controls.
@avwchapman
Merge remote-tracking branch 'origin/beta' into 909-virtual-track-ui-…
1f94d50 
…support

# Conflicts:
#	src/app/views/dashboard-page/release-management/release-track-page/release-track-page.component.html
@avwchapman
style: apply formatting after beta merge
bbf9729
@seansica
Merge pull request #963 from mitre-attack/feat/virtual-track-draft-re…
cb7a17e 
…tention

Virtual Track Draft Truncation/Retention Policy
@seansica
feat(admin): add ADM-backed allowed values management
f230a5a 
Add a guided Add New Property workflow and scope-first value checklists
driven by the backend ADM catalog.

Preserve other object-type settings and existing selections, refresh
enabled dropdown choices, surface legacy warnings, and document the
administration workflow.
@seansica
Merge branch 'next' into 909-virtual-track-ui-support
beadbc0
@seansica
fix(release-tracks): improve composition table layout and collapse co…
f4df931 
…ntrols
@seansica
Merge pull request #939 from mitre-attack/909-virtual-track-ui-support
680d574 
Virtual Track UI Support and Hover Changes
@seansica
Merge pull request #966 from mitre-attack/beta
167cd41 
Merge beta to next
@seansica
Merge pull request #965 from mitre-attack/feat/runtime-allowed-values
7a74680 
feat(admin): add ADM-backed allowed values management
@seansica
feat(stix): support complete read-only object previews
44ed1b5
@seansica
feat(release-tracks): browse virtual snapshots and review quarantine
9bcdfb3
@seansica
chore(preview): add isolated virtual snapshot design fixtures
970f026
@seansica
Merge pull request #968 from mitre-attack/feat/virtual-snapshot-views
fc89c77 
Overhaul Virtual Release Tracks UI/UX
@seansica
Merge pull request #967 from mitre-attack/next
654b56a 
merge next into beta
@seansica
fix(lifecycle): preserve special links during ordered deprecation
7a4aac2
@seansica
Merge pull request #972 from mitre-attack/hotfix/lifecycle-relationsh…
79b0f6d 
…ip-integrity

fix: check relationships before deprecating objects
@jondricek
Merge pull request #973 from mitre-attack/next
9ca12c2 
chore(release): promote next lifecycle fixes to beta
@jondricek
jondricek merged commit 6865f0c into alpha Oct 9, 2026
7 checks passed
@codecov-commenter

codecov-commenter commented Oct 9, 2026

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

❌ Patch coverage is 69.52275% with 1092 lines in your changes missing coverage. Please review.
✅ Project coverage is 49.55%. Comparing base (e3f82ad) to head (9ca12c2).
⚠️ Report is 311 commits behind head on alpha.

Files with missing lines Patch % Lines
...membership-section/membership-section.component.ts 50.64% 269 Missing ⚠️
...pp/components/save-dialog/save-dialog.component.ts 70.00% 109 Missing and 8 partials ⚠️
...omponents/object-status/object-status.component.ts 26.15% 96 Missing ⚠️
src/app/classes/release-tracks/snapshot.ts 63.67% 93 Missing ⚠️
...ents/stix/name-property/name-property.component.ts 71.69% 89 Missing and 3 partials ⚠️
...p/components/stix/stix-list/stix-list.component.ts 36.97% 75 Missing ⚠️
...object-card/release-track-object-card.component.ts 57.26% 50 Missing ⚠️
...nts/new-track-dialog/new-track-dialog.component.ts 88.11% 41 Missing ⚠️
src/app/classes/stix/technique.ts 3.57% 27 Missing ⚠️
...preview-dialog/release-preview-dialog.component.ts 90.18% 20 Missing and 7 partials ⚠️
... and 28 more
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files 
@@             Coverage Diff             @@
##            alpha     #974       +/-   ##
===========================================
+ Coverage   31.18%   49.55%   +18.37%     
===========================================
  Files         181      214       +33     
  Lines       18739    29203    +10464     
  Branches      233     2363     +2130     
===========================================
+ Hits         5844    14473     +8629     
- Misses      12895    14641     +1746     
- Partials        0       89       +89

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions

github-actions Bot commented Oct 9, 2026

Copy link
Copy Markdown

🎉 This PR is included in version 4.17.0-alpha.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

released on @alpha

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jondricek @codecov-commenter @adpare @clemiller @seansica @avwchapman