Add ticks for loading projects

microsoft · Sep 20, 2024 · 9207098 · 9207098
1 parent e755114
commit 9207098
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/teachertool/src/App.tsx b/teachertool/src/App.tsx
@@ -19,6 +19,7 @@ import { SignedOutPanel } from "./components/SignedOutPanel";
 import * as authClient from "./services/authClient";
 import { ErrorCode } from "./types/errorCode";
 import { loadProjectMetadataAsync } from "./transforms/loadProjectMetadataAsync";
+import { Ticks } from "./constants";
 
 export const App = () => {
     const { state, dispatch } = useContext(AppStateContext);
@@ -47,6 +48,7 @@ export const App = () => {
                     const decoded = decodeURIComponent(projectParam);
                     const shareId = pxt.Cloud.parseScriptId(decoded);
                     if (!!shareId) {
+                        pxt.tickEvent(Ticks.LoadProjectFromUrl);
                         await loadProjectMetadataAsync(decoded, shareId);
                     }
                 }

diff --git a/teachertool/src/components/ShareLinkInput.tsx b/teachertool/src/components/ShareLinkInput.tsx
@@ -5,6 +5,9 @@ import { AppStateContext } from "../state/appStateContext";
 import { classList } from "react-common/components/util";
 import { Input } from "react-common/components/controls/Input";
 import { loadProjectMetadataAsync } from "../transforms/loadProjectMetadataAsync";
+import { Strings, Ticks } from "../constants";
+import { getChecklistHash, makeToast } from "../utils";
+import { showToast } from "../transforms/showToast";
 
 interface IProps {}
 
@@ -26,7 +29,14 @@ export const ShareLinkInput: React.FC<IProps> = () => {
 
     const onEnterKey = useCallback(() => {
         const shareId = pxt.Cloud.parseScriptId(text);
-        if (!!shareId && !(shareId === projectMetadata?.shortid || shareId === projectMetadata?.persistId)) {
+        if (!shareId) {
+            pxt.tickEvent(Ticks.LoadProjectInvalid);
+            showToast(makeToast("error", lf(Strings.InvalidShareLink)));
+            return;
+        }
+
+        if (shareId !== projectMetadata?.shortid && shareId !== projectMetadata?.persistId) {
+            pxt.tickEvent(Ticks.LoadProjectFromInput, { checklistHash: getChecklistHash(teacherTool.checklist) });
             loadProjectMetadataAsync(text, shareId);
         }
     }, [text, projectMetadata?.shortid, projectMetadata?.persistId]);

diff --git a/teachertool/src/constants.ts b/teachertool/src/constants.ts
@@ -58,6 +58,7 @@ export namespace Strings {
     export const BelowMin = lf("Below minimum value");
     export const ExceedsMax = lf("Exceeds maximum value");
     export const InvalidValue = lf("Invalid value");
+    export const InvalidShareLink = lf("Invalid share link");
 }
 
 export namespace Ticks {
@@ -89,6 +90,9 @@ export namespace Ticks {
     export const ParamErrorMissingMessage = "teachertool.paramerrormissingmessage";
     export const SetEvalResultOutcome = "teachertool.setevalresultoutcome";
     export const SetEvalResultNotes = "teachertool.setevalresultnotes";
+    export const LoadProjectFromInput = "teachertool.loadproject.frominput";
+    export const LoadProjectFromUrl = "teachertool.loadproject.fromurl";
+    export const LoadProjectInvalid = "teachertool.loadproject.invalid";
 }
 
 namespace Misc {

diff --git a/teachertool/src/utils/index.ts b/teachertool/src/utils/index.ts
@@ -84,7 +84,7 @@ export function getReadableBlockString(name: string) {
 export function getChecklistHash(checklist: Checklist): string {
     // We only hash the criteria (not the name), since the name doesn't really matter in our scenarios,
     // and it could be translated, etc for built-in checklists.
-    return pxt.Util.sha256(JSON.stringify(checklist.criteria));
+    return checklist.criteria.length == 0 ? "empty" : pxt.Util.sha256(JSON.stringify(checklist.criteria));
 }
 
 export function getObfuscatedProjectId(projectId: string | undefined): string {