From 1cb2d567539b9d1e46176b0396d64202f8f63b99 Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Thu, 5 Sep 2024 16:56:23 -0700
Subject: [PATCH 01/12] soft deleting criteria entries to readd them if a user
 undoes the deletion

---
 .../src/components/CriteriaResultEntry.tsx    | 20 +++++++++++--
 .../src/components/EvalResultDisplay.tsx      |  1 +
 teachertool/src/components/Toasts.tsx         |  2 +-
 .../src/components/styling/Toasts.module.scss |  4 +++
 teachertool/src/constants.ts                  |  2 ++
 .../transforms/readdCriteriaToChecklist.ts    | 30 +++++++++++++++++++
 .../transforms/removeCriteriaFromChecklist.ts |  6 +++-
 teachertool/src/types/criteria.ts             |  1 +
 teachertool/src/utils/index.ts                |  3 +-
 9 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 teachertool/src/transforms/readdCriteriaToChecklist.ts

diff --git a/teachertool/src/components/CriteriaResultEntry.tsx b/teachertool/src/components/CriteriaResultEntry.tsx
index 8aef5ccb998a..fc47f126f312 100644
--- a/teachertool/src/components/CriteriaResultEntry.tsx
+++ b/teachertool/src/components/CriteriaResultEntry.tsx
@@ -18,6 +18,7 @@ import { Button } from "react-common/components/controls/Button";
 import { setEvalResult } from "../transforms/setEvalResult";
 import { showToast } from "../transforms/showToast";
 import { makeToast } from "../utils";
