v4.0.2

.github/workflows/main.yml

@@ -0,0 +1,32 @@
+on:
+  push:
+    paths:
+      - '**/*.csproj'
+      - '**/*.sln'
+  workflow_dispatch:
+
+jobs:
+  upgrade-check:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.x'
+
+      - name: Install .NET Upgrade Assistant
+        run: dotnet tool install -g upgrade-assistant
+
+      - name: Run Upgrade Assistant in analyze mode
+        run: |
+          upgrade-assistant analyze BExIS%2B%2B.sln --format json > upgrade-report.json
+
+      - name: Upload report artifact
+        uses: actions/upload-artifact@v3.1.3
+        with:
+          name: upgrade-report
+          path: upgrade-report.json

BExIS++.sln

@@ -1582,8 +1582,8 @@ Global
 		{9BFFFD11-03C6-47DF-9CC9-F458A9A49377} = {F3354AC7-CDA1-44E2-8E85-8DB532ED8C75}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}
 		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
+		SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}
 	EndGlobalSection
 	GlobalSection(SubversionScc) = preSolution
 		Svn-Managed = True

Components/AAA/BExIS.Security.Services/Subjects/GroupManager.cs

@@ -62,7 +62,7 @@ public List<Group> GetGroups(FilterExpression filter, OrderByExpression orderBy,
                     }
                     else if (whereClause != null)
                     {
-                        var filtered = GroupRepository.Query(whereClause);
+                        var filtered = Groups.Where(whereClause);
                         count = filtered.Count();
 
                         return filtered.Skip((pageNumber - 1) * pageSize).Take(pageSize).ToList();

Components/AAA/BExIS.Security.Services/Subjects/SubjectManager.cs

@@ -49,7 +49,7 @@ public List<Subject> GetSubjects(FilterExpression filter, OrderByExpression orde
                 {
                     if (whereClause != null && orderBy != null)
                     {
-                        var l = SubjectRepository.Query(whereClause);
+                        var l = Subjects.Where(whereClause);
                         var x = l.OrderBy(orderbyClause);
                         var y = x.Skip((pageNumber - 1) * pageSize);
                         var z = y.Take(pageSize);

Components/AAA/BExIS.Security.Services/Subjects/UserManager.cs

@@ -52,7 +52,7 @@ public List<User> GetUsers(FilterExpression filter, OrderByExpression orderBy, i
             {
                 if (whereClause != null && orderBy != null)
                 {
-                    var l = UserRepository.Query(whereClause);
+                    var l = Users.Where(whereClause);
                     var x = l.OrderBy(orderbyClause);
                     var y = x.Skip((pageNumber - 1) * pageSize);
                     var z = y.Take(pageSize);

Components/IO/BExIS.Io.Transform.Output/OutputMetadataManager.cs

@@ -69,6 +69,9 @@ public static XmlDocument GetConvertedMetadata(long datasetId, TransmissionType
                     DatasetVersion datasetVersion = datasetManager.GetDatasetLatestVersion(datasetId);
                     XmlDatasetHelper xmlDatasetHelper = new XmlDatasetHelper();
 
+                    // if no mapping name  is provided, use the metadata structure name
+                    if(string.IsNullOrEmpty(mappingName)) mappingName = datasetVersion.Dataset.MetadataStructure.Name;
+
                     string mappingFileName = xmlDatasetHelper.GetTransmissionInformation(datasetVersion.Id, type, mappingName);
                     // no mapping files with mappingName exist
                     if (string.IsNullOrEmpty(mappingFileName)) return null;

Components/Utils/BExIS.Utils.Data/DatasetVersionHelper.cs

@@ -164,6 +164,11 @@ public static async Task<long> GetVersionId(long datasetId, string username, int
                             // get latest public
                             tag = datasetManager.GetLatestTag(datasetId, true);
                             if (tag == null) return -1;
+                            else
+                            {
+                                datasetVersion = datasetManager.GetLatestVersionByTagNr(datasetId, tag.Nr);
+                                return datasetVersion.Id;
+                            }
                         }
                         else
                         {

Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs

@@ -40,9 +40,9 @@ public void GenerateSeedData()
 
                 var o12 = operationManager.Find("Shell", "Settings", "*") ?? operationManager.Create("Shell", "Settings", "*", settings);
 
-                if (!versionManager.Exists("Shell", "4.0.1"))
+                if (!versionManager.Exists("Shell", "4.0.2"))
                 {
-                    versionManager.Create("Shell", "4.0.1");
+                    versionManager.Create("Shell", "4.0.2");
                 }
             }
         }

Console/BExIS.Web.Shell.Svelte/package.json

@@ -52,7 +52,7 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"@bexis2/bexis2-core-ui": "0.4.44",
+		"@bexis2/bexis2-core-ui": "0.4.45",
 		"@sveltejs/adapter-static": "3.0.2",
 		"buffer": "6.0.3",
 		"gray-matter": "4.0.3",

Console/BExIS.Web.Shell.Svelte/src/routes/home/docs/[...slug]/[category]/+page.svelte

@@ -18,6 +18,8 @@
 
 	import sanitizeHtml from 'sanitize-html';
 	import { marked } from 'marked';
+	import { time } from 'console';
+	import { TIMEOUT } from 'dns';
 
 	export let data;
 	let content_complete = '';
@@ -41,6 +43,9 @@
 	$: version;
 
 	onMount(() => {
+
+		setTimeout(() => {
+
 		// get data from parent
 		container = document.getElementById('docs');
 		version = container?.getAttribute('version');
@@ -109,6 +114,8 @@
 
 		// Add event listener to rendered content
 		document.getElementById('content').addEventListener('click', handleLinkClick);
+		}, 1000);
+
 	});
 
 	// Select and render the currently needed content

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json

@@ -50,8 +50,8 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"@bexis2/bexis2-core-ui": "0.4.44",
-		"@bexis2/bexis2-rpm-ui": "0.2.9",
+		"@bexis2/bexis2-core-ui": "0.4.45",
+		"@bexis2/bexis2-rpm-ui": "0.2.11",
 		"@floating-ui/dom": "1.6.8",
 		"@fortawesome/free-solid-svg-icons": "6.6.0",
 		"@sveltejs/adapter-static": "3.0.2",

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/lib/components/fileupload/services.js

@@ -5,7 +5,7 @@ import { Api } from '@bexis2/bexis2-core-ui';
 export const load = async (file, entityId, version) => {
 	try {
 		const response = await Api.get(
-			'/rpm/DataStructure/load?file=' + file + '&&entityId=' + entityId + '&&version=' + version
+			'/rpm/File/load?file=' + file + '&&entityId=' + entityId + '&&version=' + version
 		);
 		console.log('🚀 ~ load ~ response:', response);
 

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

@@ -228,7 +228,7 @@ public ActionResult LoadMetadataByVersion(long entityId, int version=-1, bool lo
 
             ViewBag.Title = PresentationModel.GetViewTitleForTenant("Edit Metadata", this.Session.GetTenant());
             ViewData["Locked"] = locked;
-            ViewData["ShowOptional"] = false;
+            ViewData["ShowOptional"] = fromEditMode;
             ViewData["EntityId"] = entityId;
 
             // Set dataset Title to Model

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

@@ -2,6 +2,7 @@
 using BExIS.App.Bootstrap.Helpers;
 using BExIS.Dlm.Entities.DataStructure;
 using BExIS.Dlm.Services.Data;
+using BExIS.IO.Transform.Input;
 using BExIS.Modules.Dcm.UI.Helpers;
 using BExIS.Modules.Dcm.UI.Hooks;
 using BExIS.Modules.Dcm.UI.Models.Edit;
@@ -15,8 +16,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Web;
 using System.Web.Mvc;
+using System.Web.Routing;
 using Vaiona.Utils.Cfg;
 using Vaiona.Web.Extensions;
 using Vaiona.Web.Mvc.Modularity;
@@ -236,7 +239,7 @@ public JsonResult SaveFileDescription(long id, BExIS.UI.Hooks.Caches.FileInfo fi
             if (cache.Files.Any(f => f.Name == file.Name))
             {
                 var f = cache.Files.Where(x => x.Name == file.Name).FirstOrDefault();
-                if (f != null) f.Description = description;
+                if (f != null) f.Description = file.Description;
             }
 
             log.Messages.Add(new LogMessage(DateTime.Now, new List<string>() { file + " description updated" }, username, "File upload", "save file description"));
@@ -247,6 +250,25 @@ public JsonResult SaveFileDescription(long id, BExIS.UI.Hooks.Caches.FileInfo fi
             return Json(true);
         }
 
+        public JsonResult FileReader(string file, long entityId, long version = -1)
+        {
+            //var x =  RedirectToAction("Load", "DataStructure", new { area = "RPM", file, entityId, version });
+
+            //if (this.IsAccessible("RPM", "DataStructure", "Load"))
+            //{
+            //    var actionresult = this.Run("RPM", "DataStructure", "Load", new RouteValueDictionary() { { "file", file }, { "version", version }, { "entityId", entityId } { "encoding", EncodingType.UTF8 } });
+
+            //   // return Json("");
+            //}
+
+            return Json(new
+            {
+                redirectUrl = Url.Action("test", " DataStructure", new { area = "RPM" })
+            });
+
+            //return Json(new { redirect = true, url = Url.Action("Load", "DataStructure", new { area = "RPM", file, version, entityId, encoding = EncodingType.UTF8 }) } );
+        }
+
         private string getFileName(HttpPostedFileBase file)
         {
             // Checking for Internet Explorer

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Models/CreateDataset/StepModelHelper.cs

@@ -161,7 +161,7 @@ private bool SetActiveByPreload()
             {
                 if (Model != null &&
                     Model.MinCardinality > 0 &&
-                    Model.MaxCardinality == 1)
+                    Model.MaxCardinality >= 1)
                 {
                     Activated = true;
                 }

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Models/Metadata/MetadataAttributeModel.cs

@@ -88,7 +88,7 @@ public object Value
                     }
                 }
 
-                IsEmpty = global::System.Convert.ChangeType(_value, _value.GetType()) == null || String.IsNullOrEmpty(_value.ToString()) || _value.Equals(DefaultValue) || _value.Equals(FixedValue) ;
+                IsEmpty = global::System.Convert.ChangeType(_value, _value.GetType()) == null || String.IsNullOrEmpty(_value.ToString()); /*|| _value.Equals(DefaultValue) || _value.Equals(FixedValue)*/ ;
             }
         }
 

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/Form/_metadataAttributeView.cshtml

@@ -143,7 +143,11 @@
 
 <div id="@id" class="metadataAttributeContent" onload="metadataAttributeOnLoad(this, @hasErrors)">
 
-    @if (@Model != null && !(!showOptional && Model.IsEmpty && (Model.MinCardinality == 0) && locked))
+    @if (@Model != null && 
+        !(
+        !showOptional && 
+        (Model.IsEmpty && string.IsNullOrEmpty(Model.FixedValue)) && 
+        (Model.MinCardinality == 0) && locked))
     {
     <table>
         <tr><td></td><td><div id="help_@idInput" class="help" style="display: none;">@Html.Raw(Model.Discription)</div></td></tr>

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/package.json

@@ -50,7 +50,7 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"@bexis2/bexis2-core-ui": "0.4.44",
+		"@bexis2/bexis2-core-ui": "0.4.45",
 		"@floating-ui/dom": "1.6.8",
 		"@fortawesome/free-solid-svg-icons": "6.6.0",
 		"@sveltejs/adapter-static": "3.0.2",

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI.Svelte/src/lib/components/Card.svelte

@@ -23,6 +23,8 @@
 		entitytemplate: ''
 	};
 
+ export let authorLabel = 'Authors';
+
 	const { title, description, author, license, id, doi, entity, date, entitytemplate } = card;
 
 	// let author = '';
@@ -105,7 +107,7 @@
 			</p>
 			{#if author.length > 0}
 				<div title="Author" class="flex gap-2 items-center">
-					<span class="font-semibold">Author:</span>
+					<span class="font-semibold">{authorLabel}:</span>
 					<p class="text-sm italic text-neutral-600">{author}</p>
 				</div>
 			{/if}