geonetwork-ui 2.3.0-dev.b46332e6 → 2.3.0-dev.bc5d77f0

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 (209) hide show
  1. package/esm2022/index.mjs +2 -1
  2. package/esm2022/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.mjs +3 -3
  3. package/esm2022/libs/api/repository/src/lib/gn4/auth/avatar.service.interface.mjs +1 -1
  4. package/esm2022/libs/api/repository/src/lib/gn4/auth/gravatar.service.mjs +12 -1
  5. package/esm2022/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.mjs +36 -3
  6. package/esm2022/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.mjs +19 -7
  7. package/esm2022/libs/common/domain/src/lib/model/record/index.mjs +2 -1
  8. package/esm2022/libs/common/domain/src/lib/model/record/user-feedbacks.model.mjs +2 -0
  9. package/esm2022/libs/common/domain/src/lib/model/user/index.mjs +2 -0
  10. package/esm2022/libs/common/domain/src/lib/platform.service.interface.mjs +1 -1
  11. package/esm2022/libs/feature/editor/src/lib/+state/editor.facade.mjs +6 -2
  12. package/esm2022/libs/feature/editor/src/lib/components/record-form/form-field/form-field-license/form-field-license.component.mjs +64 -0
  13. package/esm2022/libs/feature/editor/src/lib/components/record-form/form-field/form-field-resource-updated/form-field-resource-updated.component.mjs +15 -0
  14. package/esm2022/libs/feature/editor/src/lib/components/record-form/form-field/form-field-rich/form-field-rich.component.mjs +3 -3
  15. package/esm2022/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.mjs +38 -10
  16. package/esm2022/libs/feature/editor/src/lib/components/record-form/record-form.component.mjs +3 -13
  17. package/esm2022/libs/feature/editor/src/lib/components/wizard-field/wizard-field.component.mjs +1 -1
  18. package/esm2022/libs/feature/editor/src/lib/fields.config.mjs +16 -1
  19. package/esm2022/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.mjs +3 -3
  20. package/esm2022/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.mjs +1 -1
  21. package/esm2022/libs/feature/map/src/lib/add-layer-from-wfs/add-layer-from-wfs.component.mjs +1 -1
  22. package/esm2022/libs/feature/map/src/lib/add-layer-from-wms/add-layer-from-wms.component.mjs +1 -1
  23. package/esm2022/libs/feature/notifications/src/index.mjs +4 -0
  24. package/esm2022/libs/feature/notifications/src/lib/feature-notifications.module.mjs +18 -0
  25. package/esm2022/libs/feature/notifications/src/lib/notification.model.mjs +2 -0
  26. package/esm2022/libs/feature/notifications/src/lib/notifications-container/notifications-container.component.mjs +49 -0
  27. package/esm2022/libs/feature/notifications/src/lib/notifications.service.mjs +29 -0
  28. package/esm2022/libs/feature/record/src/lib/feature-record.module.mjs +4 -4
  29. package/esm2022/libs/feature/record/src/lib/state/mdview.actions.mjs +22 -4
  30. package/esm2022/libs/feature/record/src/lib/state/mdview.effects.mjs +37 -10
  31. package/esm2022/libs/feature/record/src/lib/state/mdview.facade.mjs +22 -7
  32. package/esm2022/libs/feature/record/src/lib/state/mdview.reducer.mjs +52 -17
  33. package/esm2022/libs/feature/record/src/lib/state/mdview.selectors.mjs +18 -3
  34. package/esm2022/libs/feature/router/src/lib/default/state/router.effects.mjs +2 -2
  35. package/esm2022/libs/feature/search/src/lib/results-table/results-table.component.mjs +3 -3
  36. package/esm2022/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.mjs +3 -3
  37. package/esm2022/libs/ui/elements/src/index.mjs +2 -1
  38. package/esm2022/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.mjs +3 -3
  39. package/esm2022/libs/ui/elements/src/lib/markdown-editor/markdown-editor.component.mjs +2 -2
  40. package/esm2022/libs/ui/elements/src/lib/notification/notification.component.mjs +34 -0
  41. package/esm2022/libs/ui/elements/src/lib/record-api-form/record-api-form.component.mjs +3 -3
  42. package/esm2022/libs/ui/elements/src/lib/ui-elements.module.mjs +10 -2
  43. package/esm2022/libs/ui/elements/src/lib/user-feedback-item/time-since.pipe.mjs +59 -0
  44. package/esm2022/libs/ui/elements/src/lib/user-feedback-item/user-feedback-item.component.mjs +62 -0
  45. package/esm2022/libs/ui/inputs/src/index.mjs +15 -15
  46. package/esm2022/libs/ui/inputs/src/lib/date-picker/date-picker.component.mjs +22 -0
  47. package/esm2022/libs/ui/inputs/src/lib/date-range-picker/date-range-picker.component.mjs +7 -5
  48. package/esm2022/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.mjs +17 -8
  49. package/esm2022/libs/ui/inputs/src/lib/text-area/text-area.component.mjs +27 -4
  50. package/esm2022/libs/ui/inputs/src/lib/text-input/text-input.component.mjs +19 -3
  51. package/esm2022/libs/ui/inputs/src/lib/ui-inputs.module.mjs +11 -9
  52. package/esm2022/libs/ui/layout/src/lib/form-field-wrapper/form-field-wrapper.component.mjs +3 -3
  53. package/esm2022/translations/de.json +34 -0
  54. package/esm2022/translations/en.json +34 -0
  55. package/esm2022/translations/es.json +34 -0
  56. package/esm2022/translations/fr.json +34 -0
  57. package/esm2022/translations/it.json +34 -0
  58. package/esm2022/translations/nl.json +34 -0
  59. package/esm2022/translations/pt.json +34 -0
  60. package/fesm2022/geonetwork-ui.mjs +1529 -739
  61. package/fesm2022/geonetwork-ui.mjs.map +1 -1
  62. package/index.d.ts +1 -0
  63. package/index.d.ts.map +1 -1
  64. package/index.ts +1 -0
  65. package/libs/api/repository/src/lib/gn4/auth/avatar.service.interface.d.ts +1 -0
  66. package/libs/api/repository/src/lib/gn4/auth/avatar.service.interface.d.ts.map +1 -1
  67. package/libs/api/repository/src/lib/gn4/auth/gravatar.service.d.ts +1 -0
  68. package/libs/api/repository/src/lib/gn4/auth/gravatar.service.d.ts.map +1 -1
  69. package/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.d.ts +6 -2
  70. package/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.d.ts.map +1 -1
  71. package/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.d.ts +9 -6
  72. package/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.d.ts.map +1 -1
  73. package/libs/common/domain/src/lib/model/record/index.d.ts +1 -0
  74. package/libs/common/domain/src/lib/model/record/index.d.ts.map +1 -1
  75. package/libs/common/domain/src/lib/model/record/user-feedbacks.model.d.ts +15 -0
  76. package/libs/common/domain/src/lib/model/record/user-feedbacks.model.d.ts.map +1 -0
  77. package/libs/common/domain/src/lib/model/user/index.d.ts +2 -0
  78. package/libs/common/domain/src/lib/model/user/index.d.ts.map +1 -0
  79. package/libs/common/domain/src/lib/platform.service.interface.d.ts +3 -0
  80. package/libs/common/domain/src/lib/platform.service.interface.d.ts.map +1 -1
  81. package/libs/feature/editor/src/lib/+state/editor.facade.d.ts +8 -5
  82. package/libs/feature/editor/src/lib/+state/editor.facade.d.ts.map +1 -1
  83. package/libs/feature/editor/src/lib/components/record-form/form-field/form-field-license/form-field-license.component.d.ts +39 -0
  84. package/libs/feature/editor/src/lib/components/record-form/form-field/form-field-license/form-field-license.component.d.ts.map +1 -0
  85. package/libs/feature/editor/src/lib/components/record-form/form-field/form-field-resource-updated/form-field-resource-updated.component.d.ts +8 -0
  86. package/libs/feature/editor/src/lib/components/record-form/form-field/form-field-resource-updated/form-field-resource-updated.component.d.ts.map +1 -0
  87. package/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.d.ts +8 -1
  88. package/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.d.ts.map +1 -1
  89. package/libs/feature/editor/src/lib/components/record-form/record-form.component.d.ts.map +1 -1
  90. package/libs/feature/editor/src/lib/fields.config.d.ts.map +1 -1
  91. package/libs/feature/notifications/src/index.d.ts +4 -0
  92. package/libs/feature/notifications/src/index.d.ts.map +1 -0
  93. package/libs/feature/notifications/src/lib/feature-notifications.module.d.ts +7 -0
  94. package/libs/feature/notifications/src/lib/feature-notifications.module.d.ts.map +1 -0
  95. package/libs/feature/notifications/src/lib/notification.model.d.ts +7 -0
  96. package/libs/feature/notifications/src/lib/notification.model.d.ts.map +1 -0
  97. package/libs/feature/notifications/src/lib/notifications-container/notifications-container.component.d.ts +12 -0
  98. package/libs/feature/notifications/src/lib/notifications-container/notifications-container.component.d.ts.map +1 -0
  99. package/libs/feature/notifications/src/lib/notifications.service.d.ts +15 -0
  100. package/libs/feature/notifications/src/lib/notifications.service.d.ts.map +1 -0
  101. package/libs/feature/record/src/lib/feature-record.module.d.ts.map +1 -1
  102. package/libs/feature/record/src/lib/state/mdview.actions.d.ts +40 -6
  103. package/libs/feature/record/src/lib/state/mdview.actions.d.ts.map +1 -1
  104. package/libs/feature/record/src/lib/state/mdview.effects.d.ts +24 -4
  105. package/libs/feature/record/src/lib/state/mdview.effects.d.ts.map +1 -1
  106. package/libs/feature/record/src/lib/state/mdview.facade.d.ts +14 -4
  107. package/libs/feature/record/src/lib/state/mdview.facade.d.ts.map +1 -1
  108. package/libs/feature/record/src/lib/state/mdview.reducer.d.ts +8 -5
  109. package/libs/feature/record/src/lib/state/mdview.reducer.d.ts.map +1 -1
  110. package/libs/feature/record/src/lib/state/mdview.selectors.d.ts +12 -9
  111. package/libs/feature/record/src/lib/state/mdview.selectors.d.ts.map +1 -1
  112. package/libs/ui/elements/src/index.d.ts +1 -0
  113. package/libs/ui/elements/src/index.d.ts.map +1 -1
  114. package/libs/ui/elements/src/lib/notification/notification.component.d.ts +13 -0
  115. package/libs/ui/elements/src/lib/notification/notification.component.d.ts.map +1 -0
  116. package/libs/ui/elements/src/lib/ui-elements.module.d.ts +16 -14
  117. package/libs/ui/elements/src/lib/ui-elements.module.d.ts.map +1 -1
  118. package/libs/ui/elements/src/lib/user-feedback-item/time-since.pipe.d.ts +11 -0
  119. package/libs/ui/elements/src/lib/user-feedback-item/time-since.pipe.d.ts.map +1 -0
  120. package/libs/ui/elements/src/lib/user-feedback-item/user-feedback-item.component.d.ts +22 -0
  121. package/libs/ui/elements/src/lib/user-feedback-item/user-feedback-item.component.d.ts.map +1 -0
  122. package/libs/ui/inputs/src/index.d.ts +14 -14
  123. package/libs/ui/inputs/src/index.d.ts.map +1 -1
  124. package/libs/ui/inputs/src/lib/date-picker/date-picker.component.d.ts +9 -0
  125. package/libs/ui/inputs/src/lib/date-picker/date-picker.component.d.ts.map +1 -0
  126. package/libs/ui/inputs/src/lib/date-range-picker/date-range-picker.component.d.ts +1 -1
  127. package/libs/ui/inputs/src/lib/date-range-picker/date-range-picker.component.d.ts.map +1 -1
  128. package/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.d.ts +1 -1
  129. package/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.d.ts.map +1 -1
  130. package/libs/ui/inputs/src/lib/text-area/text-area.component.d.ts +7 -1
  131. package/libs/ui/inputs/src/lib/text-area/text-area.component.d.ts.map +1 -1
  132. package/libs/ui/inputs/src/lib/text-input/text-input.component.d.ts +4 -1
  133. package/libs/ui/inputs/src/lib/text-input/text-input.component.d.ts.map +1 -1
  134. package/libs/ui/inputs/src/lib/ui-inputs.module.d.ts +35 -35
  135. package/package.json +1 -1
  136. package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts +2 -2
  137. package/src/libs/api/repository/src/lib/gn4/auth/avatar.service.interface.ts +1 -0
  138. package/src/libs/api/repository/src/lib/gn4/auth/gravatar.service.ts +12 -1
  139. package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.mapper.ts +51 -1
  140. package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts +34 -7
  141. package/src/libs/common/domain/src/lib/model/record/index.ts +1 -0
  142. package/src/libs/common/domain/src/lib/model/record/user-feedbacks.model.ts +15 -0
  143. package/src/libs/common/domain/src/lib/platform.service.interface.ts +3 -0
  144. package/src/libs/common/fixtures/src/index.ts +8 -6
  145. package/src/libs/common/fixtures/src/lib/records.fixtures.ts +3 -3
  146. package/src/libs/common/fixtures/src/lib/user-feedbacks.fixtures.ts +83 -0
  147. package/src/libs/feature/editor/src/lib/+state/editor.facade.ts +8 -1
  148. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-license/form-field-license.component.css +0 -0
  149. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-license/form-field-license.component.html +8 -0
  150. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-license/form-field-license.component.ts +64 -0
  151. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-resource-updated/form-field-resource-updated.component.css +0 -0
  152. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-resource-updated/form-field-resource-updated.component.html +4 -0
  153. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-resource-updated/form-field-resource-updated.component.ts +15 -0
  154. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-rich/form-field-rich.component.css +0 -5
  155. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-rich/form-field-rich.component.html +1 -1
  156. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html +57 -33
  157. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts +35 -4
  158. package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.ts +2 -21
  159. package/src/libs/feature/editor/src/lib/fields.config.ts +15 -0
  160. package/src/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.html +1 -1
  161. package/src/libs/feature/notifications/src/index.ts +3 -0
  162. package/src/libs/feature/notifications/src/lib/feature-notifications.module.ts +10 -0
  163. package/src/libs/feature/notifications/src/lib/notification.model.ts +6 -0
  164. package/src/libs/feature/notifications/src/lib/notifications-container/notifications-container.component.css +0 -0
  165. package/src/libs/feature/notifications/src/lib/notifications-container/notifications-container.component.html +17 -0
  166. package/src/libs/feature/notifications/src/lib/notifications-container/notifications-container.component.ts +44 -0
  167. package/src/libs/feature/notifications/src/lib/notifications.service.ts +27 -0
  168. package/src/libs/feature/record/src/lib/feature-record.module.ts +5 -2
  169. package/src/libs/feature/record/src/lib/state/mdview.actions.ts +51 -6
  170. package/src/libs/feature/record/src/lib/state/mdview.effects.ts +82 -7
  171. package/src/libs/feature/record/src/lib/state/mdview.facade.ts +49 -8
  172. package/src/libs/feature/record/src/lib/state/mdview.reducer.ts +81 -24
  173. package/src/libs/feature/record/src/lib/state/mdview.selectors.ts +40 -10
  174. package/src/libs/feature/router/src/lib/default/state/router.effects.ts +2 -2
  175. package/src/libs/feature/search/src/lib/results-table/results-table.component.html +3 -3
  176. package/src/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.html +5 -5
  177. package/src/libs/ui/elements/src/index.ts +1 -0
  178. package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.html +1 -1
  179. package/src/libs/ui/elements/src/lib/notification/notification.component.css +0 -0
  180. package/src/libs/ui/elements/src/lib/notification/notification.component.html +52 -0
  181. package/src/libs/ui/elements/src/lib/notification/notification.component.ts +31 -0
  182. package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.html +1 -1
  183. package/src/libs/ui/elements/src/lib/ui-elements.module.ts +5 -0
  184. package/src/libs/ui/elements/src/lib/user-feedback-item/time-since.pipe.ts +54 -0
  185. package/src/libs/ui/elements/src/lib/user-feedback-item/user-feedback-item.component.css +0 -0
  186. package/src/libs/ui/elements/src/lib/user-feedback-item/user-feedback-item.component.html +75 -0
  187. package/src/libs/ui/elements/src/lib/user-feedback-item/user-feedback-item.component.ts +63 -0
  188. package/src/libs/ui/inputs/src/index.ts +14 -14
  189. package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.css +3 -0
  190. package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.html +11 -0
  191. package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.ts +16 -0
  192. package/src/libs/ui/inputs/src/lib/date-range-picker/date-range-picker.component.ts +8 -1
  193. package/src/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.ts +13 -0
  194. package/src/libs/ui/inputs/src/lib/text-area/text-area.component.html +2 -1
  195. package/src/libs/ui/inputs/src/lib/text-area/text-area.component.ts +29 -0
  196. package/src/libs/ui/inputs/src/lib/text-input/text-input.component.html +1 -1
  197. package/src/libs/ui/inputs/src/lib/text-input/text-input.component.ts +16 -1
  198. package/src/libs/ui/inputs/src/lib/ui-inputs.module.ts +2 -2
  199. package/src/libs/ui/layout/src/lib/form-field-wrapper/form-field-wrapper.component.css +0 -5
  200. package/src/libs/ui/layout/src/lib/form-field-wrapper/form-field-wrapper.component.html +1 -1
  201. package/tailwind.base.css +36 -0
  202. package/translations/de.json +34 -0
  203. package/translations/en.json +34 -0
  204. package/translations/es.json +34 -0
  205. package/translations/fr.json +34 -0
  206. package/translations/it.json +34 -0
  207. package/translations/nl.json +34 -0
  208. package/translations/pt.json +34 -0
  209. package/translations/sk.json +34 -0
