Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] : Various fixes on integration #99

Merged
merged 3 commits into from
Jul 22, 2024
Merged

[Fix] : Various fixes on integration #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f0a7db
feat: change default filters
cmoinier Jul 18, 2024
8857bc4
feat: pagination style more fitting to mockups
cmoinier Jul 18, 2024
e612932
feat: fix e2e
cmoinier Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions apps/datahub-e2e/src/e2e/search.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,10 @@ describe('search', () => {
.map((dropdown) => dropdown.getAttribute('data-cy-field'))
)
.should('eql', [
'producerOrg',
'categoryKeyword',
'organization',
'publicationYear',
'revisionYear',
'license',
'qualityScore',
'territories',
])
})
it('should display the search results', () => {
Expand Down
4 changes: 1 addition & 3 deletions apps/datahub/src/app/search/search-filters/search-filters.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@ export class SearchFiltersComponent {
displayCount = 3
searchConfig = (
getOptionalSearchConfig().ADVANCED_FILTERS || [
'producerOrg',
'categoryKeyword',
'organization',
'revisionYear',
'license',
'qualityScore',
'territories',
cmoinier marked this conversation as resolved.
Show resolved Hide resolved
]
).map((filter) => ({
fieldName: filter,
Expand Down
2 changes: 1 addition & 1 deletion conf/default.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
# The advanced search filters available to the user can be customized with this setting.
# The following fields can be used for filtering: 'organization', 'format', 'publicationYear', 'inspireKeyword', 'keyword', 'topic', 'isSpatial', 'license', 'resourceType', 'representationType', 'revisionYear', 'categoryKeyword', 'qualityScore', 'territories', 'publisherOrg', 'producerOrg'
# any other field will be ignored
# advanced_filters = ['format', 'topic', 'keyword', 'organization', 'publisherOrg', 'producerOrg']
# advanced_filters = ['producerOrg', 'categoryKeyword', 'revisionYear', 'license', 'qualityScore']
4 changes: 2 additions & 2 deletions libs/mel/src/lib/pagination-buttons/pagination-buttons.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<gn-ui-button
type="outline"
(buttonClick)="previousPage()"
extraClass="pagination-btn-nav mr-14"
extraClass="pagination-btn-nav mr-8"
>
<mat-icon class="pagination-btn-arrow material-symbols-outlined"
>chevron_left</mat-icon
Expand All @@ -14,7 +14,7 @@
>
</gn-ui-button>
} @for(page of visiblePages; track $index){ @if(page === '...'){
<span class="mr-14">{{ page }}</span>
<span class="mr-8">{{ page }}</span>
} @else {
<gn-ui-button
[type]="page === currentPage ? 'outline' : 'light'"
Expand Down
4 changes: 2 additions & 2 deletions resources/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@
@apply group-hover:bg-primary-dark group-hover:border-white group-hover:text-white transition-colors;
}
.pagination-btn {
@apply border-none bg-transparent mr-14;
@apply border-none bg-transparent mr-8 text-sm;
}
.pagination-btn:disabled {
@apply border-none bg-transparent text-primary opacity-100;
}
.pagination-btn-nav {
@apply border-none bg-transparent text-primary opacity-100;
@apply border-none bg-transparent text-primary opacity-100 text-sm;
}
.pagination-btn-nav:disabled {
@apply text-black;
Expand Down
Loading