fixup! chore: replace todos with issues

greyscaled · greyscaled · commit 305b97b69b05 · 2022-04-19T16:05:30.000Z
diff --git a/site/e2e/util.ts b/site/e2e/util.ts
@@ -57,10 +57,10 @@ interface WaitForClientSideNavigationOpts {
  * @remark This is necessary in a client-side SPA world since playwright
  * waitForNavigation waits for load events on the DOM (ex: after a page load
  * from the server).
- *
- * @todo Better logging for this.
  */
 export const waitForClientSideNavigation = async (page: Page, opts: WaitForClientSideNavigationOpts): Promise<void> => {
+  console.info(`--- waitForClientSideNavigation: start`)
+
   await Promise.all([
     waitFor(() => {
       const conditions: boolean[] = []
@@ -74,9 +74,12 @@ export const waitForClientSideNavigation = async (page: Page, opts: WaitForClien
       }
 
       const unmetConditions = conditions.filter((condition) => !condition)
+      console.info(`--- waitForClientSideNavigation: ${unmetConditions.length} conditions not met`)
 
       return Promise.resolve(unmetConditions.length === 0)
     }),
     page.waitForLoadState("networkidle"),
   ])
+
+  console.info(`--- waitForClientSideNavigation: done`)
 }
diff --git a/site/embed.go b/site/embed.go
@@ -270,8 +270,6 @@ func secureHeaders(next http.Handler) http.Handler {
 
 		// Only scripts can manipulate the dom. This prevents someone from
 		// naming themselves something like '<svg onload="alert(/cross-site-scripting/)" />'.
-		// TODO: @emyrk we need to make FE changes to enable this. We get 'TrustedHTML' and 'TrustedURL' errors
-		//		that require FE changes to work.
 		// "require-trusted-types-for" : []string{"'script'"},
 	}
 
diff --git a/site/src/components/Form/FormTextField.tsx b/site/src/components/Form/FormTextField.tsx
@@ -62,7 +62,7 @@ export interface FormTextFieldProps<T>
    *   }}
    * />
    */
-  eventTransform?: (value: string) => unknown
+  eventTransform?: (value: string) => string
   /**
    * isPassword uses a PasswordField component when `true`; otherwise a
    * TextField component is used.
@@ -145,13 +145,8 @@ export const FormTextField = <T,>({
         }
 
         const event = e
-        if (typeof eventTransform !== "undefined") {
-          // TODO(Grey): Asserting the type as a string here is not quite
-          // right in that when an input is of type="number", the value will
-          // be a number. Type asserting is better than conversion for this
-          // reason, but perhaps there's a better way to do this without any
-          // assertions.
-          event.target.value = eventTransform(e.target.value) as string
+        if (typeof eventTransform !== "undefined" && typeof event.target.value === "string") {
+          event.target.value = eventTransform(e.target.value)
         }
         form.handleChange(event)
       }}
diff --git a/site/src/pages/templates/[organization]/[template]/index.tsx b/site/src/pages/templates/[organization]/[template]/index.tsx
@@ -25,9 +25,8 @@ export const TemplatePage: React.FC = () => {
     () => `/api/v2/organizations/${unsafeSWRArgument(organizationInfo).id}/templates/${templateName}`,
   )
 
-  // TODO: The workspaces endpoint was recently changed, so that we can't get
-  // workspaces per-template. This just grabs all workspaces... and then
-  // later filters them to match the current template.
+  // This just grabs all workspaces... and then later filters them to match the
+  // current template.
   const { data: workspaces, error: workspacesError } = useSWR<Workspace[], Error>(() => `/api/v2/users/me/workspaces`)
 
   if (organizationError) {

Original file line number	Diff line number	Diff line change
`@@ -270,8 +270,6 @@ func secureHeaders(next http.Handler) http.Handler {`
`270`	`270`
`271`	`271`	`// Only scripts can manipulate the dom. This prevents someone from`
`272`	`272`	`// naming themselves something like '<svg onload="alert(/cross-site-scripting/)" />'.`
`273`		`- // TODO: @emyrk we need to make FE changes to enable this. We get 'TrustedHTML' and 'TrustedURL' errors`
`274`		`- // that require FE changes to work.`
`275`	`273`	`// "require-trusted-types-for" : []string{"'script'"},`
`276`	`274`	`}`
`277`	`275`