Merge branch 'main' into tech-debt-legacy-tags

konveyor · Apr 4, 2024 · 1c9cbda · 1c9cbda
2 parents 0bb9ef2 + 14f4fc6
commit 1c9cbda
Show file tree

Hide file tree

Showing 3 changed files with 678 additions and 646 deletions.
diff --git a/client/package.json b/client/package.json
@@ -55,7 +55,6 @@
     "typesafe-actions": "^5.1.0",
     "web-vitals": "^0.2.4",
     "xmllint": "^0.1.1",
-    "yaml": "^1.10.2",
     "yup": "^0.32.11"
   },
   "devDependencies": {
@@ -65,46 +64,44 @@
     "@testing-library/react": "^12.1.5",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.4.3",
-    "@types/dotenv-webpack": "^7.0.3",
-    "@types/ejs": "^3.1.0",
-    "@types/file-saver": "^2.0.2",
-    "@types/js-yaml": "^4.0.5",
+    "@types/dotenv-webpack": "^7.0.7",
+    "@types/ejs": "^3.1.5",
+    "@types/file-saver": "^2.0.7",
+    "@types/js-yaml": "^4.0.9",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
-    "@types/react-measure": "^2.0.6",
+    "@types/react-measure": "^2.0.12",
     "@types/react-router-dom": "^5.1.7",
-    "@types/tinycolor2": "^1.4.4",
+    "@types/tinycolor2": "^1.4.6",
     "axios-mock-adapter": "^1.19.0",
     "browserslist": "^4.19.1",
-    "camelcase": "^6.3.0",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
-    "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^5.2.7",
-    "css-minimizer-webpack-plugin": "^3.4.1",
-    "dotenv-webpack": "^7.0.3",
+    "copy-webpack-plugin": "^12.0.2",
+    "css-loader": "^6.10.0",
+    "css-minimizer-webpack-plugin": "^6.0.0",
+    "dotenv-webpack": "^8.1.0",
     "exports-loader": "^3.1.0",
     "file-loader": "^6.2.0",
-    "fork-ts-checker-webpack-plugin": "^8.0.0",
-    "html-webpack-plugin": "^5.5.0",
+    "fork-ts-checker-webpack-plugin": "^9.0.2",
+    "html-webpack-plugin": "^5.6.0",
     "i18next-parser": "^0.13.0",
-    "mini-css-extract-plugin": "^2.5.2",
+    "mini-css-extract-plugin": "^2.8.1",
     "monaco-editor-webpack-plugin": "^7.0.1",
     "msw": "^1.2.3",
     "raw-loader": "^4.0.2",
     "react-refresh": "^0.14.0",
     "react-refresh-typescript": "^2.0.9",
-    "sass-loader": "^12.4.0",
     "source-map-explorer": "^2.5.2",
-    "style-loader": "^3.3.1",
-    "svg-url-loader": "^7.1.1",
-    "terser-webpack-plugin": "^5.3.0",
-    "ts-loader": "^9.4.1",
+    "style-loader": "^3.3.4",
+    "svg-url-loader": "^8.0.0",
+    "terser-webpack-plugin": "^5.3.10",
+    "ts-loader": "^9.5.1",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.88.2",
+    "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1",
-    "webpack-merge": "^5.9.0"
+    "webpack-dev-server": "^4.15.2",
+    "webpack-merge": "^5.10.0"
   },
   "browserslist": {
     "production": [

diff --git a/...es/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx b/...es/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx
@@ -187,23 +187,7 @@ const DynamicAssessmentActionsRow: FunctionComponent<
       onOpenModal(assessment);
     } else if (action === AssessmentAction.Retake) {
       if (assessment) {
-        try {
-          await deleteAssessmentAsync({
-            assessmentId: assessment.id,
-            applicationName: application?.name,
-            applicationId: application?.id,
-            archetypeName: archetype?.name,
-            archetypeId: archetype?.id,
-          }).then(() => {
-            createAssessment();
-          });
-        } catch (error) {
-          pushNotification({
-            title: t("terms.error"),
-            variant: "danger",
-          });
-          console.error("Error while deleting assessment:", error);
-        }
+        onOpenModal(assessment);
       }
     }
   };