Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

filter deleted agreement

Ashish Viradiya458ac8dfeac3
diff --git a/components/links/link-sheet/agreement-section.tsx b/components/links/link-sheet/agreement-section.tsx
index 36f7f408..b076bb53 100644
--- a/components/links/link-sheet/agreement-section.tsx
+++ b/components/links/link-sheet/agreement-section.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useEffect, useState, useMemo } from "react";
import { motion } from "motion/react";
@@ -17,6 +17,7 @@ import { DEFAULT_LINK_TYPE } from ".";
import AgreementSheet from "./agreement-panel";
import LinkItem from "./link-item";
import { LinkUpgradeOptions } from "./link-options";
+import { Agreement } from "@prisma/client";
export default function AgreementSection({
data,
@@ -39,6 +40,8 @@ export default function AgreementSection({
const [isAgreementSheetVisible, setIsAgreementSheetVisible] =
useState<boolean>(false);
+ const filteredAgreements = useMemo(() => agreements.filter((agreement: Agreement) => !agreement.deletedAt || agreement.id === agreementId), [agreements]);
+
useEffect(() => {
setEnabled(enableAgreement!);
}, [enableAgreement]);
@@ -98,8 +101,8 @@ export default function AgreementSection({
<SelectValue placeholder="Select an agreement" />
</SelectTrigger>
<SelectContent>
- {agreements &&
- agreements.map(({ id, name }) => (
+ {filteredAgreements &&
+ filteredAgreements.map(({ id, name }) => (
<SelectItem key={id} value={id}>
{name}
</SelectItem>
diff --git a/pages/settings/presets.tsx b/pages/settings/presets.tsx
index 3fa8d060..2c32c0fe 100644
--- a/pages/settings/presets.tsx
+++ b/pages/settings/presets.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useEffect, useState, useMemo } from "react";
import { useTeam } from "@/context/team-context";
import { PlanEnum } from "@/ee/stripe/constants";
@@ -88,7 +88,8 @@ export default function Presets() {
const [data, setData] = useState<PresetData>(defaultPresetData);
const [activeTab, setActiveTab] = useState("social-media");
- const filteredAgreements = agreements.filter((agreement: Agreement) => !agreement.deletedAt);
+ const filteredAgreements = useMemo(() => agreements.filter((agreement: Agreement) => !agreement.deletedAt), [agreements]);
+
useEffect(() => {
if (presets) {
const customFields = presets.customFields ? JSON.parse(presets.customFields as string) as PresetData['customFields'] : null;