feature[ats_PZ18R]: Publish ICD change reports

2 files changed, 29 insertions, 25 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java
index 9286949fcce..3e3511fb468 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java
@@ -87,10 +87,11 @@ public final class ExportChangeReportOperation extends AbstractOperation {
       for (Artifact workflow : workflows) {
          Collection<Change> changes = computeChanges(workflow, monitor);
          if (!changes.isEmpty() && changes.size() < 4000) {
-            String legacyPcrId = workflow.getSoleAttributeValueAsString(AtsAttributeTypes.LegacyPcrId, null);
+            String id =
+               workflow.getSoleAttributeValueAsString(AtsAttributeTypes.LegacyPcrId, workflow.getHumanReadableId());
 
             Collection<ArtifactDelta> artifactDeltas = ChangeManager.getCompareArtifacts(changes);
-            String prefix = "/" + legacyPcrId;
+            String prefix = "/" + id;
             RendererManager.diff(collector, artifactDeltas, prefix, NO_DISPLAY, true, SKIP_DIALOGS, true);
          }
          monitor.worked(calculateWork(0.50));
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java
index 88c0fcf3a01..46140978527 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java
@@ -183,38 +183,41 @@ public class TeamWorldSearchItem extends WorldUISearchItem {
 
       Set<Artifact> resultSet = new HashSet<Artifact>();
       for (Artifact art : artifacts) {
-         AbstractWorkflowArtifact awa = (AbstractWorkflowArtifact) art;
-         // don't include if userArt specified and userArt not assignee
-         if (userArt != null && !awa.getStateMgr().getAssignees().contains(userArt)) {
-            continue;
-         }
-         // don't include if version specified and workflow's not targeted for version
-         if (versionArt != null) {
-            TeamWorkFlowArtifact team = awa.getParentTeamWorkflow();
-            if (team != null && (team.getTargetedVersion() == null || !team.getTargetedVersion().equals(versionArt))) {
+         if (art instanceof AbstractWorkflowArtifact) {
+            AbstractWorkflowArtifact awa = (AbstractWorkflowArtifact) art;
+
+            // don't include if userArt specified and userArt not assignee
+            if (userArt != null && !awa.getStateMgr().getAssignees().contains(userArt)) {
                continue;
             }
-         }
-         // don't include if release option doesn't match relese state of targeted version
-         if (releasedOption != ReleasedOption.Both) {
-            TeamWorkFlowArtifact team = awa.getParentTeamWorkflow();
-            if (team != null) {
-               // skip if released is desired and version artifact is not set
-               VersionArtifact setVerArt = team.getTargetedVersion();
-               if (setVerArt == null && releasedOption == ReleasedOption.Released) {
+            // don't include if version specified and workflow's not targeted for version
+            if (versionArt != null) {
+               TeamWorkFlowArtifact team = awa.getParentTeamWorkflow();
+               if (team != null && (team.getTargetedVersion() == null || !team.getTargetedVersion().equals(versionArt))) {
                   continue;
                }
-               // skip of version release is opposite of desired
-               if (setVerArt != null) {
-                  if (releasedOption == ReleasedOption.Released && !setVerArt.isReleased()) {
-                     continue;
-                  } else if (releasedOption == ReleasedOption.UnReleased && setVerArt.isReleased()) {
+            }
+            // don't include if release option doesn't match relese state of targeted version
+            if (releasedOption != ReleasedOption.Both) {
+               TeamWorkFlowArtifact team = awa.getParentTeamWorkflow();
+               if (team != null) {
+                  // skip if released is desired and version artifact is not set
+                  VersionArtifact setVerArt = team.getTargetedVersion();
+                  if (setVerArt == null && releasedOption == ReleasedOption.Released) {
                      continue;
                   }
+                  // skip of version release is opposite of desired
+                  if (setVerArt != null) {
+                     if (releasedOption == ReleasedOption.Released && !setVerArt.isReleased()) {
+                        continue;
+                     } else if (releasedOption == ReleasedOption.UnReleased && setVerArt.isReleased()) {
+                        continue;
+                     }
+                  }
                }
             }
+            resultSet.add(art);
          }
-         resultSet.add(art);
       }
       if (showAction) {
          return WorkflowManager.filterState(stateName,