Skip to content

Commit b0c8c22

Browse files
authored
Merge pull request #109 from nblumhardt/final-2022.1
Final API changes for 2022.1
2 parents ea2ccd7 + 48bc376 commit b0c8c22

File tree

5 files changed

+26
-11
lines changed

5 files changed

+26
-11
lines changed

src/Seq.Api/Client/SeqApiClient.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ public sealed class SeqApiClient : IDisposable
4848
readonly JsonSerializer _serializer = JsonSerializer.Create(
4949
new JsonSerializerSettings
5050
{
51-
Converters = { new StringEnumConverter(), new LinkCollectionConverter() }
51+
Converters = { new StringEnumConverter(), new LinkCollectionConverter() },
52+
DateParseHandling = DateParseHandling.None,
53+
FloatParseHandling = FloatParseHandling.Decimal
5254
});
5355

5456
/// <summary>

src/Seq.Api/Model/Security/Permission.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,21 @@ public enum Permission
5656
Setup,
5757

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

6363
/// <summary>
6464
/// Access to settings and features that interact with, or provide access to, the underlying host server,
6565
/// such as app (plug-in) installation, backup settings, cluster configuration, diagnostics, and features
66-
/// relying on outbound network access like package feeds and update checks.
66+
/// relying on outbound network access like package feeds and update checks. This permission is required for
67+
/// configuration of the authentication provider and related settings.
6768
/// </summary>
68-
System
69+
System,
70+
71+
/// <summary>
72+
/// Create, edit, and delete user accounts, reset local user passwords.
73+
/// </summary>
74+
Organization
6975
}
7076
}

src/Seq.Api/Model/Security/RoleEntity.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ public class RoleEntity : Entity
2929
/// <summary>
3030
/// Permissions granted to users in the role.
3131
/// </summary>
32-
public HashSet<Permission> Permissions { get; set; } = new HashSet<Permission>();
32+
public HashSet<Permission> Permissions { get; set; } = new();
33+
34+
/// <summary>
35+
/// Optionally, an extended description of the role.
36+
/// </summary>
37+
public string Description { get; set; }
3338
}
3439
}

src/Seq.Api/Model/Users/SearchHistoryItemStatus.cs renamed to src/Seq.Api/Model/Users/SearchHistoryItemAction.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Seq.Api.Model.Users
1717
/// <summary>
1818
/// An operation applied to a search history item.
1919
/// </summary>
20-
public enum SearchHistoryItemStatus
20+
public enum SearchHistoryItemAction
2121
{
2222
/// <summary>
2323
/// The item was used (make it more recent).
@@ -28,10 +28,10 @@ public enum SearchHistoryItemStatus
2828
/// The item has been pinned.
2929
/// </summary>
3030
Pinned,
31-
31+
3232
/// <summary>
33-
/// The item has been un-pinned.
33+
/// The item has been unpinned.
3434
/// </summary>
35-
Forgotten
35+
Unpinned
3636
}
3737
}

src/Seq.Api/Model/Users/SearchHistoryItemPart.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
// ReSharper disable ClassNeverInstantiated.Global
16+
1517
namespace Seq.Api.Model.Users
1618
{
1719
/// <summary>
@@ -20,13 +22,13 @@ namespace Seq.Api.Model.Users
2022
public class SearchHistoryItemPart
2123
{
2224
/// <summary>
23-
/// The filter entered by the user into the filter bar.
25+
/// The search or query entered by the user into the search bar.
2426
/// </summary>
2527
public string Search { get; set; }
2628

2729
/// <summary>
2830
/// Status to apply to the search history item.
2931
/// </summary>
30-
public SearchHistoryItemStatus Status { get; set; }
32+
public SearchHistoryItemAction Action { get; set; }
3133
}
3234
}

0 commit comments

Comments
 (0)