Merge pull request #2107 from BEXIS2/rc

Rc v4.0.2

Author: DavidBlaa

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/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-lock.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/package.json

@@ -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.Svelte/src/routes/home/docs/[...slug]/[category]/+page.svelte

@@ -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/package-lock.json

@@ -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);