diff --git a/.github/workflows/all-app-sandbox.yml b/.github/workflows/all-app-sandbox.yml index b3e750a4..919833d0 100644 --- a/.github/workflows/all-app-sandbox.yml +++ b/.github/workflows/all-app-sandbox.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: '18' + node-version: "18" - name: Install AWS CLI run: | @@ -75,7 +75,9 @@ jobs: REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }} REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }} REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }} - CI: false # Disabling CI to not treat warnings as errors + REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }} + REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }} + CI: false # Disabling CI to not treat warnings as errors run: npm run build - name: Deploy to S3 Bucket @@ -91,7 +93,7 @@ jobs: uses: chetan/invalidate-cloudfront-action@master env: DISTRIBUTION: ${{ secrets.AWS_DISTRIBUTION }} - PATHS: '/*' + PATHS: "/*" AWS_REGION: ${{ secrets.AWS_REGION }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/all-dev-rig.yml b/.github/workflows/all-dev-rig.yml index fff0cb2f..8a84a57a 100644 --- a/.github/workflows/all-dev-rig.yml +++ b/.github/workflows/all-dev-rig.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: '18' + node-version: "18" - name: Install AWS CLI run: | @@ -75,7 +75,9 @@ jobs: REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }} REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }} REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }} - CI: false # Disabling CI to not treat warnings as errors + REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }} + REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }} + CI: false # Disabling CI to not treat warnings as errors run: npm run build - name: Deploy to S3 Bucket @@ -91,7 +93,7 @@ jobs: uses: chetan/invalidate-cloudfront-action@master env: DISTRIBUTION: ${{ secrets.AWS_DISTRIBUTION }} - PATHS: '/*' + PATHS: "/*" AWS_REGION: ${{ secrets.AWS_REGION }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/all-dev-tn.yml b/.github/workflows/all-dev-tn.yml index eba10455..1c89b3f0 100644 --- a/.github/workflows/all-dev-tn.yml +++ b/.github/workflows/all-dev-tn.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: '18' + node-version: "18" - name: Install AWS CLI run: | @@ -75,7 +75,9 @@ jobs: REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }} REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }} REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }} - CI: false # Disabling CI to not treat warnings as errors + REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }} + REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }} + CI: false # Disabling CI to not treat warnings as errors run: npm run build - name: Deploy to S3 Bucket @@ -91,7 +93,7 @@ jobs: uses: chetan/invalidate-cloudfront-action@master env: DISTRIBUTION: ${{ secrets.AWS_DISTRIBUTION }} - PATHS: '/*' + PATHS: "/*" AWS_REGION: ${{ secrets.AWS_REGION }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/all-prod-rig.yml b/.github/workflows/all-prod-rig.yml index 98b6d296..5dcf0dfb 100644 --- a/.github/workflows/all-prod-rig.yml +++ b/.github/workflows/all-prod-rig.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: '18' + node-version: "18" - name: Install AWS CLI run: | @@ -75,7 +75,9 @@ jobs: REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }} REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }} REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }} - CI: false # Disabling CI to not treat warnings as errors + REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }} + REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }} + CI: false # Disabling CI to not treat warnings as errors run: npm run build - name: Deploy to S3 Bucket @@ -91,7 +93,7 @@ jobs: uses: chetan/invalidate-cloudfront-action@master env: DISTRIBUTION: ${{ secrets.AWS_DISTRIBUTION }} - PATHS: '/*' + PATHS: "/*" AWS_REGION: ${{ secrets.AWS_REGION }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/all-staging-tn.yml b/.github/workflows/all-staging-tn.yml index 5abd8faf..ff516169 100644 --- a/.github/workflows/all-staging-tn.yml +++ b/.github/workflows/all-staging-tn.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: '18' + node-version: "18" - name: Install AWS CLI run: | @@ -75,7 +75,9 @@ jobs: REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }} REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }} REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }} - CI: false # Disabling CI to not treat warnings as errors + REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }} + REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }} + CI: false # Disabling CI to not treat warnings as errors run: npm run build - name: Deploy to S3 Bucket @@ -91,7 +93,7 @@ jobs: uses: chetan/invalidate-cloudfront-action@master env: DISTRIBUTION: ${{ secrets.AWS_DISTRIBUTION }} - PATHS: '/*' + PATHS: "/*" AWS_REGION: ${{ secrets.AWS_REGION }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/src/components/Assesment/Assesment.jsx b/src/components/Assesment/Assesment.jsx index 3a6385bb..4bdd6ab0 100644 --- a/src/components/Assesment/Assesment.jsx +++ b/src/components/Assesment/Assesment.jsx @@ -344,7 +344,7 @@ export const ProfileHeader = ({ const handleProfileBack = () => { try { if (process.env.REACT_APP_IS_APP_IFRAME === "true") { - window.parent.postMessage({ type: "restore-iframe-content" }); + window.parent.postMessage({ type: "restore-iframe-content" }, "*"); navigate("/"); } else { navigate("/discover-start"); diff --git a/src/components/DiscoverSentance/DiscoverSentance.jsx b/src/components/DiscoverSentance/DiscoverSentance.jsx index c64ebe3f..742981cb 100644 --- a/src/components/DiscoverSentance/DiscoverSentance.jsx +++ b/src/components/DiscoverSentance/DiscoverSentance.jsx @@ -34,10 +34,9 @@ const SpeakSentenceComponent = () => { const [disableScreen, setDisableScreen] = useState(false); const [play] = useSound(LevelCompleteAudio); const [openMessageDialog, setOpenMessageDialog] = useState(""); - const [totalSyllableCount, setTotalSyllableCount] = useState(''); + const [totalSyllableCount, setTotalSyllableCount] = useState(""); const [isNextButtonCalled, setIsNextButtonCalled] = useState(false); - const callConfettiAndPlay = () => { play(); callConfetti(); @@ -100,16 +99,19 @@ const SpeakSentenceComponent = () => { }, [voiceText]); const send = (score) => { - if (process.env.REACT_APP_IS_APP_IFRAME === 'true') { - window.parent.postMessage({ - score: score, - message: "all-test-rig-score", - }); + if (process.env.REACT_APP_IS_APP_IFRAME === "true") { + window.parent.postMessage( + { + score: score, + message: "all-test-rig-score", + }, + "*" + ); } }; const handleNext = async () => { - setIsNextButtonCalled(true) + setIsNextButtonCalled(true); setEnableNext(false); try { @@ -165,17 +167,17 @@ const SpeakSentenceComponent = () => { const { data: getSetData } = getSetResultRes; const data = JSON.stringify(getSetData?.data); Log(data, "discovery", "ET"); - if(process.env.REACT_APP_POST_LEARNER_PROGRESS === "true"){ - await axios.post( - `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.CREATE_LEARNER_PROGRESS}`, - { - userId: localStorage.getItem("virtualId"), - sessionId: localStorage.getItem("sessionId"), - subSessionId: sub_session_id, - milestoneLevel: getSetData?.data?.currentLevel, - language: localStorage.getItem("lang"), - } - ); + if (process.env.REACT_APP_POST_LEARNER_PROGRESS === "true") { + await axios.post( + `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.CREATE_LEARNER_PROGRESS}`, + { + userId: localStorage.getItem("virtualId"), + sessionId: localStorage.getItem("sessionId"), + subSessionId: sub_session_id, + milestoneLevel: getSetData?.data?.currentLevel, + language: localStorage.getItem("lang"), + } + ); } if ( getSetData.data.sessionResult === "pass" && @@ -193,7 +195,9 @@ const SpeakSentenceComponent = () => { `${process.env.REACT_APP_CONTENT_SERVICE_APP_HOST}/${config.URLS.GET_PAGINATION}?page=1&limit=5&collectionId=${sentences?.[newSentencePassedCounter]?.collectionId}` ); setCurrentContentType("Sentence"); - setTotalSyllableCount(resSentencesPagination?.data?.totalSyllableCount); + setTotalSyllableCount( + resSentencesPagination?.data?.totalSyllableCount + ); setCurrentCollectionId( sentences?.[newSentencePassedCounter]?.collectionId ); @@ -274,7 +278,7 @@ const SpeakSentenceComponent = () => { `${process.env.REACT_APP_CONTENT_SERVICE_APP_HOST}/${config.URLS.GET_PAGINATION}?page=1&limit=5&collectionId=${sentences?.collectionId}` ); setCurrentContentType("Sentence"); - setTotalSyllableCount(resPagination?.data?.totalSyllableCount) + setTotalSyllableCount(resPagination?.data?.totalSyllableCount); setCurrentCollectionId(sentences?.collectionId); setAssessmentResponse(resAssessment); localStorage.setItem("storyTitle", sentences?.name); @@ -289,7 +293,8 @@ const SpeakSentenceComponent = () => { })(); }, []); const handleBack = () => { - const destination = process.env.REACT_APP_IS_APP_IFRAME === 'true' ? "/" : "/discover-start"; + const destination = + process.env.REACT_APP_IS_APP_IFRAME === "true" ? "/" : "/discover-start"; navigate(destination); // if (process.env.REACT_APP_IS_APP_IFRAME === 'true') { // navigate("/"); diff --git a/src/config/awsS3.js b/src/config/awsS3.js index 34d950f4..6fa0f244 100644 --- a/src/config/awsS3.js +++ b/src/config/awsS3.js @@ -1,9 +1,9 @@ -// import { S3Client } from '@aws-sdk/client-s3'; +import { S3Client } from "@aws-sdk/client-s3"; -// export default new S3Client({ -// region: process.env.REACT_APP_AWS_S3_REGION, -// credentials: { -// accessKeyId: process.env.REACT_APP_AWS_ACCESS_KEY_ID, -// secretAccessKey: process.env.REACT_APP_AWS_SECRET_ACCESS_KEY, -// }, -// }); +export default new S3Client({ + region: process.env.REACT_APP_AWS_S3_REGION, + credentials: { + accessKeyId: process.env.REACT_APP_AWS_ACCESS_KEY_ID, + secretAccessKey: process.env.REACT_APP_AWS_SECRET_ACCESS_KEY, + }, +}); diff --git a/src/utils/VoiceAnalyser.js b/src/utils/VoiceAnalyser.js index a0883824..2e8e2694 100644 --- a/src/utils/VoiceAnalyser.js +++ b/src/utils/VoiceAnalyser.js @@ -30,7 +30,8 @@ import { } from "./constants"; import config from "./urlConstants.json"; import { filterBadWords } from "./Badwords"; -// import S3Client from '../config/awsS3'; +import S3Client from "../config/awsS3"; +import { PutObjectCommand } from "@aws-sdk/client-s3"; /* eslint-disable */ const AudioPath = { @@ -363,7 +364,7 @@ function VoiceAnalyser(props) { // TODO: Remove false when REACT_APP_AWS_S3_BUCKET_NAME and keys added var audioFileName = ""; - if (process.env.REACT_APP_CAPTURE_AUDIO === "true" && false) { + if (process.env.REACT_APP_CAPTURE_AUDIO === "true") { let getContentId = currentLine; audioFileName = `${ process.env.REACT_APP_CHANNEL diff --git a/src/views/Practice/Practice.jsx b/src/views/Practice/Practice.jsx index 3fe6ac43..39c18dad 100644 --- a/src/views/Practice/Practice.jsx +++ b/src/views/Practice/Practice.jsx @@ -119,10 +119,13 @@ const Practice = () => { const send = (score) => { if (process.env.REACT_APP_IS_APP_IFRAME === "true") { - window.parent.postMessage({ - score: score, - message: "all-test-rig-score", - }); + window.parent.postMessage( + { + score: score, + message: "all-test-rig-score", + }, + "*" + ); } }; @@ -683,7 +686,7 @@ const Practice = () => { questions[currentQuestion]?.contentSourceData || []; const stringLengths = contentSourceData.map((item) => item.text.length); const length = stringLengths[0]; - window.parent.postMessage({ type: "stringLengths", length }); + window.parent.postMessage({ type: "stringLengths", length }, "*"); } } }, [questions[currentQuestion]]);