clean up naming and such

Author: thomaswhyyou

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

@@ -16,7 +16,6 @@ import {
 import { detectToolbarParam } from "./helpers";
 import {
   InspectionResult,
-  checkUsable,
   useInspectGuideClientStore,
 } from "./useInspectGuideClientStore";
 
@@ -28,7 +27,11 @@ const GuidesList = ({
   displayOption: DisplayOption;
 }) => {
   return guides.map((guide, idx) => {
-    if (displayOption === "current-page" && !checkUsable(guide)) {
+    if (
+      displayOption === "current-page" &&
+      !guide.annotation.isEligible &&
+      !guide.annotation.isQualified
+    ) {
       return null;
     }
     if (displayOption === "all-eligible" && !guide.annotation.isEligible) {

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

@@ -36,27 +36,24 @@ type AnnotatedStatuses = {
   active: ActiveStatus;
   targetable: TargetableStatus;
   archived: ArchivedStatus;
+  // Individual qualified statuses:
   activatable: ActivatableStatus;
 };
 
 type GuideAnnotation = AnnotatedStatuses & {
   // Resolved eligibility based on active, targetable and archived statuses,
   // which are backend driven evaluation results that are exposed for debugging.
   isEligible: boolean;
+
+  // Resolved display qualification based on an activatable status, which
+  // informs "when" and "where" an eligible guide can be displayed to user.
+  isQualified: boolean;
 };
 
 export type AnnotatedGuide = KnockGuide & {
   annotation: GuideAnnotation;
 };
 
-export const checkUsable = (guide: AnnotatedGuide | MissingGuide) => {
-  if (guide.__typename === "MissingGuide") return false;
-  if (!checkEligible(guide)) return false;
-  if (!guide.annotation.activatable.status) return false;
-
-  return true;
-};
-
 // Exists and ordered in control but absent in switchboard (therefore not
 // included in the api response), which implies a newly created guide that has
 // never been published to switchboard.
@@ -67,6 +64,7 @@ export type MissingGuide = {
   bypass_global_group_limit: false;
   annotation: {
     isEligible: false;
+    isQualified: false;
   };
 };
 
@@ -113,6 +111,11 @@ const resolveIsEligible = ({
   return true;
 };
 
+export const resolveIsQualified = ({ activatable }: AnnotatedStatuses) => {
+  if (!activatable.status) return false;
+  return true;
+};
+
 type StoreStateSnapshot = Pick<
   KnockGuideClientStoreState,
   "location" | "guides" | "guideGroups" | "ineligibleGuides" | "debug"
@@ -126,15 +129,18 @@ const annotateGuide = (
   const marker = ineligibleGuides[guide.key];
 
   const statuses: AnnotatedStatuses = {
+    // isEligible:
     active: { status: guide.active },
     targetable: marker ? toTargetableStatus(marker) : { status: true },
-    activatable: { status: checkActivatable(guide, location) },
     archived: marker ? toArchivedStatus(marker) : { status: false },
+    // isQualified:
+    activatable: { status: checkActivatable(guide, location) },
   };
 
   const annotation: GuideAnnotation = {
     ...statuses,
     isEligible: resolveIsEligible(statuses),
+    isQualified: resolveIsQualified(statuses),
   };
 
   return {
@@ -151,6 +157,7 @@ const newMissingGuide = (key: KnockGuide["key"]) =>
     bypass_global_group_limit: false,
     annotation: {
       isEligible: false,
+      isQualified: false,
     },
   }) as MissingGuide;