Merge pull request #2301 from BEXIS2/rc

DavidBlaa · web-flow · commit 97a30b79dac9 · 2025-12-09T11:18:52.000+01:00
Rc
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -13,10 +13,12 @@ name: "CodeQL Advanced"
 
 on:
   push:
-    branches: 
+    branches:
+      - master
       - rc
   pull_request:
     branches: 
+      - master
       - rc
   schedule:
     - cron: '38 14 * * 4'
diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs
@@ -308,7 +308,7 @@ public void GenerateSeedData()
                 if (!metadataStructureManager.Repo.Get().Any(m => m.Name.Equals("Publication")))
                 {
                     string titleXPath = "Metadata/publication/publication/Title/TitleDatatype_string";
-                    string descriptionXpath = "Metadata/publication/publication/Abstract/AbstractXmlSchemaSimpleType";
+                    string descriptionXpath = "Metadata/publication/publication/Abstract/AbstractDatatype_string";
 
                     ImportSchema("Publication", "BEXIS2-Publication-Schema-draft.xsd", "Metadata", publication.Name, publication.EntityType.FullName, titleXPath, descriptionXpath);
                 }
diff --git a/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Helpers/DdmSeedDataGenerator.cs b/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Helpers/DdmSeedDataGenerator.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Vaiona.Web.Mvc.Modularity;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace BExIS.Modules.Ddm.UI.Helpers
 {
@@ -192,6 +193,12 @@ private void createCitationMappingConcept()
         {
             using (var conceptManager = new ConceptManager())
             {
+
+                /*
+                APA,
+                RIS,
+                Text,
+                Bibtex*/
                 foreach (CitationFormat value in Enum.GetValues(typeof(CitationFormat)))
                 {
                     var keys = new List<MappingKey>();
@@ -261,7 +268,7 @@ private void createCitationMappingConcept()
                     if (!keys.Any(k => k.Name.Equals("data/authorNames")))
                         authors = conceptManager.CreateMappingKey("AuthorNames", "", "", false, true, "data/authorNames", concept);
 
-                    if (!keys.Any(k => k.Name.Equals("data/authorNames/authorName")))
+                    if (!keys.Any(k => k.Name.Equals("data/authorNames/authorname")))
                         conceptManager.CreateMappingKey("AuthorName", "", "", false, false, "data/authorNames/authorName", concept, authors);
                 }
             }
diff --git a/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Models/CitationModels.cs b/Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Models/CitationModels.cs
@@ -43,7 +43,8 @@ public class CitationDataModel
         [XmlElement("version")]
         public string Version { get; set; }
 
-        [XmlElement("projects")]
+        [XmlArray("projects")]
+        [XmlArrayItem("project")]
         public List<string> Projects { get; set; }
 
         [XmlElement("year")]
@@ -70,8 +71,6 @@ public class CitationDataModel
         //public string EntityType { get; set; }
 
         [XmlElement("entryType")]
-        [Required(ErrorMessage = "Entry Type is required")]
-        [MinLength(1, ErrorMessage = "Entry Type cannot be empty")]
         public string EntryType { get; set; }
 
         [XmlElement("entityName")]
diff --git a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/BExIS.Modules.Dim.UI.csproj b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/BExIS.Modules.Dim.UI.csproj
@@ -277,8 +277,8 @@
     <Reference Include="Telerik.Web.Mvc, Version=2013.2.611.340, Culture=neutral, PublicKeyToken=29ac1a93ec063d92, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\packages\TelerikMvcExtensions.2013.2.611\lib\net40\Telerik.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="Vaelastrasz.Library, Version=5.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\packages\Vaelastrasz.Library.5.0.2\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
+    <Reference Include="Vaelastrasz.Library, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\packages\Vaelastrasz.Library.6.0.0\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
     </Reference>
     <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath>
diff --git a/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/packages.config b/Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/packages.config
@@ -86,6 +86,6 @@
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net48" />
   <package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net48" />
   <package id="TelerikMvcExtensions" version="2013.2.611" targetFramework="net48" />
-  <package id="Vaelastrasz.Library" version="5.0.2" targetFramework="net48" />
+  <package id="Vaelastrasz.Library" version="6.0.0" targetFramework="net48" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="net48" />
 </packages>
diff --git a/Console/Workspace b/Console/Workspace
@@ -1 +1 @@
-Subproject commit f28e5adfce446665358ea2bc1ec413b6bb25586b
+Subproject commit a2d4b1f17d3767d3f300fb92b1218406445ef4ed
diff --git a/Modules/DIM/BExIS.Dim.Helper/BExIS.Dim.Helpers.csproj b/Modules/DIM/BExIS.Dim.Helper/BExIS.Dim.Helpers.csproj
@@ -150,8 +150,8 @@
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="Vaelastrasz.Library, Version=5.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Vaelastrasz.Library.5.0.2\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
+    <Reference Include="Vaelastrasz.Library, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Vaelastrasz.Library.6.0.0\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Modules/DIM/BExIS.Dim.Helper/Export/GenericDataRepoConverter.cs b/Modules/DIM/BExIS.Dim.Helper/Export/GenericDataRepoConverter.cs
@@ -123,7 +123,7 @@ public string Convert(long datasetVersionId)
                                 string path = Path.Combine(AppConfiguration.DataPath, cd.URI);
                                 string name = cd.URI.Split('\\').Last();
 
-                                if (cd.Name.StartsWith("generated") && !cd.Name.Equals("text/csv")) continue;
+                                if (cd.Name.StartsWith("generated") && !cd.MimeType.Equals(broker.PrimaryDataFormat)) continue;
 
                                 if (FileHelper.FileExist(path))
                                 {
diff --git a/Modules/DIM/BExIS.Dim.Helper/packages.config b/Modules/DIM/BExIS.Dim.Helper/packages.config
@@ -28,5 +28,5 @@
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
   <package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net48" />
-  <package id="Vaelastrasz.Library" version="5.0.2" targetFramework="net48" />
+  <package id="Vaelastrasz.Library" version="6.0.0" targetFramework="net48" />
 </packages>
diff --git a/database update scripts/4.1.0-4.2.0.sql b/database update scripts/4.1.0-4.2.0.sql

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ public void GenerateSeedData()`
`308`	`308`	`if (!metadataStructureManager.Repo.Get().Any(m => m.Name.Equals("Publication")))`
`309`	`309`	`{`
`310`	`310`	`string titleXPath = "Metadata/publication/publication/Title/TitleDatatype_string";`
`311`		`- string descriptionXpath = "Metadata/publication/publication/Abstract/AbstractXmlSchemaSimpleType";`
	`311`	`+ string descriptionXpath = "Metadata/publication/publication/Abstract/AbstractDatatype_string";`
`312`	`312`
`313`	`313`	`ImportSchema("Publication", "BEXIS2-Publication-Schema-draft.xsd", "Metadata", publication.Name, publication.EntityType.FullName, titleXPath, descriptionXpath);`
`314`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using System.Collections.Generic;`
`10`	`10`	`using System.Linq;`
`11`	`11`	`using Vaiona.Web.Mvc.Modularity;`
	`12`	`+using static System.Net.Mime.MediaTypeNames;`
`12`	`13`
`13`	`14`	`namespace BExIS.Modules.Ddm.UI.Helpers`
`14`	`15`	`{`
`@@ -192,6 +193,12 @@ private void createCitationMappingConcept()`
`192`	`193`	`{`
`193`	`194`	`using (var conceptManager = new ConceptManager())`
`194`	`195`	`{`
	`196`	`+`
	`197`	`+ /*`
	`198`	`+ APA,`
	`199`	`+ RIS,`
	`200`	`+ Text,`
	`201`	`+ Bibtex*/`
`195`	`202`	`foreach (CitationFormat value in Enum.GetValues(typeof(CitationFormat)))`
`196`	`203`	`{`
`197`	`204`	`var keys = new List<MappingKey>();`
`@@ -261,7 +268,7 @@ private void createCitationMappingConcept()`
`261`	`268`	`if (!keys.Any(k => k.Name.Equals("data/authorNames")))`
`262`	`269`	`authors = conceptManager.CreateMappingKey("AuthorNames", "", "", false, true, "data/authorNames", concept);`
`263`	`270`
`264`		`- if (!keys.Any(k => k.Name.Equals("data/authorNames/authorName")))`
	`271`	`+ if (!keys.Any(k => k.Name.Equals("data/authorNames/authorname")))`
`265`	`272`	`conceptManager.CreateMappingKey("AuthorName", "", "", false, false, "data/authorNames/authorName", concept, authors);`
`266`	`273`	`}`
`267`	`274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public string Convert(long datasetVersionId)`
`123`	`123`	`string path = Path.Combine(AppConfiguration.DataPath, cd.URI);`
`124`	`124`	`string name = cd.URI.Split('\\').Last();`
`125`	`125`
`126`		`- if (cd.Name.StartsWith("generated") && !cd.Name.Equals("text/csv")) continue;`
	`126`	`+ if (cd.Name.StartsWith("generated") && !cd.MimeType.Equals(broker.PrimaryDataFormat)) continue;`
`127`	`127`
`128`	`128`	`if (FileHelper.FileExist(path))`
`129`	`129`	`{`