fix(merge): merge main into branch

oaknational · May 12, 2023 · b4ee76a · b4ee76a
2 parents 6572f5e + 4f104a3
commit b4ee76a
Show file tree

Hide file tree

Showing 108 changed files with 6,778 additions and 3,183 deletions.
diff --git a/.env.test b/.env.test
@@ -16,6 +16,8 @@ NEXT_PUBLIC_HUBSPOT_PORTAL_ID="NEXT_PUBLIC_HUBSPOT_PORTAL_ID"
 NEXT_PUBLIC_HUBSPOT_FALLBACK_FORM_ID="NEXT_PUBLIC_HUBSPOT_FALLBACK_FORM_ID"
 NEXT_PUBLIC_HUBSPOT_NEWSLETTER_FORM_ID="NEXT_PUBLIC_HUBSPOT_NEWSLETTER_FORM_ID"
 NEXT_PUBLIC_HUBSPOT_SCRIPT_DOMAIN="NEXT_PUBLIC_HUBSPOT_SCRIPT_DOMAIN"
+NEXT_PUBLIC_HUBSPOT_FORM_SUBMISSION_URL='https://hubspot-forms.thenational.academy/submissions/v3/integration/submit'
+NEXT_PUBLIC_HUBSPOT_DOWNLOADS_FORM_ID='b0f0b8a0-0b0a-4b0e-8b0e-0b0b0b0b0b0b'
 
 HUBSPOT_FORMS_ACCESS_TOKEN="HUBSPOT_FORMS_ACCESS_TOKEN"
 

diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@
 playwright-report/
 test-results/
 npm_audit.json
+audit.json
 
 # Browserstack Local log
 local.log

diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md
@@ -1,3 +1,104 @@
+## [1.181.3](https://github.com/oaknational/Oak-Web-Application/compare/v1.181.2...v1.181.3) (2023-05-12)
+
+
+### Bug Fixes
+
+* **download-hubspot-form:** finish hubspot download form field handling ([670457b](https://github.com/oaknational/Oak-Web-Application/commit/670457bff61a5fdc785741c73e37473192f348ba))
+* **getPayload:** if no school of homeschool urn should be undefined ([2502baa](https://github.com/oaknational/Oak-Web-Application/commit/2502baa8916e713e8a9d559ef73ea73e513ba202))
+* **hubspotform:** increase test coverage ([998b406](https://github.com/oaknational/Oak-Web-Application/commit/998b406b6ef045521a626ced93caf0545a34b74a))
+* **hubspotform:** increase test coverage ([c8b6b6f](https://github.com/oaknational/Oak-Web-Application/commit/c8b6b6f7d9895137b73ac52f72ddfc2fe26851fe))
+* **main:** merge main in ([7f3a8d5](https://github.com/oaknational/Oak-Web-Application/commit/7f3a8d5a8f8ee1b13a23de70bec11fe73f48222b))
+* **useDownloadForm:** fix test by mocking analytics ([fe11881](https://github.com/oaknational/Oak-Web-Application/commit/fe118811755c04f602ae03a98fc6c5d5f55d6cb8))
+
+## [1.181.2](https://github.com/oaknational/Oak-Web-Application/compare/v1.181.1...v1.181.2) (2023-05-11)
+
+
+### Bug Fixes
+
+* add no theme into learning themes ([e6b3ff1](https://github.com/oaknational/Oak-Web-Application/commit/e6b3ff153b74987904359aa35347d641227a5e39))
+* type errors ([c02c502](https://github.com/oaknational/Oak-Web-Application/commit/c02c502d5c1bc51f57042144a9462da575037e52))
+
+## [1.181.1](https://github.com/oaknational/Oak-Web-Application/compare/v1.181.0...v1.181.1) (2023-05-11)
+
+
+### Bug Fixes
+
+* **security policy:** meet formatting standard ([be40d8d](https://github.com/oaknational/Oak-Web-Application/commit/be40d8d44110af4c398705c4a36d580d9e2feb50))
+
+# [1.181.0](https://github.com/oaknational/Oak-Web-Application/compare/v1.180.3...v1.181.0) (2023-05-11)
+
+
+### Bug Fixes
+
+* correct pagination index for search hit clicked ([519992d](https://github.com/oaknational/Oak-Web-Application/commit/519992d62b7182f179be094ec2deeac02adc7fc4))
+* lesson and unit type errors ([ec918ab](https://github.com/oaknational/Oak-Web-Application/commit/ec918ab7b9cfdee4774e5b98a2e6b890754c7970))
+* lesson list has filter options ([6df31d4](https://github.com/oaknational/Oak-Web-Application/commit/6df31d459a5a7c349d33339a7e27644a9a33689a))
+* search complete on page change ([c969492](https://github.com/oaknational/Oak-Web-Application/commit/c969492629d2b0bd3c3bb23c90064060f2e02a32))
+
+
+### Features
+
+* add teacher search tracking events ([4afd291](https://github.com/oaknational/Oak-Web-Application/commit/4afd291e16adcd69c26ccc0b9a0cc8873d46288b))
+
+## [1.180.3](https://github.com/oaknational/Oak-Web-Application/compare/v1.180.2...v1.180.3) (2023-05-11)
+
+## [1.180.2](https://github.com/oaknational/Oak-Web-Application/compare/v1.180.1...v1.180.2) (2023-05-11)
+
+## [1.180.1](https://github.com/oaknational/Oak-Web-Application/compare/v1.180.0...v1.180.1) (2023-05-11)
+
+# [1.180.0](https://github.com/oaknational/Oak-Web-Application/compare/v1.179.0...v1.180.0) (2023-05-10)
+
+
+### Bug Fixes
+
+* initial route pageview ([8504706](https://github.com/oaknational/Oak-Web-Application/commit/85047060206817a996a07fe06f7617bd403f334e))
+* make viewType non-optional page prop ([0e33940](https://github.com/oaknational/Oak-Web-Application/commit/0e3394028e9f14de31ee4a89a21796dd8cbfaf60))
+
+
+### Features
+
+* consolidate  capture event ([d1b4071](https://github.com/oaknational/Oak-Web-Application/commit/d1b4071cf499a9868f6f0756e2215a12406576fa))
+
+# [1.179.0](https://github.com/oaknational/Oak-Web-Application/compare/v1.178.3...v1.179.0) (2023-05-10)
+
+
+### Bug Fixes
+
+* **config test:** add new env var to test config ([38ee7c3](https://github.com/oaknational/Oak-Web-Application/commit/38ee7c312373094c8f50eb888974aaae0ed47dbe))
+* **config test:** update test env vars ([1037043](https://github.com/oaknational/Oak-Web-Application/commit/1037043f5879618d7568f88b222ef42b435d03cc))
+* **downloads submit:** fix on submit return type to accept string undefined ([c376683](https://github.com/oaknational/Oak-Web-Application/commit/c3766832446e568556a65e022f2063a29765865c))
+* **downloads submit:** prettier fix ([6d0af46](https://github.com/oaknational/Oak-Web-Application/commit/6d0af46a8fd23b82524116509a94e4c669e84bf4))
+* **hubspot test:** fix test ([744a208](https://github.com/oaknational/Oak-Web-Application/commit/744a208fa6fb068e3315ff915fd5e03f3adb097a))
+* **main:** merge main into branch ([b21df6c](https://github.com/oaknational/Oak-Web-Application/commit/b21df6c5a56f2d217b380591255e20ec37eb0fbd))
+* **safari:** fix safari not sending bug ([c33e9f3](https://github.com/oaknational/Oak-Web-Application/commit/c33e9f3c98d54dc6e51a2bf9e1ef275087670609))
+* **safari:** fix safari not sending bug ([386418c](https://github.com/oaknational/Oak-Web-Application/commit/386418c1b6dde014c96db93e6418adfe2c47ffe3))
+* **tests:** fix test suites ([c5fe449](https://github.com/oaknational/Oak-Web-Application/commit/c5fe4498101327f4a6e23a283021ed0ff6b769d1))
+* **tests:** fix test suites style ([9a056fe](https://github.com/oaknational/Oak-Web-Application/commit/9a056fe64ce2ece05206960779805a7a137f135a))
+* **use download:** add await to hubspot form response ([2bdcc3e](https://github.com/oaknational/Oak-Web-Application/commit/2bdcc3e9278b4dc26e35b6b4c405e8b2a096ca6e))
+* **useDownloadsfrom:** add downloads config to owa ([ff4cb02](https://github.com/oaknational/Oak-Web-Application/commit/ff4cb022a829a786d0dfd56b2fdc27d08fd533db))
+
+
+### Features
+
+* **downloads:** prettier fixes ([713241b](https://github.com/oaknational/Oak-Web-Application/commit/713241bccfa97bde23801af2af0b54dfbf19f104))
+* **downloads:** send data to hubspot on downloads submit ([3dc76e1](https://github.com/oaknational/Oak-Web-Application/commit/3dc76e1091ad3f2216afc23b00f072df9f14ac25))
+
+## [1.178.3](https://github.com/oaknational/Oak-Web-Application/compare/v1.178.2...v1.178.3) (2023-05-10)
+
+## [1.178.2](https://github.com/oaknational/Oak-Web-Application/compare/v1.178.1...v1.178.2) (2023-05-10)
+
+
+### Bug Fixes
+
+* **blog:** replacce sanity cdn links with proxied urls ([67aab48](https://github.com/oaknational/Oak-Web-Application/commit/67aab480eb3c6e9cd7e1342242a04a8fa6d6003b))
+
+## [1.178.1](https://github.com/oaknational/Oak-Web-Application/compare/v1.178.0...v1.178.1) (2023-05-10)
+
+
+### Bug Fixes
+
+* replace sanity asset urls with first party proxy domain ([7ac0ff1](https://github.com/oaknational/Oak-Web-Application/commit/7ac0ff1f61024034b3ec13bcd631afa35bd4b46e))
+
 # [1.178.0](https://github.com/oaknational/Oak-Web-Application/compare/v1.177.4...v1.178.0) (2023-05-04)
 
 

diff --git a/avo.json b/avo.json
@@ -7,17 +7,17 @@
     "name": "Oak's Tracking Plan"
   },
   "branch": {
-    "id": "master",
-    "name": "main"
+    "id": "lt4Ht2V5v",
+    "name": "teacher-search"
   },
   "sources": [
     {
       "id": "OXY1Uf7nb",
       "name": "Oak Web Application",
       "path": "src/browser-lib/avo/Avo.ts",
-      "actionId": "OF9PJmKhzB2UrSexOffP",
-      "branchId": "master",
-      "updatedAt": "2023-04-21T10:43:08.619Z"
+      "actionId": "VqTukVwl7NVU5tbjM3bN",
+      "branchId": "lt4Ht2V5v",
+      "updatedAt": "2023-05-10T14:37:34.351Z"
     }
   ],
   "force": false

diff --git a/jest.config.js b/jest.config.js
@@ -36,6 +36,7 @@ const customJestConfig = {
     "src/__tests__/__helpers__/*",
     ".storybook/storybook.*.test.js$",
     "e2e_tests/browser/engineering/*",
+    ".netlify/*",
   ],
   moduleNameMapper: {
     // Force module uuid to resolve with the CJS entry point, because Jest does not support package.json.exports. See https://github.com/uuidjs/uuid/issues/451

diff --git a/jest.setup.js b/jest.setup.js
@@ -13,6 +13,8 @@ jest.mock("react", () => ({
   useId: () => "react-use-id-test-result",
 }));
 
+jest.mock("next/dist/client/router", () => require("next-router-mock"));
+
 jest.mock("@bugsnag/js", () => ({
   __esModule: true,
   default: {

diff --git a/netlify.toml b/netlify.toml
@@ -1,17 +1,29 @@
 [[plugins]]
 package = "./netlify/plugins/github-deployments"
 
-# Force all access through the managed TLD.
+# Force all access through the managed TLD (default). HTTP
 [[redirects]]
 from = 'http://oak-web-application.netlify.app/*'
-to = 'https://owa.thenational.academy/:splat'
+to = 'https://www.thenational.academy/:splat'
 status = 302
 force = true
-
-# Force all access through the managed TLD.
+# Force all access through the managed TLD (default). HTTPS
 [[redirects]]
 from = 'https://oak-web-application.netlify.app/*'
-to = 'https://owa.thenational.academy/:splat'
+to = 'https://www.thenational.academy/:splat'
+status = 302
+force = true
+
+# Force all access through the managed TLD (main branch). HTTP
+[[redirects]]
+from = 'http://main--oak-web-application.netlify.app/*'
+to = 'https://www.thenational.academy/:splat'
+status = 302
+force = true
+# Force all access through the managed TLD (main branch). HTTPS
+[[redirects]]
+from = 'https://main--oak-web-application.netlify.app/*'
+to = 'https://www.thenational.academy/:splat'
 status = 302
 force = true
 

diff --git a/oak-config/oak.config.test.json b/oak-config/oak.config.test.json
@@ -9,8 +9,10 @@
     "frameUrl": "gleap-frame-url"
   },
   "hubspot": {
+    "formSubmissionUrl":"https://hubspot-forms.thenational.academy/submissions/v3/integration/submit",
     "portalId": "12345",
     "newsletterFormId": "uuid-oijfeoe-ijfere-g-ererg",
+    "downloadsFormId": "uuid-oijfeoe-ijfere-g-ererg",
     "fallbackFormId": "uuid-r0439f4fd-f43j04g-d-3r9",
     "requiredSecrets": ["HUBSPOT_FORMS_ACCESS_TOKEN"]
   },