Skip to content

Commit

Permalink
SHIBUI-701 Hide filter list nav option
Browse files Browse the repository at this point in the history
  • Loading branch information
rmathis committed Nov 12, 2018
1 parent 544e5eb commit 7f18a02
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</div>
</div>
<div>
<button class="btn btn-primary btn-filter pull-left" (click)="viewFilters.emit(provider)">
<button class="btn btn-primary btn-filter pull-left" (click)="viewFilters.emit(provider)" *ngIf="hasFilters(provider)">
<i class="fa fa-filter"></i>&nbsp;
<span class="label" translate="action.manage-filters">Manage Filters</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Component, Input, ChangeDetectionStrategy, Output, EventEmitter } from

import { MetadataProvider } from '../../domain/model';
import { EntityItemComponent } from './entity-item.component';
import { FilterableProviders } from '../../provider/model';

@Component({
selector: 'provider-item',
Expand All @@ -20,4 +21,8 @@ export class ProviderItemComponent extends EntityItemComponent {

@Output() changeOrderUp: EventEmitter<MetadataProvider> = new EventEmitter();
@Output() changeOrderDown: EventEmitter<MetadataProvider> = new EventEmitter();

hasFilters(provider: MetadataProvider): boolean {
return FilterableProviders.indexOf(provider['@type']) > -1;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
[format]="formats.DROPDOWN"
[status]="status$ | async">
<a class="dropdown-item"
*ngIf="canFilter$ | async"
[routerLink]="['../', 'filters']"
routerLinkActive="active"
[attr.aria-label]="'label.filter-list' | translate"
Expand Down Expand Up @@ -56,6 +57,7 @@
<editor-nav
[format]="formats.TABS">
<a class="nav-link"
*ngIf="canFilter$ | async"
[routerLink]="['../', 'filters']"
routerLinkActive="active"
[attr.aria-label]="'label.filter-list' | translate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { UnsavedEntityComponent } from '../../domain/component/unsaved-entity.di
import { CanComponentDeactivate } from '../../../core/service/can-deactivate.guard';
import { DifferentialService } from '../../../core/service/differential.service';
import { NAV_FORMATS } from '../../domain/component/editor-nav.component';
import { FilterableProviders } from '../model';

@Component({
selector: 'provider-edit',
Expand All @@ -33,6 +34,7 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate
isInvalid$: Observable<boolean>;
status$: Observable<any>;
isSaving$: Observable<boolean>;
canFilter$: Observable<boolean>;

latest: MetadataProvider;
provider: MetadataProvider;
Expand Down Expand Up @@ -70,6 +72,8 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate

this.provider$.subscribe(p => this.provider = p);
this.store.select(fromProvider.getEntityChanges).subscribe(changes => this.latest = changes);

this.canFilter$ = this.definition$.pipe(map(def => FilterableProviders.indexOf(def.type) > -1));
}

go(id: string): void {
Expand Down
4 changes: 4 additions & 0 deletions ui/src/app/metadata/provider/model/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,9 @@ export const MetadataProviderEditorTypes = [
FileSystemMetadataProviderEditor
];

export const FilterableProviders = [
FileBackedHttpMetadataProviderEditor.type
];

export * from './file-backed-http.provider.form';
export * from './provider.form';

0 comments on commit 7f18a02

Please sign in to comment.