Skip to content

Commit b9b3cf5

Browse files
committed
feat: bug fixes and general improvements
1 parent 4d6b40e commit b9b3cf5

11 files changed

Lines changed: 13 additions & 420 deletions

src/WebExpress.WebApp/WebApi/V1/RestPopupNotification.cs renamed to src/WebExpress.WebApp/WWW/Api/1/RestPopupNotification.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
using WebExpress.WebCore.WebRestApi;
88
using WebExpress.WebUI.WebNotification;
99

10-
namespace WebExpress.WebApp.WebAPI.V1
10+
namespace WebExpress.WebApp.WWW.Api._1
1111
{
1212
/// <summary>
1313
/// Returns the status and progress of a task (WebTask).
1414
/// </summary>
15-
[Segment("popupnotifications", "")]
16-
[ContextPath("/api")]
1715
[Method(CrudMethod.GET)]
1816
[Method(CrudMethod.DELETE)]
17+
[IncludeSubPaths(true)]
1918
public sealed class RestPopupNotification : IRestApi
2019
{
2120
private readonly IComponentHub _componentHub;

src/WebExpress.WebApp/WebApi/V1/RestTaskStatus.cs renamed to src/WebExpress.WebApp/WWW/Api/1/RestTaskStatus.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//using WebExpress.WebCore.WebMessage;
66
//using WebExpress.WebCore.WebResource;
77

8-
//namespace WebExpress.WebApp.WebAPI.V1
8+
//namespace WebExpress.WebApp.WWW.Api.V1
99
//{
1010
// /// <summary>
1111
// /// Determines the status and progress of a task (WebTask).

src/WebExpress.WebApp/WebApi/V1/RestUserManagement.cs renamed to src/WebExpress.WebApp/WWW/Api/1/RestUserManagement.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//using static WebExpress.WebCore.Internationalization.InternationalizationManager;
1010
//using WebExpress.WebApp.WebUser.Model;
1111

12-
//namespace WebExpress.WebAPI.V1
12+
//namespace WebExpress.WebApp.WWW.Api.V1
1313
//{
1414
// /// <summary>
1515
// /// REST API for user management.

src/WebExpress.WebApp/WebApiControl/ControlApiNotificationPopup.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using System;
22
using System.Text;
33
using System.Text.Json;
4+
using WebExpress.WebApp.WWW.Api._1;
5+
using WebExpress.WebCore;
46
using WebExpress.WebCore.WebHtml;
57
using WebExpress.WebUI.WebControl;
68
using WebExpress.WebUI.WebPage;
@@ -35,7 +37,7 @@ public override IHtmlNode Render(IRenderControlContext renderContext, IVisualTre
3537
var settings = new
3638
{
3739
id = "26E517F5-56F7-485E-A212-6033618708F3",
38-
resturi = applicationContext?.ContextPath.Concat("api/1/popupnotifications")?.ToString(),
40+
resturi = WebEx.ComponentHub.SitemapManager.GetUri<RestPopupNotification>(applicationContext).ToString(),
3941
intervall = 15000
4042
};
4143

src/WebExpress.WebApp/WebApiControl/ControlApiTable.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Text;
55
using System.Text.Json;
66
using WebExpress.WebCore.WebHtml;
7+
using WebExpress.WebCore.WebUri;
78
using WebExpress.WebUI.WebControl;
89
using WebExpress.WebUI.WebPage;
910

@@ -17,7 +18,7 @@ public class ControlApiTable : ControlPanel, IControlApi
1718
/// <summary>
1819
/// Returns or sets the uri that determines the data.
1920
/// </summary>
20-
public string RestUri { get; set; }
21+
public IUri RestUri { get; set; }
2122

2223
/// <summary>
2324
/// Returns or sets the settings for the editing options (e.g. Edit, Delete, ...).
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace WebExpress.WebApp.WebApiControl
1+
using WebExpress.WebCore.WebUri;
2+
3+
namespace WebExpress.WebApp.WebApiControl
24
{
35
/// <summary>
46
/// Interface for controlling API interactions.
@@ -8,6 +10,6 @@ public interface IControlApi
810
/// <summary>
911
/// Returns or sets the uri that determines the data.
1012
/// </summary>
11-
public string RestUri { get; set; }
13+
public IUri RestUri { get; set; }
1214
}
1315
}

src/WebExpress.WebApp/WebNotificaation/Notification.cs

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

0 commit comments

Comments
 (0)