Mijn-1316/electrische laadpalen #1117
Merged
Conversation
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
OscarBakker
force-pushed
the
feat1316/electrische-laadpalen
branch
from
7ca8394 to
7037405
Compare
OscarBakker
force-pushed
the
feat1316/electrische-laadpalen
branch
2 times, most recently
from
77cdf40 to
13a79c1
Compare
Transform Laadpaal detail response. Add detailpanel oplaadpunten. Do a detail loopup after composing the urls content with the next urls content. Add transformers, nextUrls capabilities. Composed detail lookup still not working. Electrische laadpalen toegevoed aan mijn buurtkaart. Add charge-point.svg icon. Different name for beschikbaar and snel beschikbaar Remove unnecessary config in buurt.ts Refactor source api request. Refactor multiple request interceptors, next request logic.
…ig request functionality.
OscarBakker
force-pushed
the
feat1316/electrische-laadpalen
branch
from
13a79c1 to
f530f03
Compare
OscarBakker
changed the title
src/server/config.ts
Outdated
| @@ -62,6 +62,7 @@ export interface DataRequestConfig extends AxiosRequestConfig { | |||
| cancelTimeout?: number; | |||
| postponeFetch?: boolean; | |||
| urls?: Record<string, string>; | |||
| nextUrls?: string[]; | |||
There was a problem hiding this comment.
Kun je deze weghalen? In source-api-request doen we niks met nextUrls
| @@ -426,24 +425,10 @@ export const datasetEndpoints: Record< | |||
| 'https://map.data.amsterdam.nl/maps/oplaadpunten?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAMES=ms:snel_beschikbaar&OUTPUTFORMAT=geojson&SRSNAME=urn:ogc:def:crs:EPSG::4326', | |||
| ], | |||
| }, | |||
| disabled: IS_AP, | |||
There was a problem hiding this comment.
Ah sorry Oscar, zo kunnen we het alleen op test bekijken. Beter is disabled: IS_PRODUCTION
src/server/services/buurt/buurt.ts
Outdated
| requestConfig.request = config.requestConfig.request; | ||
| } | ||
|
|
||
| const response: any = await requestData(requestConfig, requestID); |
There was a problem hiding this comment.
Suggested change
| const response: any = await requestData(requestConfig, requestID); | |
| const response = await requestData(requestConfig, requestID); |
any is niet nodig,
| requestConfig.url, | ||
| 'https://map.data.amsterdam.nl/maps/oplaadpunten?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAMES=ms:snel_beschikbaar&OUTPUTFORMAT=geojson&SRSNAME=urn:ogc:def:crs:EPSG::4326', | ||
| ]; | ||
| const requests = urls?.map((url) => { |
There was a problem hiding this comment.
Suggested change
| const requests = urls?.map((url) => { | |
| const requests = urls.map((url) => { |
Optional chaining is hier niet vereist aangezien urls altijd bestaat.
Comment on lines
520
to
539
| let responses: any; | ||
|
|
||
| try { | ||
| responses = await Promise.all(requests); | ||
| } catch (error) { | ||
| return error; | ||
| } | ||
|
|
||
| responses = responses.filter((res: any) => res.data); | ||
|
|
||
| // If transformDetail is called return the first response for the detail view | ||
| if (responses[0].data._embedded) return responses[0]; | ||
|
|
||
| // Combine all responses into one for the list view | ||
| if (responses.length > 1) { | ||
| responses[0].data = responses.slice(1).reduce((acc: any, response: any) => { | ||
| return acc.concat(response.data); | ||
| }, responses[0].data); | ||
| } | ||
| return responses[0]; |
There was a problem hiding this comment.
Je kent de type hier dus any is niet nodig. Je hoeft de Promise.all ook niet te wrappen in try/catch, dat gebeurt al in source-api-request.
En ipv reduce, kun je niet beter iets doen als:
const responses = await Promise.all(requests);
responses[0].data = responses.map((response)=>response.data).flat();
return responses[0];
c4cd305 to
3976d07
Compare
timvanoostrom
approved these changes
Feb 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.