-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
3464 - do not pass ODP to useIsEditODPEnabled && useShowReviewIndicator
- Loading branch information
Showing
12 changed files
with
44 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 4 additions & 6 deletions
10
src/client/pages/OriginalDataPoint/components/DataSources/hooks/useIsDisabled.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,9 @@ | ||
import { OriginalDataPoint } from 'meta/assessment' | ||
|
||
import { useIsPrintRoute } from 'client/hooks/useIsRoute' | ||
import { useCanEditData } from 'client/pages/OriginalDataPoint/hooks/useCanEditData' | ||
import { useIsEditODPEnabled } from 'client/pages/OriginalDataPoint/hooks/useIsEditODPEnabled' | ||
|
||
export const useIsDisabled = (originalDataPoint: OriginalDataPoint) => { | ||
export const useIsDisabled = () => { | ||
const { print } = useIsPrintRoute() | ||
|
||
const canEditData = useCanEditData(originalDataPoint) | ||
return Boolean(print || !canEditData || !originalDataPoint.year) | ||
const canEditData = useIsEditODPEnabled() | ||
return Boolean(print || !canEditData) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
src/client/pages/OriginalDataPoint/hooks/useIsEditODPEnabled.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { useOriginalDataPoint } from 'client/store/ui/originalDataPoint' | ||
import { useIsEditTableDataEnabled } from 'client/store/user' | ||
import { useOriginalDataPointRouteParams } from 'client/hooks/useRouteParams' | ||
|
||
export const useIsEditODPEnabled = () => { | ||
const { sectionName } = useOriginalDataPointRouteParams() | ||
const isEditTableDataEnabled = useIsEditTableDataEnabled(sectionName) | ||
const originalDataPoint = useOriginalDataPoint() | ||
|
||
return isEditTableDataEnabled && originalDataPoint?.year > 0 | ||
} |
10 changes: 4 additions & 6 deletions
10
src/client/pages/OriginalDataPoint/hooks/useShowReviewIndicator.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,9 @@ | ||
import { OriginalDataPoint } from 'meta/assessment' | ||
|
||
import { useIsPrintRoute } from 'client/hooks/useIsRoute' | ||
import { useCanEditData } from 'client/pages/OriginalDataPoint/hooks/useCanEditData' | ||
import { useIsEditODPEnabled } from 'client/pages/OriginalDataPoint/hooks/useIsEditODPEnabled' | ||
|
||
export const useShowReviewIndicator = (originalDataPoint: OriginalDataPoint) => { | ||
export const useShowReviewIndicator = () => { | ||
const { print } = useIsPrintRoute() | ||
|
||
const canEditData = useCanEditData(originalDataPoint) | ||
return originalDataPoint.id && !print && canEditData | ||
const canEditData = useIsEditODPEnabled() | ||
return !print && canEditData | ||
} |