+import { readdCriteriaToChecklist } from "../transforms/readdCriteriaToChecklist";
 
 interface CriteriaResultNotesProps {
     criteriaId: string;
@@ -76,6 +77,20 @@ const CriteriaResultError: React.FC<CriteriaResultErrorProps> = ({ criteriaInsta
     );
 };
 
+export const UndoDeleteCriteriaButton: React.FC<{ criteriaId: string }> = ({ criteriaId }) => {
+    const handleUndoClicked = () => {
+        readdCriteriaToChecklist(criteriaId);
+    }
+
+    return (
+        <Button
+            title={Strings.Undo}
+            label={Strings.Undo}
+            onClick={handleUndoClicked}
+        />
+    )
+}
+
 const CriteriaResultToolbarTray: React.FC<{ criteriaId: string }> = ({ criteriaId }) => {
     const { state: teacherTool } = useContext(AppStateContext);
 
@@ -91,9 +106,8 @@ const CriteriaResultToolbarTray: React.FC<{ criteriaId: string }> = ({ criteriaI
     }
 
     async function handleDeleteClickedAsync() {
-        if (confirm(Strings.ConfirmDeleteCriteriaInstance)) {
-            removeCriteriaFromChecklist(criteriaId);
-        }
+        removeCriteriaFromChecklist(criteriaId);
+        showToast(makeToast("info", Strings.CriteriaDeleted, 5000, <UndoDeleteCriteriaButton criteriaId={criteriaId} />));
     }
 
     return (
diff --git a/teachertool/src/components/EvalResultDisplay.tsx b/teachertool/src/components/EvalResultDisplay.tsx
index 84bd2cf4077a..e424f60b1627 100644
--- a/teachertool/src/components/EvalResultDisplay.tsx
+++ b/teachertool/src/components/EvalResultDisplay.tsx
@@ -122,6 +122,7 @@ const CriteriaWithResultsTable: React.FC = () => {
         <div className={css["results-list"]}>
             {Object.values(criteria).map(criteriaInstance => {
                 return (
+                    !criteriaInstance.deleted &&
                     <CriteriaResultEntry criteriaId={criteriaInstance.instanceId} key={criteriaInstance.instanceId} />
                 );
             })}
diff --git a/teachertool/src/components/Toasts.tsx b/teachertool/src/components/Toasts.tsx
index a57d8ad5e464..520030dcbb9e 100644
--- a/teachertool/src/components/Toasts.tsx
+++ b/teachertool/src/components/Toasts.tsx
@@ -54,7 +54,7 @@ const ToastNotification: React.FC<IToastNotificationProps> = ({ toast }) => {
                 <div className={css["text-container"]}>
                     {toast.text && <div className={classList(css["text"], "tt-toast-text")}>{toast.text}</div>}
                     {toast.detail && <div className={css["detail"]}>{toast.detail}</div>}
-                    {toast.jsx && <div>{toast.jsx}</div>}
+                    {toast.jsx && <div className={css["custom-jsx"]}>{toast.jsx}</div>}
                 </div>
                 {!toast.hideDismissBtn && !toast.showSpinner && (
                     <div className={css["dismiss-btn"]} onClick={handleDismissClicked}>
diff --git a/teachertool/src/components/styling/Toasts.module.scss b/teachertool/src/components/styling/Toasts.module.scss
index 968db5dff6ac..1626b50483e2 100644
--- a/teachertool/src/components/styling/Toasts.module.scss
+++ b/teachertool/src/components/styling/Toasts.module.scss
@@ -85,6 +85,10 @@
             .detail {
                 font-size: 0.875rem;
             }
+
+            .custom-jsx {
+                pointer-events: auto;
+            }
         }
 
         .dismiss-btn {
diff --git a/teachertool/src/constants.ts b/teachertool/src/constants.ts
index 3e8155896e94..3355474ee9a6 100644
--- a/teachertool/src/constants.ts
+++ b/teachertool/src/constants.ts
@@ -53,6 +53,8 @@ export namespace Strings {
     export const EvaluationComplete = lf("Evaluation complete");
     export const UnableToEvaluatePartial = lf("Unable to evaluate some criteria");
     export const GiveFeedback = lf("Give Feedback");
+    export const CriteriaDeleted = lf("Criteria Deleted");
+    export const Undo = lf("Undo");
 }
 
 export namespace Ticks {
diff --git a/teachertool/src/transforms/readdCriteriaToChecklist.ts b/teachertool/src/transforms/readdCriteriaToChecklist.ts
new file mode 100644
index 000000000000..9eb63e4204de
--- /dev/null
+++ b/teachertool/src/transforms/readdCriteriaToChecklist.ts
@@ -0,0 +1,30 @@
+import { stateAndDispatch } from "../state";
+import { logDebug } from "../services/loggingService";
+import { setChecklist } from "./setChecklist";
+import { Ticks } from "../constants";
+import { getCriteriaInstanceWithId } from "../state/helpers";
+
+export function readdCriteriaToChecklist(criteriaInstanceId: string) {
+    const { state: teacherTool } = stateAndDispatch();
+
+    logDebug(`Removing criteria with id: ${criteriaInstanceId}`);
+
+    const instance = getCriteriaInstanceWithId(teacherTool, criteriaInstanceId);
+    const catalogCriteriaId = instance?.catalogCriteriaId;
+    const allCriteria = [...teacherTool.checklist.criteria];
+    console.log("all of the criteria", allCriteria);
+    const criteriaIndex = allCriteria.findIndex(c => c.instanceId === criteriaInstanceId);
+    allCriteria[criteriaIndex].deleted = false;
+    console.log("all of the criteria after deletion", allCriteria);
+
+    const newChecklist = {
+        ...teacherTool.checklist,
+        criteria: allCriteria,
+    };
+
+    setChecklist(newChecklist);
+
+    if (catalogCriteriaId) {
+        pxt.tickEvent(Ticks.RemoveCriteria, { catalogCriteriaId });
+    }
+}
diff --git a/teachertool/src/transforms/removeCriteriaFromChecklist.ts b/teachertool/src/transforms/removeCriteriaFromChecklist.ts
index aa2a5cbf43ff..652afb9bbd30 100644
--- a/teachertool/src/transforms/removeCriteriaFromChecklist.ts
+++ b/teachertool/src/transforms/removeCriteriaFromChecklist.ts
@@ -11,10 +11,14 @@ export function removeCriteriaFromChecklist(criteriaInstanceId: string) {
 
     const instance = getCriteriaInstanceWithId(teacherTool, criteriaInstanceId);
     const catalogCriteriaId = instance?.catalogCriteriaId;
+    const allCriteria = [...teacherTool.checklist.criteria];
+    const criteriaIndex = allCriteria.findIndex(c => c.instanceId === criteriaInstanceId);
+    allCriteria[criteriaIndex].deleted = true;
+
 
     const newChecklist = {
         ...teacherTool.checklist,
-        criteria: teacherTool.checklist.criteria.filter(c => c.instanceId !== criteriaInstanceId),
+        criteria: allCriteria,
     };
 
     setChecklist(newChecklist);
diff --git a/teachertool/src/types/criteria.ts b/teachertool/src/types/criteria.ts
index 80c3422faa9f..656d65521b65 100644
--- a/teachertool/src/types/criteria.ts
+++ b/teachertool/src/types/criteria.ts
@@ -20,6 +20,7 @@ export interface CriteriaInstance {
     instanceId: string;
     params: CriteriaParameterValue[] | undefined;
     userFeedback?: UserFeedback;
+    deleted?: boolean;
 }
 
 // Represents a parameter definition in a catalog criteria.
diff --git a/teachertool/src/utils/index.ts b/teachertool/src/utils/index.ts
index a8a35c78b165..f70b2afc250d 100644
--- a/teachertool/src/utils/index.ts
+++ b/teachertool/src/utils/index.ts
@@ -5,12 +5,13 @@ import { classList } from "react-common/components/util";
 import { CatalogCriteria } from "../types/criteria";
 import { Strings } from "../constants";
 
-export function makeToast(type: ToastType, text: string, timeoutMs: number = 5000): ToastWithId {
+export function makeToast(type: ToastType, text: string, timeoutMs: number = 5000, jsx?: React.ReactNode): ToastWithId {
     return {
         id: nanoid(),
         type,
         text,
         timeoutMs,
+        jsx,
     };
 }
 

From 1d1e11caf747f925c9fb9cdcd46f58541428f391 Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Thu, 5 Sep 2024 17:31:18 -0700
Subject: [PATCH 02/12] initial styling for undo button

---
 teachertool/src/components/CriteriaResultEntry.tsx    |  3 ++-
 teachertool/src/components/styling/Toasts.module.scss |  1 +
 teachertool/src/style.overrides/Button.scss           | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/teachertool/src/components/CriteriaResultEntry.tsx b/teachertool/src/components/CriteriaResultEntry.tsx
index fc47f126f312..bfb8907e79eb 100644
--- a/teachertool/src/components/CriteriaResultEntry.tsx
+++ b/teachertool/src/components/CriteriaResultEntry.tsx
@@ -84,6 +84,7 @@ export const UndoDeleteCriteriaButton: React.FC<{ criteriaId: string }> = ({ cri
 
     return (
         <Button
+            className="undo-button"
             title={Strings.Undo}
             label={Strings.Undo}
             onClick={handleUndoClicked}
@@ -107,7 +108,7 @@ const CriteriaResultToolbarTray: React.FC<{ criteriaId: string }> = ({ criteriaI
 
     async function handleDeleteClickedAsync() {
         removeCriteriaFromChecklist(criteriaId);
-        showToast(makeToast("info", Strings.CriteriaDeleted, 5000, <UndoDeleteCriteriaButton criteriaId={criteriaId} />));
+        showToast(makeToast("info", Strings.CriteriaDeleted, 500000, <UndoDeleteCriteriaButton criteriaId={criteriaId} />));
     }
 
     return (
diff --git a/teachertool/src/components/styling/Toasts.module.scss b/teachertool/src/components/styling/Toasts.module.scss
index 1626b50483e2..e5c6128e94af 100644
--- a/teachertool/src/components/styling/Toasts.module.scss
+++ b/teachertool/src/components/styling/Toasts.module.scss
@@ -88,6 +88,7 @@
 
             .custom-jsx {
                 pointer-events: auto;
+                display: inline;
             }
         }
 
diff --git a/teachertool/src/style.overrides/Button.scss b/teachertool/src/style.overrides/Button.scss
index ec33f90dfaaf..68f09a3f7acc 100644
--- a/teachertool/src/style.overrides/Button.scss
+++ b/teachertool/src/style.overrides/Button.scss
@@ -75,3 +75,14 @@
 .pass > .common-button.common-dropdown-button {
     border: 3px solid var(--pxt-success-accent);
 }
+
+.undo-button {
+    width: 3rem;
+    height: 2rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background-color: var(--pxt-button-secondary-background);
+    color: var(--pxt-button-secondary-foreground);
+}
\ No newline at end of file

From 66ea6a2fb9a78ccc16a0056e24c99da1108235f2 Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Fri, 6 Sep 2024 15:15:45 -0700
Subject: [PATCH 03/12] styling fixed for button

---
 teachertool/src/components/styling/Toasts.module.scss | 6 ++++--
 teachertool/src/style.overrides/Button.scss           | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/teachertool/src/components/styling/Toasts.module.scss b/teachertool/src/components/styling/Toasts.module.scss
index e5c6128e94af..8d711adfc6a9 100644
--- a/teachertool/src/components/styling/Toasts.module.scss
+++ b/teachertool/src/components/styling/Toasts.module.scss
@@ -43,6 +43,7 @@
         gap: 0.5rem;
         padding: 0.75rem;
         font-size: 1.125rem;
+        align-items: center;
 
         .icon-container {
             display: flex;
@@ -72,7 +73,8 @@
 
         .text-container {
             display: flex;
-            flex-direction: column;
+            flex-direction: row;
+            align-items: center;
             text-align: left;
 
             .text {
@@ -88,7 +90,7 @@
 
             .custom-jsx {
                 pointer-events: auto;
-                display: inline;
+                margin-left: 1rem;
             }
         }
 
diff --git a/teachertool/src/style.overrides/Button.scss b/teachertool/src/style.overrides/Button.scss
index 68f09a3f7acc..162bca791057 100644
--- a/teachertool/src/style.overrides/Button.scss
+++ b/teachertool/src/style.overrides/Button.scss
@@ -83,6 +83,6 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    background-color: var(--pxt-button-secondary-background);
+    background-color: var(--pxt-info-accent-darkened);
     color: var(--pxt-button-secondary-foreground);
 }
\ No newline at end of file

From 641a31f4660ce8dc407b05449ce5172d8b150b35 Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Fri, 6 Sep 2024 15:28:18 -0700
Subject: [PATCH 04/12] don't evaluate deleted criteria

---
 teachertool/src/transforms/runEvaluateAsync.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/teachertool/src/transforms/runEvaluateAsync.ts b/teachertool/src/transforms/runEvaluateAsync.ts
index c49b10707f30..e1ea6b8bb153 100644
--- a/teachertool/src/transforms/runEvaluateAsync.ts
+++ b/teachertool/src/transforms/runEvaluateAsync.ts
@@ -17,7 +17,9 @@ export async function runEvaluateAsync(fromUserInteraction: boolean) {
         setActiveTab("results");
     }
 
-    const evalRequests = teacherTool.checklist.criteria.map(criteriaInstance =>
+    const validCriteria = teacherTool.checklist.criteria.filter(c => !c.deleted);
+
+    const evalRequests = validCriteria.map(criteriaInstance =>
         runSingleEvaluateAsync(criteriaInstance.instanceId, fromUserInteraction)
     );
 

From 98a0d0f2288dd204f647d14bad1aee3a275e0b73 Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Mon, 9 Sep 2024 11:22:27 -0700
Subject: [PATCH 05/12] undo will now dismiss the toast

---
 teachertool/src/components/CriteriaResultEntry.tsx    | 11 +++++++++--
 .../src/transforms/readdCriteriaToChecklist.ts        |  2 --
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/teachertool/src/components/CriteriaResultEntry.tsx b/teachertool/src/components/CriteriaResultEntry.tsx
index bfb8907e79eb..b326e8e33128 100644
--- a/teachertool/src/components/CriteriaResultEntry.tsx
+++ b/teachertool/src/components/CriteriaResultEntry.tsx
@@ -19,6 +19,7 @@ import { setEvalResult } from "../transforms/setEvalResult";
 import { showToast } from "../transforms/showToast";
 import { makeToast } from "../utils";
 import { readdCriteriaToChecklist } from "../transforms/readdCriteriaToChecklist";
+import { dismissToast } from "../state/actions";
 
 interface CriteriaResultNotesProps {
     criteriaId: string;
@@ -77,9 +78,13 @@ const CriteriaResultError: React.FC<CriteriaResultErrorProps> = ({ criteriaInsta
     );
 };
 
-export const UndoDeleteCriteriaButton: React.FC<{ criteriaId: string }> = ({ criteriaId }) => {
+const UndoDeleteCriteriaButton: React.FC<{ criteriaId: string, toastId: string }> = ({ criteriaId, toastId }) => {
+    const { dispatch } = useContext(AppStateContext);
     const handleUndoClicked = () => {
         readdCriteriaToChecklist(criteriaId);
+        if (toastId) {
+            dispatch(dismissToast(toastId));
+        }
     }
 
     return (
@@ -108,7 +113,9 @@ const CriteriaResultToolbarTray: React.FC<{ criteriaId: string }> = ({ criteriaI
 
     async function handleDeleteClickedAsync() {
         removeCriteriaFromChecklist(criteriaId);
-        showToast(makeToast("info", Strings.CriteriaDeleted, 500000, <UndoDeleteCriteriaButton criteriaId={criteriaId} />));
+        const toast = makeToast("info", Strings.CriteriaDeleted);
+        toast.jsx = <UndoDeleteCriteriaButton criteriaId={criteriaId} toastId={toast.id} />;
+        showToast(toast);
     }
 
     return (
diff --git a/teachertool/src/transforms/readdCriteriaToChecklist.ts b/teachertool/src/transforms/readdCriteriaToChecklist.ts
index 9eb63e4204de..0e2c4653557c 100644
--- a/teachertool/src/transforms/readdCriteriaToChecklist.ts
+++ b/teachertool/src/transforms/readdCriteriaToChecklist.ts
@@ -12,10 +12,8 @@ export function readdCriteriaToChecklist(criteriaInstanceId: string) {
     const instance = getCriteriaInstanceWithId(teacherTool, criteriaInstanceId);
     const catalogCriteriaId = instance?.catalogCriteriaId;
     const allCriteria = [...teacherTool.checklist.criteria];
-    console.log("all of the criteria", allCriteria);
     const criteriaIndex = allCriteria.findIndex(c => c.instanceId === criteriaInstanceId);
     allCriteria[criteriaIndex].deleted = false;
-    console.log("all of the criteria after deletion", allCriteria);
 
     const newChecklist = {
         ...teacherTool.checklist,

From 275732b28d96c2f1275c8b1c15f86237de0d3dd7 Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <49178322+srietkerk@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:45:09 -0700
Subject: [PATCH 06/12] Have log debug have the correct string on readd

Co-authored-by: Eric Anderson <eanders@microsoft.com>
---
 teachertool/src/transforms/readdCriteriaToChecklist.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/teachertool/src/transforms/readdCriteriaToChecklist.ts b/teachertool/src/transforms/readdCriteriaToChecklist.ts
index 0e2c4653557c..336c41ee4f3f 100644
--- a/teachertool/src/transforms/readdCriteriaToChecklist.ts
+++ b/teachertool/src/transforms/readdCriteriaToChecklist.ts
@@ -7,7 +7,7 @@ import { getCriteriaInstanceWithId } from "../state/helpers";
 export function readdCriteriaToChecklist(criteriaInstanceId: string) {
     const { state: teacherTool } = stateAndDispatch();
 
-    logDebug(`Removing criteria with id: ${criteriaInstanceId}`);
+    logDebug(`Re-adding criteria with id: ${criteriaInstanceId}`);
 
     const instance = getCriteriaInstanceWithId(teacherTool, criteriaInstanceId);
     const catalogCriteriaId = instance?.catalogCriteriaId;

From 7f5298d10d9d28cd180295839c01a789eb0b24ce Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Tue, 10 Sep 2024 09:49:01 -0700
Subject: [PATCH 07/12] fix max with soft deletion

---
 teachertool/src/components/CatalogOverlay.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/teachertool/src/components/CatalogOverlay.tsx b/teachertool/src/components/CatalogOverlay.tsx
index ebd5ddf8af15..a95584496b46 100644
--- a/teachertool/src/components/CatalogOverlay.tsx
+++ b/teachertool/src/components/CatalogOverlay.tsx
@@ -80,7 +80,7 @@ const CatalogItem: React.FC<CatalogItemProps> = ({ catalogCriteria, recentlyAdde
     const { state: teacherTool } = useContext(AppStateContext);
 
     const existingInstanceCount = teacherTool.checklist.criteria.filter(
-        i => i.catalogCriteriaId === catalogCriteria.id
+        i => i.catalogCriteriaId === catalogCriteria.id && !i.deleted
     ).length;
     const isMaxed = catalogCriteria.maxCount !== undefined && existingInstanceCount >= catalogCriteria.maxCount;
     return catalogCriteria.template ? (

From 7cf2545adde799d4feba7c67e71b3814d3b9a20c Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Tue, 10 Sep 2024 16:18:21 -0700
Subject: [PATCH 08/12] hard delete criteria after toast goes away. added
 active criteria function to helpers

---
 teachertool/src/components/CatalogOverlay.tsx |  2 +-
 .../src/components/CriteriaResultEntry.tsx    |  9 ++++--
 teachertool/src/state/helpers.ts              |  4 +++
 .../transforms/removeCriteriaFromChecklist.ts |  9 +++---
 .../softDeleteCriteriaFromChecklist.ts        | 29 +++++++++++++++++++
 5 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 teachertool/src/transforms/softDeleteCriteriaFromChecklist.ts

diff --git a/teachertool/src/components/CatalogOverlay.tsx b/teachertool/src/components/CatalogOverlay.tsx
index a95584496b46..ebd5ddf8af15 100644
--- a/teachertool/src/components/CatalogOverlay.tsx
+++ b/teachertool/src/components/CatalogOverlay.tsx
@@ -80,7 +80,7 @@ const CatalogItem: React.FC<CatalogItemProps> = ({ catalogCriteria, recentlyAdde
     const { state: teacherTool } = useContext(AppStateContext);
 
     const existingInstanceCount = teacherTool.checklist.criteria.filter(
-        i => i.catalogCriteriaId === catalogCriteria.id && !i.deleted
+        i => i.catalogCriteriaId === catalogCriteria.id
     ).length;
     const isMaxed = catalogCriteria.maxCount !== undefined && existingInstanceCount >= catalogCriteria.maxCount;
     return catalogCriteria.template ? (
diff --git a/teachertool/src/components/CriteriaResultEntry.tsx b/teachertool/src/components/CriteriaResultEntry.tsx
index b326e8e33128..cd5034171bd9 100644
--- a/teachertool/src/components/CriteriaResultEntry.tsx
+++ b/teachertool/src/components/CriteriaResultEntry.tsx
@@ -20,6 +20,7 @@ import { showToast } from "../transforms/showToast";
 import { makeToast } from "../utils";
 import { readdCriteriaToChecklist } from "../transforms/readdCriteriaToChecklist";
 import { dismissToast } from "../state/actions";
+import { softDeleteCriteriaFromChecklist } from "../transforms/softDeleteCriteriaFromChecklist";
 
 interface CriteriaResultNotesProps {
     criteriaId: string;
@@ -112,10 +113,14 @@ const CriteriaResultToolbarTray: React.FC<{ criteriaId: string }> = ({ criteriaI
     }
 
     async function handleDeleteClickedAsync() {
-        removeCriteriaFromChecklist(criteriaId);
-        const toast = makeToast("info", Strings.CriteriaDeleted);
+        const toastTimeout = 5000;
+        softDeleteCriteriaFromChecklist(criteriaId);
+        const toast = makeToast("info", Strings.CriteriaDeleted, toastTimeout);
         toast.jsx = <UndoDeleteCriteriaButton criteriaId={criteriaId} toastId={toast.id} />;
         showToast(toast);
+        setTimeout(() => {
+            removeCriteriaFromChecklist(criteriaId);
+        }, toastTimeout + 500);
     }
 
     return (
diff --git a/teachertool/src/state/helpers.ts b/teachertool/src/state/helpers.ts
index 61e14759e06e..38ce83bf9b30 100644
--- a/teachertool/src/state/helpers.ts
+++ b/teachertool/src/state/helpers.ts
@@ -11,6 +11,10 @@ export function getCatalogCriteriaWithId(id: string): CatalogCriteria | undefine
     return state.catalog?.find(c => c.id === id);
 }
 
+export function getActiveCriteria(state: AppState): CriteriaInstance[] {
+    return state.checklist.criteria.filter(c => !c.deleted);
+}
+
 export function getCriteriaInstanceWithId(state: AppState, id: string): CriteriaInstance | undefined {
     return state.checklist.criteria.find(c => c.instanceId === id);
 }
diff --git a/teachertool/src/transforms/removeCriteriaFromChecklist.ts b/teachertool/src/transforms/removeCriteriaFromChecklist.ts
index 652afb9bbd30..f1439890d8dd 100644
--- a/teachertool/src/transforms/removeCriteriaFromChecklist.ts
+++ b/teachertool/src/transforms/removeCriteriaFromChecklist.ts
@@ -11,14 +11,13 @@ export function removeCriteriaFromChecklist(criteriaInstanceId: string) {
 
     const instance = getCriteriaInstanceWithId(teacherTool, criteriaInstanceId);
     const catalogCriteriaId = instance?.catalogCriteriaId;
-    const allCriteria = [...teacherTool.checklist.criteria];
-    const criteriaIndex = allCriteria.findIndex(c => c.instanceId === criteriaInstanceId);
-    allCriteria[criteriaIndex].deleted = true;
-
 
     const newChecklist = {
         ...teacherTool.checklist,
-        criteria: allCriteria,
+        criteria: teacherTool.checklist.criteria.filter(c =>
+            c.instanceId !== criteriaInstanceId ||
+            c.instanceId === criteriaInstanceId && !c.deleted
+        ),
     };
 
     setChecklist(newChecklist);
diff --git a/teachertool/src/transforms/softDeleteCriteriaFromChecklist.ts b/teachertool/src/transforms/softDeleteCriteriaFromChecklist.ts
new file mode 100644
index 000000000000..dc56e5419734
--- /dev/null
+++ b/teachertool/src/transforms/softDeleteCriteriaFromChecklist.ts
@@ -0,0 +1,29 @@
+import { stateAndDispatch } from "../state";
+import { logDebug } from "../services/loggingService";
+import { setChecklist } from "./setChecklist";
+import { Ticks } from "../constants";
+import { getCriteriaInstanceWithId } from "../state/helpers";
+
+export function softDeleteCriteriaFromChecklist(criteriaInstanceId: string) {
+    const { state: teacherTool } = stateAndDispatch();
+
+    logDebug(`Soft deleting criteria with id: ${criteriaInstanceId}`);
+
+    const instance = getCriteriaInstanceWithId(teacherTool, criteriaInstanceId);
+    const catalogCriteriaId = instance?.catalogCriteriaId;
+    const allCriteria = [...teacherTool.checklist.criteria];
+    const criteriaIndex = allCriteria.findIndex(c => c.instanceId === criteriaInstanceId);
+    allCriteria[criteriaIndex].deleted = true;
+
+
+    const newChecklist = {
+        ...teacherTool.checklist,
+        criteria: allCriteria,
+    };
+
+    setChecklist(newChecklist);
+
+    if (catalogCriteriaId) {
+        pxt.tickEvent(Ticks.RemoveCriteria, { catalogCriteriaId });
+    }
+}

From 02d42a808073cbc7f4d03633ecaa95d06b5edb53 Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Tue, 10 Sep 2024 16:19:47 -0700
Subject: [PATCH 09/12] remove jsx from make toast since not being used

---
 teachertool/src/utils/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/teachertool/src/utils/index.ts b/teachertool/src/utils/index.ts
index f70b2afc250d..a8a35c78b165 100644
--- a/teachertool/src/utils/index.ts
+++ b/teachertool/src/utils/index.ts
@@ -5,13 +5,12 @@ import { classList } from "react-common/components/util";
 import { CatalogCriteria } from "../types/criteria";
 import { Strings } from "../constants";
 
-export function makeToast(type: ToastType, text: string, timeoutMs: number = 5000, jsx?: React.ReactNode): ToastWithId {
+export function makeToast(type: ToastType, text: string, timeoutMs: number = 5000): ToastWithId {
     return {
         id: nanoid(),
         type,
         text,
         timeoutMs,
-        jsx,
     };
 }
 

From 0935b2078b5bca70f6644e91a8a9d723c45bac00 Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Tue, 10 Sep 2024 16:23:09 -0700
Subject: [PATCH 10/12] renamed readd to reAdd

---
 teachertool/src/components/CriteriaResultEntry.tsx            | 4 ++--
 ...eaddCriteriaToChecklist.ts => reAddCriteriaToChecklist.ts} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename teachertool/src/transforms/{readdCriteriaToChecklist.ts => reAddCriteriaToChecklist.ts} (93%)

diff --git a/teachertool/src/components/CriteriaResultEntry.tsx b/teachertool/src/components/CriteriaResultEntry.tsx
index cd5034171bd9..17f0ac761444 100644
--- a/teachertool/src/components/CriteriaResultEntry.tsx
+++ b/teachertool/src/components/CriteriaResultEntry.tsx
@@ -18,7 +18,7 @@ import { Button } from "react-common/components/controls/Button";
 import { setEvalResult } from "../transforms/setEvalResult";
 import { showToast } from "../transforms/showToast";
 import { makeToast } from "../utils";
-import { readdCriteriaToChecklist } from "../transforms/readdCriteriaToChecklist";
+import { reAddCriteriaToChecklist } from "../transforms/reAddCriteriaToChecklist";
 import { dismissToast } from "../state/actions";
 import { softDeleteCriteriaFromChecklist } from "../transforms/softDeleteCriteriaFromChecklist";
 
@@ -82,7 +82,7 @@ const CriteriaResultError: React.FC<CriteriaResultErrorProps> = ({ criteriaInsta
 const UndoDeleteCriteriaButton: React.FC<{ criteriaId: string, toastId: string }> = ({ criteriaId, toastId }) => {
     const { dispatch } = useContext(AppStateContext);
     const handleUndoClicked = () => {
-        readdCriteriaToChecklist(criteriaId);
+        reAddCriteriaToChecklist(criteriaId);
         if (toastId) {
             dispatch(dismissToast(toastId));
         }
diff --git a/teachertool/src/transforms/readdCriteriaToChecklist.ts b/teachertool/src/transforms/reAddCriteriaToChecklist.ts
similarity index 93%
rename from teachertool/src/transforms/readdCriteriaToChecklist.ts
rename to teachertool/src/transforms/reAddCriteriaToChecklist.ts
index 336c41ee4f3f..67e24780a2d3 100644
--- a/teachertool/src/transforms/readdCriteriaToChecklist.ts
+++ b/teachertool/src/transforms/reAddCriteriaToChecklist.ts
@@ -4,7 +4,7 @@ import { setChecklist } from "./setChecklist";
 import { Ticks } from "../constants";
 import { getCriteriaInstanceWithId } from "../state/helpers";
 
-export function readdCriteriaToChecklist(criteriaInstanceId: string) {
+export function reAddCriteriaToChecklist(criteriaInstanceId: string) {
     const { state: teacherTool } = stateAndDispatch();
 
     logDebug(`Re-adding criteria with id: ${criteriaInstanceId}`);

From 6a0d7b59bc31379ed38a1d45463f6c1f2f4c4a68 Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Tue, 10 Sep 2024 16:31:19 -0700
Subject: [PATCH 11/12] using helper for active criteria where necessary

---
 teachertool/src/components/EvalResultDisplay.tsx | 6 ++----
 teachertool/src/transforms/runEvaluateAsync.ts   | 5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/teachertool/src/components/EvalResultDisplay.tsx b/teachertool/src/components/EvalResultDisplay.tsx
index e424f60b1627..5a99136c4786 100644
--- a/teachertool/src/components/EvalResultDisplay.tsx
+++ b/teachertool/src/components/EvalResultDisplay.tsx
@@ -16,7 +16,7 @@ import { runEvaluateAsync } from "../transforms/runEvaluateAsync";
 import { isProjectLoaded } from "../state/helpers";
 import { showToast } from "../state/actions";
 import { makeToast } from "../utils";
-import { getSafeChecklistName } from "../state/helpers";
+import { getSafeChecklistName, getActiveCriteria } from "../state/helpers";
 import { writeChecklistToFile } from "../services/fileSystemService";
 
 interface ResultsHeaderProps {
@@ -115,14 +115,12 @@ const ResultsHeader: React.FC<ResultsHeaderProps> = ({ printRef }) => {
 
 const CriteriaWithResultsTable: React.FC = () => {
     const { state: teacherTool } = useContext(AppStateContext);
-    const { checklist } = teacherTool;
-    const { criteria } = checklist;
+    const criteria = getActiveCriteria(teacherTool);
 
     return (
         <div className={css["results-list"]}>
             {Object.values(criteria).map(criteriaInstance => {
                 return (
-                    !criteriaInstance.deleted &&
                     <CriteriaResultEntry criteriaId={criteriaInstance.instanceId} key={criteriaInstance.instanceId} />
                 );
             })}
diff --git a/teachertool/src/transforms/runEvaluateAsync.ts b/teachertool/src/transforms/runEvaluateAsync.ts
index e1ea6b8bb153..3ff314bc2029 100644
--- a/teachertool/src/transforms/runEvaluateAsync.ts
+++ b/teachertool/src/transforms/runEvaluateAsync.ts
@@ -4,6 +4,7 @@ import { showToast } from "./showToast";
 import { setActiveTab } from "./setActiveTab";
 import { runSingleEvaluateAsync } from "./runSingleEvaluateAsync";
 import { Strings } from "../constants";
+import { getActiveCriteria } from "../state/helpers";
 
 export async function runEvaluateAsync(fromUserInteraction: boolean) {
     const { state: teacherTool } = stateAndDispatch();
@@ -17,9 +18,9 @@ export async function runEvaluateAsync(fromUserInteraction: boolean) {
         setActiveTab("results");
     }
 
-    const validCriteria = teacherTool.checklist.criteria.filter(c => !c.deleted);
+    const activeCriteria = getActiveCriteria(teacherTool);
 
-    const evalRequests = validCriteria.map(criteriaInstance =>
+    const evalRequests = activeCriteria.map(criteriaInstance =>
         runSingleEvaluateAsync(criteriaInstance.instanceId, fromUserInteraction)
     );
 

From 5031335e0f72ff205394549ebf6b57f48479d872 Mon Sep 17 00:00:00 2001
From: Sarah Rietkerk <sarahnrietkerk@gmail.com>
Date: Tue, 10 Sep 2024 16:47:41 -0700
Subject: [PATCH 12/12] only export active criteria

---
 teachertool/src/components/EvalResultDisplay.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/teachertool/src/components/EvalResultDisplay.tsx b/teachertool/src/components/EvalResultDisplay.tsx
index 5a99136c4786..7edbaea8e4aa 100644
--- a/teachertool/src/components/EvalResultDisplay.tsx
+++ b/teachertool/src/components/EvalResultDisplay.tsx
@@ -13,10 +13,9 @@ import { setChecklistName } from "../transforms/setChecklistName";
 import { Strings, Ticks } from "../constants";
 import { Button } from "react-common/components/controls/Button";
 import { runEvaluateAsync } from "../transforms/runEvaluateAsync";
-import { isProjectLoaded } from "../state/helpers";
 import { showToast } from "../state/actions";
 import { makeToast } from "../utils";
-import { getSafeChecklistName, getActiveCriteria } from "../state/helpers";
+import { isProjectLoaded, getSafeChecklistName, getActiveCriteria } from "../state/helpers";
 import { writeChecklistToFile } from "../services/fileSystemService";
 
 interface ResultsHeaderProps {
@@ -27,6 +26,7 @@ const ResultsHeader: React.FC<ResultsHeaderProps> = ({ printRef }) => {
     const { state: teacherTool } = useContext(AppStateContext);
     const { checklist, projectMetadata } = teacherTool;
     let { name: checklistName } = checklist;
+    const criteriaToExport = getActiveCriteria(teacherTool);
     const [checklistNameInputRef, setChecklistNameInputRef] = useState<HTMLInputElement>();
 
     const handleEvaluateClickedAsync = async () => {
@@ -49,7 +49,7 @@ const ResultsHeader: React.FC<ResultsHeaderProps> = ({ printRef }) => {
 
     const handleExportChecklistClicked = () => {
         pxt.tickEvent(Ticks.ExportChecklist);
-        writeChecklistToFile(checklist);
+        writeChecklistToFile({ name: checklistName, criteria: criteriaToExport });
     };
 
     return (