WIP : Advanced filters #702

f-necas · 2023-11-22T16:02:37Z

Allows to implement custom filters based on thesaurus and orgForResource

TODO :

Implements new topics codelists : done need merge
- Add topic category code to gnui i18n package core-geonetwork#7511
Add a thesaurus fielter which handle translations coming from index and not gnui i18n package
- Improve request to retrieve data from a single key (stuck with it)
Implement a contact field to retrieve OrgForresource

github-actions · 2023-11-22T16:03:44Z

Affected libs: api-repository, feature-catalog, feature-record, feature-router, feature-search, feature-map, feature-dataviz, feature-auth, common-domain, api-metadata-converter, feature-editor, ui-search, common-fixtures, util-shared, ui-elements, ui-catalog, ui-widgets, ui-inputs, ui-map, ui-dataviz, data-access-gn4, data-access-datafeeder, util-data-fetcher, util-app-config, util-i18n, ui-layout,
Affected apps: datahub, metadata-editor, demo, webcomponents, search, map-viewer, datafeeder, metadata-converter, data-platform,

🚀 Build and deploy storybook and demo on GitHub Pages
📦 Build and push affected docker images

jahow · 2023-12-07T08:57:33Z

libs/feature/search/src/lib/utils/service/fields.ts

+      .search(
+        'bucket',
+        JSON.stringify(
+          this.esService.getSearchRequestBody({


Doing this degrades the abstraction over the GN4/ElasticSearch backend; this abstraction is still not fully complete but we should be careful not to "open new holes" in it.

If achieving this through the Repository interface is really too far-fetched then I guess keeping this would be acceptable though.

No gn4 api calls should be made but in gn4 repository lib.

to compare semantic version of backend API

as the error is thrown from getApiVersion()

fgravin

Thanks for the work @Angi-Kinas & @f-necas, it was a tough one.
The contact & thesaurus fields work well, congratz.

Nevertheless, we have to refactor your work as it violates many OOP and architectural principles. See my components to understand small issues from here to there !

I am taking over it in #719 to bring a little help on the way 🤟

fgravin · 2023-12-09T13:59:37Z

libs/data-access/gn4/src/openapi/api/tools.api.service.ts

@@ -913,4 +926,88 @@ export class ToolsApiService {
      }
    )
  }
+


Never write open API client by hand.
BTW, the registries client already exists in RegistriesApiService

fgravin · 2023-12-09T14:00:17Z

libs/feature/search/src/lib/utils/service/fields.ts

@@ -127,6 +128,57 @@ export class GnUiTranslationSearchField extends SimpleSearchField {
  }
 }

+export class ThesaurusTranslationSearchField extends SimpleSearchField {


Could have extended the GnuiTranslationField, which is almost the same, instead.

fgravin · 2023-12-09T14:01:43Z

libs/data-access/gn4/src/custom-api/thesaurus.api.service.ts

The content of the commit has nothing to do with the commit message.

fgravin · 2023-12-09T14:03:55Z

apps/datahub/src/app/home/news-page/key-figures/key-figures.component.html

@@ -4,7 +4,7 @@
      class="py-[37px] pl-[47px] rounded-lg border bg-white mb-5 card-shadow cursor-pointer"
      [figure]="recordsCount$ | async"
      [icon]="'folder_open'"
-      [title]="'catalog.figures.datasets'"
+      [title]="'catalog.figures.datasets' | translate"


This is useless as the gn-ui-figure already does a translation.

fgravin · 2023-12-09T14:04:56Z

translations/en.json

@@ -1,6 +1,6 @@
 {
-  "catalog.figures.datasets": "{count, plural, =0{datasets} one{dataset} other{datasets}}",


This should tells that there is an issue with the translation.
In a previous commit, you added a key which is not recognized by ngx-translate.
Never add key by hand in this file.

fgravin · 2023-12-09T20:47:38Z

libs/feature/search/src/lib/utils/service/fields.ts

+    return this.version.pipe(
+      switchMap((version) =>
+        version == '4.2.2'
+          ? super.getFiltersForValues(values)


Both lines are exactly the same as the default value of esFieldName in getFiltersForValues is this.esFieldName

fgravin · 2023-12-09T20:47:39Z

libs/feature/search/src/lib/utils/service/fields.ts

+
+  constructor(public order: 'asc' | 'desc' = 'asc', public injector: Injector) {
+    super('OrgForResource', order, injector)
+    this.esFieldName = 'OrgForResourceObject.default'


This override super.esFieldName as well.

fgravin · 2023-12-09T20:48:15Z

libs/feature/search/src/lib/utils/service/fields.ts

+      .search(
+        'bucket',
+        JSON.stringify(
+          this.esService.getSearchRequestBody({


No gn4 api calls should be made but in gn4 repository lib.

fgravin · 2023-12-09T20:48:33Z

libs/feature/search/src/lib/utils/service/fields.ts

+        'bucket',
+        JSON.stringify(
+          this.esService.getSearchRequestBody({
+            contactForResource: {


Nice payload 👍

fgravin · 2023-12-09T20:50:16Z

libs/feature/search/src/lib/utils/service/fields.ts

-  getFiltersForValues(values: FieldValue[]): Observable<FieldFilters> {
+  getFiltersForValues(
+    values: FieldValue[],
+    esFieldName: string = this.esFieldName


If you change the signature, then you don't correctly implements the abstract class.
BTW, implements an abstract is javascript abusive, one should extend a class, and implement an interface. It would have rise a warning there.

fgravin · 2023-12-11T12:53:54Z

Closing: partially done with #719
Just missing contacts filter.

f-necas force-pushed the DH-customize-advanced-filters branch from 021b5f0 to 7dba06f Compare November 22, 2023 17:43

fgravin added bug Something isn't working enhancement Proposal for a new feature labels Dec 4, 2023

fgravin added this to the 2.1.0 milestone Dec 4, 2023

f-necas and others added 3 commits December 5, 2023 13:45

feat: adds ThesaurusTranslationSearchField request to fields

912f2cb

Add contact filter from OrgForResource

6302fe0

feat(DH) :Add translation for contact filter

c7d0f9a

Angi-Kinas force-pushed the DH-customize-advanced-filters branch from 7ef0511 to c7d0f9a Compare December 5, 2023 12:45

feat: retrieve values for orgs

b91f0fa

Angi-Kinas force-pushed the DH-customize-advanced-filters branch from b91f0fa to efa9686 Compare December 6, 2023 08:35

f-necas force-pushed the DH-customize-advanced-filters branch from efa9686 to b91f0fa Compare December 6, 2023 08:54

jahow reviewed Dec 7, 2023

View reviewed changes

fgravin and others added 6 commits December 7, 2023 17:43

chore: add semver dependency

ff26b82

to compare semantic version of backend API

refactor(platform): remove isApiCompatible

d4ac088

as the error is thrown from getApiVersion()

refactor(org): use semver for version comparison

5c5aae1

feat(platform): throw an error is the version is not compatible

d56f845

WIP: Add new ContactField that differs between gn version

f909efc

feat: update dump, remove log and fix filter

ed85f75

fgravin requested changes Dec 9, 2023

View reviewed changes

fgravin closed this Dec 11, 2023

jahow deleted the DH-customize-advanced-filters branch January 23, 2024 09:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP : Advanced filters #702

WIP : Advanced filters #702

f-necas commented Nov 22, 2023 •

edited

Loading

github-actions bot commented Nov 22, 2023 •

edited

Loading

jahow Dec 7, 2023

fgravin Dec 9, 2023

fgravin left a comment

fgravin Dec 9, 2023

fgravin Dec 9, 2023

fgravin Dec 9, 2023

fgravin Dec 9, 2023

fgravin Dec 9, 2023

fgravin Dec 9, 2023

fgravin Dec 9, 2023

fgravin Dec 9, 2023

fgravin Dec 9, 2023

fgravin Dec 9, 2023

fgravin commented Dec 11, 2023

@@ @@ -913,4 +926,88 @@ export class ToolsApiService { @@
                     }
                   )
                 }

		@@ -1,6 +1,6 @@
		{
		"catalog.figures.datasets": "{count, plural, =0{datasets} one{dataset} other{datasets}}",

WIP : Advanced filters #702

WIP : Advanced filters #702

Conversation

f-necas commented Nov 22, 2023 • edited Loading

github-actions bot commented Nov 22, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fgravin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fgravin commented Dec 11, 2023

f-necas commented Nov 22, 2023 •

edited

Loading

github-actions bot commented Nov 22, 2023 •

edited

Loading