Skip to content

Commit 3bad57f

Browse files
committed
fix: Use cozy-client hook to get instance data
The query wasn't correct because it was missing an singleDocData into options. I chose to the hook from cozy-client to have a more normalize way to access data
1 parent a819a3d commit 3bad57f

File tree

2 files changed

+8
-59
lines changed

2 files changed

+8
-59
lines changed

src/components/Settings/index.jsx

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Button } from 'cozy-ui/transpiled/react/deprecated/Button'
66
import GearIcon from 'cozy-ui/transpiled/react/Icons/Gear'
77
import useI18n from 'components/useI18n'
88

9-
import { models, useClient, useQuery } from 'cozy-client'
9+
import { models, useClient, useInstanceInfo } from 'cozy-client'
1010
import { generateWebLink } from 'cozy-client/dist'
1111
import flag from 'cozy-flags'
1212

@@ -42,14 +42,6 @@ import {
4242
logOut
4343
} from 'lib/reducers'
4444

45-
import {
46-
buildDiskUsageQuery,
47-
buildInstanceQuery,
48-
buildContextQuery
49-
} from '../../queries'
50-
51-
import { isFetchingQueries } from 'components/Settings/helper'
52-
5345
export const Settings = ({
5446
isBusy,
5547
logOut,
@@ -63,20 +55,7 @@ export const Settings = ({
6355
const { t } = useI18n()
6456
const client = useClient()
6557

66-
const diskUsageQuery = buildDiskUsageQuery()
67-
const diskUsageResult = useQuery(
68-
diskUsageQuery.definition,
69-
diskUsageQuery.options
70-
)
71-
72-
const instanceQuery = buildInstanceQuery()
73-
const instanceResult = useQuery(
74-
instanceQuery.definition,
75-
instanceQuery.options
76-
)
77-
78-
const contextQuery = buildContextQuery()
79-
const contextResult = useQuery(contextQuery.definition, contextQuery.options)
58+
const { isLoaded: isInstanceInfoLoaded, ...instanceInfo } = useInstanceInfo()
8059

8160
const onClickOutside = useCallback(
8261
event => {
@@ -108,22 +87,11 @@ export const Settings = ({
10887

10988
let shouldDisplayViewOfferButton = false
11089
let managerUrlPremiumLink
111-
let isFetchingFromQueries
112-
113-
isFetchingFromQueries = isFetchingQueries([
114-
diskUsageResult,
115-
instanceResult,
116-
contextResult
117-
])
118-
119-
if (!isFetchingFromQueries) {
120-
const data = {
121-
context: contextResult.data,
122-
diskUsage: diskUsageResult.data,
123-
instance: instanceResult.data
124-
}
90+
91+
if (isInstanceInfoLoaded) {
12592
shouldDisplayViewOfferButton =
126-
instanceModel.shouldDisplayOffers(data) || hasAnOffer(data)
93+
instanceModel.shouldDisplayOffers(instanceInfo) ||
94+
hasAnOffer(instanceInfo)
12795

12896
const hasSubscription = flag('settings.subscription')
12997

@@ -138,11 +106,11 @@ export const Settings = ({
138106

139107
managerUrlPremiumLink = webLink
140108
} else {
141-
managerUrlPremiumLink = instanceModel.buildPremiumLink(data)
109+
managerUrlPremiumLink = instanceModel.buildPremiumLink(instanceInfo)
142110
}
143111
}
144112

145-
const areAllFetchingDone = !isFetchingFromQueries && !isFetching
113+
const areAllFetchingDone = isInstanceInfoLoaded && !isFetching
146114
const openMenu = isOpen && areAllFetchingDone
147115

148116
return (

src/queries/index.js

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)