Fix past particples of command verbs. e.g. removd => removed

liammclennan · liammclennan · commit d2c46baecc7a · 2025-03-19T10:43:01.000+10:00
diff --git a/README.md b/README.md
diff --git a/src/SeqCli/Cli/Commands/Dashboard/ListCommand.cs b/src/SeqCli/Cli/Commands/Dashboard/ListCommand.cs
@@ -37,7 +37,7 @@ public ListCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
         _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 
         _entityIdentity = Enable(new EntityIdentityFeature("dashboard", "list"));
-        _entityOwner = Enable(new EntityOwnerFeature("dashboard", "list", _entityIdentity));
+        _entityOwner = Enable(new EntityOwnerFeature("dashboard", "list", "listed", _entityIdentity));
         _output = Enable(new OutputFormatFeature(config.Output));
         _connection = Enable<ConnectionFeature>();
     }
diff --git a/src/SeqCli/Cli/Commands/Dashboard/RemoveCommand.cs b/src/SeqCli/Cli/Commands/Dashboard/RemoveCommand.cs
@@ -36,7 +36,7 @@ public RemoveCommand(SeqConnectionFactory connectionFactory)
         _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 
         _entityIdentity = Enable(new EntityIdentityFeature("dashboard", "remove"));
-        _entityOwner = Enable(new EntityOwnerFeature("dashboard", "remove", _entityIdentity));
+        _entityOwner = Enable(new EntityOwnerFeature("dashboard", "remove", "removed", _entityIdentity));
         _connection = Enable<ConnectionFeature>();
     }
 
diff --git a/src/SeqCli/Cli/Commands/Signal/ImportCommand.cs b/src/SeqCli/Cli/Commands/Signal/ImportCommand.cs
@@ -51,7 +51,7 @@ public ImportCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config
             _ => _merge = true);
 
         _fileInputFeature = Enable(new FileInputFeature("File to import"));
-        _entityOwner = Enable(new EntityOwnerFeature("signal", "import"));
+        _entityOwner = Enable(new EntityOwnerFeature("signal", "import", "imported"));
         _connection = Enable<ConnectionFeature>();
     }
 
diff --git a/src/SeqCli/Cli/Commands/Signal/ListCommand.cs b/src/SeqCli/Cli/Commands/Signal/ListCommand.cs
@@ -37,7 +37,7 @@ public ListCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
         _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 
         _entityIdentity = Enable(new EntityIdentityFeature("signal", "list"));
-        _entityOwner = Enable(new EntityOwnerFeature("signal", "list", _entityIdentity));
+        _entityOwner = Enable(new EntityOwnerFeature("signal", "list", "listed", _entityIdentity));
         _output = Enable(new OutputFormatFeature(config.Output));
         _connection = Enable<ConnectionFeature>();
     }
diff --git a/src/SeqCli/Cli/Commands/Signal/RemoveCommand.cs b/src/SeqCli/Cli/Commands/Signal/RemoveCommand.cs
@@ -36,7 +36,7 @@ public RemoveCommand(SeqConnectionFactory connectionFactory)
         _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 
         _entityIdentity = Enable(new EntityIdentityFeature("signal", "remove"));
-        _entityOwner = Enable(new EntityOwnerFeature("signal", "remove", _entityIdentity));
+        _entityOwner = Enable(new EntityOwnerFeature("signal", "remove", "removed", _entityIdentity));
         _connection = Enable<ConnectionFeature>();
     }
 
diff --git a/src/SeqCli/Cli/Commands/Workspace/ListCommand.cs b/src/SeqCli/Cli/Commands/Workspace/ListCommand.cs
@@ -23,7 +23,7 @@ public ListCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
         _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 
         _entityIdentity = Enable(new EntityIdentityFeature("workspace", "list"));
-        _entityOwner = Enable(new EntityOwnerFeature("workspace", "list", _entityIdentity));
+        _entityOwner = Enable(new EntityOwnerFeature("workspace", "list", "listed", _entityIdentity));
         _output = Enable(new OutputFormatFeature(config.Output));
         _connection = Enable<ConnectionFeature>();
     }
diff --git a/src/SeqCli/Cli/Commands/Workspace/RemoveCommand.cs b/src/SeqCli/Cli/Commands/Workspace/RemoveCommand.cs
@@ -22,7 +22,7 @@ public RemoveCommand(SeqConnectionFactory connectionFactory)
         _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
 
         _entityIdentity = Enable(new EntityIdentityFeature("workspace", "remove"));
-        _entityOwner = Enable(new EntityOwnerFeature("workspace", "remove", _entityIdentity));
+        _entityOwner = Enable(new EntityOwnerFeature("workspace", "remove", "removed", _entityIdentity));
         _connection = Enable<ConnectionFeature>();
     }
 
