Merge pull request #2124 from BEXIS2/master

v4.0.2

Author: DavidBlaa

.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-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",