SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Implement search

Browse source
This commit is contained in:
Sipke Schoorstra 2021-04-09 21:47:44 +02:00
parent 8900443669
commit 9709ee6ca2
5 changed files with 58 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/Elsa.Core/Persistence/Specifications/WorkflowInstances/WorkflowInstanceSpecificationExtensions.cs
View file

@ -12,8 +12,9 @@ namespace Elsa.Persistence.Specifications.WorkflowInstances
public static ISpecification<WorkflowInstance> WithContextId<TContextType>(this ISpecification<WorkflowInstance> specification, string contextId) => specification.And(new WorkflowInstanceContextIdMatchSpecification(typeof(TContextType), contextId));
public static ISpecification<WorkflowInstance> WithContext(this ISpecification<WorkflowInstance> specification, string contextType) => specification.And(new WorkflowInstanceContextMatchSpecification(contextType));
public static ISpecification<WorkflowInstance> WithContext(this ISpecification<WorkflowInstance> specification, Type contextType) => specification.And(new WorkflowInstanceContextMatchSpecification(contextType));
public static ISpecification<WorkflowInstance> WithContextd<TContextType>(this ISpecification<WorkflowInstance> specification) => specification.And(new WorkflowInstanceContextMatchSpecification(typeof(TContextType)));
public static ISpecification<WorkflowInstance> WithContextId<TContextType>(this ISpecification<WorkflowInstance> specification) => specification.And(new WorkflowInstanceContextMatchSpecification(typeof(TContextType)));
public static ISpecification<WorkflowInstance> WithStatus(this ISpecification<WorkflowInstance> specification, WorkflowStatus status) => specification.And(new WorkflowStatusSpecification(status));
public static ISpecification<WorkflowInstance> WithSearchTerm(this ISpecification<WorkflowInstance> specification, string searchTerm) => specification.And(new WorkflowSearchTermSpecification(searchTerm));
}
}

13
src/core/Elsa.Core/Persistence/Specifications/WorkflowInstances/WorkflowSearchTermSpecification.cs Normal file
View file

@ -0,0 +1,13 @@
using System;
using System.Linq.Expressions;
using Elsa.Models;
namespace Elsa.Persistence.Specifications.WorkflowInstances
{
public class WorkflowSearchTermSpecification : Specification<WorkflowInstance>
{
public string SearchTerm { get; set; }
public WorkflowSearchTermSpecification(string searchTerm) => SearchTerm = searchTerm;
public override Expression<Func<WorkflowInstance, bool>> ToExpression() => x => x.Name!.Contains(SearchTerm) || x.Id.Contains(SearchTerm) || x.ContextId!.Contains(SearchTerm);
}
}

2
src/designer/elsa-workflows-studio/src/components/controls/elsa-pager/elsa-pager.tsx
View file

