Merge pull request #99 from camptocamp/various-fixes-integration

[Fix] : Various fixes on integration
camptocamp · Jul 22, 2024 · 37c9b89 · 37c9b89
2 parents d50edea + e612932
commit 37c9b89
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/apps/datahub-e2e/src/e2e/search.cy.ts b/apps/datahub-e2e/src/e2e/search.cy.ts
@@ -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', () => {

diff --git a/apps/datahub/src/app/search/search-filters/search-filters.component.ts b/apps/datahub/src/app/search/search-filters/search-filters.component.ts
@@ -30,12 +30,10 @@ export class SearchFiltersComponent {
   displayCount = 3
   searchConfig = (
     getOptionalSearchConfig().ADVANCED_FILTERS || [
+      'producerOrg',
       'categoryKeyword',
-      'organization',
       'revisionYear',
       'license',
-      'qualityScore',
-      'territories',
     ]
   ).map((filter) => ({
     fieldName: filter,

diff --git a/conf/default.toml b/conf/default.toml
@@ -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']
diff --git a/libs/mel/src/lib/pagination-buttons/pagination-buttons.component.html b/libs/mel/src/lib/pagination-buttons/pagination-buttons.component.html
@@ -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
@@ -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'"

diff --git a/resources/styles.css b/resources/styles.css
@@ -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;