geonetwork-ui 2.2.0-dev.5b8d393f → 2.2.0-dev.6f0f0ee9

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.
Files changed (205) hide show
  1. package/esm2022/libs/api/metadata-converter/src/lib/gn4/atomic-operations.mjs +27 -1
  2. package/esm2022/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.mjs +49 -58
  3. package/esm2022/libs/api/metadata-converter/src/lib/gn4/gn4.metadata.mapper.mjs +5 -4
  4. package/esm2022/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.mjs +1 -1
  5. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/codelists/keyword.mapper.mjs +14 -0
  6. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/converter.mjs +20 -17
  7. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/read-parts.mjs +52 -23
  8. package/esm2022/libs/api/metadata-converter/src/lib/iso19139/write-parts.mjs +52 -32
  9. package/esm2022/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.mjs +10 -3
  10. package/esm2022/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.mjs +14 -5
  11. package/esm2022/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.mjs +33 -8
  12. package/esm2022/libs/common/domain/src/lib/model/record/metadata.model.mjs +1 -1
  13. package/esm2022/libs/common/domain/src/lib/model/search/aggregation.model.mjs +1 -1
  14. package/esm2022/libs/common/domain/src/lib/model/search/field.model.mjs +2 -0
  15. package/esm2022/libs/common/domain/src/lib/model/search/filter.model.mjs +1 -1
  16. package/esm2022/libs/common/domain/src/lib/model/search/index.mjs +2 -1
  17. package/esm2022/libs/common/domain/src/lib/model/search/search.model.mjs +1 -1
  18. package/esm2022/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.mjs +1 -1
  19. package/esm2022/libs/common/domain/src/lib/platform.service.interface.mjs +1 -1
  20. package/esm2022/libs/feature/map/src/lib/map-context/map-context.service.mjs +9 -1
  21. package/esm2022/libs/feature/record/src/lib/state/mdview.reducer.mjs +2 -2
  22. package/esm2022/libs/feature/search/src/index.mjs +3 -1
  23. package/esm2022/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.mjs +3 -3
  24. package/esm2022/libs/feature/search/src/lib/feature-search.module.mjs +2 -6
  25. package/esm2022/libs/feature/search/src/lib/filter-geometry.token.mjs +4 -0
  26. package/esm2022/libs/feature/search/src/lib/fuzzy-search/fuzzy-search.component.mjs +7 -3
  27. package/esm2022/libs/feature/search/src/lib/record-url.token.mjs +4 -0
  28. package/esm2022/libs/feature/search/src/lib/results-list/results-list.container.component.mjs +2 -2
  29. package/esm2022/libs/feature/search/src/lib/results-table/results-table.component.mjs +3 -4
  30. package/esm2022/libs/feature/search/src/lib/state/effects.mjs +2 -2
  31. package/esm2022/libs/feature/search/src/lib/state/search.facade.mjs +3 -2
  32. package/esm2022/libs/feature/search/src/lib/utils/service/fields.mjs +41 -26
  33. package/esm2022/libs/feature/search/src/lib/utils/service/fields.service.mjs +11 -9
  34. package/esm2022/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.mjs +3 -3
  35. package/esm2022/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.mjs +3 -3
  36. package/esm2022/libs/ui/elements/src/lib/metadata-info/metadata-info.component.mjs +35 -22
  37. package/esm2022/libs/ui/elements/src/lib/metadata-quality/metadata-quality.component.mjs +3 -4
  38. package/esm2022/libs/ui/elements/src/lib/record-api-form/record-api-form.component.mjs +9 -6
  39. package/esm2022/libs/ui/elements/src/lib/thumbnail/thumbnail.component.mjs +3 -3
  40. package/esm2022/libs/ui/elements/src/lib/ui-elements.module.mjs +4 -4
  41. package/esm2022/libs/ui/inputs/src/lib/button/button.component.mjs +3 -3
  42. package/esm2022/libs/ui/inputs/src/lib/navigation-button/navigation-button.component.mjs +3 -3
  43. package/esm2022/libs/ui/inputs/src/lib/text-area/text-area.component.mjs +3 -3
  44. package/esm2022/libs/ui/inputs/src/lib/ui-inputs.module.mjs +6 -6
  45. package/esm2022/libs/util/i18n/src/index.mjs +1 -2
  46. package/esm2022/translations/de.json +7 -5
  47. package/esm2022/translations/en.json +10 -8
  48. package/esm2022/translations/es.json +7 -5
  49. package/esm2022/translations/fr.json +9 -7
  50. package/esm2022/translations/it.json +9 -7
  51. package/esm2022/translations/nl.json +7 -5
  52. package/esm2022/translations/pt.json +7 -5
  53. package/fesm2022/geonetwork-ui.mjs +456 -404
  54. package/fesm2022/geonetwork-ui.mjs.map +1 -1
  55. package/libs/api/metadata-converter/src/lib/gn4/atomic-operations.d.ts +2 -0
  56. package/libs/api/metadata-converter/src/lib/gn4/atomic-operations.d.ts.map +1 -1
  57. package/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.d.ts +0 -1
  58. package/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.d.ts.map +1 -1
  59. package/libs/api/metadata-converter/src/lib/gn4/gn4.metadata.mapper.d.ts.map +1 -1
  60. package/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.d.ts +3 -5
  61. package/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.d.ts.map +1 -1
  62. package/libs/api/metadata-converter/src/lib/iso19139/codelists/keyword.mapper.d.ts +3 -0
  63. package/libs/api/metadata-converter/src/lib/iso19139/codelists/keyword.mapper.d.ts.map +1 -0
  64. package/libs/api/metadata-converter/src/lib/iso19139/converter.d.ts.map +1 -1
  65. package/libs/api/metadata-converter/src/lib/iso19139/read-parts.d.ts +6 -6
  66. package/libs/api/metadata-converter/src/lib/iso19139/read-parts.d.ts.map +1 -1
  67. package/libs/api/metadata-converter/src/lib/iso19139/write-parts.d.ts +4 -3
  68. package/libs/api/metadata-converter/src/lib/iso19139/write-parts.d.ts.map +1 -1
  69. package/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.d.ts.map +1 -1
  70. package/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.d.ts +1 -1
  71. package/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.d.ts.map +1 -1
  72. package/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.d.ts +9 -2
  73. package/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.d.ts.map +1 -1
  74. package/libs/common/domain/src/lib/model/record/metadata.model.d.ts +18 -12
  75. package/libs/common/domain/src/lib/model/record/metadata.model.d.ts.map +1 -1
  76. package/libs/common/domain/src/lib/model/search/aggregation.model.d.ts +1 -1
  77. package/libs/common/domain/src/lib/model/search/aggregation.model.d.ts.map +1 -1
  78. package/libs/common/domain/src/lib/model/search/field.model.d.ts +2 -0
  79. package/libs/common/domain/src/lib/model/search/field.model.d.ts.map +1 -0
  80. package/libs/common/domain/src/lib/model/search/filter.model.d.ts +1 -1
  81. package/libs/common/domain/src/lib/model/search/filter.model.d.ts.map +1 -1
  82. package/libs/common/domain/src/lib/model/search/index.d.ts +1 -0
  83. package/libs/common/domain/src/lib/model/search/index.d.ts.map +1 -1
  84. package/libs/common/domain/src/lib/model/search/search.model.d.ts +1 -1
  85. package/libs/common/domain/src/lib/model/search/search.model.d.ts.map +1 -1
  86. package/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.d.ts +1 -0
  87. package/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.d.ts.map +1 -1
  88. package/libs/common/domain/src/lib/platform.service.interface.d.ts +1 -1
  89. package/libs/common/domain/src/lib/platform.service.interface.d.ts.map +1 -1
  90. package/libs/feature/map/src/lib/map-context/map-context.service.d.ts +1 -0
  91. package/libs/feature/map/src/lib/map-context/map-context.service.d.ts.map +1 -1
  92. package/libs/feature/search/src/index.d.ts +2 -0
  93. package/libs/feature/search/src/index.d.ts.map +1 -1
  94. package/libs/feature/search/src/lib/feature-search.module.d.ts +0 -4
  95. package/libs/feature/search/src/lib/feature-search.module.d.ts.map +1 -1
  96. package/libs/feature/search/src/lib/filter-geometry.token.d.ts +4 -0
  97. package/libs/feature/search/src/lib/filter-geometry.token.d.ts.map +1 -0
  98. package/libs/feature/search/src/lib/fuzzy-search/fuzzy-search.component.d.ts +1 -1
  99. package/libs/feature/search/src/lib/fuzzy-search/fuzzy-search.component.d.ts.map +1 -1
  100. package/libs/feature/search/src/lib/record-url.token.d.ts +3 -0
  101. package/libs/feature/search/src/lib/record-url.token.d.ts.map +1 -0
  102. package/libs/feature/search/src/lib/results-table/results-table.component.d.ts +0 -1
  103. package/libs/feature/search/src/lib/results-table/results-table.component.d.ts.map +1 -1
  104. package/libs/feature/search/src/lib/state/search.facade.d.ts +1 -1
  105. package/libs/feature/search/src/lib/state/search.facade.d.ts.map +1 -1
  106. package/libs/feature/search/src/lib/utils/service/fields.d.ts +21 -8
  107. package/libs/feature/search/src/lib/utils/service/fields.d.ts.map +1 -1
  108. package/libs/feature/search/src/lib/utils/service/fields.service.d.ts.map +1 -1
  109. package/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.d.ts +1 -1
  110. package/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.d.ts.map +1 -1
  111. package/libs/ui/elements/src/lib/metadata-info/metadata-info.component.d.ts +10 -6
  112. package/libs/ui/elements/src/lib/metadata-info/metadata-info.component.d.ts.map +1 -1
  113. package/libs/ui/elements/src/lib/metadata-quality/metadata-quality.component.d.ts.map +1 -1
  114. package/libs/ui/elements/src/lib/record-api-form/record-api-form.component.d.ts +3 -1
  115. package/libs/ui/elements/src/lib/record-api-form/record-api-form.component.d.ts.map +1 -1
  116. package/libs/ui/elements/src/lib/ui-elements.module.d.ts +13 -13
  117. package/libs/ui/inputs/src/lib/button/button.component.d.ts +1 -1
  118. package/libs/ui/inputs/src/lib/button/button.component.d.ts.map +1 -1
  119. package/libs/ui/inputs/src/lib/text-area/text-area.component.d.ts +1 -1
  120. package/libs/ui/inputs/src/lib/text-area/text-area.component.d.ts.map +1 -1
  121. package/libs/ui/inputs/src/lib/ui-inputs.module.d.ts +40 -40
  122. package/libs/ui/layout/src/lib/interactive-table/interactive-table-column/interactive-table-column.component.d.ts +1 -1
  123. package/libs/util/i18n/src/index.d.ts +0 -1
  124. package/libs/util/i18n/src/index.d.ts.map +1 -1
  125. package/package.json +2 -2
  126. package/src/libs/api/metadata-converter/src/lib/fixtures/generic.records.ts +61 -8
  127. package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.ts +55 -9
  128. package/src/libs/api/metadata-converter/src/lib/fixtures/geocat-ch.records.ts +225 -24
  129. package/src/libs/api/metadata-converter/src/lib/gn4/atomic-operations.ts +29 -0
  130. package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts +80 -73
  131. package/src/libs/api/metadata-converter/src/lib/gn4/gn4.metadata.mapper.ts +4 -3
  132. package/src/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts +3 -5
  133. package/src/libs/api/metadata-converter/src/lib/iso19139/codelists/keyword.mapper.ts +16 -0
  134. package/src/libs/api/metadata-converter/src/lib/iso19139/converter.ts +24 -21
  135. package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts +115 -62
  136. package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts +169 -95
  137. package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts +22 -2
  138. package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.ts +15 -4
  139. package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts +47 -8
  140. package/src/libs/common/domain/src/lib/model/record/metadata.model.ts +21 -14
  141. package/src/libs/common/domain/src/lib/model/search/aggregation.model.ts +1 -1
  142. package/src/libs/common/domain/src/lib/model/search/field.model.ts +1 -0
  143. package/src/libs/common/domain/src/lib/model/search/filter.model.ts +1 -1
  144. package/src/libs/common/domain/src/lib/model/search/index.ts +1 -0
  145. package/src/libs/common/domain/src/lib/model/search/search.model.ts +1 -1
  146. package/src/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.ts +1 -0
  147. package/src/libs/common/domain/src/lib/platform.service.interface.ts +1 -4
  148. package/src/libs/common/fixtures/src/lib/gn4/groups.fixtures.ts +1 -1
  149. package/src/libs/common/fixtures/src/lib/records.fixtures.ts +50 -10
  150. package/src/libs/feature/map/src/lib/map-context/map-context.service.ts +10 -0
  151. package/src/libs/feature/record/src/lib/state/mdview.reducer.ts +1 -1
  152. package/src/libs/feature/search/src/index.ts +2 -0
  153. package/src/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.html +3 -4
  154. package/src/libs/feature/search/src/lib/feature-search.module.ts +1 -10
  155. package/src/libs/feature/search/src/lib/filter-geometry.token.ts +7 -0
  156. package/src/libs/feature/search/src/lib/fuzzy-search/fuzzy-search.component.ts +9 -3
  157. package/src/libs/feature/search/src/lib/record-url.token.ts +4 -0
  158. package/src/libs/feature/search/src/lib/results-list/results-list.container.component.ts +1 -1
  159. package/src/libs/feature/search/src/lib/results-table/results-table.component.html +104 -127
  160. package/src/libs/feature/search/src/lib/results-table/results-table.component.ts +0 -1
  161. package/src/libs/feature/search/src/lib/state/effects.ts +1 -1
  162. package/src/libs/feature/search/src/lib/state/search.facade.ts +2 -1
  163. package/src/libs/feature/search/src/lib/utils/service/fields.service.ts +21 -16
  164. package/src/libs/feature/search/src/lib/utils/service/fields.ts +43 -34
  165. package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.html +1 -1
  166. package/src/libs/ui/elements/src/lib/markdown-editor/markdown-editor.component.css +5 -0
  167. package/src/libs/ui/elements/src/lib/markdown-editor/markdown-editor.component.html +39 -0
  168. package/src/libs/ui/elements/src/lib/markdown-editor/markdown-editor.component.ts +58 -0
  169. package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.css +2 -2
  170. package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.ts +1 -0
  171. package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html +51 -24
  172. package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts +37 -15
  173. package/src/libs/ui/elements/src/lib/metadata-quality/metadata-quality.component.ts +2 -3
  174. package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.html +5 -5
  175. package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.ts +12 -4
  176. package/src/libs/ui/elements/src/lib/thumbnail/thumbnail.component.html +2 -2
  177. package/src/libs/ui/elements/src/lib/ui-elements.module.ts +1 -1
  178. package/src/libs/ui/inputs/src/lib/button/button.component.ts +1 -0
  179. package/src/libs/ui/inputs/src/lib/navigation-button/navigation-button.component.css +3 -0
  180. package/src/libs/ui/inputs/src/lib/navigation-button/navigation-button.component.html +1 -1
  181. package/src/libs/ui/inputs/src/lib/text-area/text-area.component.ts +1 -0
  182. package/src/libs/ui/inputs/src/lib/ui-inputs.module.ts +2 -2
  183. package/src/libs/util/i18n/src/index.ts +0 -1
  184. package/tailwind.base.config.js +3 -0
  185. package/tailwind.base.css +2 -2
  186. package/translations/de.json +7 -5
  187. package/translations/en.json +10 -8
  188. package/translations/es.json +7 -5
  189. package/translations/fr.json +9 -7
  190. package/translations/it.json +9 -7
  191. package/translations/nl.json +7 -5
  192. package/translations/pt.json +7 -5
  193. package/translations/sk.json +7 -5
  194. package/esm2022/libs/util/i18n/src/lib/testing/test.translate.loader.mjs +0 -24
  195. package/esm2022/libs/util/i18n/src/lib/testing/test.translate.module.mjs +0 -109
  196. package/esm2022/libs/util/i18n/src/lib/testing/translations.model.mjs +0 -6
  197. package/libs/util/i18n/src/lib/testing/test.translate.loader.d.ts +0 -17
  198. package/libs/util/i18n/src/lib/testing/test.translate.loader.d.ts.map +0 -1
  199. package/libs/util/i18n/src/lib/testing/test.translate.module.d.ts +0 -131
  200. package/libs/util/i18n/src/lib/testing/test.translate.module.d.ts.map +0 -1
  201. package/libs/util/i18n/src/lib/testing/translations.model.d.ts +0 -21
  202. package/libs/util/i18n/src/lib/testing/translations.model.d.ts.map +0 -1
  203. package/src/libs/util/i18n/src/lib/testing/test.translate.loader.ts +0 -26
  204. package/src/libs/util/i18n/src/lib/testing/test.translate.module.ts +0 -235
  205. package/src/libs/util/i18n/src/lib/testing/translations.model.ts +0 -28
