Skip to content

Fix errors with decomposed production with invalid cache entries #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isc-tleavitt merged 3 commits into from
Jan 31, 2025
Merged

Fix errors with decomposed production with invalid cache entries #702

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ac5e43
fix: errors from trying to export undecomposed production; remove inv…
isc-pbarton Jan 30, 2025
96a1306
fix: unit test failure if another running production has conflicting …
isc-pbarton Jan 30, 2025
3f6851e
Merge branch 'main' into fix-decomp-bad-cache
isc-tleavitt Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed Import All options not importing the Embedded Git configuration file
- Improved performance of IDE editing and baselining of decomposed productions
- Fixed Discard / Stash not working on deletes (#688)
- Fixed errors saving decomposed productions when invalid items in item cache (#701)
- Removed unnecessary Add and Remove menu items from decomposed productions (#701)

## [2.9.0] - 2025-01-09

Expand Down
7 changes: 4 additions & 3 deletions cls/SourceControl/Git/Extension.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,9 @@ Method OnSourceMenuContextItem(itemName As %String, menuItemName As %String, ByR
} else {
set Enabled = $case(menuItemName, "AddToSC":1,:-1)
}

}
if ##class(SourceControl.Git.Utils).ItemIsProductionToDecompose(itemName) && ((menuItemName = "AddToSC") || (menuItemName = "RemoveFromSC")) {
set Enabled = -1
}
if (menuItemName '= "") {
set DisplayName = ..LocalizeName(menuItemName)
Expand Down Expand Up @@ -365,8 +367,7 @@ Method OnAfterSave(InternalName As %String, Object As %RegisteredObject = {$$$NU
if $data(productionItems) {
do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
}
}
if ..IsInSourceControl(InternalName) {
} elseif ..IsInSourceControl(InternalName) {
if fromWebApp {
if fullExternalName = ##class(SourceControl.Git.Utils).FullExternalName(InternalName) {
// Reimport item into database
Expand Down
4 changes: 2 additions & 2 deletions test/UnitTest/SourceControl/Git/ProductionDecomposition.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ XData ProductionDefinition3

Method OnBeforeAllTests() As %Status
{
merge ..SourceControlGlobal = ^SYS("SourceControl")
return $$$OK
merge ..SourceControlGlobal = ^SYS("SourceControl")
return ##class(Ens.Director).StopProduction(,1)
}

Method OnBeforeOneTest() As %Status
Expand Down
Loading