Skip to content

Commit

Permalink
Merge pull request #1844 from BEXIS2/rc
Browse files Browse the repository at this point in the history 
Rc
  • Loading branch information
@DavidBlaa
DavidBlaa authored Sep 13, 2024
2 parents 94518b5 + 39aeafd commit fa072ca
Show file tree
Hide file tree
Showing 31 changed files with 95 additions and 73 deletions.
2 changes: 1 addition & 1 deletion Components/AAA/BExIS.Security.Services.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<connectionStrings>
<!--<add name="ApplicationServices" connectionString="Server=bx2test.inf-bb.uni-jena.de;Port=5432;Database=aquadiva4;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=300;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5412;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
</connectionStrings>
<appSettings>
<!--<appSettings configSource="BExIS.Dlm.Tests.dev.config">-->
Expand Down
2 changes: 1 addition & 1 deletion Components/DLM/BExIS.Dlm.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<connectionStrings>
<!--<add name="ApplicationServices" connectionString="Server=bx2test.inf-bb.uni-jena.de;Port=5432;Database=aquadiva4;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=300;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5412;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
</connectionStrings>
<appSettings>
<!--<appSettings configSource="BExIS.Dlm.Tests.dev.config">-->
Expand Down
4 changes: 2 additions & 2 deletions Components/IO/BExIS.IO.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<configuration>
<connectionStrings>
<!--<add name="ApplicationServices" connectionString="Server=bx2test.inf-bb.uni-jena.de;Port=5432;Database=aquadiva4;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=300;" />-->
<!--<add name="ApplicationServices" connectionString="Server=localhost;Port=5412;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=SzxQszAcgFvvCq8MxJ;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
<!--<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />

</connectionStrings>

Expand Down
3 changes: 1 addition & 2 deletions Components/IO/BExIS.IO.Transform.Input/StructureAnalyser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,8 @@ public TextMarker SuggestTextMarker(string rowA, string rowB)
// var template matches by name
var byNames = new List<VariableTemplate>();

