Merge pull request #758 from trycompai/lewis/comp-onboarding-testjam-fixes

[dev] [carhartlewis] lewis/comp-onboarding-testjam-fixes

Author: Marfuen

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskChart.tsx

@@ -3,7 +3,7 @@
 import { RiskMatrixChart } from "@/components/risks/charts/RiskMatrixChart";
 import { useI18n } from "@/locales/client";
 import type { Vendor } from "@comp/db/types";
-import { VendorInherentRiskSheet } from "./VendorInherentRiskSheet";
+import { updateVendorInherentRisk } from "../actions/update-vendor-inherent-risk";
 
 interface InherentRiskChartProps {
 	vendor: Vendor;
@@ -16,14 +16,11 @@ export function VendorInherentRiskChart({ vendor }: InherentRiskChartProps) {
 		<RiskMatrixChart
 			title={t("vendors.risks.inherent_risk")}
 			description={t("vendors.risks.update_inherent_risk_description")}
+			riskId={vendor.id}
 			activeLikelihood={vendor.inherentProbability}
 			activeImpact={vendor.inherentImpact}
-			sheetQueryParam="inherent-risk-sheet"
-			EditSheetComponent={VendorInherentRiskSheet}
-			editSheetProps={{
-				vendorId: vendor.id,
-				initialProbability: vendor.inherentProbability,
-				initialImpact: vendor.inherentImpact,
+			saveAction={async ({ id, probability, impact }) => {
+				return updateVendorInherentRisk({ vendorId: id, inherentProbability: probability, inherentImpact: impact });
 			}}
 		/>
 	);

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorInherentRiskForm.tsx

@@ -3,7 +3,7 @@
 import { RiskMatrixChart } from "@/components/risks/charts/RiskMatrixChart";
 import { useI18n } from "@/locales/client";
 import type { Vendor } from "@comp/db/types";
-import { VendorResidualRiskSheet } from "./VendorResidualRiskSheet";
+import { updateVendorResidualRisk } from "../actions/update-vendor-residual-risk";
 
 interface ResidualRiskChartProps {
 	vendor: Vendor;
@@ -16,13 +16,11 @@ export function VendorResidualRiskChart({ vendor }: ResidualRiskChartProps) {
 		<RiskMatrixChart
 			title={t("vendors.risks.residual_risk")}
 			description={t("vendors.risks.update_residual_risk_description")}
+			riskId={vendor.id}
 			activeLikelihood={vendor.residualProbability}
 			activeImpact={vendor.residualImpact}
-			sheetQueryParam="residual-risk-sheet"
-			EditSheetComponent={VendorResidualRiskSheet}
-			editSheetProps={{
-				vendorId: vendor.id,
-				initialRisk: vendor,
+			saveAction={async ({ id, probability, impact }) => {
+				return updateVendorResidualRisk({ vendorId: id, residualProbability: probability, residualImpact: impact });
 			}}
 		/>
 	);

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/VendorResidualRiskChart.tsx

@@ -1,9 +1,9 @@
 "use client";
 
-import { InherentRiskSheet } from "@/components/sheets/InherentRiskSheet";
 import { useI18n } from "@/locales/client";
 import type { Risk } from "@comp/db/types";
 import { RiskMatrixChart } from "./RiskMatrixChart";
+import { updateInherentRiskAction } from "@/actions/risk/update-inherent-risk-action";
 
 interface InherentRiskChartProps {
 	risk: Risk;
@@ -16,14 +16,11 @@ export function InherentRiskChart({ risk }: InherentRiskChartProps) {
 		<RiskMatrixChart
 			title={t("risk.metrics.inherentRisk")}
 			description={t("risk.dashboard.inherent_risk_description")}
+			riskId={risk.id}
 			activeLikelihood={risk.likelihood}
 			activeImpact={risk.impact}
-			sheetQueryParam="inherent-risk-sheet"
-			EditSheetComponent={InherentRiskSheet}
-			editSheetProps={{
-				riskId: risk.id,
-				initialProbability: risk.likelihood,
-				initialImpact: risk.impact,
+			saveAction={async ({ id, probability, impact }) => {
+				return updateInherentRiskAction({ id, probability, impact });
 			}}
 		/>
 	);

apps/app/src/components/risks/charts/InherentRiskChart.tsx

@@ -1,9 +1,9 @@
 "use client";
 
-import { ResidualRiskSheet } from "@/components/sheets/ResidualRiskSheet";
 import { useI18n } from "@/locales/client";
 import type { Risk } from "@comp/db/types";
 import { RiskMatrixChart } from "./RiskMatrixChart";
+import { updateResidualRiskEnumAction } from "@/actions/risk/update-residual-risk-enum-action";
 
 interface ResidualRiskChartProps {
 	risk: Risk;
@@ -16,14 +16,11 @@ export function ResidualRiskChart({ risk }: ResidualRiskChartProps) {
 		<RiskMatrixChart
 			title={t("risk.metrics.residualRisk")}
 			description={t("risk.dashboard.residual_risk_description")}
+			riskId={risk.id}
 			activeLikelihood={risk.residualLikelihood}
 			activeImpact={risk.residualImpact}
-			sheetQueryParam="residual-risk-sheet"
-			EditSheetComponent={ResidualRiskSheet}
-			editSheetProps={{
-				riskId: risk.id,
-				initialProbability: risk.residualLikelihood,
-				initialImpact: risk.residualImpact,
+			saveAction={async ({ id, probability, impact }) => {
+				return updateResidualRiskEnumAction({ id, probability, impact });
 			}}
 		/>
 	);