Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Seq.Api/Client/SeqApiClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ public sealed class SeqApiClient : IDisposable
readonly JsonSerializer _serializer = JsonSerializer.Create(
new JsonSerializerSettings
{
Converters = { new StringEnumConverter(), new LinkCollectionConverter() }
Converters = { new StringEnumConverter(), new LinkCollectionConverter() },
DateParseHandling = DateParseHandling.None,
FloatParseHandling = FloatParseHandling.Decimal
});

/// <summary>
Expand Down
12 changes: 9 additions & 3 deletions src/Seq.Api/Model/Security/Permission.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,21 @@ public enum Permission
Setup,

/// <summary>
/// Access to settings required for day-to-day operation of Seq, such as users, retention policies, API keys.
/// Access to settings that control data ingestion, storage, dashboarding and alerting.
/// </summary>
Project,

/// <summary>
/// Access to settings and features that interact with, or provide access to, the underlying host server,
/// such as app (plug-in) installation, backup settings, cluster configuration, diagnostics, and features
/// relying on outbound network access like package feeds and update checks.
/// relying on outbound network access like package feeds and update checks. This permission is required for
/// configuration of the authentication provider and related settings.
/// </summary>
System
System,

/// <summary>
/// Create, edit, and delete user accounts, reset local user passwords.
/// </summary>
Organization
}
}
7 changes: 6 additions & 1 deletion src/Seq.Api/Model/Security/RoleEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ public class RoleEntity : Entity
/// <summary>
/// Permissions granted to users in the role.
/// </summary>
public HashSet<Permission> Permissions { get; set; } = new HashSet<Permission>();
public HashSet<Permission> Permissions { get; set; } = new();

/// <summary>
/// Optionally, an extended description of the role.
/// </summary>
public string Description { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Seq.Api.Model.Users
/// <summary>
/// An operation applied to a search history item.
/// </summary>
public enum SearchHistoryItemStatus
public enum SearchHistoryItemAction
{
/// <summary>
/// The item was used (make it more recent).
Expand All @@ -28,10 +28,10 @@ public enum SearchHistoryItemStatus
/// The item has been pinned.
/// </summary>
Pinned,

/// <summary>
/// The item has been un-pinned.
/// The item has been unpinned.
/// </summary>
Forgotten
Unpinned
}
}
6 changes: 4 additions & 2 deletions src/Seq.Api/Model/Users/SearchHistoryItemPart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// ReSharper disable ClassNeverInstantiated.Global

namespace Seq.Api.Model.Users
{
/// <summary>
Expand All @@ -20,13 +22,13 @@ namespace Seq.Api.Model.Users
public class SearchHistoryItemPart
{
/// <summary>
/// The filter entered by the user into the filter bar.
/// The search or query entered by the user into the search bar.
/// </summary>
public string Search { get; set; }

/// <summary>
/// Status to apply to the search history item.
/// </summary>
public SearchHistoryItemStatus Status { get; set; }
public SearchHistoryItemAction Action { get; set; }
}
}