Rename filter components for consistency

pull/10046/head
Oliver Günther 3 years ago
parent 0003590e33
commit 73efd63b03
No known key found for this signature in database
GPG Key ID: 88872239EB414F99
  1. 2
      frontend/src/app/features/boards/board/board-filter/board-filter.component.html
  2. 2
      frontend/src/app/features/work-packages/components/filters/filter-boolean-value/filter-boolean-value.component.ts
  3. 2
      frontend/src/app/features/work-packages/components/filters/filter-container/filter-container.directive.ts
  4. 2
      frontend/src/app/features/work-packages/components/filters/filter-date-time-value/filter-date-time-value.component.ts
  5. 2
      frontend/src/app/features/work-packages/components/filters/filter-date-times-value/filter-date-times-value.component.ts
  6. 2
      frontend/src/app/features/work-packages/components/filters/filter-date-value/filter-date-value.component.ts
  7. 2
      frontend/src/app/features/work-packages/components/filters/filter-dates-value/filter-dates-value.component.ts
  8. 2
      frontend/src/app/features/work-packages/components/filters/filter-integer-value/filter-integer-value.component.ts
  9. 4
      frontend/src/app/features/work-packages/components/filters/filter-searchable-multiselect-value/filter-searchable-multiselect-value.component.ts
  10. 2
      frontend/src/app/features/work-packages/components/filters/filter-string-value/filter-string-value.component.ts
  11. 2
      frontend/src/app/features/work-packages/components/filters/filter-toggled-multiselect-value/filter-toggled-multiselect-value.component.ts
  12. 40
      frontend/src/app/features/work-packages/components/filters/query-filter/query-filter.component.html

@ -1 +1 @@
<filter-container></filter-container>
<op-filter-container></op-filter-container>

