mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
[CST-7217] Use short number pipe and fix badge alignment
This commit is contained in:
@@ -4,11 +4,10 @@
|
|||||||
[queryParams]="addQueryParams" queryParamsHandling="merge">
|
[queryParams]="addQueryParams" queryParamsHandling="merge">
|
||||||
<label class="mb-0 d-flex w-100">
|
<label class="mb-0 d-flex w-100">
|
||||||
<input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
|
<input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
|
||||||
<span class="w-100 filter-value px-1 break-facet">
|
<span class="w-100 pl-1 break-facet">
|
||||||
|
<span class="float-right badge badge-secondary badge-pill">{{filterValue.count | dsShortNumber}}</span>
|
||||||
{{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
|
{{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
<span class="float-right filter-value-count ml-auto">
|
|
||||||
<span class="badge badge-secondary badge-pill">{{filterValue.count}}</span>
|
|
||||||
</span>
|
|
||||||
</a>
|
</a>
|
||||||
|
@@ -9,7 +9,7 @@ a {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.break-facet {
|
.break-facet {
|
||||||
word-break: break-all;
|
word-break: break-word;
|
||||||
}
|
}
|
||||||
|
|
||||||
.filter-checkbox {
|
.filter-checkbox {
|
||||||
|
@@ -18,6 +18,7 @@ import { SearchFacetOptionComponent } from './search-facet-option.component';
|
|||||||
import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
|
||||||
import { PaginationService } from '../../../../../../core/pagination/pagination.service';
|
import { PaginationService } from '../../../../../../core/pagination/pagination.service';
|
||||||
import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
|
import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
|
||||||
|
import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
|
||||||
|
|
||||||
describe('SearchFacetOptionComponent', () => {
|
describe('SearchFacetOptionComponent', () => {
|
||||||
let comp: SearchFacetOptionComponent;
|
let comp: SearchFacetOptionComponent;
|
||||||
@@ -89,7 +90,7 @@ describe('SearchFacetOptionComponent', () => {
|
|||||||
beforeEach(waitForAsync(() => {
|
beforeEach(waitForAsync(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
|
imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
|
||||||
declarations: [SearchFacetOptionComponent],
|
declarations: [SearchFacetOptionComponent, ShortNumberPipe],
|
||||||
providers: [
|
providers: [
|
||||||
{ provide: SearchService, useValue: new SearchServiceStub(searchLink) },
|
{ provide: SearchService, useValue: new SearchServiceStub(searchLink) },
|
||||||
{ provide: Router, useValue: new RouterStub() },
|
{ provide: Router, useValue: new RouterStub() },
|
||||||
|
@@ -3,6 +3,6 @@
|
|||||||
[queryParams]="changeQueryParams" queryParamsHandling="merge">
|
[queryParams]="changeQueryParams" queryParamsHandling="merge">
|
||||||
<span class="filter-value px-1">{{filterValue.label}}</span>
|
<span class="filter-value px-1">{{filterValue.label}}</span>
|
||||||
<span class="float-right filter-value-count ml-auto">
|
<span class="float-right filter-value-count ml-auto">
|
||||||
<span class="badge badge-secondary badge-pill">{{filterValue.count}}</span>
|
<span class="badge badge-secondary badge-pill">{{filterValue.count | dsShortNumber}}</span>
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
@@ -15,10 +15,14 @@ import { SearchConfigurationService } from '../../../../../../core/shared/search
|
|||||||
import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
|
import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
|
||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { SearchFacetRangeOptionComponent } from './search-facet-range-option.component';
|
import { SearchFacetRangeOptionComponent } from './search-facet-range-option.component';
|
||||||
import { RANGE_FILTER_MAX_SUFFIX, RANGE_FILTER_MIN_SUFFIX } from '../../search-range-filter/search-range-filter.component';
|
import {
|
||||||
|
RANGE_FILTER_MAX_SUFFIX,
|
||||||
|
RANGE_FILTER_MIN_SUFFIX
|
||||||
|
} from '../../search-range-filter/search-range-filter.component';
|
||||||
import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
|
||||||
import { PaginationService } from '../../../../../../core/pagination/pagination.service';
|
import { PaginationService } from '../../../../../../core/pagination/pagination.service';
|
||||||
import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
|
import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
|
||||||
|
import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
|
||||||
|
|
||||||
describe('SearchFacetRangeOptionComponent', () => {
|
describe('SearchFacetRangeOptionComponent', () => {
|
||||||
let comp: SearchFacetRangeOptionComponent;
|
let comp: SearchFacetRangeOptionComponent;
|
||||||
@@ -60,7 +64,7 @@ describe('SearchFacetRangeOptionComponent', () => {
|
|||||||
beforeEach(waitForAsync(() => {
|
beforeEach(waitForAsync(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
|
imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
|
||||||
declarations: [SearchFacetRangeOptionComponent],
|
declarations: [SearchFacetRangeOptionComponent, ShortNumberPipe],
|
||||||
providers: [
|
providers: [
|
||||||
{ provide: SearchService, useValue: new SearchServiceStub(searchLink) },
|
{ provide: SearchService, useValue: new SearchServiceStub(searchLink) },
|
||||||
{ provide: Router, useValue: new RouterStub() },
|
{ provide: Router, useValue: new RouterStub() },
|
||||||
|
@@ -9,7 +9,7 @@ a {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.break-facet {
|
.break-facet {
|
||||||
word-break: break-all;
|
word-break: break-word;
|
||||||
}
|
}
|
||||||
|
|
||||||
.filter-checkbox {
|
.filter-checkbox {
|
||||||
|
Reference in New Issue
Block a user