max-line-length: 120

microsoft · Jan 25, 2024 · 0470d35 · 0470d35
1 parent 7b39e4a
commit 0470d35
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 16 deletions.
diff --git a/teachertool/.prettierrc b/teachertool/.prettierrc
@@ -2,5 +2,5 @@
     "arrowParens": "avoid",
     "semi": true,
     "tabWidth": 4,
-    "printWidth":200
+    "printWidth":120
 }
diff --git a/teachertool/src/components/ActiveRubricDisplay.tsx b/teachertool/src/components/ActiveRubricDisplay.tsx
@@ -23,12 +23,22 @@ const ActiveRubricDisplay: React.FC<IProps> = ({}) => {
                     criteriaInstance.catalogCriteriaId && (
                         <div className="criteria-instance-display" key={criteriaInstance.instanceId}>
                             {catalogCriteria?.template}
-                            <Button className="criteria-btn-remove" label={lf("X")} onClick={() => removeCriteriaFromRubric(criteriaInstance)} title={lf("Remove")} />
+                            <Button
+                                className="criteria-btn-remove"
+                                label={lf("X")}
+                                onClick={() => removeCriteriaFromRubric(criteriaInstance)}
+                                title={lf("Remove")}
+                            />
                         </div>
                     )
                 );
             })}
-            <Button className="add-criteria secondary" label={lf("+ Add Criteria")} onClick={showCatalogModal} title={lf("Add Criteria")} />
+            <Button
+                className="add-criteria secondary"
+                label={lf("+ Add Criteria")}
+                onClick={showCatalogModal}
+                title={lf("Add Criteria")}
+            />
         </div>
     );
 };