@ -34,7 +34,7 @@ import { HalResource } from 'core-app/features/hal/resources/hal-resource';
import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
@Component({
selector: 'filter-boolean-value',
selector: 'op-filter-boolean-value',
templateUrl: './filter-boolean-value.component.html',
})
export class FilterBooleanValueComponent {

@ -47,7 +47,7 @@ import { WorkPackageFiltersService } from 'core-app/features/work-packages/compo
@Component({
templateUrl: './filter-container.directive.html',
changeDetection: ChangeDetectionStrategy.OnPush,
selector: 'filter-container',
selector: 'op-filter-container',
})
export class WorkPackageFilterContainerComponent extends UntilDestroyedMixin implements OnInit, OnDestroy {
@Input('showFilterButton') showFilterButton = false;

@ -39,7 +39,7 @@ import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/que
import { AbstractDateTimeValueController } from '../abstract-filter-date-time-value/abstract-filter-date-time-value.controller';
@Component({
selector: 'filter-date-time-value',
selector: 'op-filter-date-time-value',
templateUrl: './filter-date-time-value.component.html',
})
export class FilterDateTimeValueComponent extends AbstractDateTimeValueController implements OnInit {

@ -39,7 +39,7 @@ import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/que
import { AbstractDateTimeValueController } from '../abstract-filter-date-time-value/abstract-filter-date-time-value.controller';
@Component({
selector: 'filter-date-times-value',
selector: 'op-filter-date-times-value',
templateUrl: './filter-date-times-value.component.html',
})
export class FilterDateTimesValueComponent extends AbstractDateTimeValueController implements OnInit {

@ -36,7 +36,7 @@ import { TimezoneService } from 'core-app/core/datetime/timezone.service';
import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
@Component({
selector: 'filter-date-value',
selector: 'op-filter-date-value',
templateUrl: './filter-date-value.component.html',
})
export class FilterDateValueComponent extends UntilDestroyedMixin {

@ -37,7 +37,7 @@ import { TimezoneService } from 'core-app/core/datetime/timezone.service';
import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
@Component({
selector: 'filter-dates-value',
selector: 'op-filter-dates-value',
templateUrl: './filter-dates-value.component.html',
})
export class FilterDatesValueComponent extends UntilDestroyedMixin {

@ -36,7 +36,7 @@ import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/que
import { QueryFilterResource } from 'core-app/features/hal/resources/query-filter-resource';
@Component({
selector: 'filter-integer-value',
selector: 'op-filter-integer-value',
templateUrl: './filter-integer-value.component.html',
})
export class FilterIntegerValueComponent extends UntilDestroyedMixin {

@ -16,7 +16,6 @@ import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destr
import { ApiV3Resource } from 'core-app/core/apiv3/cache/cachable-apiv3-resource';
import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
import { HalResourceSortingService } from 'core-app/features/hal/services/hal-resource-sorting.service';
import { HalResourceNotificationService } from 'core-app/features/hal/services/hal-resource-notification.service';
import {
ChangeDetectionStrategy,
@ -34,7 +33,7 @@ import { CurrentUserService } from 'core-app/core/current-user/current-user.serv
import { take } from 'rxjs/internal/operators/take';
@Component({
selector: 'filter-searchable-multiselect-value',
selector: 'op-filter-searchable-multiselect-value',
changeDetection: ChangeDetectionStrategy.OnPush,
templateUrl: './filter-searchable-multiselect-value.component.html',
})
@ -69,7 +68,6 @@ export class FilterSearchableMultiselectValueComponent extends UntilDestroyedMix
@ViewChild('ngSelectInstance', { static: true }) ngSelectInstance:NgSelectComponent;
constructor(readonly halResourceService:HalResourceService,
readonly halSorting:HalResourceSortingService,
readonly apiV3Service:ApiV3Service,
readonly cdRef:ChangeDetectorRef,
readonly I18n:I18nService,

@ -35,7 +35,7 @@ import { componentDestroyed } from '@w11k/ngx-componentdestroyed';
import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
@Component({
selector: 'filter-string-value',
selector: 'op-filter-string-value',
templateUrl: './filter-string-value.component.html',
})
export class FilterStringValueComponent extends UntilDestroyedMixin {

@ -48,7 +48,7 @@ import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/que
import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
@Component({
selector: 'filter-toggled-multiselect-value',
selector: 'op-filter-toggled-multiselect-value',
changeDetection: ChangeDetectionStrategy.OnPush,
templateUrl: './filter-toggled-multiselect-value.component.html',
})

@ -38,78 +38,78 @@
</option>
</select>
<filter-boolean-value
<op-filter-boolean-value
*ngIf="valueType == '[1]Boolean'"
(filterChanged)="onFilterUpdated($event)"
[shouldFocus]="shouldFocus"
[filter]="filter"
></filter-boolean-value>
></op-filter-boolean-value>
</div>
<!-- Values -->
<ng-container *ngIf="showValuesInput && valueType">
<div class="advanced-filters--filter-value" [ngSwitch]="valueType">
<filter-integer-value
<op-filter-integer-value
*ngSwitchCase="'[1]Integer'"
(filterChanged)="onFilterUpdated($event)"
[shouldFocus]="shouldFocus"
[filter]="filter"
></filter-integer-value>
></op-filter-integer-value>
<filter-date-value
<op-filter-date-value
*ngSwitchCase="'[1]Date'"
(filterChanged)="onFilterUpdated($event)"
[shouldFocus]="shouldFocus"
[filter]="filter"
></filter-date-value>
></op-filter-date-value>
<filter-dates-value
<op-filter-dates-value
*ngSwitchCase="'[2]Date'"
(filterChanged)="onFilterUpdated($event)"
[shouldFocus]="shouldFocus"
[filter]="filter"
></filter-dates-value>
></op-filter-dates-value>
<filter-date-time-value
<op-filter-date-time-value
*ngSwitchCase="'[1]DateTime'"
(filterChanged)="onFilterUpdated($event)"
[shouldFocus]="shouldFocus"
[filter]="filter"
></filter-date-time-value>
></op-filter-date-time-value>
<filter-date-times-value
<op-filter-date-times-value
*ngSwitchCase="'[2]DateTime'"
[shouldFocus]="shouldFocus"
(filterChanged)="onFilterUpdated($event)"
[filter]="filter"
></filter-date-times-value>
></op-filter-date-times-value>
<filter-string-value
<op-filter-string-value
*ngSwitchCase="'[1]String'"
(filterChanged)="onFilterUpdated($event)"
[shouldFocus]="shouldFocus"
[filter]="filter"
></filter-string-value>
></op-filter-string-value>
<filter-string-value
<op-filter-string-value
*ngSwitchCase="'[1]Float'"
(filterChanged)="onFilterUpdated($event)"
[shouldFocus]="shouldFocus"
[filter]="filter"
></filter-string-value>
></op-filter-string-value>
<ng-container *ngSwitchDefault>
<filter-toggled-multiselect-value
<op-filter-toggled-multiselect-value
*ngIf="filter.currentSchema.loadedAllowedValues()"
(filterChanged)="onFilterUpdated($event)"
[shouldFocus]="shouldFocus"
[filter]="filter"
></filter-toggled-multiselect-value>
<filter-searchable-multiselect-value
></op-filter-toggled-multiselect-value>
<op-filter-searchable-multiselect-value
*ngIf="!filter.currentSchema.loadedAllowedValues()"
(filterChanged)="onFilterUpdated($event)"
[shouldFocus]="shouldFocus"
[filter]="filter"
></filter-searchable-multiselect-value>
></op-filter-searchable-multiselect-value>
</ng-container>
</div>
</ng-container>

Loading…
Cancel
Save