@@ -1,17 +1,23 @@
1
1
  import {
2
2
  MeResponseApiModel,
3
3
  UserApiModel,
4
+ UserFeedbackDTOApiModel,
4
5
  } from '../../../../../../../libs/data-access/gn4/src'
5
6
  import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
6
7
  import { Injectable } from '@angular/core'
7
- import { AvatarServiceInterface } from '../auth/avatar.service.interface'
8
+ import { AvatarServiceInterface } from '../auth'
8
9
  import { map } from 'rxjs/operators'
9
10
  import { Observable, of } from 'rxjs'
10
11
  import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
12
+ import {
13
+ UserFeedback,
14
+ UserFeedbackViewModel,
15
+ } from '../../../../../../../libs/common/domain/src/lib/model/record'
11
16
 
12
17
  @Injectable()
13
18
  export class Gn4PlatformMapper {
14
19
  constructor(private avatarService: AvatarServiceInterface) {}
20
+
15
21
  userFromMeApi(apiUser: MeResponseApiModel): Observable<UserModel | null> {
16
22
  if (!apiUser) return of(null)
17
23
  const {
@@ -28,6 +34,7 @@ export class Gn4PlatformMapper {
28
34
  .getProfileIcon(hash)
29
35
  .pipe(map((profileIcon) => ({ ...user, profileIcon } as UserModel)))
30
36
  }
37
+
31
38
  userFromApi(apiUser: UserApiModel): UserModel {
32
39
  if (!apiUser) return null
33
40
  const {
@@ -65,4 +72,47 @@ export class Gn4PlatformMapper {
65
72
  }
66
73
  })
67
74
  }
75
+
76
+ userFeedbacksFromApi(userFeedback: any): UserFeedback {
77
+ return {
78
+ uuid: userFeedback.uuid,
79
+ metadataUUID: userFeedback.metadataUUID,
80
+ comment: userFeedback.comment,
81
+ authorUserId: userFeedback.authorUserId.toString(),
82
+ authorName: userFeedback.authorName,
83
+ authorEmail: userFeedback.authorEmail,
84
+ published: userFeedback.published,
85
+ parentUuid: userFeedback.parentUuid ?? undefined,
86
+ date: new Date(userFeedback.date),
87
+ }
88
+ }
89
+
90
+ userFeedbacksToApi(
91
+ userFeedback: UserFeedback
92
+ ): Partial<UserFeedbackDTOApiModel> {
93
+ return {
94
+ uuid: userFeedback.uuid,
95
+ metadataUUID: userFeedback.metadataUUID,
96
+ comment: userFeedback.comment,
97
+ authorUserId: Number.parseInt(userFeedback.authorUserId),
98
+ authorName: userFeedback.authorName,
99
+ authorEmail: userFeedback.authorEmail,
100
+ published: userFeedback.published,
101
+ parentUuid: userFeedback.parentUuid,
102
+ date: userFeedback.date.getTime().toString(),
103
+ }
104
+ }
105
+
106
+ async createUserFeedbackViewModel(
107
+ baseUserFeedback: UserFeedback
108
+ ): Promise<UserFeedbackViewModel> {
109
+ const userAvatarUrl = await this.avatarService.getProfileIconUrl(
110
+ baseUserFeedback.authorUserId?.toString()
111
+ )
112
+
113
+ return {
114
+ ...baseUserFeedback,
115
+ avatarUrl: userAvatarUrl,
116
+ }
117
+ }
68
118
  }
@@ -6,11 +6,15 @@ import {
6
6
  RegistriesApiService,
7
7
  SiteApiService,
8
8
  ToolsApiService,
9
+ UserfeedbackApiService,
9
10
  UsersApiService,
10
11
  } from '../../../../../../../libs/data-access/gn4/src'
11
12
  import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
12
13
  import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
13
- import { Organization } from '../../../../../../../libs/common/domain/src/lib/model/record'
14
+ import {
15
+ Organization,
16
+ UserFeedback,
17
+ } from '../../../../../../../libs/common/domain/src/lib/model/record'
14
18
  import { Gn4PlatformMapper } from './gn4-platform.mapper'
15
19
  import { ltr } from 'semver'
16
20
  import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
@@ -21,9 +25,9 @@ const minApiVersion = '4.2.2'
21
25
  @Injectable()
22
26
  export class Gn4PlatformService implements PlatformServiceInterface {
23
27
  private readonly type = 'GeoNetwork'
24
- private me$: Observable<UserModel>
25
- private users$: Observable<UserModel[]>
26
- private isAnonymous$: Observable<boolean>
28
+ private readonly me$: Observable<UserModel>
29
+ private readonly users$: Observable<UserModel[]>
30
+ private readonly isUserAnonymous$: Observable<boolean>
27
31
 
28
32
  private keyTranslations$ = this.toolsApiService
29
33
  .getTranslationsPackage1('gnui')
@@ -65,13 +69,18 @@ export class Gn4PlatformService implements PlatformServiceInterface {
65
69
  private mapper: Gn4PlatformMapper,
66
70
  private toolsApiService: ToolsApiService,
67
71
  private registriesApiService: RegistriesApiService,
68
- private langService: LangService
72
+ private langService: LangService,
73
+ private userfeedbackApiService: UserfeedbackApiService
69
74
  ) {
70
75
  this.me$ = this.meApi.getMe().pipe(
71
76
  switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
72
77
  shareReplay({ bufferSize: 1, refCount: true })
73
78
  )
74
- this.isAnonymous$ = this.me$.pipe(map((user) => !user || !('id' in user)))
79
+
80
+ this.isUserAnonymous$ = this.me$.pipe(
81
+ map((user) => !user || !('id' in user))
82
+ )
83
+
75
84
  this.users$ = this.usersApi.getUsers().pipe(
76
85
  map((users) => users.map((user) => this.mapper.userFromApi(user))),
77
86
  shareReplay()
@@ -91,7 +100,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
91
100
  }
92
101
 
93
102
  isAnonymous(): Observable<boolean> {
94
- return this.isAnonymous$
103
+ return this.isUserAnonymous$
95
104
  }
96
105
 
97
106
  getOrganizations(): Observable<Organization[]> {
@@ -148,6 +157,24 @@ export class Gn4PlatformService implements PlatformServiceInterface {
148
157
  ),
149
158
  shareReplay(1)
150
159
  )
160
+
151
161
  return this.thesauri[uri]
152
162
  }
163
+
164
+ getUserFeedbacks(uuid: string): Observable<UserFeedback[]> {
165
+ return this.userfeedbackApiService
166
+ .getUserComments(uuid)
167
+ .pipe(
168
+ map((userFeedbacks) =>
169
+ userFeedbacks.map(this.mapper.userFeedbacksFromApi)
170
+ )
171
+ )
172
+ }
173
+
174
+ postUserFeedbacks(userFeedback: UserFeedback): Observable<void> {
175
+ const mappedUserFeedBack = this.mapper.userFeedbacksToApi(userFeedback)
176
+ return this.userfeedbackApiService
177
+ .newUserFeedback(mappedUserFeedBack)
178
+ .pipe(map(() => undefined))
179
+ }
153
180
  }
@@ -1,3 +1,4 @@
1
1
  export * from './contact.model'
2
2
  export * from './organization.model'
3
3
  export * from './metadata.model'
4
+ export * from './user-feedbacks.model'
@@ -0,0 +1,15 @@
1
+ export interface UserFeedback {
2
+ uuid: string
3
+ comment: string
4
+ metadataUUID: string
5
+ authorUserId: string
6
+ authorName: string
7
+ authorEmail: string
8
+ published: boolean
9
+ parentUuid?: string
10
+ date: Date
11
+ }
12
+
13
+ export interface UserFeedbackViewModel extends UserFeedback {
14
+ avatarUrl: string
15
+ }
@@ -2,6 +2,7 @@ import type { Observable } from 'rxjs'
2
2
  import type { UserModel } from './model/user/user.model'
3
3
  import type { Organization } from './model/record/organization.model'
4
4
  import type { ThesaurusModel } from './model/thesaurus/'
5
+ import { UserFeedback } from './model/record'
5
6
 
6
7
  export abstract class PlatformServiceInterface {
7
8
  abstract getType(): string
@@ -16,4 +17,6 @@ export abstract class PlatformServiceInterface {
16
17
  abstract getOrganizations(): Observable<Organization[]>
17
18
  abstract translateKey(key: string): Observable<string>
18
19
  abstract getThesaurusByUri(uri: string): Observable<ThesaurusModel>
20
+ abstract getUserFeedbacks(recordUuid: string): Observable<UserFeedback[]>
21
+ abstract postUserFeedbacks(recordUuid: UserFeedback): Observable<void>
19
22
  }
@@ -1,11 +1,13 @@
1
+ export * from './lib/elasticsearch'
2
+ export * from './lib/gn4'
3
+ export * from './lib/search'
4
+
1
5
  export * from './lib/geojson.fixtures'
6
+ export * from './lib/link.fixtures'
2
7
  export * from './lib/ol-feature.fixture'
8
+ export * from './lib/organisations.fixture'
3
9
  export * from './lib/record-link.fixtures'
4
- export * from './lib/link.fixtures'
5
10
  export * from './lib/records.fixtures'
6
- export * from './lib/organisations.fixture'
7
- export * from './lib/elasticsearch'
8
- export * from './lib/search'
9
- export * from './lib/user.fixtures'
10
11
  export * from './lib/repository.fixtures'
11
- export * from './lib/gn4'
12
+ export * from './lib/user.fixtures'
13
+ export * from './lib/user-feedbacks.fixtures'
@@ -1,5 +1,5 @@
1
1
  import { DatasetRecord } from '../../../../../libs/common/domain/src/lib/model/record'
2
- import { deepFreeze } from './utils/freeze'
2
+ import { deepFreeze } from './utils'
3
3
 
4
4
  export const DATASET_RECORDS: DatasetRecord[] = deepFreeze([
5
5
  {
@@ -49,8 +49,8 @@ export const DATASET_RECORDS: DatasetRecord[] = deepFreeze([
49
49
  status: 'ongoing',
50
50
  recordCreated: new Date('2022-02-01T15:12:00'),
51
51
  recordUpdated: new Date('2022-02-01T15:12:00'),
52
- datasetCreated: new Date('2022-09-01T14:18:19'),
53
- datasetUpdated: new Date('2022-12-04T15:12:00'),
52
+ resourceCreated: new Date('2022-09-01T14:18:19'),
53
+ resourceUpdated: new Date('2022-12-04T15:12:00'),
54
54
  title: 'A very interesting dataset (un jeu de données très intéressant)',
55
55
  abstract: `# Introduction
56
56
  This dataset has been established for testing purposes.
@@ -0,0 +1,83 @@
1
+ import { UserFeedback } from '../../../../../libs/common/domain/src/lib/model/record'
2
+ import { deepFreeze } from './utils'
3
+
4
+ export const SOME_USER_FEEDBACKS: UserFeedback[] = deepFreeze([
5
+ {
6
+ uuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
7
+ comment: 'A nice comment.',
8
+ metadataUUID: 'my-dataset-001',
9
+ authorUserId: '46798',
10
+ authorName: 'Arnaud De Maison',
11
+ authorEmail: 'a.demaison@geo2france.fr',
12
+ published: true,
13
+ parentUuid: undefined,
14
+ date: new Date('2023-01-01T08:00:00Z'),
15
+ },
16
+ {
17
+ uuid: '52cbd0f1-9cb9-4409-8e85-bc608f049af4',
18
+ comment: 'A very nice comment that is a reply.',
19
+ metadataUUID: 'my-dataset-001',
20
+ authorUserId: '46798',
21
+ authorName: 'Arnaud De Maison',
22
+ authorEmail: 'a.demaison@geo2france.fr',
23
+ published: true,
24
+ parentUuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
25
+ date: new Date('2023-01-01T09:00:00Z'),
26
+ },
27
+ {
28
+ uuid: 'b48f62ec-b5e6-4d27-a396-2c2b44f6dcb5',
29
+ comment: 'Another nice comment.',
30
+ metadataUUID: 'my-dataset-001',
31
+ authorUserId: '46798',
32
+ authorName: 'Arnaud De Maison',
33
+ authorEmail: 'a.demaison@geo2france.fr',
34
+ published: true,
35
+ parentUuid: undefined,
36
+ date: new Date('2023-01-01T10:00:00Z'),
37
+ },
38
+ {
39
+ uuid: '1f12a3be-fc8a-4e83-968f-9b88ffbcab02',
40
+ comment: 'Another very nice reply.',
41
+ metadataUUID: 'my-dataset-001',
42
+ authorUserId: '46798',
43
+ authorName: 'Arnaud De Maison',
44
+ authorEmail: 'a.demaison@geo2france.fr',
45
+ published: true,
46
+ parentUuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
47
+ date: new Date('2023-01-01T11:00:00Z'),
48
+ },
49
+ {
50
+ uuid: 'f8dd778d-e93c-4b3c-ba9b-9574be070f46',
51
+ comment: 'Another nice comment.',
52
+ metadataUUID: 'my-dataset-001',
53
+ authorUserId: '46798',
54
+ authorName: 'Arnaud De Maison',
55
+ authorEmail: 'a.demaison@geo2france.fr',
56
+ published: true,
57
+ parentUuid: undefined,
58
+ date: new Date('2023-01-01T10:00:00Z'),
59
+ },
60
+ {
61
+ uuid: 'df3b8872-61d1-4ae9-8822-bb070b94d7d1',
62
+ comment: 'Another nice comment.',
63
+ metadataUUID: 'my-dataset-001',
64
+ authorUserId: '46798',
65
+ authorName: 'Arnaud De Maison',
66
+ authorEmail: 'a.demaison@geo2france.fr',
67
+ published: true,
68
+ parentUuid: undefined,
69
+ date: new Date('2023-01-01T11:00:00Z'),
70
+ },
71
+ ])
72
+
73
+ export const A_USER_FEEDBACK: UserFeedback = deepFreeze({
74
+ uuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
75
+ comment: 'A nice comment.',
76
+ metadataUUID: 'my-dataset-001',
77
+ authorUserId: '46798',
78
+ authorName: 'Arnaud De Maison',
79
+ authorEmail: 'a.demaison@geo2france.fr',
80
+ published: true,
81
+ parentUuid: undefined,
82
+ date: new Date('2023-01-01T08:00:00Z'),
83
+ })
@@ -3,14 +3,21 @@ import { select, Store } from '@ngrx/store'
3
3
  import * as EditorActions from './editor.actions'
4
4
  import * as EditorSelectors from './editor.selectors'
5
5
  import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
6
+ import { filter, Observable } from 'rxjs'
7
+ import { Actions, ofType } from '@ngrx/effects'
6
8
 
7
9
  @Injectable()
8
10
  export class EditorFacade {
9
11
  private readonly store = inject(Store)
12
+ private actions$ = inject(Actions)
10
13
 
11
14
  record$ = this.store.pipe(select(EditorSelectors.selectRecord))
12
15
  saving$ = this.store.pipe(select(EditorSelectors.selectRecordSaving))
13
- saveError$ = this.store.pipe(select(EditorSelectors.selectRecordSaveError))
16
+ saveError$ = this.store.pipe(
17
+ select(EditorSelectors.selectRecordSaveError),
18
+ filter((error) => !!error)
19
+ )
20
+ saveSuccess$ = this.actions$.pipe(ofType(EditorActions.saveRecordSuccess))
14
21
  changedSinceSave$ = this.store.pipe(
15
22
  select(EditorSelectors.selectRecordChangedSinceSave)
16
23
  )
@@ -0,0 +1,8 @@
1
+ <gn-ui-dropdown-selector
2
+ [title]="label"
3
+ [showTitle]="false"
4
+ [choices]="choices"
5
+ [selected]="selected"
6
+ (selectValue)="onSelectValue($event)"
7
+ >
8
+ </gn-ui-dropdown-selector>
@@ -0,0 +1,64 @@
1
+ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
2
+ import { FormControl } from '@angular/forms'
3
+ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
4
+ import { DropdownSelectorComponent } from '../../../../../../../../../libs/ui/inputs/src'
5
+
6
+ @Component({
7
+ selector: 'gn-ui-form-field-license',
8
+ templateUrl: './form-field-license.component.html',
9
+ styleUrls: ['./form-field-license.component.css'],
10
+ changeDetection: ChangeDetectionStrategy.OnPush,
11
+ standalone: true,
12
+ imports: [DropdownSelectorComponent],
13
+ })
14
+ export class FormFieldLicenseComponent {
15
+ @Input() control!: FormControl
16
+ @Input() label: string
17
+
18
+ get selected() {
19
+ return this.control.value[0]?.text
20
+ }
21
+
22
+ onSelectValue(value: unknown) {
23
+ this.control.setValue([{ text: value }])
24
+ }
25
+
26
+ choices = [
27
+ {
28
+ value: 'cc-by',
29
+ label: marker('editor.record.form.license.cc-by'),
30
+ },
31
+ {
32
+ value: 'cc-by-sa',
33
+ label: marker('editor.record.form.license.cc-by-sa'),
34
+ },
35
+ {
36
+ value: 'cc-zero',
37
+ label: marker('editor.record.form.license.cc-zero'),
38
+ },
39
+ {
40
+ value: 'etalab',
41
+ label: marker('editor.record.form.license.etalab'),
42
+ },
43
+ {
44
+ value: 'etalab-v2',
45
+ label: marker('editor.record.form.license.etalab-v2'),
46
+ },
47
+ {
48
+ value: 'odbl',
49
+ label: marker('editor.record.form.license.odbl'),
50
+ },
51
+ {
52
+ value: 'odc-by',
53
+ label: marker('editor.record.form.license.odc-by'),
54
+ },
55
+ {
56
+ value: 'pddl',
57
+ label: marker('editor.record.form.license.pddl'),
58
+ },
59
+ {
60
+ value: 'unknown',
61
+ label: marker('editor.record.form.license.unknown'),
62
+ },
63
+ ]
64
+ }
@@ -0,0 +1,4 @@
1
+ <gn-ui-date-picker
2
+ [date]="control.value"
3
+ (dateChange)="control.setValue($event)"
4
+ ></gn-ui-date-picker>
@@ -0,0 +1,15 @@
1
+ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
2
+ import { FormControl } from '@angular/forms'
3
+ import { DatePickerComponent } from '../../../../../../../../../libs/ui/inputs/src'
4
+
5
+ @Component({
6
+ selector: 'gn-ui-form-field-resource-updated',
7
+ templateUrl: './form-field-resource-updated.component.html',
8
+ styleUrls: ['./form-field-resource-updated.component.css'],
9
+ changeDetection: ChangeDetectionStrategy.OnPush,
10
+ standalone: true,
11
+ imports: [DatePickerComponent],
12
+ })
13
+ export class FormFieldResourceUpdatedComponent {
14
+ @Input() control!: FormControl
15
+ }
@@ -1,5 +0,0 @@
1
- .icon-small {
2
- font-size: 16px;
3
- height: 16px;
4
- width: 16px;
5
- }
@@ -4,7 +4,7 @@
4
4
  [extraClass]="getButtonExtraClass()"
5
5
  (buttonClick)="togglePreview()"
6
6
  >
7
- <span class="material-symbols-outlined mr-1 icon-small">{{
7
+ <span class="material-symbols-outlined mr-1 gn-ui-icon-small">{{
8
8
  preview ? 'visibility' : 'visibility_off'
9
9
  }}</span>
10
10
  {{ preview ? 'WYSIWYG' : 'Markdown' }}
@@ -1,29 +1,61 @@
1
1
  <div class="flex flex-col h-full">
2
- <div class="mb-2 flex flex-row">
3
- <label class="grow">
4
- <span class="font-medium field-label">{{
5
- config.labelKey | translate
6
- }}</span>
7
- <span *ngIf="config.hintKey" class="text-gray-900 text-sm">
8
- - {{ config.hintKey | translate }}
9
- </span>
10
- </label>
11
- <mat-icon
12
- *ngIf="isFieldOk"
13
- class="material-symbols-outlined text-[#c6d950] icon-ok"
14
- >check_circle</mat-icon
15
- >
16
- <mat-icon
17
- *ngIf="isFieldLocked"
18
- class="material-symbols-outlined text-blue-400 icon-locked"
19
- >lock</mat-icon
20
- >
21
- <mat-icon
22
- *ngIf="isFieldInvalid"
23
- class="material-symbols-outlined text-pink-500 icon-invalid"
24
- >cancel</mat-icon
2
+ <ng-container *ngIf="withoutWrapper; else withGenericWrapper">
3
+ <ng-container *ngTemplateOutlet="fieldContent"></ng-container>
4
+ </ng-container>
5
+ <ng-template #withGenericWrapper>
6
+ <gn-ui-form-field-wrapper
7
+ [label]="config.labelKey | translate"
8
+ [hint]="config.hintKey | translate"
25
9
  >
26
- </div>
10
+ <ng-container *ngTemplateOutlet="fieldContent"></ng-container>
11
+ </gn-ui-form-field-wrapper>
12
+ </ng-template>
13
+ </div>
14
+
15
+ <ng-template #fieldContent>
16
+ <ng-container *ngIf="isTitle">
17
+ <div class="flex justify-between items-center gap-3">
18
+ <h2
19
+ #titleInput
20
+ class="grow text-3xl font-normal"
21
+ [gnUiEditableLabel]="true"
22
+ (editableLabelChanged)="formControl.setValue($event)"
23
+ >
24
+ {{ formControl.value }}
25
+ </h2>
26
+ <span
27
+ class="material-symbols-outlined gn-ui-icon-small m-2 cursor-pointer"
28
+ (click)="focusTitleInput()"
29
+ >edit</span
30
+ >
31
+ <span
32
+ class="material-symbols-outlined gn-ui-icon-small m-2"
33
+ [matTooltip]="config.hintKey | translate"
34
+ matTooltipPosition="above"
35
+ >
36
+ help
37
+ </span>
38
+ </div>
39
+ </ng-container>
40
+ <ng-container *ngIf="isAbstract">
41
+ <gn-ui-form-field-rich
42
+ class="h-[8rem]"
43
+ [control]="formControl"
44
+ [label]="config.labelKey | translate"
45
+ [hint]="config.hintKey | translate"
46
+ ></gn-ui-form-field-rich>
47
+ </ng-container>
48
+ <ng-container *ngIf="isLicenses">
49
+ <gn-ui-form-field-license
50
+ [control]="formControl"
51
+ [label]="config.labelKey | translate"
52
+ ></gn-ui-form-field-license>
53
+ </ng-container>
54
+ <ng-container *ngIf="isResourceUpdated">
55
+ <gn-ui-form-field-resource-updated
56
+ [control]="formControl"
57
+ ></gn-ui-form-field-resource-updated>
58
+ </ng-container>
27
59
  <ng-container *ngIf="isSimpleField">
28
60
  <gn-ui-form-field-simple
29
61
  [type]="simpleType"
@@ -39,14 +71,6 @@
39
71
  [invalid]="isFieldInvalid"
40
72
  ></gn-ui-form-field-file>
41
73
  </ng-container>
42
- <ng-container *ngIf="isAbstract">
43
- <gn-ui-form-field-rich
44
- class="h-[8rem]"
45
- [control]="formControl"
46
- [label]="config.labelKey | translate"
47
- [hint]="config.hintKey | translate"
48
- ></gn-ui-form-field-rich>
49
- </ng-container>
50
74
  <ng-container *ngIf="isArrayField">
51
75
  <gn-ui-form-field-array></gn-ui-form-field-array>
52
76
  </ng-container>
@@ -65,4 +89,4 @@
65
89
  >
66
90
  {{ config.invalidHintKey | translate }}
67
91
  </div>
68
- </div>
92
+ </ng-template>
@@ -1,22 +1,29 @@
1
+ import { CommonModule } from '@angular/common'
1
2
  import {
2
3
  ChangeDetectionStrategy,
3
4
  Component,
5
+ ElementRef,
4
6
  Input,
5
7
  Output,
8
+ ViewChild,
6
9
  } from '@angular/core'
7
10
  import { FormControl, ReactiveFormsModule } from '@angular/forms'
8
11
  import { MatIconModule } from '@angular/material/icon'
12
+ import { MatTooltipModule } from '@angular/material/tooltip'
13
+ import { EditableLabelDirective } from '../../../../../../../../libs/ui/inputs/src'
14
+ import { FormFieldWrapperComponent } from '../../../../../../../../libs/ui/layout/src'
9
15
  import { TranslateModule } from '@ngx-translate/core'
10
16
  import { Observable } from 'rxjs'
11
17
  import { FormFieldArrayComponent } from './form-field-array/form-field-array.component'
12
18
  import { FormFieldFileComponent } from './form-field-file/form-field-file.component'
19
+ import { FormFieldLicenseComponent } from './form-field-license/form-field-license.component'
13
20
  import { FormFieldObjectComponent } from './form-field-object/form-field-object.component'
21
+ import { FormFieldResourceUpdatedComponent } from './form-field-resource-updated/form-field-resource-updated.component'
14
22
  import { FormFieldRichComponent } from './form-field-rich/form-field-rich.component'
15
23
  import { FormFieldSimpleComponent } from './form-field-simple/form-field-simple.component'
16
24
  import { FormFieldSpatialExtentComponent } from './form-field-spatial-extent/form-field-spatial-extent.component'
17
25
  import { FormFieldTemporalExtentComponent } from './form-field-temporal-extent/form-field-temporal-extent.component'
18
26
  import { FormFieldConfig } from './form-field.model'
19
- import { CommonModule } from '@angular/common'
20
27
 
21
28
  @Component({
22
29
  selector: 'gn-ui-form-field',
@@ -25,6 +32,14 @@ import { CommonModule } from '@angular/common'
25
32
  changeDetection: ChangeDetectionStrategy.OnPush,
26
33
  standalone: true,
27
34
  imports: [
35
+ CommonModule,
36
+ ReactiveFormsModule,
37
+ EditableLabelDirective,
38
+ MatIconModule,
39
+ MatTooltipModule,
40
+ FormFieldWrapperComponent,
41
+ FormFieldLicenseComponent,
42
+ FormFieldResourceUpdatedComponent,
28
43
  FormFieldSimpleComponent,
29
44
  FormFieldRichComponent,
30
45
  FormFieldObjectComponent,
@@ -32,10 +47,7 @@ import { CommonModule } from '@angular/common'
32
47
  FormFieldTemporalExtentComponent,
33
48
  FormFieldFileComponent,
34
49
  FormFieldArrayComponent,
35
- CommonModule,
36
- ReactiveFormsModule,
37
50
  TranslateModule,
38
- MatIconModule,
39
51
  ],
40
52
  })
41
53
  export class FormFieldComponent {
@@ -48,12 +60,18 @@ export class FormFieldComponent {
48
60
  }
49
61
  @Output() valueChange: Observable<unknown>
50
62
 
63
+ @ViewChild('titleInput') titleInput: ElementRef
64
+
51
65
  formControl = new FormControl()
52
66
 
53
67
  constructor() {
54
68
  this.valueChange = this.formControl.valueChanges
55
69
  }
56
70
 
71
+ focusTitleInput() {
72
+ this.titleInput.nativeElement.children[0].focus()
73
+ }
74
+
57
75
  get simpleType() {
58
76
  return this.config.type as
59
77
  | 'date'
@@ -100,7 +118,20 @@ export class FormFieldComponent {
100
118
  return !this.config.locked && this.config.invalid
101
119
  }
102
120
 
121
+ get isTitle() {
122
+ return this.model === 'title'
123
+ }
103
124
  get isAbstract() {
104
125
  return this.model === 'abstract'
105
126
  }
127
+ get isLicenses() {
128
+ return this.model === 'licenses'
129
+ }
130
+ get isResourceUpdated() {
131
+ return this.model === 'resourceUpdated'
132
+ }
133
+
134
+ get withoutWrapper() {
135
+ return this.model === 'title' || this.model === 'abstract'
136
+ }
106
137
  }