-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
front: avoid useless query on editor for switch types and infra
Fix #6971 Unsubscribe some RTK queries to avoid useless queries, by creating wrapper for useInfra & useSwitchType.
- Loading branch information
1 parent
d6f255b
commit 0dc83c3
Showing
11 changed files
with
168 additions
and
61 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
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
54 changes: 54 additions & 0 deletions
54
front/src/applications/editor/tools/switchEdition/useSwitchTypes.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,54 @@ | ||
| import { useCallback, useEffect, useState } from 'react'; | ||
|
|
||
| import { isNil } from 'lodash'; | ||
|
|
||
| import { osrdEditoastApi } from 'common/api/osrdEditoastApi'; | ||
|
|
||
| import type { SwitchType } from './types'; | ||
|
|
||
| // Client prefered order | ||
| const trackNodeTypeOrder = [ | ||
| 'link', | ||
| 'point_switch', | ||
| 'crossing', | ||
| 'single_slip_switch', | ||
| 'double_slip_switch', | ||
| ]; | ||
|
|
||
| export default function useSwitchTypes(infraID: number | undefined) { | ||
| const [data, setData] = useState<SwitchType[]>([]); | ||
| const [getInfraSwitchTypes, { isLoading, error }] = | ||
| osrdEditoastApi.endpoints.getInfraByInfraIdSwitchTypes.useLazyQuery({}); | ||
|
|
||
| const fetch = useCallback( | ||
| async (infraId?: number) => { | ||
| // reset | ||
| setData([]); | ||
| try { | ||
| if (!isNil(infraId)) { | ||
| const resp = getInfraSwitchTypes({ infraId }); | ||
| const result = await resp.unwrap(); | ||
| if (result) { | ||
| const orderedData = [...result] as SwitchType[]; | ||
| orderedData.sort( | ||
| (a, b) => trackNodeTypeOrder.indexOf(a.id) - trackNodeTypeOrder.indexOf(b.id) | ||
| ); | ||
| setData(orderedData); | ||
| } else { | ||
| setData([]); | ||
| } | ||
| resp.unsubscribe(); | ||
| } | ||
| } catch (e) { | ||
| console.error(e); | ||
| } | ||
| }, | ||
| [getInfraSwitchTypes] | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| fetch(infraID); | ||
| }, [infraID, fetch]); | ||
|
|
||
| return { data, isLoading, error }; | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import { useCallback, useEffect, useState } from 'react'; | ||
|
|
||
| import { isNil } from 'lodash'; | ||
|
|
||
| import type { Infra } from 'common/api/osrdEditoastApi'; | ||
| import { osrdEditoastApi } from 'common/api/osrdEditoastApi'; | ||
| import { useInfraID } from 'common/osrdContext'; | ||
|
|
||
| /** | ||
| * Hook to retrieve an infra item by it's id. | ||
| * Using RTK `useLazyQuery` does the job but also produces a lot of queries due to its subscription mechanism for updating its cache. | ||
| */ | ||
| export default function useInfra(infraID?: number) { | ||
| const [data, setData] = useState<Infra | null>(null); | ||
| const [getInfra, { isLoading, error }] = osrdEditoastApi.endpoints.getInfraByInfraId.useLazyQuery( | ||
| {} | ||
| ); | ||
|
|
||
| const fetch = useCallback( | ||
| async (infraId?: number) => { | ||
| // reset | ||
| setData(null); | ||
| try { | ||
| if (!isNil(infraId)) { | ||
| const resp = getInfra({ infraId }); | ||
| const result = await resp.unwrap(); | ||
| setData(result || null); | ||
| resp.unsubscribe(); | ||
| } | ||
| } catch (e) { | ||
| console.error(e); | ||
| } | ||
| }, | ||
| [getInfra] | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| fetch(infraID); | ||
| }, [infraID, fetch]); | ||
|
|
||
| return { data, isLoading, error }; | ||
| } | ||
|
|
||
| export function useCurrentInfra() { | ||
| const infraID = useInfraID(); | ||
| return useInfra(infraID); | ||
| } |