geonetwork-ui 2.4.3 → 2.5.0-dev.17cec7bce
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.mjs +20 -17
- package/esm2022/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts-for-resource/form-field-contacts-for-resource.component.mjs +2 -1
- package/esm2022/translations/fr.json +2 -2
- package/fesm2022/geonetwork-ui.mjs +22 -18
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.d.ts +1 -0
- package/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.d.ts.map +1 -1
- package/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts-for-resource/form-field-contacts-for-resource.component.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts +22 -16
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts-for-resource/form-field-contacts-for-resource.component.ts +1 -0
- package/translations/fr.json +2 -2
|
@@ -24,6 +24,7 @@ export declare class ElasticsearchService {
|
|
|
24
24
|
private getQueryLang;
|
|
25
25
|
private isCurrentSearchLang;
|
|
26
26
|
private filtersToQuery;
|
|
27
|
+
private mustNotFilters;
|
|
27
28
|
private buildPayloadQuery;
|
|
28
29
|
buildMoreOnAggregationPayload(aggregations: any, key: string, searchFilters: SearchFilters, configFilters: SearchFilters): EsSearchParams;
|
|
29
30
|
queryFilterOnValues(key: any, values: any): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elasticsearch.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAMlC,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAKlB,WAAW,EACZ,MAAM,8DAA8D,CAAA;AAErE,OAAO,EACL,iBAAiB,EACjB,cAAc,EAGd,aAAa,EACb,aAAa,EAGd,MAAM,sDAAsD,CAAA;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,8DAA8D,CAAA;;AAE5F,MAAM,MAAM,SAAS,GAAG;IAAE,KAAK,CAAC,EAAE,IAAI,CAAC;IAAC,GAAG,CAAC,EAAE,IAAI,CAAA;CAAE,CAAA;AAEpD,qBAGa,oBAAoB;IAO7B,OAAO,CAAC,WAAW;IACoB,OAAO,CAAC,YAAY;IAL7D,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,KAAK,CAAwB;gBAG3B,WAAW,EAAE,WAAW,EACe,YAAY,EAAE,MAAM;IAGrE,oBAAoB,CAClB,YAAY,GAAE,GAAQ,EACtB,IAAI,SAAI,EACR,IAAI,SAAI,EACR,MAAM,GAAE,WAAkB,EAC1B,aAAa,GAAE,aAAoB,EACnC,aAAa,GAAE,aAAkB,EACjC,aAAa,GAAE,aAAkB,EACjC,KAAK,CAAC,EAAE,MAAM,EAAE,EAChB,QAAQ,CAAC,EAAE,QAAQ,GAClB,cAAc;IAoBjB,OAAO,CAAC,oBAAoB;IA4C5B,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAI1D,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc;IAUpD,uBAAuB,CACrB,MAAM,EAAE,aAAa,EACrB,IAAI,SAAI,EACR,OAAO,WAAsD,GAC5D,cAAc;IAkDjB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,6BAA6B;IA0BrC,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,cAAc;IAkEtB,OAAO,CAAC,iBAAiB;
|
|
1
|
+
{"version":3,"file":"elasticsearch.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAMlC,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAKlB,WAAW,EACZ,MAAM,8DAA8D,CAAA;AAErE,OAAO,EACL,iBAAiB,EACjB,cAAc,EAGd,aAAa,EACb,aAAa,EAGd,MAAM,sDAAsD,CAAA;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,8DAA8D,CAAA;;AAE5F,MAAM,MAAM,SAAS,GAAG;IAAE,KAAK,CAAC,EAAE,IAAI,CAAC;IAAC,GAAG,CAAC,EAAE,IAAI,CAAA;CAAE,CAAA;AAEpD,qBAGa,oBAAoB;IAO7B,OAAO,CAAC,WAAW;IACoB,OAAO,CAAC,YAAY;IAL7D,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,KAAK,CAAwB;gBAG3B,WAAW,EAAE,WAAW,EACe,YAAY,EAAE,MAAM;IAGrE,oBAAoB,CAClB,YAAY,GAAE,GAAQ,EACtB,IAAI,SAAI,EACR,IAAI,SAAI,EACR,MAAM,GAAE,WAAkB,EAC1B,aAAa,GAAE,aAAoB,EACnC,aAAa,GAAE,aAAkB,EACjC,aAAa,GAAE,aAAkB,EACjC,KAAK,CAAC,EAAE,MAAM,EAAE,EAChB,QAAQ,CAAC,EAAE,QAAQ,GAClB,cAAc;IAoBjB,OAAO,CAAC,oBAAoB;IA4C5B,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAI1D,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc;IAUpD,uBAAuB,CACrB,MAAM,EAAE,aAAa,EACrB,IAAI,SAAI,EACR,OAAO,WAAsD,GAC5D,cAAc;IAkDjB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,6BAA6B;IA0BrC,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,cAAc;IAkEtB,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,iBAAiB;IAmEzB,6BAA6B,CAC3B,YAAY,EAAE,GAAG,EACjB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,GAC3B,cAAc;IAQjB,mBAAmB,CAAC,GAAG,KAAA,EAAE,MAAM,KAAA;;;;;;;IAU/B,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc;IA6BvD,kBAAkB,CAAC,WAAW,KAAA;IAI9B;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IAEH,yBAAyB,CAAC,WAAW,KAAA;IAkBrC,OAAO,CAAC,cAAc;IA2CtB,OAAO,CAAC,uBAAuB;IAO/B,wBAAwB,CAAC,YAAY,EAAE,kBAAkB,GAAG,GAAG;IA2C/D,sBAAsB,CACpB,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,iBAAiB,GAC9B,WAAW;yCAjiBH,oBAAoB;6CAApB,oBAAoB;CAykBhC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-field-contacts-for-resource.component.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts-for-resource/form-field-contacts-for-resource.component.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,YAAY,EAEZ,SAAS,EACT,MAAM,EAEP,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,UAAU,EACV,YAAY,EACZ,IAAI,EAEL,MAAM,oEAAoE,CAAA;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,kEAAkE,CAAA;AAC5F,OAAO,EAAE,6BAA6B,EAAE,MAAM,uFAAuF,CAAA;AACrI,OAAO,EAAE,wBAAwB,EAAE,MAAM,kFAAkF,CAAA;;AAyB3H,qBAwBa,qCACX,YAAW,SAAS,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"form-field-contacts-for-resource.component.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts-for-resource/form-field-contacts-for-resource.component.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,YAAY,EAEZ,SAAS,EACT,MAAM,EAEP,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,UAAU,EACV,YAAY,EACZ,IAAI,EAEL,MAAM,oEAAoE,CAAA;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,kEAAkE,CAAA;AAC5F,OAAO,EAAE,6BAA6B,EAAE,MAAM,uFAAuF,CAAA;AACrI,OAAO,EAAE,wBAAwB,EAAE,MAAM,kFAAkF,CAAA;;AAyB3H,qBAwBa,qCACX,YAAW,SAAS,EAAE,MAAM;IAqB1B,OAAO,CAAC,wBAAwB;IAChC,OAAO,CAAC,6BAA6B;IApB9B,KAAK,EAAE,UAAU,EAAE,CAAA;IAClB,WAAW,EAAE,YAAY,CAAC,UAAU,EAAE,CAAC,CAAqB;IAEtE,0BAA0B,EAAE,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAY;IAE/D,WAAW,EAAE,IAAI,EAAE,CAOlB;IAED,qBAAqB,EAAE,IAAI,EAAE,CAAK;IAElC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAY;gBAG7C,wBAAwB,EAAE,wBAAwB,EAClD,6BAA6B,EAAE,6BAA6B;IAGtE,WAAW;IAML,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAW/B,gBAAgB,CAAC,SAAS,EAAE,MAAM;IAKlC,iBAAiB;IAMjB,0BAA0B;IAsB1B,2BAA2B,CAAC,mBAAmB,EAAE,UAAU,EAAE;IAY7D,aAAa,CAAC,KAAK,EAAE,MAAM;IAK3B,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI;IAYlD,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAI3C;;OAEG;IACH,aAAa,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,MAAM,CAGtC;IAEJ;;OAEG;IACH,kBAAkB,UAAW,MAAM,4CAUlC;IAED;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM;yCAvI9B,qCAAqC;2CAArC,qCAAqC;CA0JjD"}
|
package/package.json
CHANGED
|
@@ -297,6 +297,25 @@ export class ElasticsearchService {
|
|
|
297
297
|
return queryParts.length > 0 ? (queryParts as FilterQuery) : undefined
|
|
298
298
|
}
|
|
299
299
|
|
|
300
|
+
private mustNotFilters(): Record<string, unknown>[] {
|
|
301
|
+
return [
|
|
302
|
+
{
|
|
303
|
+
...this.queryFilterOnValues('resourceType', [
|
|
304
|
+
'service',
|
|
305
|
+
'map',
|
|
306
|
+
'map/static',
|
|
307
|
+
'mapDigital',
|
|
308
|
+
]),
|
|
309
|
+
},
|
|
310
|
+
{
|
|
311
|
+
query_string: {
|
|
312
|
+
query:
|
|
313
|
+
'resourceType:featureCatalog AND !resourceType:dataset AND !cl_level.key:dataset',
|
|
314
|
+
},
|
|
315
|
+
},
|
|
316
|
+
]
|
|
317
|
+
}
|
|
318
|
+
|
|
300
319
|
private buildPayloadQuery(
|
|
301
320
|
{ any, ...fieldSearchFilters }: SearchFilters,
|
|
302
321
|
configFilters: SearchFilters,
|
|
@@ -304,14 +323,7 @@ export class ElasticsearchService {
|
|
|
304
323
|
geometry?: Geometry
|
|
305
324
|
) {
|
|
306
325
|
const must = [] as Record<string, unknown>[]
|
|
307
|
-
const must_not =
|
|
308
|
-
...this.queryFilterOnValues('resourceType', [
|
|
309
|
-
'service',
|
|
310
|
-
'map',
|
|
311
|
-
'map/static',
|
|
312
|
-
'mapDigital',
|
|
313
|
-
]),
|
|
314
|
-
}
|
|
326
|
+
const must_not = this.mustNotFilters()
|
|
315
327
|
const should = [] as Record<string, unknown>[]
|
|
316
328
|
const filter = [this.queryFilterOnValues('isTemplate', 'n')] as Record<
|
|
317
329
|
string,
|
|
@@ -413,14 +425,8 @@ export class ElasticsearchService {
|
|
|
413
425
|
},
|
|
414
426
|
},
|
|
415
427
|
],
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
'service',
|
|
419
|
-
'map',
|
|
420
|
-
'map/static',
|
|
421
|
-
'mapDigital',
|
|
422
|
-
]),
|
|
423
|
-
},
|
|
428
|
+
|
|
429
|
+
must_not: this.mustNotFilters(),
|
|
424
430
|
},
|
|
425
431
|
},
|
|
426
432
|
_source: ['resourceTitleObject', 'uuid'],
|
package/translations/fr.json
CHANGED
|
@@ -161,7 +161,7 @@
|
|
|
161
161
|
"domain.contact.role.point_of_contact": "Point de contact",
|
|
162
162
|
"domain.contact.role.principal_investigator": "Chercheur principal",
|
|
163
163
|
"domain.contact.role.processor": "Processeur",
|
|
164
|
-
"domain.contact.role.publisher": "
|
|
164
|
+
"domain.contact.role.publisher": "Producteur",
|
|
165
165
|
"domain.contact.role.resource_provider": "Fournisseur",
|
|
166
166
|
"domain.contact.role.rights_holder": "Détenteur des droits",
|
|
167
167
|
"domain.contact.role.sponsor": "Sponsor",
|
|
@@ -225,7 +225,7 @@
|
|
|
225
225
|
"editor.record.form.constraint.otherConstraints": "Autres contraintes",
|
|
226
226
|
"editor.record.form.constraint.securityConstraints": "Contraintes de sécurité",
|
|
227
227
|
"editor.record.form.draft.updateAlert": "Depuis la création de ce brouillon, ce jeu de données a été modifié le { date } par { user }. Publier votre version peut supprimer ses modifications. Pour éviter cela, vous pouvez annuler vos changements, ou publier votre version en connaissance de cause.",
|
|
228
|
-
"editor.record.form.field.abstract": "
|
|
228
|
+
"editor.record.form.field.abstract": "Description",
|
|
229
229
|
"editor.record.form.field.constraintsShortcuts": "",
|
|
230
230
|
"editor.record.form.field.contacts.noContact": "Veuillez renseigner au moins un point de contact.",
|
|
231
231
|
"editor.record.form.field.contacts.placeholder": "Choisissez un contact",
|