Skip to content

Commit 138fccf

Browse files
committed
101623: Fix lint/tests after removing invalid links, Make arrows on Treeview smaller
1 parent 85f9511 commit 138fccf

5 files changed

Lines changed: 14 additions & 15 deletions

File tree

src/app/core/browse/browse.service.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('BrowseService', () => {
2727
const browseDefinitions = [
2828
Object.assign(new FlatBrowseDefinition(), {
2929
id: 'date',
30-
metadataBrowse: false,
30+
browseType: 'flatBrowse',
3131
sortOptions: [
3232
{
3333
name: 'title',
@@ -54,7 +54,7 @@ describe('BrowseService', () => {
5454
}),
5555
Object.assign(new ValueListBrowseDefinition(), {
5656
id: 'author',
57-
metadataBrowse: true,
57+
browseType: 'valueList',
5858
sortOptions: [
5959
{
6060
name: 'title',
@@ -158,7 +158,7 @@ describe('BrowseService', () => {
158158

159159
describe('when getBrowseEntriesFor is called with a valid browse definition id', () => {
160160
it('should call hrefOnlyDataService.findListByHref with the expected href', () => {
161-
const expected = browseDefinitions[1]._links.entries.href;
161+
const expected = (browseDefinitions[1] as ValueListBrowseDefinition)._links.entries.href;
162162

163163
scheduler.schedule(() => service.getBrowseEntriesFor(new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
164164
scheduler.flush();

src/app/core/shared/flat-browse-definition.model.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ export class FlatBrowseDefinition extends NonHierarchicalBrowseDefinition {
2424
return this._links.self.href;
2525
}
2626

27-
getRenderType(): string {
28-
return this.dataType;
29-
}
30-
3127
@deserialize
3228
_links: {
3329
self: HALLink;
3430
items: HALLink;
3531
};
32+
33+
getRenderType(): string {
34+
return this.dataType;
35+
}
3636
}

src/app/core/shared/non-hierarchical-browse-definition.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
1+
import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
22
import { SortOption } from './sort-option.model';
33
import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-decorator';
4-
import { HALLink } from './hal-link.model';
54
import { BrowseDefinition } from './browse-definition.model';
65

76
/**

src/app/core/shared/value-list-browse-definition.model.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ export class ValueListBrowseDefinition extends NonHierarchicalBrowseDefinition {
2424
return this._links.self.href;
2525
}
2626

27-
getRenderType(): string {
28-
return this.dataType;
29-
}
30-
3127
@deserialize
3228
_links: {
3329
self: HALLink;
3430
entries: HALLink;
3531
};
32+
33+
getRenderType(): string {
34+
return this.dataType;
35+
}
3636
}

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-cente
2323
<!-- Leaf node -->
2424
<cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
2525
<button type="button" class="btn btn-default" cdkTreeNodeToggle>
26-
<span class="fas fa-angle-right fa-2x invisible" aria-hidden="true"></span>
26+
<span class="fas fa-angle-right invisible" aria-hidden="true"></span>
2727
</button>
2828
<label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
2929
[class.text-success]="node.isSelected"
@@ -54,7 +54,7 @@ <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-cente
5454
<button type="button" class="btn btn-default" cdkTreeNodeToggle
5555
[attr.aria-label]="'toggle ' + node.name"
5656
(click)="loadChildren(node)">
57-
<span class="fas {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}} fa-2x"
57+
<span class="fas {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"
5858
aria-hidden="true"></span>
5959
</button>
6060

0 commit comments

Comments
 (0)