more clean up

Author: thomaswhyyou

packages/react/src/modules/guide/components/Toolbar/V2/GuideHoverCard.tsx

@@ -20,7 +20,13 @@ export const GuideHoverCard = ({
     return <Stack align="center">{children}</Stack>;
   }
 
-  const { annotation: _, ...rest } = guide;
+  // Prune out internal or legacy fields.
+  const {
+    annotation: _annotation,
+    activation_location_rules: _activation_location_rules,
+    priority: _priority,
+    ...rest
+  } = guide;
 
   return (
     <HoverCard.Root>

packages/react/src/modules/guide/components/Toolbar/V2/GuideRow.tsx

@@ -7,7 +7,11 @@ import { CheckCircle2, CircleDashed, Eye, UserCircle2 } from "lucide-react";
 import * as React from "react";
 
 import { GuideHoverCard } from "./GuideHoverCard";
-import { AnnotatedGuide, UnknownGuide } from "./useInspectGuideClientStore";
+import {
+  AnnotatedGuide,
+  UnknownGuide,
+  isUnknownGuide,
+} from "./useInspectGuideClientStore";
 
 const Row = ({ children }: React.PropsWithChildren) => (
   <Stack h="7" px="2" borderTop="px" justify="space-between" align="center">
@@ -40,15 +44,14 @@ export const GuideRow = ({ guide, orderIndex }: Props) => {
 
       <Stack justify="flex-end">
         <Stack gap="1">
-          {guide.__typename === "Guide" && (
+          {!isUnknownGuide(guide) && (
             <>
               <Tooltip
                 label={
                   guide.annotation.targetable.status
-                    ? "This user is targeted"
+                    ? "This user is being targeted"
                     : guide.annotation.targetable.message
                 }
-                // enabled={!guide.annotation.targetable.status}
               >
                 <Button
                   px="1"
@@ -61,7 +64,7 @@ export const GuideRow = ({ guide, orderIndex }: Props) => {
               <Tooltip
                 label={
                   guide.annotation.archived.status
-                    ? "User has already archived this guide"
+                    ? "User has already dismissed this guide"
                     : "User has not dismissed this guide"
                 }
               >
@@ -77,7 +80,7 @@ export const GuideRow = ({ guide, orderIndex }: Props) => {
           )}
           <Tooltip
             label={
-              guide.__typename === "UnknownGuide"
+              isUnknownGuide(guide)
                 ? "This guide has never been committed and published yet"
                 : !guide.active
                   ? "This guide is not active"

packages/react/src/modules/guide/components/Toolbar/V2/useInspectGuideClientStore.ts

@@ -41,6 +41,10 @@ type GuideAnnotation = AnnotatedStatuses & {
 
 export type AnnotatedGuide = KnockGuide & {
   annotation: GuideAnnotation;
+
+  // Legacy fields, typed only to make tsc happy when we prune these out.
+  activation_location_rules?: KnockGuide["activation_url_patterns"];
+  priority?: number;
 };
 
 // Exists and ordered in control but absent in switchboard (therefore not