Skip to content

Commit

Permalink
Merge pull request #92 from datalust/dev
Browse files Browse the repository at this point in the history
2020.5 Release
  • Loading branch information
nblumhardt authored Dec 24, 2020
2 parents 83b5b9e + f1d45b8 commit 395a16a
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 2 deletions.
10 changes: 9 additions & 1 deletion src/Seq.Api/Model/Apps/AppSettingPart.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.

using System.Collections.Generic;

namespace Seq.Api.Model.Apps
{
/// <summary>
Expand Down Expand Up @@ -40,11 +42,17 @@ public class AppSettingPart
public string HelpText { get; set; }

/// <summary>
/// The type of value accepted for the setting; valid values are <c>Text</c>,
/// The type of value accepted for the setting; valid values are <c>Text</c>, <c>Select</c>,
/// <c>LongText</c>, <c>Checkbox</c>, <c>Integer</c>, <c>Decimal</c>, and <c>Password</c>.
/// </summary>
/// <remarks>An enum was historically not used here in order to improve
/// forwards/backwards compatibility.</remarks>
public string Type { get; set; }

/// <summary>
/// For settings of <see cref="Type"/> <c>Select</c>, a description of the values that can be chosen
/// for the setting.
/// </summary>
public List<AppSettingValuePart> AllowedValues { get; set; } = new List<AppSettingValuePart>();
}
}
19 changes: 19 additions & 0 deletions src/Seq.Api/Model/Apps/AppSettingValuePart.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
namespace Seq.Api.Model.Apps
{
/// <summary>
/// Describes a value accepted for an <see cref="AppSettingPart"/> with type <c>Select</c>.
/// </summary>
public class AppSettingValuePart
{
/// <summary>
/// The value accepted for the setting.
/// </summary>
public string Value { get; set; }

/// <summary>
/// Optionally, a description of the value, which Seq will use as the value's label in the UI. By default,
/// the <see cref="Value"/> will be used as the label.
/// </summary>
public string Description { get; set; }
}
}
7 changes: 7 additions & 0 deletions src/Seq.Api/Model/Workspaces/WorkspaceEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

using Seq.Api.Model.Security;
using Seq.Api.Model.Signals;

namespace Seq.Api.Model.Workspaces
{
Expand Down Expand Up @@ -42,6 +43,12 @@ public class WorkspaceEntity : Entity
/// </summary>
public bool IsProtected { get; set; }

/// <summary>
/// An optional <see cref="SignalExpressionPart"/> that will be activated when opening the <em>Events</em>
/// screen with the workspace selected.
/// </summary>
public SignalExpressionPart DefaultSignalExpression { get; set; }

/// <summary>
/// Content included in the workspace.
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Seq.Api/Seq.Api.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Client library for the Seq HTTP API.</Description>
<VersionPrefix>2020.4.0</VersionPrefix>
<VersionPrefix>2020.5.0</VersionPrefix>
<Authors>Datalust;Contributors</Authors>
<TargetFramework>netstandard2.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down

0 comments on commit 395a16a

Please sign in to comment.