diff --git a/src/SeqCli/Cli/Features/EntityOwnerFeature.cs b/src/SeqCli/Cli/Features/EntityOwnerFeature.cs
@@ -21,20 +21,22 @@ class EntityOwnerFeature : CommandFeature
 {
     readonly string _entityName;
     readonly string _verb;
+    private readonly string _verbPastParticiple;
     readonly EntityIdentityFeature? _identityFeature;
 
-    public EntityOwnerFeature(string entityName, string verb, EntityIdentityFeature? identityFeature = null)
+    public EntityOwnerFeature(string entityName, string verb, string verbPastParticiple, EntityIdentityFeature? identityFeature = null)
     {
         _entityName = entityName ?? throw new ArgumentNullException(nameof(entityName));
         _verb = verb ?? throw new ArgumentNullException(nameof(verb));
+        _verbPastParticiple = verbPastParticiple ?? throw new ArgumentNullException(nameof(verbPastParticiple));
         _identityFeature = identityFeature;
     }
 
     public override void Enable(OptionSet options)
     {
         options.Add(
             "o=|owner=",
-            $"The id of the user to {_verb} {_entityName}s for; by default, shared {_entityName}s are {_verb.TrimEnd('e')}d",
+            $"The id of the user to {_verb} {_entityName}s for; by default, shared {_entityName}s are {_verbPastParticiple}",
             o =>
             {
                 OwnerId = StringNormalizationExtensions.Normalize(o);
@@ -55,4 +57,5 @@ public override IEnumerable<string> GetUsageErrors()
     public string? OwnerId { get; private set; }
 
     public bool IncludeShared { get; private set; } = true;
+
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public ListCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)`
`37`	`37`	`_connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));`
`38`	`38`
`39`	`39`	`_entityIdentity = Enable(new EntityIdentityFeature("dashboard", "list"));`
`40`		`- _entityOwner = Enable(new EntityOwnerFeature("dashboard", "list", _entityIdentity));`
	`40`	`+ _entityOwner = Enable(new EntityOwnerFeature("dashboard", "list", "listed", _entityIdentity));`
`41`	`41`	`_output = Enable(new OutputFormatFeature(config.Output));`
`42`	`42`	`_connection = Enable<ConnectionFeature>();`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public RemoveCommand(SeqConnectionFactory connectionFactory)`
`36`	`36`	`_connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));`
`37`	`37`
`38`	`38`	`_entityIdentity = Enable(new EntityIdentityFeature("dashboard", "remove"));`
`39`		`- _entityOwner = Enable(new EntityOwnerFeature("dashboard", "remove", _entityIdentity));`
	`39`	`+ _entityOwner = Enable(new EntityOwnerFeature("dashboard", "remove", "removed", _entityIdentity));`
`40`	`40`	`_connection = Enable<ConnectionFeature>();`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public ImportCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config`
`51`	`51`	`_ => _merge = true);`
`52`	`52`
`53`	`53`	`_fileInputFeature = Enable(new FileInputFeature("File to import"));`
`54`		`- _entityOwner = Enable(new EntityOwnerFeature("signal", "import"));`
	`54`	`+ _entityOwner = Enable(new EntityOwnerFeature("signal", "import", "imported"));`
`55`	`55`	`_connection = Enable<ConnectionFeature>();`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public ListCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)`
`23`	`23`	`_connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));`
`24`	`24`
`25`	`25`	`_entityIdentity = Enable(new EntityIdentityFeature("workspace", "list"));`
`26`		`- _entityOwner = Enable(new EntityOwnerFeature("workspace", "list", _entityIdentity));`
	`26`	`+ _entityOwner = Enable(new EntityOwnerFeature("workspace", "list", "listed", _entityIdentity));`
`27`	`27`	`_output = Enable(new OutputFormatFeature(config.Output));`
`28`	`28`	`_connection = Enable<ConnectionFeature>();`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public RemoveCommand(SeqConnectionFactory connectionFactory)`
`22`	`22`	`_connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));`
`23`	`23`
`24`	`24`	`_entityIdentity = Enable(new EntityIdentityFeature("workspace", "remove"));`
`25`		`- _entityOwner = Enable(new EntityOwnerFeature("workspace", "remove", _entityIdentity));`
	`25`	`+ _entityOwner = Enable(new EntityOwnerFeature("workspace", "remove", "removed", _entityIdentity));`
`26`	`26`	`_connection = Enable<ConnectionFeature>();`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -21,20 +21,22 @@ class EntityOwnerFeature : CommandFeature`
`21`	`21`	`{`
`22`	`22`	`readonly string _entityName;`
`23`	`23`	`readonly string _verb;`
	`24`	`+ private readonly string _verbPastParticiple;`
`24`	`25`	`readonly EntityIdentityFeature? _identityFeature;`
`25`	`26`
`26`		`- public EntityOwnerFeature(string entityName, string verb, EntityIdentityFeature? identityFeature = null)`
	`27`	`+ public EntityOwnerFeature(string entityName, string verb, string verbPastParticiple, EntityIdentityFeature? identityFeature = null)`
`27`	`28`	`{`
`28`	`29`	`_entityName = entityName ?? throw new ArgumentNullException(nameof(entityName));`
`29`	`30`	`_verb = verb ?? throw new ArgumentNullException(nameof(verb));`
	`31`	`+ _verbPastParticiple = verbPastParticiple ?? throw new ArgumentNullException(nameof(verbPastParticiple));`
`30`	`32`	`_identityFeature = identityFeature;`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`public override void Enable(OptionSet options)`
`34`	`36`	`{`
`35`	`37`	`options.Add(`
`36`	`38`	`"o=\|owner=",`
`37`		`- $"The id of the user to {_verb} {_entityName}s for; by default, shared {_entityName}s are {_verb.TrimEnd('e')}d",`
	`39`	`+ $"The id of the user to {_verb} {_entityName}s for; by default, shared {_entityName}s are {_verbPastParticiple}",`
`38`	`40`	`o =>`
`39`	`41`	`{`
`40`	`42`	`OwnerId = StringNormalizationExtensions.Normalize(o);`
`@@ -55,4 +57,5 @@ public override IEnumerable<string> GetUsageErrors()`
`55`	`57`	`public string? OwnerId { get; private set; }`
`56`	`58`
`57`	`59`	`public bool IncludeShared { get; private set; } = true;`
	`60`	`+`
`58`	`61`	`}`