@ -42,7 +42,7 @@ export class ElsaPager {
const from = page * pageSize + 1;
const to = Math.min(from + pageSize, totalCount);
const pageCount = Math.round(((totalCount - 1) / pageSize) + 1);
const pageCount = Math.round(((totalCount - 1) / pageSize) + 0.5);
const maxPageButtons = 10;
const fromPage = Math.max(0, page - maxPageButtons / 2);

47
src/designer/elsa-workflows-studio/src/components/screens/workflow-instances-list/elsa-workflow-instances-list-screen/elsa-workflow-instances-list-screen.tsx
View file

@ -23,7 +23,8 @@ export class ElsaWorkflowInstancesListScreen {
@State() selectedWorkflowInstanceIds: Array<string> = [];
@State() selectAllChecked: boolean;
@State() page: number = 0;
@State() pageSize: number = 25;
@State() pageSize: number = 15;
@State() searchTerm?: string;
confirmDialog: HTMLElsaConfirmDialogElement;
@ -42,7 +43,7 @@ export class ElsaWorkflowInstancesListScreen {
this.selectedWorkflowStatus = query.status;
this.selectedOrderBy = query.orderBy ?? OrderBy.Started;
this.page = !!query.page ? parseInt(query.page) : 0;
this.pageSize = !!query.pageSize ? parseInt(query.pageSize) : 25;
this.pageSize = !!query.pageSize ? parseInt(query.pageSize) : 15;
}
async loadWorkflowBlueprints() {
@ -54,7 +55,7 @@ export class ElsaWorkflowInstancesListScreen {
async loadWorkflowInstances() {
const elsaClient = this.createClient();
this.workflowInstances = await elsaClient.workflowInstancesApi.list(this.page, this.pageSize, this.selectedWorkflowId, this.selectedWorkflowStatus, this.selectedOrderBy);
this.workflowInstances = await elsaClient.workflowInstancesApi.list(this.page, this.pageSize, this.selectedWorkflowId, this.selectedWorkflowStatus, this.selectedOrderBy, this.searchTerm);
}
createClient() {
@ -77,11 +78,11 @@ export class ElsaWorkflowInstancesListScreen {
if (!!orderBy)
filters['orderBy'] = orderBy;
if(!!this.page)
if (!!this.page)
filters['page'] = this.page.toString();
if(!!this.pageSize)
if (!!this.pageSize)
filters['pageSize'] = this.pageSize.toString();
const queryString = collection.map(filters, (v, k) => `${k}=${v}`).join('&');
@ -108,7 +109,7 @@ export class ElsaWorkflowInstancesListScreen {
async routeChanged(e: LocationSegments) {
debugger;
if (e.pathname.toLowerCase().indexOf('workflow-instances') < 0)
return;
@ -170,6 +171,16 @@ export class ElsaWorkflowInstancesListScreen {
}
}
async onSearch(e: Event) {
e.preventDefault();
const form = e.currentTarget as HTMLFormElement;
const formData = new FormData(form);
const searchTerm: FormDataEntryValue = formData.get('searchTerm');
this.searchTerm = searchTerm.toString();
await this.loadWorkflowInstances();
}
render() {
const workflowInstances = this.workflowInstances.items;
const workflowBlueprints = this.workflowBlueprints;
@ -198,6 +209,28 @@ export class ElsaWorkflowInstancesListScreen {
return (
<div>
<div class="relative z-10 flex-shrink-0 flex h-16 bg-white border-b border-gray-200">
<div class="flex-1 px-4 flex justify-between sm:px-6 lg:px-8">
<div class="flex-1 flex">
<form class="w-full flex md:ml-0" onSubmit={e => this.onSearch(e)}>
<label htmlFor="search_field" class="sr-only">Search</label>
<div class="relative w-full text-cool-gray-400 focus-within:text-cool-gray-600">
<div class="absolute inset-y-0 left-0 flex items-center pointer-events-none">
<svg class="h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z"/>
</svg>
</div>
<input name="searchTerm"
class="block w-full h-full pl-8 pr-3 py-2 rounded-md text-cool-gray-900 placeholder-cool-gray-500 focus:placeholder-cool-gray-400 sm:text-sm border-0 focus:outline-none focus:ring-0"
placeholder="Search"
type="search"/>
</div>
</form>
</div>
</div>
</div>
<div class="p-8 flex content-end justify-right bg-white space-x-4">
<div class="flex-shrink-0">
{this.renderBulkActions()}

4
src/server/Elsa.Server.Api/Endpoints/WorkflowInstances/List.cs
View file

@ -61,8 +61,8 @@ namespace Elsa.Server.Api.Endpoints.WorkflowInstances
if (workflowStatus != null)
specification = specification.WithStatus(workflowStatus.Value);
if (!string.IsNullOrWhiteSpace(searchTerm))
specification = specification.WithWorkflowName(searchTerm);
if (!string.IsNullOrWhiteSpace(searchTerm))
specification = specification.WithSearchTerm(searchTerm);
var orderBySpecification = default(OrderBy<WorkflowInstance>);