@@ -1,5 +1,5 @@
1
- import { firstValueFrom, Observable, of, switchMap, tap } from 'rxjs'
2
- import { catchError, map, shareReplay } from 'rxjs/operators'
1
+ import { firstValueFrom, Observable, of, switchMap } from 'rxjs'
2
+ import { map } from 'rxjs/operators'
3
3
  import { Injector } from '@angular/core'
4
4
  import { TranslateService } from '@ngx-translate/core'
5
5
  import { marker } from '@biesbjerg/ngx-translate-extract-marker'
@@ -13,7 +13,10 @@ import {
13
13
  FieldFilters,
14
14
  TermBucket,
15
15
  } from '../../../../../../../libs/common/domain/src/lib/model/search'
16
- import { ElasticsearchService } from '../../../../../../../libs/api/repository/src'
16
+ import {
17
+ ElasticsearchService,
18
+ METADATA_LANGUAGE,
19
+ } from '../../../../../../../libs/api/repository/src'
17
20
  import { LangService } from '../../../../../../../libs/util/i18n/src'
18
21
 
19
22
  export type FieldValue = string | number
@@ -36,8 +39,9 @@ export class SimpleSearchField implements AbstractSearchField {
36
39
 
37
40
  constructor(
38
41
  protected esFieldName: string,
42
+ protected injector: Injector,
39
43
  protected order: 'asc' | 'desc' = 'asc',
40
- protected injector: Injector
44
+ protected orderType: 'key' | 'count' = 'key'
41
45
  ) {}
42
46
 
43
47
  protected getAggregations(): AggregationsParams {
@@ -46,13 +50,13 @@ export class SimpleSearchField implements AbstractSearchField {
46
50
  type: 'terms',
47
51
  field: this.esFieldName,
48
52
  limit: 1000,
49
- sort: [this.order, 'key'],
53
+ sort: [this.order, this.orderType],
50
54
  },
51
55
  }
52
56
  }
