Skip to content

Commit 6a54f2b

Browse files
EleonoraPetzoldEleonoraPetzold
authored
Merge pull request #182 from bexis/dev_v3
Dev v3
2 parents 2ee7672 + eb899cd commit 6a54f2b

106 files changed

Lines changed: 5425 additions & 2175 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Components/AAA/BExIS.Security.Services/Utilities/MessageHelper.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public static string GetSendRequestMessage(long datasetid, string title, string
160160

161161
public static string GetWithdrawRequestHeader(long datasetid, string requester)
162162
{
163-
return $"Data request from {requester} for dataset with ID <b>{datasetid}</b> withdrawn";
163+
return $"Data request from {requester} for dataset with ID {datasetid} withdrawn";
164164
}
165165

166166
public static string GetWithdrawRequestMessage(long datasetid, string title, string requester)
@@ -173,7 +173,7 @@ public static string GetWithdrawRequestMessage(long datasetid, string title, str
173173

174174
public static string GetAcceptRequestHeader(long datasetid, string requester)
175175
{
176-
return $"Data request from {requester} for dataset with ID <b>{datasetid}</b> granted";
176+
return $"Data request from {requester} for dataset with ID {datasetid} granted";
177177
}
178178

179179
public static string GetAcceptRequestMessage(long datasetid, string title)
@@ -186,7 +186,7 @@ public static string GetAcceptRequestMessage(long datasetid, string title)
186186

187187
public static string GetRejectedRequestHeader(long datasetid, string requester)
188188
{
189-
return $"Data request from {requester} for dataset with ID <b>{datasetid}</b> rejected";
189+
return $"Data request from {requester} for dataset with ID {datasetid} rejected";
190190
}
191191

192192
public static string GetRejectedRequestMessage(long datasetid, string title)
@@ -342,7 +342,7 @@ public static string GetUnsetPublicMessage(string userName, long datasetid, stri
342342

343343
public static string GetPushApiStoreHeader(long datasetid, string title)
344344
{
345-
return $"Receive data for dataset '{title}' with ID <b>{datasetid}</b>";
345+
return $"Receive data for dataset '{title}' with ID {datasetid}";
346346
}
347347

348348
public static string GetPushApiStoreMessage(long datasetid, string userName, string[] errors = null)
@@ -386,7 +386,7 @@ public static string GetPushApiValidateMessage(long datasetid, string userName,
386386

387387
public static string GetPushApiUploadSuccessHeader(long datasetid, string title)
388388
{
389-
return $"Upload <b>completed</b> for dataset: '{title}' with ID <b>{datasetid}</b>";
389+
return $"Upload completed for dataset: '{title}' with ID {datasetid}";
390390
}
391391

392392
public static string GetPushApiUploadSuccessMessage(long datasetid, string userName)
@@ -396,7 +396,7 @@ public static string GetPushApiUploadSuccessMessage(long datasetid, string userN
396396

397397
public static string GetPushApiUploadFailHeader(long datasetid, string title)
398398
{
399-
return $"Upload was not successful for dataset '{title}' with ID <b>{datasetid}</b>";
399+
return $"Upload was not successful for dataset '{title}' with ID {datasetid}";
400400
}
401401

402402
public static string GetPushApiUploadFailMessage(long datasetid, string userName, string[] errors)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
},
5353
"type": "module",
5454
"dependencies": {
55-
"@bexis2/bexis2-core-ui": "0.4.64",
55+
"@bexis2/bexis2-core-ui": "0.4.65",
5656
"@sveltejs/adapter-static": "3.0.2",
5757
"buffer": "6.0.3",
5858
"gray-matter": "4.0.3",

‎Console/BExIS.Web.Shell/App_Data/BExIS.Web.Shell.xml‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Console/BExIS.Web.Shell/Areas/BAM/BAM.Manifest.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@
2727
title="Get partyTypes for account" description="Get partyTypes for account which are defined in setting.xml" icon=""
2828
controller="PartyService" action="GetPartyTypesForAccount"
2929
extends="" />
30-
<Export tag="lunchbar" id="helpBam" order="2"
31-
title="Account / Parties" description="Parties Help Manual" icon=""
32-
controller="Help" action="index"
33-
extends="./lunchbarRoot/help" />
30+
3431
<!-- Settings Example-->
3532
<!--<Export tag="settings" id="manageMetadata" order="1"
3633
title="Manage Metadata Structure" description="Edit or Importa new Metadata Structure" icon=""

‎Console/BExIS.Web.Shell/Areas/BAM/BExIS.Modules.Bam.UI.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
<Compile Include="Controllers\API\PartyRelationshipsController.cs" />
118118
<Compile Include="Controllers\API\PartyRelationshipTypesController.cs" />
119119
<Compile Include="Controllers\API\PartyTypesController.cs" />
120-
<Compile Include="Controllers\HelpController.cs" />
121120
<Compile Include="Controllers\PartyController.cs" />
122121
<Compile Include="Controllers\PartyServiceController.cs" />
123122
<Compile Include="Helpers\BAMSeedDataGenerator.cs" />
@@ -187,7 +186,6 @@
187186
<Content Include="Scripts\respond.matchmedia.addListener.min.js" />
188187
<Content Include="Scripts\respond.min.js" />
189188
<Content Include="Scripts\_references.js" />
190-
<Content Include="Views\Help\Informations.xml" />
191189
<Content Include="Views\Web.config" />
192190
<Content Include="Views\_ViewStart.cshtml" />
193191
<Content Include="Views\Party\Index.cshtml" />
@@ -199,7 +197,6 @@
199197
<Content Include="Views\Party\_relationshipEditViewPartial.cshtml" />
200198
<Content Include="Views\Party\_addPartyRelationshipPartial.cshtml" />
201199
<Content Include="Views\PartyService\_userRegisterationPartial.cshtml" />
202-
<Content Include="Views\Help\Index.cshtml" />
203200
<Content Include="Views\PartyService\_customAttributesPartial.cshtml" />
204201
<Content Include="Views\PartyService\Edit.cshtml" />
205202
<Content Include="Views\Party\_addPartyTypePair.cshtml" />

‎Console/BExIS.Web.Shell/Areas/BAM/Bam.Settings.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
{
22
"description": "...",
33
"entries": [
4-
{
5-
"description": "URL to the manual. If empty, it links to the latest manual from BEXIS2",
6-
"key": "help",
7-
"title": "Help URL",
8-
"type": "String",
9-
"value": ""
10-
},
114
{
125
"description": "Defined AccountPartyTypes value in web config format is like PartyType1:PartyTypePairTitle1-PartyTypePairTitle2,PartyType2",
136
"key": "AccountPartyRelationshipTypes",

‎Console/BExIS.Web.Shell/Areas/BAM/Controllers/HelpController.cs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎Console/BExIS.Web.Shell/Areas/BAM/Views/Help/Index.cshtml‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎Console/BExIS.Web.Shell/Areas/BAM/Views/Help/Informations.xml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"@types/node": "22.0.2",
3535
"@typescript-eslint/eslint-plugin": "8.0.0",
3636
"@typescript-eslint/parser": "8.0.0",
37+
"@ts4nfdi/terminology-service-suite-js": "^6.0.0",
3738
"autoprefixer": "10.4.19",
3839
"eslint": "9.8.0",
3940
"eslint-config-prettier": "9.1.0",
@@ -50,7 +51,7 @@
5051
},
5152
"type": "module",
5253
"dependencies": {
53-
"@bexis2/bexis2-core-ui": "0.4.64",
54+
"@bexis2/bexis2-core-ui": "0.4.65",
5455
"@bexis2/bexis2-rpm-ui": "0.2.15",
5556
"@floating-ui/dom": "1.6.8",
5657
"@fortawesome/free-solid-svg-icons": "6.6.0",

0 commit comments

Comments
 (0)