@@ -22,7 +22,10 @@ type ResultListInterface = {
22
22
name : string
23
23
keywords : string [ ]
24
24
slug : string
25
- owner : { __typename ?: 'Owner' | undefined ; group : string }
25
+ owner : {
26
+ __typename ?: 'Owner' | undefined ;
27
+ group : string ;
28
+ teamkatalogenURL ?: string ; }
26
29
} [ ]
27
30
stories ?: {
28
31
__typename ?: 'Story'
@@ -67,17 +70,17 @@ const ResultList = ({
67
70
68
71
const isDataProduct = ( item : any ) => ! ! item . datasets
69
72
70
- const getTeamKatalogenInfo = ( item : any ) => {
73
+ const getTeamKatalogenInfo = ( teamkatalogenURL : any ) => {
71
74
const getTeamID = ( url : string ) => {
72
75
var urlComponents = url ?. split ( "/" )
73
76
return urlComponents ?. [ urlComponents . length - 1 ]
74
77
}
75
- const tk = teamkatalogen ?. find ( ( it ) => getTeamID ( it . url ) == getTeamID ( item ?. owner ?. teamkatalogenURL ) )
78
+ const tk = teamkatalogen ?. find ( ( it ) => getTeamID ( it . url ) == getTeamID ( teamkatalogenURL ) )
76
79
const po = productAreas ?. find ( ( it ) => it . id == tk ?. productAreaID )
77
80
78
81
return {
79
82
productArea : po ?. name ,
80
- teamkatalogenTeam : tk ?. name || item . group ?. group
83
+ teamkatalogenTeam : tk ?. name
81
84
}
82
85
}
83
86
@@ -129,7 +132,7 @@ const ResultList = ({
129
132
group : it . result . group ,
130
133
teamkatalogenURL : it . result . teamkatalogenURL ,
131
134
} }
132
- { ...getTeamKatalogenInfo ( it . result ) }
135
+ { ...getTeamKatalogenInfo ( it . result . teamkatalogenURL ) }
133
136
/>
134
137
)
135
138
)
@@ -148,7 +151,7 @@ const ResultList = ({
148
151
description = { d . result . description }
149
152
link = { `/dataproduct/${ d . result . id } /${ d . result . slug } ` }
150
153
datasets = { d . result . datasets }
151
- { ...getTeamKatalogenInfo ( d . result ) }
154
+ { ...getTeamKatalogenInfo ( d . result . group . teamkatalogenURL ) }
152
155
/>
153
156
)
154
157
) }
@@ -168,7 +171,7 @@ const ResultList = ({
168
171
name = { d . name }
169
172
keywords = { d . keywords }
170
173
link = { `/dataproduct/${ d . id } /${ d . slug } ` }
171
- { ...getTeamKatalogenInfo ( d ) }
174
+ { ...getTeamKatalogenInfo ( d . owner . teamkatalogenURL ) }
172
175
/>
173
176
) ) }
174
177
</ Results >
@@ -190,7 +193,7 @@ const ResultList = ({
190
193
name = { s . name }
191
194
resourceType = { "datafortelling" }
192
195
link = { `/story/${ s . id } ` }
193
- { ...getTeamKatalogenInfo ( s ) }
196
+ { ...getTeamKatalogenInfo ( s . teamkatalogenURL ) }
194
197
keywords = { s . keywords }
195
198
editable = { true }
196
199
description = { s . description }
@@ -217,7 +220,7 @@ const ResultList = ({
217
220
id = { p . id }
218
221
name = { p . name }
219
222
link = { p . link }
220
- { ...getTeamKatalogenInfo ( p ) }
223
+ { ...getTeamKatalogenInfo ( p . teamkatalogenURL ) }
221
224
description = { p . description }
222
225
innsiktsproduktType = { p . type }
223
226
editable = { ! ! userInfo ?. googleGroups ?. find ( ( it : any ) => it . email == p . group ) }
0 commit comments