diff --git a/teachertool/src/components/CatalogModal.tsx b/teachertool/src/components/CatalogModal.tsx
@@ -54,7 +54,12 @@ const CatalogModal: React.FC<IProps> = ({}) => {
     ];
 
     return teacherTool.modal === "catalog-display" ? (
-        <Modal className="catalog-modal" title={lf("Select the criteria you'd like to include")} onClose={closeModal} actions={modalActions}>
+        <Modal
+            className="catalog-modal"
+            title={lf("Select the criteria you'd like to include")}
+            onClose={closeModal}
+            actions={modalActions}
+        >
             {teacherTool.catalog?.map(criteria => {
                 return (
                     criteria?.template && (

diff --git a/teachertool/src/components/DebugInput.tsx b/teachertool/src/components/DebugInput.tsx
@@ -22,13 +22,25 @@ const DebugInput: React.FC<IProps> = ({}) => {
         <div className="debug-container">
             <div className="single-share-link-input-container">
                 {lf("Share Link:")}
-                <Input id="shareLinkInput" className="link-input" placeholder={lf("Share link to validate")} initialValue={shareLink} onChange={setShareLink} />
+                <Input
+                    id="shareLinkInput"
+                    className="link-input"
+                    placeholder={lf("Share link to validate")}
+                    initialValue={shareLink}
+                    onChange={setShareLink}
+                />
             </div>
             <div className="rubric-json-input-container">
                 {lf("Rubric:")}
                 <Textarea id="rubricJsonInput" className="json-input" rows={20} onChange={setRubric} />
             </div>
-            <Button id="evaluateSingleProjectButton" className="ui button primary" onClick={evaluate} title={"Evaluate"} label={lf("Evaluate")} />
+            <Button
+                id="evaluateSingleProjectButton"
+                className="ui button primary"
+                onClick={evaluate}
+                title={"Evaluate"}
+                label={lf("Evaluate")}
+            />
         </div>
     );
 };

diff --git a/teachertool/src/components/EvalResultDisplay.tsx b/teachertool/src/components/EvalResultDisplay.tsx
@@ -19,7 +19,9 @@ const EvalResultDisplay: React.FC<IProps> = ({}) => {
                         return (
                             <div className="result-block-id" key={id}>
                                 <p className="block-id-label">{id}:</p>
-                                <p className={result ? "positive-text" : "negative-text"}>{result ? "passed" : "failed"}</p>
+                                <p className={result ? "positive-text" : "negative-text"}>
+                                    {result ? "passed" : "failed"}
+                                </p>
                             </div>
                         );
                     })}

diff --git a/teachertool/src/components/HeaderBar.tsx b/teachertool/src/components/HeaderBar.tsx
@@ -14,7 +14,11 @@ export const HeaderBar: React.FC<HeaderBarProps> = () => {
         return (
             <div className="ui item logo organization">
                 {appTheme.organizationWideLogo || appTheme.organizationLogo ? (
-                    <img className={`ui logo`} src={appTheme.organizationWideLogo || appTheme.organizationLogo} alt={lf("{0} Logo", appTheme.organization)} />
+                    <img
+                        className={`ui logo`}
+                        src={appTheme.organizationWideLogo || appTheme.organizationLogo}
+                        alt={lf("{0} Logo", appTheme.organization)}
+                    />
                 ) : (
                     <span className="name">{appTheme.organization}</span>
                 )}
@@ -24,7 +28,12 @@ export const HeaderBar: React.FC<HeaderBarProps> = () => {
 
     const getTargetLogo = () => {
         return (
-            <div aria-label={lf("{0} Logo", appTheme.boardName)} role="menuitem" className={`ui item logo brand mobile hide`} onClick={brandIconClick}>
+            <div
+                aria-label={lf("{0} Logo", appTheme.boardName)}
+                role="menuitem"
+                className={`ui item logo brand mobile hide`}
+                onClick={brandIconClick}
+            >
                 {appTheme.useTextLogo ? (
                     [
                         <span className="name" key="org-name">
@@ -35,7 +44,11 @@ export const HeaderBar: React.FC<HeaderBarProps> = () => {
                         </span>,
                     ]
                 ) : appTheme.logo || appTheme.portraitLogo ? (
-                    <img className={`ui ${appTheme.logoWide ? "small" : ""} logo`} src={appTheme.logo || appTheme.portraitLogo} alt={lf("{0} Logo", appTheme.boardName)} />
+                    <img
+                        className={`ui ${appTheme.logoWide ? "small" : ""} logo`}
+                        src={appTheme.logo || appTheme.portraitLogo}
+                        alt={lf("{0} Logo", appTheme.boardName)}
+                    />
                 ) : (
                     <span className="name">{appTheme.boardName}</span>
                 )}
@@ -69,7 +82,12 @@ export const HeaderBar: React.FC<HeaderBarProps> = () => {
                 <div className="spacer" />
 
                 <div className="header-right">
-                    <Button className="menu-button" leftIcon="fas fa-home large" title={lf("Return to the editor homepage")} onClick={onHomeClicked} />
+                    <Button
+                        className="menu-button"
+                        leftIcon="fas fa-home large"
+                        title={lf("Return to the editor homepage")}
+                        onClick={onHomeClicked}
+                    />
                 </div>
             </MenuBar>
         </header>

diff --git a/teachertool/src/components/MakecodeFrame.tsx b/teachertool/src/components/MakecodeFrame.tsx
@@ -9,7 +9,9 @@ export const MakeCodeFrame: React.FC<MakeCodeFrameProps> = () => {
     const { state: teacherTool } = useContext(AppStateContext);
 
     function createIFrameUrl(shareId: string): string {
-        const editorUrl: string = pxt.BrowserUtils.isLocalHost() ? "http://localhost:3232/index.html" : getEditorUrl((window as any).pxtTargetBundle.appTheme.embedUrl);
+        const editorUrl: string = pxt.BrowserUtils.isLocalHost()
+            ? "http://localhost:3232/index.html"
+            : getEditorUrl((window as any).pxtTargetBundle.appTheme.embedUrl);
 
         let url = editorUrl;
         if (editorUrl.charAt(editorUrl.length - 1) === "/" && !pxt.BrowserUtils.isLocalHost()) {
@@ -26,7 +28,14 @@ export const MakeCodeFrame: React.FC<MakeCodeFrameProps> = () => {
     /* eslint-disable @microsoft/sdl/react-iframe-missing-sandbox */
     return (
         <div className="makecode-frame-outer" style={{ display: "block" }}>
-            {teacherTool.projectMetadata && <iframe className="makecode-frame" src={createIFrameUrl(teacherTool.projectMetadata.id)} title={"title"} ref={handleIFrameRef} />}
+            {teacherTool.projectMetadata && (
+                <iframe
+                    className="makecode-frame"
+                    src={createIFrameUrl(teacherTool.projectMetadata.id)}
+                    title={"title"}
+                    ref={handleIFrameRef}
+                />
+            )}
         </div>
     );
     /* eslint-enable @microsoft/sdl/react-iframe-missing-sandbox */

diff --git a/teachertool/src/state/actions.ts b/teachertool/src/state/actions.ts
@@ -62,7 +62,17 @@ type HideModal = ActionBase & {
  * Union of all actions
  */
 
-export type Action = PostNotification | RemoveNotification | SetProjectMetadata | SetEvalResult | SetTargetConfig | SetCatalog | SetSelectedCriteria | RemoveCriteriaInstance | ShowModal | HideModal;
+export type Action =
+    | PostNotification
+    | RemoveNotification
+    | SetProjectMetadata
+    | SetEvalResult
+    | SetTargetConfig
+    | SetCatalog
+    | SetSelectedCriteria
+    | RemoveCriteriaInstance
+    | ShowModal
+    | HideModal;
 
 /**
  * Action creators
@@ -116,4 +126,15 @@ const hideModal = (): HideModal => ({
     type: "HIDE_MODAL",
 });
 
-export { postNotification, removeNotification, setProjectMetadata, setEvalResult, setTargetConfig, setCatalog, setSelectedCriteria, removeCriteriaInstance, showModal, hideModal };
+export {
+    postNotification,
+    removeNotification,
+    setProjectMetadata,
+    setEvalResult,
+    setTargetConfig,
+    setCatalog,
+    setSelectedCriteria,
+    removeCriteriaInstance,
+    showModal,
+    hideModal,
+};
diff --git a/teachertool/src/transforms/addCriteriaToRubric.ts b/teachertool/src/transforms/addCriteriaToRubric.ts
@@ -14,7 +14,9 @@ export function addCriteriaToRubric(catalogCriteriaIds: string[]) {
     for (const catalogCriteriaId of catalogCriteriaIds) {
         const catalogCriteria = getCatalogCriteriaWithId(catalogCriteriaId);
         if (!catalogCriteria) {
-            logError(ErrorCode.addingMissingCriteria, "Attempting to add criteria with unrecognized id", { id: catalogCriteriaId });
+            logError(ErrorCode.addingMissingCriteria, "Attempting to add criteria with unrecognized id", {
+                id: catalogCriteriaId,
+            });
             continue;
         }