geonetwork-ui 2.5.0-dev.97ab0d3e8 → 2.5.0-dev.b51c2cb0f
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 +17 -5
- package/esm2022/libs/api/repository/src/lib/gn4/gn4-repository.mjs +2 -2
- package/fesm2022/geonetwork-ui.mjs +17 -5
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.d.ts +2 -1
- package/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.d.ts.map +1 -1
- package/libs/api/repository/src/lib/gn4/gn4-repository.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts +19 -5
- package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts +1 -5
|
@@ -2,6 +2,7 @@ import { Geometry } from 'geojson';
|
|
|
2
2
|
import { Aggregation, AggregationParams, AggregationsParams, SortByField } from '../../../../../../../libs/common/domain/src/lib/model/search';
|
|
3
3
|
import { AggregationResult, EsSearchParams, RequestFields, SearchFilters } from '../../../../../../../libs/api/metadata-converter/src';
|
|
4
4
|
import { LangService } from '../../../../../../../libs/util/i18n/src';
|
|
5
|
+
import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record';
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
6
7
|
export type DateRange = {
|
|
7
8
|
start?: Date;
|
|
@@ -17,7 +18,7 @@ export declare class ElasticsearchService {
|
|
|
17
18
|
private processRuntimeFields;
|
|
18
19
|
registerRuntimeField(fieldName: string, expression: string): void;
|
|
19
20
|
getMetadataByIdPayload(uuid: string): EsSearchParams;
|
|
20
|
-
getRelatedRecordPayload(
|
|
21
|
+
getRelatedRecordPayload(record: CatalogRecord, size?: number, _source?: string[]): EsSearchParams;
|
|
21
22
|
private buildPayloadSort;
|
|
22
23
|
private injectLangInQueryStringFields;
|
|
23
24
|
private getQueryLang;
|
|
@@ -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;;
|
|
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,aAAkB,EACjC,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;IAiEtB,OAAO,CAAC,iBAAiB;IA0EzB,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;IAmCvD,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;IAyC/D,sBAAsB,CACpB,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,iBAAiB,GAC9B,WAAW;yCAxhBH,oBAAoB;6CAApB,oBAAoB;CAgkBhC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gn4-repository.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/api/repository/src/lib/gn4/gn4-repository.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGX,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAGL,YAAY,EAGb,MAAM,mDAAmD,CAAA;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,2DAA2D,CAAA;AACzF,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,YAAY,EACb,MAAM,2DAA2D,CAAA;AAClE,OAAO,EACL,YAAY,EACZ,aAAa,EACd,MAAM,wEAAwE,CAAA;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,yEAAyE,CAAA;AAClH,OAAO,EAAE,0BAA0B,EAAE,MAAM,sFAAsF,CAAA;AACjI,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,4CAA4C,CAAA;AACnD,OAAO,EAKL,UAAU,EAEV,OAAO,EAGR,MAAM,MAAM,CAAA;AAGb,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;;AAMtD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAA;AAEhC,qBACa,aAAc,YAAW,0BAA0B;IAK5D,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,eAAe;IATzB,cAAc,gBAAsB;IACpC,cAAc,mBAAqC;gBAGzC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,gBAAgB,EAC9B,eAAe,EAAE,oBAAoB,EACrC,SAAS,EAAE,YAAY,EACvB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,wBAAwB;IAGnD,MAAM,CAAC,EACL,OAAO,EACP,MAAM,EACN,MAAM,EACN,KAAK,EACL,IAAI,EACJ,SAAS,EACT,cAAc,GACf,EAAE,YAAY,GAAG,UAAU,CAAC,aAAa,CAAC;IA6B3C,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC;IAoB1D,SAAS,CAAC,gBAAgB,EAAE,MAAM,GAAG,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC;IAiBrE,iBAAiB,CAAC,SAAS,EAAE,aAAa,GAAG,UAAU,CAAC,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"gn4-repository.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/api/repository/src/lib/gn4/gn4-repository.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -28,6 +28,7 @@ import {
|
|
|
28
28
|
} from '../../../../../../../libs/api/metadata-converter/src'
|
|
29
29
|
import { LangService } from '../../../../../../../libs/util/i18n/src'
|
|
30
30
|
import { formatDate, isDateRange } from './date-range.utils'
|
|
31
|
+
import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
|
|
31
32
|
|
|
32
33
|
export type DateRange = { start?: Date; end?: Date }
|
|
33
34
|
|
|
@@ -134,8 +135,7 @@ export class ElasticsearchService {
|
|
|
134
135
|
}
|
|
135
136
|
|
|
136
137
|
getRelatedRecordPayload(
|
|
137
|
-
|
|
138
|
-
uuid: string,
|
|
138
|
+
record: CatalogRecord,
|
|
139
139
|
size = 6,
|
|
140
140
|
_source = [...ES_SOURCE_SUMMARY, 'allKeywords', 'createDate']
|
|
141
141
|
): EsSearchParams {
|
|
@@ -148,9 +148,23 @@ export class ElasticsearchService {
|
|
|
148
148
|
fields: [
|
|
149
149
|
'resourceTitleObject.default',
|
|
150
150
|
'resourceAbstractObject.default',
|
|
151
|
-
'
|
|
151
|
+
'allKeywords',
|
|
152
|
+
],
|
|
153
|
+
like: [
|
|
154
|
+
{
|
|
155
|
+
doc: {
|
|
156
|
+
resourceTitleObject: {
|
|
157
|
+
default: record.title,
|
|
158
|
+
},
|
|
159
|
+
resourceAbstractObject: {
|
|
160
|
+
default: record.abstract,
|
|
161
|
+
},
|
|
162
|
+
allKeywords: record.keywords.map(
|
|
163
|
+
(keyword) => keyword.label
|
|
164
|
+
),
|
|
165
|
+
},
|
|
166
|
+
},
|
|
152
167
|
],
|
|
153
|
-
like: title,
|
|
154
168
|
min_term_freq: 1,
|
|
155
169
|
max_query_terms: 12,
|
|
156
170
|
},
|
|
@@ -166,7 +180,7 @@ export class ElasticsearchService {
|
|
|
166
180
|
},
|
|
167
181
|
},
|
|
168
182
|
],
|
|
169
|
-
must_not: [{ wildcard: { uuid:
|
|
183
|
+
must_not: [{ wildcard: { uuid: record.uniqueIdentifier } }],
|
|
170
184
|
},
|
|
171
185
|
},
|
|
172
186
|
size,
|
|
@@ -143,11 +143,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
|
|
|
143
143
|
'bucket',
|
|
144
144
|
null,
|
|
145
145
|
JSON.stringify(
|
|
146
|
-
this.gn4SearchHelper.getRelatedRecordPayload(
|
|
147
|
-
similarTo.title,
|
|
148
|
-
similarTo.uniqueIdentifier,
|
|
149
|
-
3
|
|
150
|
-
)
|
|
146
|
+
this.gn4SearchHelper.getRelatedRecordPayload(similarTo, 3)
|
|
151
147
|
)
|
|
152
148
|
)
|
|
153
149
|
.pipe(
|