if (string.IsNullOrEmpty(input)) // if a varaible name exist as input
if (!string.IsNullOrEmpty(input)) // if a varaible name exist as input
{

// name
foreach (var template in allTemplates)
{
Expand Down
2 changes: 2 additions & 0 deletions Components/IO/BExIS.Io.Transform.Output/OutputDataStructureManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,11 @@ public VariableElement(Variable variable)
isOptional = variable.IsValueOptional;
unit = new UnitElement(variable.Unit.Id);
dataType = new DataTypeElement(variable.DataType.Id);
missingValues = new List<MissingValueElement>();
if (variable.MissingValues.Any())
variable.MissingValues.ToList().ForEach(m => missingValues.Add(new MissingValueElement(m.DisplayName, m.Description, m.Placeholder)));

meanings = new List<MeaningElement>();
if (variable.Meanings.Any())
variable.Meanings.ToList().ForEach(m => meanings.Add(new MeaningElement(m.Name, m.Description)));
}
Expand Down
2 changes: 1 addition & 1 deletion Components/JSON/BExIS.JSON.Helpers.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<connectionStrings>
<!--<add name="ApplicationServices" connectionString="Server=bx2test.inf-bb.uni-jena.de;Port=5432;Database=aquadiva4;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=300;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5412;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />


</connectionStrings>
Expand Down
2 changes: 1 addition & 1 deletion Components/UI/BExIS.UI.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<connectionStrings>
<!--<add name="ApplicationServices" connectionString="Server=bx2test.inf-bb.uni-jena.de;Port=5432;Database=aquadiva4;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=300;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5412;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
</connectionStrings>

<appSettings>
Expand Down
4 changes: 2 additions & 2 deletions Components/Utils/BExIS.Utils.Data.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<configuration>
<connectionStrings>
<!--<add name="ApplicationServices" connectionString="Server=bx2test.inf-bb.uni-jena.de;Port=5432;Database=aquadiva4;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=300;" />-->
<!--<add name="ApplicationServices" connectionString="Server=localhost;Port=5412;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=SzxQszAcgFvvCq8MxJ;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
<!--<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />

</connectionStrings>

Expand Down
4 changes: 2 additions & 2 deletions Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public void GenerateSeedData()

var o12 = operationManager.Find("Shell", "Settings", "*") ?? operationManager.Create("Shell", "Settings", "*", settings);

if (!versionManager.Exists("Shell", "3.3.2"))
if (!versionManager.Exists("Shell", "3.3.3"))
{
versionManager.Create("Shell", "3.3.2");
versionManager.Create("Shell", "3.3.3");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Components/Utils/BExIS.Utils.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<connectionStrings>
<!--<add name="ApplicationServices" connectionString="Server=bx2test.inf-bb.uni-jena.de;Port=5432;Database=aquadiva4;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=300;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5412;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />

</connectionStrings>

Expand Down
2 changes: 1 addition & 1 deletion Components/Utils/TestProject1/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<configuration>
<connectionStrings>
<!--<add name="ApplicationServices" connectionString="Server=bx2test.inf-bb.uni-jena.de;Port=5432;Database=aquadiva4;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=300;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5412;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
</connectionStrings>

<appSettings>
Expand Down
10 changes: 5 additions & 5 deletions Components/Vaiona/Vaiona.Logging/Vaiona.Logging.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\PostSharp 2.1\Release\PostSharp.dll</HintPath>
</Reference>-->
<Reference Include="PostSharp, Version=4.3.19.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\PostSharp.4.3.19\lib\net35-client\PostSharp.dll</HintPath>
<Reference Include="PostSharp, Version=4.3.48.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\PostSharp.4.3.48\lib\net35-client\PostSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -89,10 +89,10 @@
<!--<DontImportPostSharp>True</DontImportPostSharp>-->
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\packages\PostSharp.4.3.19\tools\PostSharp.targets" Condition="Exists('..\..\..\packages\PostSharp.4.3.19\tools\PostSharp.targets')" />
<Import Project="..\..\..\packages\PostSharp.4.3.48\tools\PostSharp.targets" Condition="Exists('..\..\..\packages\PostSharp.4.3.48\tools\PostSharp.targets')" />
<Target Name="EnsurePostSharpImported" BeforeTargets="BeforeBuild" Condition="'$(PostSharp30Imported)' == ''">
<Error Condition="!Exists('..\..\..\packages\PostSharp.4.3.19\tools\PostSharp.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://www.postsharp.net/links/nuget-restore." />
<Error Condition="Exists('..\..\..\packages\PostSharp.4.3.19\tools\PostSharp.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://www.postsharp.net/links/nuget-restore." />
<Error Condition="!Exists('..\..\..\packages\PostSharp.4.3.48\tools\PostSharp.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://www.postsharp.net/links/nuget-restore." />
<Error Condition="Exists('..\..\..\packages\PostSharp.4.3.48\tools\PostSharp.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://www.postsharp.net/links/nuget-restore." />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
2 changes: 1 addition & 1 deletion Components/Vaiona/Vaiona.Logging/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="PostSharp" version="4.3.19" targetFramework="net48" />
<package id="PostSharp" version="4.3.48" targetFramework="net48" />
</packages>
4 changes: 2 additions & 2 deletions Components/XML/BExIS.Xml.Helpers.UnitTests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<configuration>
<connectionStrings>
<!--<add name="ApplicationServices" connectionString="Server=bx2test.inf-bb.uni-jena.de;Port=5432;Database=aquadiva4;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=300;" />-->
<!--<add name="ApplicationServices" connectionString="Server=localhost;Port=5412;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=SzxQszAcgFvvCq8MxJ;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />
<!--<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />-->
<add name="ApplicationServices" connectionString="Server=localhost;Port=5432;Database=bexis2test;Userid=postgres;Password=1;Pooling=true;MinPoolSize=2;MaxPoolSize=100;ConnectionIdleLifetime=3600;" />

</connectionStrings>
<appSettings>
Expand Down
8 changes: 4 additions & 4 deletions Console/BExIS.Web.Shell.Svelte/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Console/BExIS.Web.Shell.Svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"type": "module",
"dependencies": {
"@bexis2/bexis2-core-ui": "0.4.13",
"@bexis2/bexis2-core-ui": "0.4.17",
"@sveltejs/adapter-static": "^3.0.1",
"patch-package": "^8.0.0",
"svelte-collapsible": "^0.3.0",
Expand Down
14 changes: 7 additions & 7 deletions Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
},
"type": "module",
"dependencies": {
"@bexis2/bexis2-core-ui": "0.4.13",
"@bexis2/bexis2-core-ui": "0.4.17",
"@bexis2/bexis2-rpm-ui": "^0.2.2",
"@floating-ui/dom": "^1.6.3",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
Expand Down
31 changes: 19 additions & 12 deletions Console/BExIS.Web.Shell/Areas/DIM/Controllers/SubmissionController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,19 +568,26 @@ private Tuple<string, string> PrepareData(long datasetVersionId, long brokerId)

switch (_broker.Name.ToLower())
{
case "pangaea":
{
PangaeaDataRepoConverter dataRepoConverter = new PangaeaDataRepoConverter(_broker);
case "gfbio":
{
switch (_broker.Type.ToLower())
{
case "observations":
{
PangaeaDataRepoConverter dataRepoConverter = new PangaeaDataRepoConverter(_broker);

tmp = new Tuple<string, string>(dataRepoConverter.Convert(datasetVersionId), "text/txt");
return tmp;
}
case "collections":
{
GenericDataRepoConverter dataRepoConverter = new GenericDataRepoConverter(_broker);
tmp = new Tuple<string, string>(dataRepoConverter.Convert(datasetVersionId), "application/zip");
return tmp;
}
tmp = new Tuple<string, string>(dataRepoConverter.Convert(datasetVersionId), "text/txt");
return tmp;
}
default: // also collections
{
//default
GenericDataRepoConverter dataRepoConverter = new GenericDataRepoConverter(_broker);
tmp = new Tuple<string, string>(dataRepoConverter.Convert(datasetVersionId), "application/zip");
return tmp;
}
}
}
case "pensoft":
{
PensoftDataRepoConverter dataRepoConverter = new PensoftDataRepoConverter(_broker);
Expand Down
8 changes: 4 additions & 4 deletions Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"type": "module",
"dependencies": {
"@bexis2/bexis2-core-ui": "0.4.13",
"@bexis2/bexis2-core-ui": "0.4.17",
"@floating-ui/dom": "^1.6.3",
"@sveltejs/adapter-static": "^3.0.1",
"@sveltejs/package": "^2.3.1",
Expand Down
2 changes: 1 addition & 1 deletion Console/BExIS.Web.Shell/General.Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
<!-- landing page for users , when they logged in successfuly -->
<entry key="faq" value="https://github.com/BEXIS2/Core/wiki/FAQ" type="string" />

<entry key="version" value="3.3.2" type="string" />
<entry key="version" value="3.3.3" type="string" />
</settings>
2 changes: 1 addition & 1 deletion Console/BExIS.Web.Shell/Web.config.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<add key="UseSchemaInDatabaseGeneration" value="False" />
<add key="ThrowErrorWhenParialContentNotFound" value="False" />
<add key="ApplicationName" value="{APPLICATIONNAME}" />
<add key="ApplicationVersion" value="3.3.2" />
<add key="ApplicationVersion" value="3.3.3" />
<add key="SessionWarningDelaySecond" value="30" />
<!-- Keep it as false, there are some test data in the database-->
<add key="CreateDatabase" value="false" />
Expand Down
2 changes: 1 addition & 1 deletion Console/Workspace
Submodule Workspace updated 2 files
+1 −1 General/General.Settings.xml
+1 −0 Tenants/bexis2/contents/footer.htm
Loading

0 comments on commit fa072ca

Please sign in to comment.