stateless refactor #811
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,92 +1,89 @@ | ||
| import { denormalize, normalize } from "normalizr" | ||
| import React, { useEffect, useState } from "react" | ||
| import { useDispatch } from "react-redux" | ||
| import { v4 } from "uuid" | ||
| import StatelessEditor from "../../components/StatelessEditor" | ||
| import { normalizedQuiz } from "../../schemas" | ||
| import { initializedEditor } from "../../store/editor/editorActions" | ||
| import { storeState, useTypedSelector } from "../../store/store" | ||
| import { | ||
| Item, | ||
| PrivateSpecItem, | ||
| PrivateSpecOption, | ||
| PublicSpecItem, | ||
| PublicSpecOption, | ||
| Quiz, | ||
| } from "../../types/Quiz" | ||
|
|
||
| const Stateless: React.FC = () => { | ||
| const dispatch = useDispatch() | ||
| const store = useTypedSelector(state => state) | ||
| const [port, setPort] = useState<MessagePort | null>(null) | ||
|
|
||
| useEffect(() => { | ||
| if (!port) { | ||
| return | ||
| } | ||
| port.postMessage({ | ||
| message: "current-state", | ||
| data: convertStoreToSpecs(store), | ||
|
There was a problem hiding this comment. Implement the changes in rage/secret-project-331#264 |
||
| }) | ||
| }, [store]) | ||
|
|
||
| useEffect(() => { | ||
| const handler = (message: WindowEventMap["message"]) => { | ||
| if (message.source !== parent) { | ||
| return | ||
| } | ||
| const port = message.ports[0] | ||
| if (port) { | ||
| console.log("Frame received a port:", port) | ||
| setPort(port) | ||
| port.onmessage = (message: WindowEventMap["message"]) => { | ||
| console.log( | ||
| "Frame received a message from port", | ||
| JSON.stringify(message.data), | ||
| ) | ||
| const data = message.data | ||
| if (data.message === "set-state") { | ||
| console.log("Frame: setting state from message") | ||
| console.log(data) | ||
| dispatch(initializedEditor(normalizeData(data.data), data.data)) | ||
| } else { | ||
| console.error("Frame received an unknown message from message port") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| console.log("frame adding event listener") | ||
| addEventListener("message", handler) | ||
| // target origin is *, beacause this is a sandboxed iframe without the | ||
| // allow-same-origin permission | ||
| parent.postMessage("ready", "*") | ||
|
|
||
| // cleanup function | ||
| return () => { | ||
| console.log("removing event listener") | ||
| removeEventListener("message", handler) | ||
| } | ||
| }, [store]) | ||
|
|
||
| if (!store) { | ||
| return <>Waiting for content...</> | ||
| } | ||
|
|
||
| if (!port) { | ||
| return <>Waiting for port...</> | ||
| } | ||
|
|
||
| return <StatelessEditor onHeightChange={onHeightChange} port={port} /> | ||
| } | ||
|
|
||
| const onHeightChange = (newHeight: number, port: MessagePort) => { | ||
| port.postMessage({ | ||
| message: "height-changed", | ||
| data: newHeight, | ||
| }) | ||
| } | ||
|
|
||
| const normalizeData = (data: any) => { | ||
|
|
@@ -104,8 +101,53 @@ const normalizeData = (data: any) => { | |
| questions: normalizedInputData.entities.questions ?? {}, | ||
| } | ||
| } | ||
| interface QuizzesSpecs { | ||
| private_spec: Quiz | ||
| public_spec: { id: string; items: PublicSpecItem[] } | ||
| } | ||
|
|
||
| const convertStoreToSpecs = (store: storeState): QuizzesSpecs => { | ||
| const denormalizedData = denormalizeData(store) | ||
|
|
||
| const specs: QuizzesSpecs = { | ||
| private_spec: denormalizeData(store), | ||
| public_spec: { | ||
| id: v4(), | ||
|
There was a problem hiding this comment. |
||
| items: denormalizedData.items.map(i => { | ||
| const publicItem: PublicSpecItem = { | ||
| formatRegex: i.formatRegex, | ||
| multi: i.multi, | ||
| id: i.id, | ||
| body: i.body, | ||
| direction: i.direction, | ||
| maxLabel: i.maxLabel, | ||
| maxValue: i.maxValue, | ||
| maxWords: i.maxWords, | ||
| minLabel: i.minLabel, | ||
| minValue: i.minValue, | ||
| minWords: i.minWords, | ||
| order: i.order, | ||
| title: i.title, | ||
| type: i.type, | ||
| options: i.options.map(o => { | ||
| const publicOption: PublicSpecOption = { | ||
| id: o.id, | ||
| body: o.body, | ||
| order: o.order, | ||
| title: o.title, | ||
| quizItemId: o.quizItemId, | ||
| } | ||
| return publicOption | ||
| }), | ||
| } | ||
| return publicItem | ||
| }), | ||
| }, | ||
| } | ||
| return specs | ||
| } | ||
|
|
||
| const denormalizeData = (store: storeState): Quiz => { | ||
| let quizData = { | ||
| quizzes: store.editor.quizzes, | ||
| items: store.editor.items, | ||
|
|
@@ -117,7 +159,6 @@ const denormalizeData = (store: storeState) => { | |
| return denormalize(quizData.quizId, normalizedQuiz, quizData) | ||
| } | ||
|
|
||
| const emptyQuiz: Quiz = { | ||
| id: v4(), | ||
| autoConfirm: true, | ||
|
|
||
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
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.
remove