diff --git a/teachertool/src/components/CatalogOverlay.tsx b/teachertool/src/components/CatalogOverlay.tsx index ecd99ea0ff92..f86fc80d5ff1 100644 --- a/teachertool/src/components/CatalogOverlay.tsx +++ b/teachertool/src/components/CatalogOverlay.tsx @@ -44,10 +44,7 @@ const CatalogItemLabel: React.FC = ({ catalogCriteria, is
{isMaxed ? ( - + ) : ( <> = ({ catalogCriteria, is title={lf("Added!")} /> diff --git a/teachertool/src/components/CriteriaResultEntry.tsx b/teachertool/src/components/CriteriaResultEntry.tsx index 9e04a4c13537..ccb160c6dc0b 100644 --- a/teachertool/src/components/CriteriaResultEntry.tsx +++ b/teachertool/src/components/CriteriaResultEntry.tsx @@ -69,7 +69,11 @@ const CriteriaResultError: React.FC = ({ criteriaInsta leftIcon="fas fa-times-circle" title={Strings.Dismiss} onClick={() => - setEvalResult(criteriaInstanceId, { result: EvaluationStatus.NotStarted, resultIsManual: false, error: undefined }) + setEvalResult(criteriaInstanceId, { + result: EvaluationStatus.NotStarted, + resultIsManual: false, + error: undefined, + }) } />
diff --git a/teachertool/src/components/ImportChecklistModal.tsx b/teachertool/src/components/ImportChecklistModal.tsx index 2fb3208f33ee..f94a0d098fa1 100644 --- a/teachertool/src/components/ImportChecklistModal.tsx +++ b/teachertool/src/components/ImportChecklistModal.tsx @@ -23,10 +23,10 @@ export const ImportChecklistModal: React.FC = () => { async function handleFileDroppedAsync(file: File) { const parsedChecklist = await getChecklistFromFileAsync(file, false /* allow partial */); if (!parsedChecklist) { - pxt.tickEvent(Ticks.ImportChecklistInvalidFile) + pxt.tickEvent(Ticks.ImportChecklistInvalidFile); setErrorMessage(Strings.InvalidChecklistFile); } else { - pxt.tickEvent(Ticks.ImportChecklistSuccess) + pxt.tickEvent(Ticks.ImportChecklistSuccess); setErrorMessage(undefined); closeModal(true); replaceActiveChecklistAsync(parsedChecklist); @@ -34,7 +34,11 @@ export const ImportChecklistModal: React.FC = () => { } return teacherTool.modalOptions?.modal === "import-checklist" ? ( - closeModal(false)} className={css["import-checklist-modal"]}> + closeModal(false)} + className={css["import-checklist-modal"]} + >
diff --git a/teachertool/src/transforms/mergeEvalResult.ts b/teachertool/src/transforms/mergeEvalResult.ts index 93f2adce4aca..82ba038e1f0f 100644 --- a/teachertool/src/transforms/mergeEvalResult.ts +++ b/teachertool/src/transforms/mergeEvalResult.ts @@ -4,7 +4,12 @@ import { setEvalResult } from "./setEvalResult"; import { setUserFeedback } from "./setUserFeedback"; // This will set the outcome and notes for a given criteria instance id, but if the provided value is undefined, it will not change that value. -export function mergeEvalResult(criteriaInstanceId: string, isManual: boolean, outcome?: EvaluationStatus, notes?: string) { +export function mergeEvalResult( + criteriaInstanceId: string, + isManual: boolean, + outcome?: EvaluationStatus, + notes?: string +) { const { state: teacherTool, dispatch } = stateAndDispatch(); const newCriteriaEvalResult = { ...teacherTool.evalResults[criteriaInstanceId] }; diff --git a/teachertool/src/types/criteriaParameters.ts b/teachertool/src/types/criteriaParameters.ts index 4c78e05096cd..cebc60b7f2a6 100644 --- a/teachertool/src/types/criteriaParameters.ts +++ b/teachertool/src/types/criteriaParameters.ts @@ -6,29 +6,29 @@ export type CriteriaParameterBase = { type: CriteriaParameterType; default: string | undefined; paths: string[]; // The json path(s) to update with the parameter value in the catalog criteria. -} +}; export type StringParameterBase = CriteriaParameterBase & { maxCharacters?: number; -} +}; export type StringParameter = StringParameterBase & { type: "string"; -} +}; export type LongStringParameter = StringParameterBase & { type: "longString"; -} +}; export type NumberParameter = CriteriaParameterBase & { type: "number"; min?: number; max?: number; -} +}; export type BlockParameter = CriteriaParameterBase & { type: "block"; -} +}; /** * System parameters are fields that can change for a criteria but which are not set directly by the user. @@ -37,9 +37,14 @@ export type BlockParameter = CriteriaParameterBase & { export type SystemParameter = CriteriaParameterBase & { type: "system"; key?: string; -} - -export type CriteriaParameter = StringParameter | LongStringParameter | NumberParameter | BlockParameter | SystemParameter; +}; + +export type CriteriaParameter = + | StringParameter + | LongStringParameter + | NumberParameter + | BlockParameter + | SystemParameter; export interface CriteriaParameterValidationResult { valid: boolean;