Skip to content
This repository was archived by the owner on Nov 1, 2024. It is now read-only.

Commit 7e16b50

Browse files
authored
Merge pull request #307 from navikt/bugfix/dataset_access_info
show correct access
2 parents a8183ae + 449f576 commit 7e16b50

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

components/dataproducts/access/datasetAccess.tsx

+7-13
Original file line numberDiff line numberDiff line change
@@ -243,24 +243,18 @@ const DatasetAccess = ({ id }: AccessListProps) => {
243243

244244
if (fetchAccessRequestsForDataset.error)
245245
return <ErrorMessage error={fetchAccessRequestsForDataset.error} />
246-
if (
247-
fetchAccessRequestsForDataset.loading ||
248-
!fetchAccessRequestsForDataset.data?.accessRequests
249-
)
250-
return <div />
251246

252-
const datasetAccessRequests =
253-
fetchAccessRequestsForDataset.data.accessRequests as any[]
247+
const datasetAccessRequests = fetchAccessRequestsForDataset.loading ||
248+
!fetchAccessRequestsForDataset.data?.accessRequests
249+
? []
250+
: fetchAccessRequestsForDataset.data.accessRequests as any[]
254251

255252
if (getDataset.error)
256253
return <ErrorMessage error={getDataset.error} />
257-
if (
258-
getDataset.loading ||
259-
!getDataset?.dataset?.access
260-
)
261-
return <div />
262254

263-
const access = getDataset.dataset.access
255+
const access = getDataset.loading ||
256+
!getDataset?.dataset?.access ? [] :
257+
getDataset.dataset.access
264258

265259
const approveRequest = async (requestID: string) => {
266260
try {

0 commit comments

Comments
 (0)