deletes of PTD items now delete associated config item from production

not fully working because deleting items with git pull does not work

Author: isc-pbarton

cls/SourceControl/Git/Production.cls

@@ -266,8 +266,11 @@ ClassMethod ParseExternalName(externalName, Output internalName)
     }
 }
 
-/// Given an internal name for a PTD item, returns a suggested filename for export.
-ClassMethod ParseInternalName(internalName, noFolders As %Boolean = 0, Output fileName)
+/// Given an internal name for a PTD item, returns a suggested filename for export, as well as:
+/// - itemName: name of the configuration item
+/// - productionName: name of the associated production
+/// - isProdSettings: if true, this item is a production settings; if false, this item is a configuration item settings
+ClassMethod ParseInternalName(internalName, noFolders As %Boolean = 0, Output fileName, Output itemName, Output productionName, Output isProdSettings As %Boolean)
 {
     set name = $piece(internalName,".",1,*-1)
     if 'noFolders {
@@ -276,9 +279,10 @@ ClassMethod ParseInternalName(internalName, noFolders As %Boolean = 0, Output fi
     }
     // Abbreviate "ProductionSettings" to "ProdStgs", "Settings" to "Stgs".
     Set prefix = $Case($Extract(name), "P":"ProdStgs-", "S":"Stgs-", :"")
-    Set name = prefix_$Piece(name,"-",2,*)
+    set isProdSettings = ($Extract(name) = "P")
+    Set name = $Piece(name,"-",2,*)
     set $ListBuild(itemName, itemClassName) = $ListFromString(name, "|")
-    set name = $select(
+    set name = prefix_$select(
         $get(itemClassName) '= "": itemName_$zhex($zcrc(itemClassName,6)),
         1: name
     )
@@ -288,4 +292,28 @@ ClassMethod ParseInternalName(internalName, noFolders As %Boolean = 0, Output fi
     set fileName = $translate($replace(name, ".", "_") _ ".xml", "\", "/")
 }
 
+/// Given an internal name for a PTD item, removes that item from the production.
+ClassMethod RemoveItem(internalName, noFolders As %Boolean = 0) As %Status
+{
+    set sc = $$$OK
+    try {
+        if '##class(%Library.EnsembleMgr).IsEnsembleNamespace() {
+            quit
+        }
+        do ..ParseInternalName(internalName, noFolders, , .itemName, .productionName, .isProdSettings)
+        if 'isProdSettings {
+            set production = ##class(Ens.Config.Production).%OpenId(productionName,,.sc)
+            quit:$$$ISERR(sc)
+            set configItem = production.OpenItemByConfigName(itemName,.sc)
+            quit:$$$ISERR(sc)
+            do production.RemoveItem(configItem)
+            set sc = production.%Save()
+            quit:$$$ISERR(sc)
+        }
+    } catch err {
+        set sc = err.AsStatus()
+    }
+    return sc
+}
+
 }

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

@@ -43,6 +43,7 @@ Method DeleteFile(item As %String) As %Status
     set sc = $$$OK
     set type = ##class(SourceControl.Git.Utils).Type(item)
     set name = ##class(SourceControl.Git.Utils).NameWithoutExtension(item)
+    set settings = ##class(SourceControl.Git.Settings).%New()
     set deleted = 1
     if type = "prj" {
         set sc = $system.OBJ.DeleteProject(name)
@@ -52,6 +53,11 @@ Method DeleteFile(item As %String) As %Status
         set sc = ##class(%Routine).Delete(item)
     }elseif type = "csp" {
         set sc = $System.CSP.DeletePage(item)
+    } elseif settings.decomposeProductions && (type = "ptd") {
+        set sc = ##class(%SYSTEM.Status).AppendStatus(
+            ##class(SourceControl.Git.Production).RemoveItem(item),
+            ##class(%Library.RoutineMgr).Delete(item)
+        )
     }elseif ##class(SourceControl.Git.Utils).UserTypeCached(item) {
         set sc = ##class(%Library.RoutineMgr).Delete(item)
     } else {
@@ -71,4 +77,3 @@ Method DeleteFile(item As %String) As %Status
 }
 
 }
-

cls/SourceControl/Git/Utils.cls

@@ -1264,7 +1264,7 @@ ClassMethod ImportItem(InternalName As %String, force As %Boolean = 0, verbose A
     set type = ..Type(InternalName)
     set imported = 1
     if ..IsRoutineOutdated(InternalName) || force || (type = "ptd"){
-        if (type = "ptd") && ##class(%Library.EnsembleMgr).IsEnsembleNamespace() {
+        if (type = "ptd") && settings.decomposeProductions && ##class(%Library.EnsembleMgr).IsEnsembleNamespace() {
             // Deployment manager should not reexport because studio project file includes timestamp
             // ideally we could just new %SourceControl, but Ens portal config pages do not use %SourceControl
             new %gscSkipSaveHooks
@@ -2682,4 +2682,3 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
 }
 
 }
-