Filter criteria you've already included in your rubric

teachertool/src/components/CatalogModal.tsx

@@ -7,6 +7,7 @@ import { Modal } from "react-common/components/controls/Modal";
 import { hideModal } from "../transforms/hideModal";
 import { addCriteriaToRubric } from "../transforms/addCriteriaToRubric";
 import { CatalogCriteria } from "../types/criteria";
+import { getSelectableCatalogCriteria } from "../state/helpers";
 
 interface IProps {}
 
@@ -53,14 +54,16 @@ export const CatalogModal: React.FC<IProps> = ({}) => {
         },
     ];
 
+    const selectableCatalogCriteria = getSelectableCatalogCriteria();
+
     return teacherTool.modal === "catalog-display" ? (
         <Modal
             className="catalog-modal"
             title={lf("Select the criteria you'd like to include")}
             onClose={closeModal}
             actions={modalActions}
         >
-            {teacherTool.catalog?.map(criteria => {
+            {selectableCatalogCriteria.map(criteria => {
                 return (
                     criteria?.template && (
                         <Checkbox

teachertool/src/state/helpers.ts

@@ -41,3 +41,19 @@ export function verifyRubricIntegrity(rubric: Rubric): {
     }
     return { valid: invalidCriteria.length === 0, validCriteria, invalidCriteria };
 }
+
+export function getSelectableCatalogCriteria(): CatalogCriteria[] {
+    const { state } = stateAndDispatch();
+
+    const usedCriteria = state.rubric.criteria.map(c => c.catalogCriteriaId) ?? [];
+
+    // Return a criteria as selectable if it has parameters (so it can be used multiple times in a rubric)
+    // or if it has not yet been used in the active rubric.
+    return (
+        state.catalog?.filter(
+            catalogCriteria =>
+                (catalogCriteria.parameters && catalogCriteria.parameters.length > 0) ||
+                !usedCriteria.includes(catalogCriteria.id)
+        ) ?? []
+    );
+}