diff --git a/package.json b/package.json index 37162d1bb1..5328375897 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,8 @@ "resolutions": { "@types/react": "16.9.49", "@types/react-dom": "16.9.8", - "@types/react-router-dom": "5.3.3" + "@types/react-router-dom": "5.3.3", + "cheerio": "1.0.0-rc.3" }, "scripts": { "postinstall": "husky install" diff --git a/services/common/jest.config.js b/services/common/jest.config.js index f99beb220f..7e519b840b 100644 --- a/services/common/jest.config.js +++ b/services/common/jest.config.js @@ -3,7 +3,7 @@ module.exports = { "^.+\\.(t|j)sx?$": [ "ts-jest", { - tsConfigFile: "./tsconfig.json", + tsconfig: "./tsconfig.json", isolatedModules: true, }, ], diff --git a/services/common/package.json b/services/common/package.json index ec86d64656..b32260b056 100644 --- a/services/common/package.json +++ b/services/common/package.json @@ -61,7 +61,7 @@ "react-hot-loader": "4.12.21", "sharp": "^0.33.3", "style-loader": "4.0.0", - "ts-jest": "29.1.2", + "ts-jest": "29.2.5", "typescript": "4.7.4", "undici": "6.19.7", "webpack": "5.95.0", @@ -86,4 +86,4 @@ "jest-junit": { "output": "./coverage/tests-report.xml" } -} +} \ No newline at end of file diff --git a/services/core-web/jest.config.js b/services/core-web/jest.config.js index c824be9799..6a94846269 100644 --- a/services/core-web/jest.config.js +++ b/services/core-web/jest.config.js @@ -3,7 +3,7 @@ module.exports = { "^.+\\.(t|j)sx?$": [ "ts-jest", { - tsConfigFile: "./tsconfig.json", + tsconfig: "./tsconfig.json", isolatedModules: true, }, ], diff --git a/services/core-web/package.json b/services/core-web/package.json index e10bda29ee..52b6dc671e 100644 --- a/services/core-web/package.json +++ b/services/core-web/package.json @@ -95,7 +95,7 @@ "cssnano": "7.0.6", "cypress": "13.15.0", "cypress-file-upload": "^5.0.8", - "enzyme-to-json": "3.3.5", + "enzyme-to-json": "3.6.2", "esbuild-loader": "4.2.2", "eslint": "9.13.0", "eslint-config-airbnb": "19.0.4", @@ -125,7 +125,7 @@ "speed-measure-webpack-plugin": "^1.5.0", "style-loader": "4.0.0", "thread-loader": "4.0.4", - "ts-jest": "29.1.2", + "ts-jest": "29.2.5", "ts-node": "^10.9.1", "tsconfig-paths-webpack-plugin": "^4.1.0", "typescript": "4.7.4", @@ -173,4 +173,4 @@ "browserslist": [ "> 0.1%" ] -} +} \ No newline at end of file diff --git a/services/core-web/src/components/mine/Permit/PermitConditionExtraction.tsx b/services/core-web/src/components/mine/Permit/PermitConditionExtraction.tsx index 9b0d2790da..f6da29f853 100644 --- a/services/core-web/src/components/mine/Permit/PermitConditionExtraction.tsx +++ b/services/core-web/src/components/mine/Permit/PermitConditionExtraction.tsx @@ -82,29 +82,3 @@ export const RenderExtractionError: FC = () => ( ); - - -export const RenderExtractionError: FC = () => ( - - - - Permit Conditions - - - - -
-
-

- -

-

Failed to extract permit conditions

-

- We encountered an issue while extracting the permit conditions. Please try again. if the problem persists, check the file and ensure it meets the required format. -

-
-
-
- -
-); \ No newline at end of file diff --git a/services/core-web/src/tests/components/Forms/__snapshots__/MineRecordForm.spec.js.snap b/services/core-web/src/tests/components/Forms/__snapshots__/MineRecordForm.spec.js.snap index 373899de25..6d1d52bebf 100644 --- a/services/core-web/src/tests/components/Forms/__snapshots__/MineRecordForm.spec.js.snap +++ b/services/core-web/src/tests/components/Forms/__snapshots__/MineRecordForm.spec.js.snap @@ -68,7 +68,7 @@ exports[`MineRecordForm renders properly 1`] = ` hasFeedback={false} label="Is this a historic mine status?" > - No - + @@ -196,7 +196,7 @@ exports[`MineRecordForm renders properly 1`] = ` hasFeedback={false} label="Does this mine site belong to a government agency?" > - No - + diff --git a/services/core-web/src/tests/components/Forms/parties/__snapshots__/AddFullPartyForm.spec.js.snap b/services/core-web/src/tests/components/Forms/parties/__snapshots__/AddFullPartyForm.spec.js.snap index 0dd8c598be..7118a5d084 100644 --- a/services/core-web/src/tests/components/Forms/parties/__snapshots__/AddFullPartyForm.spec.js.snap +++ b/services/core-web/src/tests/components/Forms/parties/__snapshots__/AddFullPartyForm.spec.js.snap @@ -19,7 +19,7 @@ exports[`AddFullPartyForm renders properly 1`] = `
- Organization - +
- @@ -25,7 +25,7 @@ exports[`AddVarianceForm renders properly 1`] = ` > Approved Variance - + - Attach existing file(s) - + -