#2245 fixing issues by loading metadata and title

Author: DavidBlaa

Components/DLM/BExIS.Dlm.Services/Data/DatasetManager.cs

@@ -1510,7 +1510,7 @@ public List<DatasetVersion> GetDatasetLatestVersions(List<Int64> datasetIds, boo
         /// </summary>
         /// <param name="datasetId">The  identifiers of the dataset whose their latest versions is requested</param>
         /// <returns>The list of the latest versions of the deleted datasets</returns>
-        private DatasetVersion getDeletedDatasetLatestVersion(long datasetId)
+        public DatasetVersion GetDeletedDatasetLatestVersion(long datasetId)
         {
             using (IUnitOfWork uow = this.GetUnitOfWork())
             {

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/FormController.cs

@@ -177,10 +177,15 @@ public ActionResult LoadMetadataByVersion(long entityId, int version=-1, bool lo
 
                      DatasetVersion dsv = null;
 
-                    if (version == -1)
+                    if (version == -1) // latest
                     {
                         dsv = datasetManager.GetDatasetLatestVersion(entityId);
                     }
+                    else if (version == 0 || dataset.Status == DatasetStatus.Deleted) // check may deleted
+                    {
+                        if(dataset.Status == DatasetStatus.Deleted)
+                            dsv = datasetManager.GetDeletedDatasetLatestVersion(entityId);
+                    }
                     else
                     {
                         dsv = datasetManager.GetDatasetVersion(entityId, version);

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Controllers/DataController.cs

@@ -347,6 +347,22 @@ public ActionResult ShowData(long id, int version = 0, bool asPartial = false, s
                             ViewData["State"] = "hidden";
                             ViewData["HasEditRight"] = model.HasEditRight;
 
+                            var deletedVersion = dm.GetDeletedDatasetLatestVersion(id);
+                            latestVersion = true;
+                            latestVersionId = deletedVersion.Id;
+                            versionId = deletedVersion.Id;
+                            version = dm.GetDatasetVersionNr(versionId);
+                            latestVersionNr = dm.GetDatasetVersionNr(latestVersionId);
+
+                            if (deletedVersion != null && deletedVersion.StateInfo != null)
+                            {
+                                isValid = DatasetStateInfo.Valid.ToString().Equals(deletedVersion.StateInfo.State) ? "yes" : "no";
+                                ViewData["IsValid"] = isValid;
+                            }
+
+                            title = deletedVersion != null ? deletedVersion.Title : "n.a.";
+                            labels = getLabels(id, versionId, tag, deletedVersion.Dataset.EntityTemplate.Name);
+
                             model.GrantAccess = false;
                             model.ViewAccess = false;
                             model.DownloadAccess = false;
@@ -426,14 +442,23 @@ public ActionResult ShowData(long id, int version = 0, bool asPartial = false, s
         }
 
         [ChildActionOnly]
-        public async Task<ActionResult> GetCitationOrTitle(long datasetVersionId)
+        public async Task<ActionResult> GetCitationOrTitle(long Id, long datasetVersionId)
         {
             try
             {
                 using (var datasetManager = new DatasetManager())
                 using (var conceptManager = new ConceptManager())
                 {
-                    var datasetVersion = datasetManager.GetDatasetVersion(datasetVersionId);
+                    var dataset = datasetManager.GetDataset(Id);
+                    DatasetVersion datasetVersion = null;
+                    if (dataset.Status == DatasetStatus.Deleted)
+                    {
+                        datasetVersion = datasetManager.GetDeletedDatasetLatestVersion(Id);
+                    }
+                    else
+                    {
+                        datasetVersion = datasetManager.GetDatasetVersion(datasetVersionId);
+                    }
 
                     if (datasetVersion == null)
                     {

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Views/Data/ShowData.cshtml

@@ -243,7 +243,7 @@
 
     <div class="datasetview_header">
         <div class="datasetview_header-title">
-            @{Html.RenderAction("GetCitationOrTitle", "Data", new { datasetVersionId = Model.VersionId });}
+            @{Html.RenderAction("GetCitationOrTitle", "Data", new { Id = Model.Id, datasetVersionId = Model.VersionId });}
         </div>
 
         <div class="datasetview_header-toggle flex">