Mobile Updates & Repo clean up #131
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
Member
oreHGA
commented
Jul 23, 2023
•
oreHGA
commented
- New insights page with filter for "Weekly" & "Monthly"
- Support for yes/no, number, customOptions & text responses
- Remove /analysis directory as that should be in a different repo
- Fix to the analysis charts (allowing for displaying powerByBand over time)
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
fusionMobile/src/pages/home.tsx
Outdated
Comment on lines
39
to
55
| React.useEffect(() => { | ||
| if (activeChartPrompt) { | ||
| console.log("activeChartPrompt", activeChartPrompt); | ||
| (async () => { | ||
| const res = await promptService.getPromptResponses( | ||
| activeChartPrompt.uuid | ||
| ); | ||
|
|
||
| // sort events | ||
| res.sort((a, b) => { | ||
| return a.triggerTimestamp - b.triggerTimestamp; | ||
| }); | ||
|
|
||
| setActiveChartPromptResponses(res); | ||
| })(); | ||
| } | ||
| }, [activeChartPrompt]); |
There was a problem hiding this comment.
Could this be extracted into a useQuery hook that handles the fetching, the good thing about this is we can do a check to see if the uuid of the active prompt is present and then enable/disable our query like this
Suggested change
| React.useEffect(() => { | |
| if (activeChartPrompt) { | |
| console.log("activeChartPrompt", activeChartPrompt); | |
| (async () => { | |
| const res = await promptService.getPromptResponses( | |
| activeChartPrompt.uuid | |
| ); | |
| // sort events | |
| res.sort((a, b) => { | |
| return a.triggerTimestamp - b.triggerTimestamp; | |
| }); | |
| setActiveChartPromptResponses(res); | |
| })(); | |
| } | |
| }, [activeChartPrompt]); | |
| const [activeChartPrompt, setActiveChartPrompt] = React.useState< | |
| Prompt | undefined | |
| >(); | |
| const activeChartPromptId = activeChartPrompt.uuid | |
| const queryInfo = useQuery({ | |
| queryKey: ["promptResponses", activeChartPromptId], | |
| queryFn: () => promptService.getPromptResponses(activeChartPromptId), | |
| // The query will not execute until the activeChartPromptId exists | |
| enabled: Boolean(activeChartPromptId), | |
| }); |
Comment on lines
30
to
92
| (async () => { | ||
| const res = await promptService.getPromptResponses(prompt.uuid); | ||
|
|
||
| if (!res) { | ||
| setChartData([]); | ||
| } else { | ||
| // sort events | ||
| res.sort((a, b) => { | ||
| return a.triggerTimestamp - b.triggerTimestamp; | ||
| }); | ||
|
|
||
| // filter by startDate | ||
| const filteredData = res | ||
| .filter((response) => { | ||
| const responseTimestamp = updateTimestampToMs( | ||
| response.responseTimestamp | ||
| ); | ||
|
|
||
| return ( | ||
| dayjs(responseTimestamp).isAfter(startDate) && | ||
| dayjs(responseTimestamp).isBefore(startDate.endOf(timePeriod)) | ||
| ); | ||
| }) | ||
| .map((d) => { | ||
| return [updateTimestampToMs(d.responseTimestamp), d.value]; | ||
| }); | ||
|
|
||
| // TODO: make this better pls | ||
| if (prompt.responseType === "number" && filteredData.length > 0) { | ||
| // group the responses by startTimestamp of the day | ||
| const dailyAverage: any = []; // [startTimestamp, average] | ||
| // just make it an object | ||
| const dailyAverageObj: any = {}; | ||
|
|
||
| filteredData.forEach((d) => { | ||
| const day = dayjs(d[0]).startOf("day").valueOf(); | ||
| const value = convertValueToNumber(d[1]); | ||
|
|
||
| console.log(day, value); | ||
| if (dailyAverageObj[day]) { | ||
| dailyAverageObj[day].push(value); | ||
| } else { | ||
| dailyAverageObj[day] = [value]; | ||
| } | ||
| }); | ||
|
|
||
| console.log(dailyAverageObj); | ||
|
|
||
| // calculate the average | ||
| Object.keys(dailyAverageObj).forEach((key) => { | ||
| const average = | ||
| dailyAverageObj[key].reduce((a: number, b: number) => a + b, 0) / | ||
| dailyAverageObj[key].length; | ||
| dailyAverage.push([Number(key), average]); | ||
| }); | ||
|
|
||
| setChartData(dailyAverage); | ||
| return; | ||
| } | ||
|
|
||
| setChartData(filteredData); | ||
| } | ||
| })(); |
There was a problem hiding this comment.
Another one we should definitely aim to convert to a reusable custom hook that uses useQuery under the hood
oreHGA
force-pushed
the
feat/jul-13-release
branch
from
75fce19
to
9106555
Compare
oreHGA
force-pushed
the
feat/jul-13-release
branch
from
1d9beb5
to
6970339
Compare
oreHGA
force-pushed
the
feat/jul-13-release
branch
from
6970339
to
8bcf08a
Compare
|
Merging this as is now, i've created issue to track the fix for #140 |
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.