From 90b094a5f1be579d1400ba1835bb81f673abf886 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Wed, 16 Dec 2020 06:27:57 +0100 Subject: [PATCH] TSK-1436: adapted PR change requests --- ...rityConfig.java => TestWebSecurityConfig.java} | 4 ++-- .../taskana/rest/ExampleWebSecurityConfig.java | 7 +++---- ...et-distribution-targets-list.component.spec.ts | 2 +- ...kbasket-distribution-targets-list.component.ts | 2 +- ...kbasket-distribution-targets.component.spec.ts | 2 +- .../workbasket-distribution-targets.component.ts | 2 +- .../workbasket-list-toolbar.component.spec.ts | 10 +++++----- .../workbasket-list-toolbar.component.ts | 2 +- .../workbasket-list.component.spec.ts | 2 +- .../workbasket-list/workbasket-list.component.ts | 2 +- .../task-history-query.component.html | 12 ++++++------ .../task-history-query.component.ts | 7 +++++-- .../shared/components/sort/sort.component.html | 4 ++-- .../task-filter/task-filter.component.scss | 15 +++++++++++++++ .../workbasket-filter.component.ts | 2 +- ...s => classification-query-filter-parameter.ts} | 2 +- .../shared/models/task-history-event-resource.ts | 2 ++ ...rs.ts => workbasket-query-filter-parameter.ts} | 0 .../app/shared/pipes/select-workbaskets.pipe.ts | 5 +++-- .../classifications/classifications.service.ts | 4 ++-- .../services/workbasket/workbasket.service.ts | 2 +- .../classification-store/classification.state.ts | 4 ++-- .../store/workbasket-store/workbasket.actions.ts | 2 +- .../general-fields.component.ts | 1 + 24 files changed, 59 insertions(+), 38 deletions(-) rename common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/{WebSecurityConfig.java => TestWebSecurityConfig.java} (98%) rename web/src/app/shared/models/{classification-query-filter-parameters.ts => classification-query-filter-parameter.ts} (86%) rename web/src/app/shared/models/{workbasket-query-parameters.ts => workbasket-query-filter-parameter.ts} (100%) diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/WebSecurityConfig.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/TestWebSecurityConfig.java similarity index 98% rename from common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/WebSecurityConfig.java rename to common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/TestWebSecurityConfig.java index 8b02270d5..bd307d857 100644 --- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/WebSecurityConfig.java +++ b/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/TestWebSecurityConfig.java @@ -23,7 +23,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** Default basic configuration for taskana web example. */ @Configuration -public class WebSecurityConfig { +public class TestWebSecurityConfig { private final String ldapServerUrl; private final String ldapBaseDn; @@ -31,7 +31,7 @@ public class WebSecurityConfig { private final String ldapGroupSearchFilter; @Autowired - public WebSecurityConfig( + public TestWebSecurityConfig( @Value("${taskana.ldap.serverUrl:ldap://localhost:10389}") String ldapServerUrl, @Value("${taskana.ldap.baseDn:OU=Test,O=TASKANA}") String ldapBaseDn, @Value("${taskana.ldap.groupSearchBase:cn=groups}") String ldapGroupSearchBase, diff --git a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/ExampleWebSecurityConfig.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/ExampleWebSecurityConfig.java index db0606373..220489601 100644 --- a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/ExampleWebSecurityConfig.java +++ b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/ExampleWebSecurityConfig.java @@ -1,5 +1,8 @@ package pro.taskana.rest; +import java.util.List; +import java.util.Map; +import java.util.function.Function; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -18,10 +21,6 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import java.util.List; -import java.util.Map; -import java.util.function.Function; - @Configuration public class ExampleWebSecurityConfig { diff --git a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.spec.ts b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.spec.ts index ed7bc688e..6aa6cd746 100644 --- a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.spec.ts +++ b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.spec.ts @@ -10,7 +10,7 @@ import { Side } from '../workbasket-distribution-targets/workbasket-distribution import { MatIconModule } from '@angular/material/icon'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatListModule } from '@angular/material/list'; -import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-parameters'; +import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-filter-parameter'; @Component({ selector: 'taskana-shared-workbasket-filter', template: '' }) class FilterStub { diff --git a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.ts b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.ts index 7a9580306..acde6c3ab 100644 --- a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.ts +++ b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.ts @@ -13,7 +13,7 @@ import { expandDown } from 'app/shared/animations/expand.animation'; import { Side } from '../workbasket-distribution-targets/workbasket-distribution-targets.component'; import { MatSelectionList } from '@angular/material/list'; import { Pair } from '../../../shared/models/pair'; -import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-parameters'; +import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-filter-parameter'; @Component({ selector: 'taskana-administration-workbasket-distribution-targets-list', diff --git a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.spec.ts b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.spec.ts index de4eed7c7..235361fa9 100644 --- a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.spec.ts +++ b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.spec.ts @@ -19,7 +19,7 @@ import { selectedWorkbasketMock, workbasketReadStateMock } from '../../../shared/store/mock-data/mock-store'; -import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-parameters'; +import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-filter-parameter'; import { Pair } from '../../../shared/models/pair'; const routeParamsMock = { id: 'workbasket' }; diff --git a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts index 1769d2e56..62007bea0 100644 --- a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts +++ b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts @@ -21,7 +21,7 @@ import { import { WorkbasketSelectors } from '../../../shared/store/workbasket-store/workbasket.selectors'; import { ButtonAction } from '../../models/button-action'; import { Pair } from '../../../shared/models/pair'; -import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-parameters'; +import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-filter-parameter'; import { QueryPagingParameter } from '../../../shared/models/query-paging-parameter'; export enum Side { diff --git a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts index 9dec6b55a..6b45b24a2 100644 --- a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts +++ b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts @@ -18,7 +18,7 @@ import { MatDialogModule } from '@angular/material/dialog'; import { RouterTestingModule } from '@angular/router/testing'; import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service'; import { Pair } from '../../../shared/models/pair'; -import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-parameters'; +import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-filter-parameter'; const getDomainFn = jest.fn().mockReturnValue(true); const domainServiceMock = jest.fn().mockImplementation( @@ -123,14 +123,14 @@ describe('WorkbasketListToolbarComponent', () => { expect(sort).toMatchObject(mockSort); }); - it('should NOT emit value when filtering is called with wrong component', async((done) => { + it('should NOT emit value when filtering is called with wrong component', () => { const mockFilter: Pair = { left: 'foo', right: { domain: ['DOMAIN_A'] } }; const performFilterSpy = jest.spyOn(component.performFilter, 'emit'); component.filtering(mockFilter); expect(performFilterSpy).toBeCalledTimes(0); - })); + }); - it('should emit value when filtering is called with correct component', async((done) => { + it('should emit value when filtering is called with correct component', () => { const mockFilter: Pair = { left: 'workbasket-list', right: { domain: ['DOMAIN_A'] } @@ -139,7 +139,7 @@ describe('WorkbasketListToolbarComponent', () => { component.filtering(mockFilter); expect(performFilterSpy).toBeCalledTimes(1); expect(performFilterSpy).toBeCalledWith(mockFilter.right); - })); + }); /* HTML */ diff --git a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.ts b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.ts index b69521eaf..a260cdb0e 100644 --- a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.ts +++ b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.ts @@ -10,7 +10,7 @@ import { ACTION } from '../../../shared/models/action'; import { CreateWorkbasket } from '../../../shared/store/workbasket-store/workbasket.actions'; import { WorkbasketSelectors } from '../../../shared/store/workbasket-store/workbasket.selectors'; import { WorkbasketService } from '../../../shared/services/workbasket/workbasket.service'; -import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-parameters'; +import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-filter-parameter'; import { Pair } from '../../../shared/models/pair'; @Component({ diff --git a/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts b/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts index 0b41bf431..7f9e93071 100644 --- a/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts +++ b/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts @@ -22,7 +22,7 @@ import { DomainService } from '../../../shared/services/domain/domain.service'; import { RouterTestingModule } from '@angular/router/testing'; import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service'; import { selectedWorkbasketMock } from '../../../shared/store/mock-data/mock-store'; -import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-parameters'; +import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-filter-parameter'; const workbasketSavedTriggeredFn = jest.fn().mockReturnValue(of(1)); const workbasketSummaryFn = jest.fn().mockReturnValue(of({})); diff --git a/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts b/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts index e764460d1..45caab673 100644 --- a/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts +++ b/web/src/app/administration/components/workbasket-list/workbasket-list.component.ts @@ -21,7 +21,7 @@ import { Workbasket } from '../../../shared/models/workbasket'; import { MatSelectionList } from '@angular/material/list'; import { DomainService } from '../../../shared/services/domain/domain.service'; import { RequestInProgressService } from '../../../shared/services/request-in-progress/request-in-progress.service'; -import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-parameters'; +import { WorkbasketQueryFilterParameter } from '../../../shared/models/workbasket-query-filter-parameter'; import { QueryPagingParameter } from '../../../shared/models/query-paging-parameter'; @Component({ diff --git a/web/src/app/history/task-history-query/task-history-query.component.html b/web/src/app/history/task-history-query/task-history-query.component.html index 0a79b2156..13340119d 100644 --- a/web/src/app/history/task-history-query/task-history-query.component.html +++ b/web/src/app/history/task-history-query/task-history-query.component.html @@ -22,8 +22,8 @@ {{getHeaderFieldDescription(taskHeader.key)}} - sort
sort
@@ -107,8 +107,8 @@ -
- +
diff --git a/web/src/app/history/task-history-query/task-history-query.component.ts b/web/src/app/history/task-history-query/task-history-query.component.ts index 31d6f5079..e5723a892 100644 --- a/web/src/app/history/task-history-query/task-history-query.component.ts +++ b/web/src/app/history/task-history-query/task-history-query.component.ts @@ -19,7 +19,7 @@ export class TaskHistoryQueryComponent implements OnInit { taskQueryResource: TaskHistoryEventResourceData; taskQuery: Array; taskQueryHeader = new TaskHistoryEventData(); - orderBy: Sorting = { + sortParameter: Sorting = { 'sort-by': TaskHistoryQuerySortParameter.CREATED, order: Direction.ASC }; @@ -28,6 +28,9 @@ export class TaskHistoryQueryComponent implements OnInit { taskQueryForm = new FormGroup({}); + // to make this enum available for html + sortDirection = Direction; + constructor( private taskQueryService: TaskHistoryQueryService, private orientationService: OrientationService, @@ -147,7 +150,6 @@ export class TaskHistoryQueryComponent implements OnInit { } changeOrderBy(key: string) { - console.log(key); if (this.filterFieldsToAllowQuerying(key)) { // if (this.orderBy.sortBy === key) { // this.orderBy.sortDirection = this.toggleSortDirection(this.orderBy.sortDirection); @@ -203,6 +205,7 @@ export class TaskHistoryQueryComponent implements OnInit { () .subscribe((taskQueryResource) => { this.requestInProgressService.setRequestInProgress(false); + console.log(taskQueryResource); this.taskQueryResource = taskQueryResource.taskHistoryEvents ? taskQueryResource : null; this.taskQuery = taskQueryResource.taskHistoryEvents ? taskQueryResource.taskHistoryEvents : null; }); diff --git a/web/src/app/shared/components/sort/sort.component.html b/web/src/app/shared/components/sort/sort.component.html index 28a5ad953..3a66ca0e8 100644 --- a/web/src/app/shared/components/sort/sort.component.html +++ b/web/src/app/shared/components/sort/sort.component.html @@ -11,7 +11,7 @@