53
57
 
54
58
  protected async getBucketLabel(bucket: TermBucket): Promise<string> {
55
- return bucket.term as string
59
+ return bucket.term.toString()
56
60
  }
57
61
 
58
62
  getAvailableValues(): Observable<FieldAvailableValue[]> {
@@ -88,9 +92,18 @@ export class SimpleSearchField implements AbstractSearchField {
88
92
  }
89
93
  }
90
94
 
91
- export class KeySearchField extends SimpleSearchField {
95
+ export class TranslatedSearchField extends SimpleSearchField {
92
96
  protected platformService = this.injector.get(PlatformServiceInterface)
93
97
 
98
+ constructor(
99
+ protected esFieldName: string,
100
+ protected injector: Injector,
101
+ protected order: 'asc' | 'desc' = 'asc',
102
+ protected orderType: 'key' | 'count' = 'key'
103
+ ) {
104
+ super(esFieldName, injector, order, orderType)
105
+ }
106
+
94
107
  protected async getTranslation(key: string) {
95
108
  return firstValueFrom(this.platformService.translateKey(key))
96
109
  }
@@ -100,6 +113,7 @@ export class KeySearchField extends SimpleSearchField {
100
113
  }
101
114
 
102
115
  getAvailableValues(): Observable<FieldAvailableValue[]> {
116
+ if (this.orderType === 'count') return super.getAvailableValues()
103
117
  // sort values by alphabetical order
104
118
  return super
105
119
  .getAvailableValues()
@@ -111,34 +125,29 @@ export class KeySearchField extends SimpleSearchField {
111
125
  }
112
126
  }
113
127
 
114
- export class ThesaurusField extends KeySearchField {
128
+ /**
129
+ * This search field will either target the `.default` field, or a specific `.langxyz` field according
130
+ * to the defined METADATA_LANGUAGE token
131
+ * The provided ES field name should not include any prefix such as `.langeng`
132
+ */
133
+ export class MultilingualSearchField extends SimpleSearchField {
115
134
  private langService = this.injector.get(LangService)
116
- private thesaurus$ = this.platformService
117
- .getThesaurusByLang(this.thesaurusName, this.langService.iso3)
118
- .pipe(
119
- catchError(() => {
120
- console.warn('Error while loading thesaurus language package')
121
- return of([])
122
- }),
123
- shareReplay(1)
124
- )
135
+ private searchLanguage = this.injector.get(METADATA_LANGUAGE, null)
125
136
 
126
137
  constructor(
127
- esFieldName: string,
128
- protected thesaurusName: string,
129
- order: 'asc' | 'desc' = 'asc',
130
- injector: Injector
138
+ protected esFieldName: string,
139
+ protected injector: Injector,
140
+ protected order: 'asc' | 'desc' = 'asc',
141
+ protected orderType: 'key' | 'count' = 'key'
131
142
  ) {
132
- super(esFieldName, order, injector)
133
- }
134
- protected async getTranslation(key: string) {
135
- return firstValueFrom(
136
- this.thesaurus$.pipe(
137
- map(
138
- (thesaurus) => thesaurus.find((keyword) => keyword.key === key)?.label
139
- )
140
- )
141
- )
143
+ super(esFieldName, injector, order, orderType)
144
+ // note: we're excluding the metadata language "current" value because that would produce
145
+ // permalinks that might not work for different users
146
+ if (this.searchLanguage && this.searchLanguage !== 'current') {
147
+ this.esFieldName += `.lang${this.searchLanguage}`
148
+ } else {
149
+ this.esFieldName += '.default'
150
+ }
142
151
  }
143
152
  }
144
153
 
@@ -163,7 +172,7 @@ export class IsSpatialSearchField extends SimpleSearchField {
163
172
  private translateService = this.injector.get(TranslateService)
164
173
 
165
174
  constructor(injector: Injector) {
166
- super('isSpatial', 'asc', injector)
175
+ super('isSpatial', injector, 'asc')
167
176
  this.esService.registerRuntimeField(
168
177
  'isSpatial',
169
178
  `String result = 'no';
@@ -223,7 +232,7 @@ export class LicenseSearchField extends SimpleSearchField {
223
232
  private translateService = this.injector.get(TranslateService)
224
233
 
225
234
  constructor(injector: Injector) {
226
- super('license', 'asc', injector)
235
+ super('license', injector, 'asc')
227
236
  this.esService.registerRuntimeField(
228
237
  'license',
229
238
  `String raw = '';
@@ -330,7 +339,7 @@ export class OrganizationSearchField implements AbstractSearchField {
330
339
  }
331
340
  export class OwnerSearchField extends SimpleSearchField {
332
341
  constructor(injector: Injector) {
333
- super('owner', 'asc', injector)
342
+ super('owner', injector, 'asc')
334
343
  }
335
344
 
336
345
  getAvailableValues(): Observable<FieldAvailableValue[]> {
@@ -5,6 +5,6 @@
5
5
  [selected]="currentLang"
6
6
  ariaName="languages"
7
7
  [showTitle]="false"
8
- [extraBtnClass]="'flex justify-items-center text-white !pl-2 !py-1'"
8
+ [extraBtnClass]="'flex justify-items-center !pl-2 !py-1'"
9
9
  >
10
10
  </gn-ui-dropdown-selector>
@@ -0,0 +1,5 @@
1
+ .icon-small {
2
+ font-size: 16px;
3
+ height: 16px;
4
+ width: 16px;
5
+ }
@@ -0,0 +1,39 @@
1
+ <div class="h-full flex flex-col">
2
+ <div class="flex-none w-full flex flex-row items-center">
3
+ <p class="flex-none font-bold">{{ label }}</p>
4
+ <div class="flex-1 flex justify-end items-center">
5
+ <gn-ui-button
6
+ [extraClass]="getButtonExtraClass()"
7
+ (buttonClick)="togglePreview()"
8
+ >
9
+ <span class="material-symbols-outlined mr-1 icon-small">{{
10
+ preview ? 'visibility' : 'visibility_off'
11
+ }}</span>
12
+ {{ preview ? 'WYSIWYG' : 'Markdown' }}
13
+ </gn-ui-button>
14
+ <span
15
+ class="material-symbols-outlined m-2 icon-small"
16
+ [matTooltip]="tooltip"
17
+ matTooltipPosition="above"
18
+ >
19
+ help
20
+ </span>
21
+ </div>
22
+ </div>
23
+ <p class="flex-none mb-2 font-medium text-sm text-gray-900">
24
+ {{ helperText }}
25
+ </p>
26
+ <div class="flex-1" [hidden]="preview">
27
+ <gn-ui-text-area
28
+ [placeholder]="placeholder"
29
+ [value]="textContent"
30
+ (valueChange)="textContentChangedHandler($event)"
31
+ ></gn-ui-text-area>
32
+ </div>
33
+ <div
34
+ class="flex-1 border border-gray-800 rounded overflow-y-scroll"
35
+ [hidden]="!preview"
36
+ >
37
+ <gn-ui-markdown-parser [textContent]="textContent"></gn-ui-markdown-parser>
38
+ </div>
39
+ </div>
@@ -0,0 +1,58 @@
1
+ import { CommonModule } from '@angular/common'
2
+ import {
3
+ ChangeDetectionStrategy,
4
+ Component,
5
+ EventEmitter,
6
+ Input,
7
+ Output,
8
+ } from '@angular/core'
9
+ import { FormsModule } from '@angular/forms'
10
+ import { MarkdownParserComponent } from '../markdown-parser/markdown-parser.component'
11
+ import { TranslateModule } from '@ngx-translate/core'
12
+ import { ButtonComponent, TextAreaComponent } from '../../../../../../libs/ui/inputs/src'
13
+ import { MatIconModule } from '@angular/material/icon'
14
+ import { MatTooltipModule } from '@angular/material/tooltip'
15
+
16
+ @Component({
17
+ selector: 'gn-ui-markdown-editor',
18
+ templateUrl: './markdown-editor.component.html',
19
+ styleUrls: ['./markdown-editor.component.css'],
20
+ changeDetection: ChangeDetectionStrategy.OnPush,
21
+ standalone: true,
22
+ imports: [
23
+ CommonModule,
24
+ FormsModule,
25
+ MatIconModule,
26
+ MatTooltipModule,
27
+ ButtonComponent,
28
+ TextAreaComponent,
29
+ MarkdownParserComponent,
30
+ TranslateModule,
31
+ ],
32
+ })
33
+ export class MarkdownEditorComponent {
34
+ @Input() label: string
35
+ @Input() tooltip?: string
36
+ @Input() helperText?: string
37
+ @Input() placeholder: string
38
+ @Input() textContent: string
39
+ @Output() textContentChanged: EventEmitter<string> =
40
+ new EventEmitter<string>()
41
+
42
+ preview = false
43
+
44
+ getButtonExtraClass() {
45
+ return `${
46
+ this.preview ? 'text-gray-200 bg-gray-900' : 'text-gray-900 bg-gray-200'
47
+ } rounded-[1.25rem] p-[0.375rem] text-xs font-medium w-24`
48
+ }
49
+
50
+ togglePreview() {
51
+ this.preview = !this.preview
52
+ }
53
+
54
+ textContentChangedHandler(textContent: string) {
55
+ this.textContent = textContent
56
+ this.textContentChanged.emit(this.textContent)
57
+ }
58
+ }
@@ -74,12 +74,12 @@
74
74
  margin-top: 0;
75
75
  margin-bottom: 10px;
76
76
  color: var(--color-primary) !important;
77
- text-decoration: none !important;
78
- @apply font-bold;
77
+ text-decoration: none;
79
78
  }
80
79
 
81
80
  :host ::ng-deep .markdown-body p > a:hover {
82
81
  color: var(--color-primary-darker) !important;
82
+ @apply underline;
83
83
  }
84
84
 
85
85
  /** Blockquotes **/
@@ -6,6 +6,7 @@ import { marked } from 'marked'
6
6
  templateUrl: './markdown-parser.component.html',
7
7
  styleUrls: ['./markdown-parser.component.css'],
8
8
  changeDetection: ChangeDetectionStrategy.OnPush,
9
+ standalone: true,
9
10
  })
10
11
  export class MarkdownParserComponent {
11
12
  @Input() textContent: string
@@ -10,6 +10,50 @@
10
10
  </gn-ui-content-ghost>
11
11
  </div>
12
12
 
13
+ <gn-ui-expandable-panel [title]="'record.metadata.usage' | translate">
14
+ <div class="flex flex-col gap-[10px] mr-4 py-[12px] rounded text-gray-900">
15
+ <ng-container *ngFor="let license of licenses">
16
+ <div *ngIf="license.url; else noUrl" class="text-primary">
17
+ <a
18
+ [href]="license.url"
19
+ target="_blank"
20
+ class="cursor-pointer hover:underline transition-all"
21
+ >
22
+ {{ license.text }}
23
+ <mat-icon
24
+ class="material-symbols-outlined !w-[12px] !h-[12px] !text-[12px] opacity-75 shrink-0"
25
+ >open_in_new</mat-icon
26
+ >
27
+ </a>
28
+ </div>
29
+ <ng-template #noUrl>
30
+ <div class="text-primary" gnUiLinkify>
31
+ {{ license.text }}
32
+ </div>
33
+ </ng-template>
34
+ </ng-container>
35
+ <ng-container *ngIf="legalConstraints.length">
36
+ <gn-ui-markdown-parser
37
+ *ngFor="let constraint of legalConstraints"
38
+ [textContent]="constraint"
39
+ >
40
+ </gn-ui-markdown-parser>
41
+ </ng-container>
42
+ <ng-container *ngIf="otherConstraints.length">
43
+ <div gnUiLinkify *ngFor="let constraint of otherConstraints">
44
+ <h5 translate class="font-medium text-black text-sm mb-[2px] mt-[16px]">
45
+ record.metadata.otherConstraints
46
+ </h5>
47
+ <gn-ui-markdown-parser [textContent]="constraint">
48
+ </gn-ui-markdown-parser>
49
+ </div>
50
+ </ng-container>
51
+
52
+ <span class="noUsage" *ngIf="!hasUsage">
53
+ {{ 'record.metadata.noUsage' | translate }}
54
+ </span>
55
+ </div>
56
+ </gn-ui-expandable-panel>
13
57
  <gn-ui-expandable-panel
14
58
  class="metadata-origin"
15
59
  *ngIf="
@@ -22,7 +66,7 @@
22
66
  >
23
67
  <p
24
68
  *ngIf="metadata.lineage"
25
- class="mb-5 pt-4 whitespace-pre-line break-words"
69
+ class="mb-5 pt-4 whitespace-pre-line break-words text-gray-900"
26
70
  gnUiLinkify
27
71
  >
28
72
  {{ metadata.lineage }}
@@ -54,23 +98,6 @@
54
98
  </div>
55
99
  </div>
56
100
  </gn-ui-expandable-panel>
57
- <gn-ui-expandable-panel [title]="'record.metadata.usage' | translate">
58
- <div class="py-4 px-6 rounded bg-gray-100 text-gray-700 flex flex-wrap gap-2">
59
- <gn-ui-badge *ngIf="metadata.extras?.isOpenData">
60
- <span translate>record.metadata.isOpenData</span>
61
- </gn-ui-badge>
62
- <span
63
- class="text-primary font-medium"
64
- *ngFor="let usage of usages"
65
- gnUiLinkify
66
- >
67
- {{ usage }}
68
- </span>
69
- <span class="text-primary font-medium noUsage" *ngIf="!hasUsage">
70
- {{ 'record.metadata.noUsage' | translate }}
71
- </span>
72
- </div>
73
- </gn-ui-expandable-panel>
74
101
  <gn-ui-expandable-panel
75
102
  *ngIf="metadata.landingPage"
76
103
  [title]="'record.metadata.details' | translate"
@@ -109,13 +136,13 @@
109
136
  </p>
110
137
  </div>
111
138
  </div>
112
- <div *ngIf="metadata.themes?.length">
113
- <p class="text-sm mb-1" translate>record.metadata.themes</p>
139
+ <div *ngIf="metadata.topics?.length">
140
+ <p class="text-sm mb-1" translate>record.metadata.topics</p>
114
141
  <div class="sm:pb-4 sm:pr-16">
115
142
  <gn-ui-badge
116
- class="inline-block mr-2 lowercase"
117
- *ngFor="let theme of metadata.themes"
118
- >{{ theme }}</gn-ui-badge
143
+ class="inline-block mr-2 mb-2 lowercase"
144
+ *ngFor="let topic of metadata.topics"
145
+ >{{ topic }}</gn-ui-badge
119
146
  >
120
147
  </div>
121
148
  </div>
@@ -127,7 +154,7 @@
127
154
  (click)="onKeywordClick(keyword)"
128
155
  [clickable]="true"
129
156
  *ngFor="let keyword of metadata.keywords"
130
- >{{ keyword }}</gn-ui-badge
157
+ >{{ keyword.label }}</gn-ui-badge
131
158
  >
132
159
  </div>
133
160
  </div>
@@ -5,7 +5,10 @@ import {
5
5
  Input,
6
6
  Output,
7
7
  } from '@angular/core'
8
- import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
8
+ import {
9
+ DatasetRecord,
10
+ Keyword,
11
+ } from '../../../../../../libs/common/domain/src/lib/model/record'
9
12
 
10
13
  @Component({
11
14
  selector: 'gn-ui-metadata-info',
@@ -16,24 +19,48 @@ import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/mode
16
19
  export class MetadataInfoComponent {
17
20
  @Input() metadata: Partial<DatasetRecord>
18
21
  @Input() incomplete: boolean
19
- @Output() keyword = new EventEmitter<string>()
22
+ @Output() keyword = new EventEmitter<Keyword>()
20
23
  updatedTimes: number
21
24
 
22
25
  get hasUsage() {
23
26
  return (
24
27
  this.metadata.extras?.isOpenData === true ||
25
- this.metadata.useLimitations?.length ||
26
- this.metadata.accessConstraints?.length
28
+ (this.metadata.legalConstraints?.length > 0 &&
29
+ this.legalConstraints.length > 0) ||
30
+ (this.metadata.otherConstraints?.length > 0 &&
31
+ this.otherConstraints.length > 0) ||
32
+ (this.metadata.licenses?.length > 0 && this.licenses.length > 0)
27
33
  )
28
34
  }
29
35
 
30
- get usages(): string[] {
36
+ get legalConstraints() {
37
+ let array = []
38
+ if (this.metadata.legalConstraints?.length) {
39
+ array = array.concat(
40
+ this.metadata.legalConstraints.filter((c) => c.text).map((c) => c.text)
41
+ )
42
+ }
43
+ return array
44
+ }
45
+
46
+ get otherConstraints() {
31
47
  let array = []
32
- if (this.metadata.useLimitations?.length) {
33
- array = array.concat(this.metadata.useLimitations)
48
+ if (this.metadata.otherConstraints?.length) {
49
+ array = array.concat(
50
+ this.metadata.otherConstraints.filter((c) => c.text).map((c) => c.text)
51
+ )
34
52
  }
35
- if (this.metadata.accessConstraints?.length) {
36
- array = array.concat(this.metadata.accessConstraints.map((c) => c.text))
53
+ return array
54
+ }
55
+
56
+ get licenses(): { text: string; url: string }[] {
57
+ let array = []
58
+ if (this.metadata.licenses?.length) {
59
+ array = array.concat(
60
+ this.metadata.licenses
61
+ .filter((c) => c.text)
62
+ .map((c) => ({ text: c.text, url: c.url }))
63
+ )
37
64
  }
38
65
  return array
39
66
  }
@@ -53,12 +80,7 @@ export class MetadataInfoComponent {
53
80
  return !this.incomplete || propName in this.metadata
54
81
  }
55
82
 
56
- onKeywordClick(keyword: string) {
83
+ onKeywordClick(keyword: Keyword) {
57
84
  this.keyword.emit(keyword)
58
85
  }
59
-
60
- copyText() {
61
- navigator.clipboard.writeText(this.metadata.uniqueIdentifier)
62
- ;(event.target as HTMLElement).blur()
63
- }
64
86
  }
@@ -32,8 +32,7 @@ export class MetadataQualityComponent implements OnChanges {
32
32
 
33
33
  get calculatedQualityScore(): number {
34
34
  return Math.round(
35
- (this.items.filter(({ value }) => value === true).length * 100) /
36
- this.items.length
35
+ (this.items.filter(({ value }) => value).length * 100) / this.items.length
37
36
  )
38
37
  }
39
38
 
@@ -56,7 +55,7 @@ export class MetadataQualityComponent implements OnChanges {
56
55
  this.items = []
57
56
  this.add('title', !!this.metadata?.title)
58
57
  this.add('description', !!this.metadata?.abstract)
59
- this.add('topic', this.metadata?.themes?.length > 0)
58
+ this.add('topic', this.metadata?.topics?.length > 0)
60
59
  this.add('keywords', this.metadata?.keywords?.length > 0)
61
60
  this.add('legalConstraints', this.metadata?.legalConstraints?.length > 0)
62
61
  this.add('organisation', !!contact?.organization)
@@ -19,8 +19,8 @@
19
19
  <div class="flex flex-row items-center gap-2">
20
20
  <gn-ui-text-input
21
21
  class="mr-2 w-20"
22
- (input)="setLimit($event.target.value)"
23
- [value]="limit$ | async"
22
+ (valueChange)="setLimit($event)"
23
+ [value]="displayLimit$ | async"
24
24
  hint=""
25
25
  >
26
26
  </gn-ui-text-input>
@@ -28,8 +28,8 @@
28
28
  <input
29
29
  class="mr-2 cursor-pointer"
30
30
  type="checkbox"
31
- [checked]="(limit$ | async) === ''"
32
- (change)="setLimit('')"
31
+ [checked]="noLimitChecked$ | async"
32
+ (change)="setLimit('-1')"
33
33
  />
34
34
  <span class="text-sm" translate
35
35
  >record.metadata.api.form.limit.all</span
@@ -42,7 +42,7 @@
42
42
  <gn-ui-text-input
43
43
  class="w-20"
44
44
  [value]="offset$ | async"
45
- (input)="setOffset($event.target.value)"
45
+ (valueChange)="setOffset($event)"
46
46
  hint=""
47
47
  >
48
48
  </gn-ui-text-input>
@@ -4,7 +4,7 @@ import { BehaviorSubject, combineLatest, map } from 'rxjs'
4
4
 
5
5
  const DEFAULT_PARAMS = {
6
6
  OFFSET: '',
7
- LIMIT: '',
7
+ LIMIT: '-1',
8
8
  FORMAT: 'json',
9
9
  }
10
10
  @Component({
@@ -44,17 +44,25 @@ export class RecordApiFormComponent {
44
44
  return outputUrl
45
45
  })
46
46
  )
47
+ noLimitChecked$ = this.limit$.pipe(
48
+ map((limit) => limit === '-1' || limit === '')
49
+ )
50
+
51
+ displayLimit$ = this.limit$.pipe(
52
+ map((limit) => (limit !== '-1' ? limit : ''))
53
+ )
47
54
 
48
55
  setOffset(value: string) {
49
56
  this.offset$.next(value)
50
57
  }
51
58
 
52
59
  setLimit(value: string) {
53
- this.limit$.next(value)
60
+ const newLimit = value === '' ? '-1' : value
61
+ this.limit$.next(newLimit)
54
62
  }
55
63
 
56
- setFormat(value: string) {
57
- this.format$.next(value)
64
+ setFormat(value: string | unknown) {
65
+ this.format$.next(String(value))
58
66
  }
59
67
 
60
68
  resetUrl() {
@@ -1,13 +1,13 @@
1
1
  <div
2
2
  #containerElement
3
- class="h-full w-full relative shrink-0 overflow-hidden flex items-center"
3
+ class="h-full w-full relative shrink-0 overflow-hidden flex items-center justify-center"
4
4
  [ngClass]="isPlaceholder ? 'bg-gray-100' : 'bg-white'"
5
5
  [attr.data-cy-is-placeholder]="isPlaceholder.toString()"
6
6
  >
7
7
  <img
8
8
  #imageElement
9
9
  class="relative w-full object-center"
10
- [ngClass]="imgFit === 'contain' ? 'h-4/5' : 'h-full'"
10
+ [ngClass]="imgFit === 'contain' ? 'h-4/5 w-4/5' : 'h-full'"
11
11
  [ngStyle]="{ objectFit: imgFit }"
12
12
  alt="thumbnail"
13
13
  loading="lazy"
@@ -45,6 +45,7 @@ import { ImageOverlayPreviewComponent } from './image-overlay-preview/image-over
45
45
  UiInputsModule,
46
46
  FormsModule,
47
47
  NgOptimizedImage,
48
+ MarkdownParserComponent,
48
49
  ],
49
50
  declarations: [
50
51
  MetadataInfoComponent,
@@ -67,7 +68,6 @@ import { ImageOverlayPreviewComponent } from './image-overlay-preview/image-over
67
68
  PaginationButtonsComponent,
68
69
  MaxLinesComponent,
69
70
  RecordApiFormComponent,
70
- MarkdownParserComponent,
71
71
  ImageOverlayPreviewComponent,
72
72
  ],
73
73
  exports: [
@@ -12,6 +12,7 @@ import { propagateToDocumentOnly } from '../../../../../../libs/util/shared/src'
12
12
  templateUrl: './button.component.html',
13
13
  styleUrls: ['./button.component.css'],
14
14
  changeDetection: ChangeDetectionStrategy.OnPush,
15
+ standalone: true,
15
16
  })
16
17
  export class ButtonComponent {
17
18
  private btnClass: string
@@ -0,0 +1,3 @@
1
+ button {
2
+ color: var(--navigation-button-color, --color-background);
3
+ }
@@ -1,5 +1,5 @@
1
1
  <button
2
- class="group flex items-center justify-center gap-1 backdrop-blur p-1 bg-primary-opacity-30 text-white rounded content-center"
2
+ class="group flex items-center justify-center gap-1 backdrop-blur p-1 bg-primary-opacity-30 rounded content-center"
3
3
  >
4
4
  <mat-icon class="material-symbols-outlined align-middle w-[18px]">{{
5
5
  icon
@@ -12,6 +12,7 @@ import { distinctUntilChanged } from 'rxjs/operators'
12
12
  selector: 'gn-ui-text-area',
13
13
  templateUrl: './text-area.component.html',
14
14
  styleUrls: ['./text-area.component.css'],
15
+ standalone: true,
15
16
  })
16
17
  export class TextAreaComponent implements AfterViewInit {
17
18
  @Input() value = ''
@@ -47,10 +47,8 @@ import { EditableLabelDirective } from './editable-label/editable-label.directiv
47
47
  declarations: [
48
48
  DropdownSelectorComponent,
49
49
  AutocompleteComponent,
50
- ButtonComponent,
51
50
  TextInputComponent,
52
51
  DragAndDropFileInputComponent,
53
- TextAreaComponent,
54
52
  ChipsInputComponent,
55
53
  NavigationButtonComponent,
56
54
  StarToggleComponent,
@@ -89,6 +87,8 @@ import { EditableLabelDirective } from './editable-label/editable-label.directiv
89
87
  MatDatepickerModule,
90
88
  MatNativeDateModule,
91
89
  EditableLabelDirective,
90
+ TextAreaComponent,
91
+ ButtonComponent,
92
92
  ],
93
93
  exports: [
94
94
  DropdownSelectorComponent,
@@ -3,6 +3,5 @@ export * from './lib/i18n.constants'
3
3
  export * from './lib/i18n.interceptor'
4
4
  export * from './lib/lang.service'
5
5
  export * from './lib/file.translate.loader'
6
- export * from './lib/testing/test.translate.module'
7
6
  export * from './lib/embedded.translate.loader'
8
7
  export * from './lib/translate.loader.utils'