-
Notifications
You must be signed in to change notification settings - Fork 5
Feature/anvil message forward #2232
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
barna-isaac
wants to merge
5
commits into
main
Choose a base branch
from
feature/anvil-message-forward
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+43
−14
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
68e3fef
anvil app forwards postmessages
barna-isaac 1d23724
show error when saving answer fails
barna-isaac 5e44ecb
replace hardcoded appId
barna-isaac 28d7e59
only record attempts for logged-in users
barna-isaac acb3665
a few review findings suggested by Claude
barna-isaac File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,6 +1,6 @@ | ||
| import React, {RefObject, useContext, useEffect} from 'react'; | ||
| import {AnvilAppDTO} from "../../../IsaacApiTypes"; | ||
| import {selectors, useAppSelector} from "../../state"; | ||
| import {selectors, useAppSelector, usePostSkillsAnswerMutation} from "../../state"; | ||
| import {AccordionSectionContext, QuestionContext} from "../../../IsaacAppTypes"; | ||
| import {selectQuestionPart} from "../../services"; | ||
| import { AnvilCookieHandler } from '../handlers/InterstitialCookieHandler'; | ||
|
|
@@ -67,26 +67,29 @@ export const AnvilApp = ({doc}: AnvilAppProps) => { | |
| }).join('&'); | ||
|
|
||
| const iframeSrc = `${baseURL}#?${queryParams}`; | ||
|
|
||
| const onMessage = function(e: any) { | ||
| if (iframeRef.current && e.source !== (iframeRef.current as HTMLIFrameElement).contentWindow) { | ||
| return; | ||
| } | ||
|
|
||
| const data = e.data; | ||
|
|
||
| if (iframeRef.current && (data.fn == "newAppHeight")) { | ||
| (iframeRef.current as HTMLIFrameElement).height = data.newHeight + 15; | ||
| } | ||
| }; | ||
| const [postSkillsAnswer] = usePostSkillsAnswerMutation(); | ||
|
|
||
| useEffect(() => { | ||
| const onMessage = function(e: any) { | ||
| if (iframeRef.current && e.source !== (iframeRef.current as HTMLIFrameElement).contentWindow) { | ||
| return; | ||
| } | ||
|
|
||
| const data = e.data; | ||
|
|
||
| if (iframeRef.current && (data.fn == "newAppHeight")) { | ||
| (iframeRef.current as HTMLIFrameElement).height = data.newHeight + 15; | ||
| } else if (iframeRef.current && user?.loggedIn && e.origin === `https://${doc.appId?.toLowerCase()}.anvil.app` && data.type === 'SUBMISSION_MARKED') { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What is the |
||
| void postSkillsAnswer({ appId: `${typeof page === 'object' && page?.id}`, body: { hmac: data.hmac, payload: data.payload } }); | ||
| } | ||
| }; | ||
|
|
||
| window.addEventListener("message", onMessage); | ||
|
|
||
| return () => { | ||
| window.removeEventListener("message", onMessage); | ||
| }; | ||
| }, [onMessage]); | ||
| }, [postSkillsAnswer, doc.appId, page, user?.loggedIn]); | ||
|
|
||
| return <AnvilCookieHandler afterAcceptedElement={ | ||
| <iframe ref={iframeRef} src={iframeSrc} title={title} className="anvil-app"/> | ||
|
|
||
This file contains hidden or 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 hidden or 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,20 @@ | ||
| import { AnvilMarkingRequestDTO } from "../../../../IsaacApiTypes"; | ||
| import {isaacApi} from "./baseApi"; | ||
| import { onQueryLifecycleEvents } from "./utils"; | ||
|
|
||
| export const skillsApi = isaacApi.injectEndpoints({ | ||
| endpoints: (build) => ({ | ||
| postSkillsAnswer: build.mutation<void, { appId: string, body: AnvilMarkingRequestDTO}>({ | ||
| query: ({ appId, body }) => ({ | ||
| url: `skills/${appId}/answer`, | ||
| method: "POST", | ||
| body, | ||
| }), | ||
| onQueryStarted: onQueryLifecycleEvents({ | ||
| errorTitle: "Couldn't save answer.", | ||
| }), | ||
| }), | ||
| }) | ||
| }); | ||
|
|
||
| export const { usePostSkillsAnswerMutation } = skillsApi; |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can certainly narrow the type a little here; if all the available types were known we could put that in place of this
anytoo?