fix rebase and conflicts

visual enhancement of the hovered edge

Author: william-schlegel

bun.lock

@@ -130,6 +130,6 @@
     "ui-design-system": "workspace:*",
     "ui-icons": "workspace:*",
     "uuid": "^14.0.0",
-    "zod": "^4.1.11",
+    "zod": "^4.1.11"
   }
 }

packages/app-builder/package.json

@@ -466,8 +466,8 @@ function GraphEdge({
         style={{ ...style, strokeDasharray: isMerged ? '8 4' : appearance.dash }}
         className={cn(
           'transition-colors duration-200',
-          appearance.stroke,
           highlighted ? appearance.active : appearance.dimmed,
+          showLabel ? 'stroke-4!' : appearance.stroke,
         )}
       />
       {showLabel ? (

packages/app-builder/src/components/Graph/GraphComponents.tsx

@@ -2,7 +2,6 @@ import { ClientObjectTagList } from '@app-builder/components/Annotations/ClientO
 import { ClientComments } from '@app-builder/components/ClientDetail/ClientComments';
 import { ScoreDetailPanel } from '@app-builder/components/ClientDetail/ScoreDetailPanel';
 import { DataFields } from '@app-builder/components/Data/DataVisualisation/DataFields';
-import { Panel } from '@app-builder/components/Panel';
 import { Spinner } from '@app-builder/components/Spinner';
 import { SCORING_LEVELS_COLORS, SCORING_LEVELS_LABEL_KEYS } from '@app-builder/models/scoring';
 import { useGetAnnotationsQuery } from '@app-builder/queries/data/get-annotations';
@@ -13,7 +12,7 @@ import { LAYOUT_NAMES } from 'ego-graph';
 import { type ReactNode, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { match, P } from 'ts-pattern';
-import { Button, Checkbox, cn, MenuCommand, Switch, Tag, ThresholdRange } from 'ui-design-system';
+import { Button, Checkbox, cn, MenuCommand, Panel, Switch, Tag, ThresholdRange } from 'ui-design-system';
 import { Icon, type IconName } from 'ui-icons';
 import { useGraphAnnotationsActions } from './contexts/GraphAnnotationsContext';
 import { useSelectedObject, useSetSelectedObject } from './contexts/GraphFocusContext';

packages/app-builder/src/components/Graph/GraphSettingsPanel.tsx

@@ -83,10 +83,7 @@ function TestGraphRoute() {
   const dataModel = useDataModel();
   const { recordType, setRecordType, recordId, setRecordId, isGeneratingGraph, loadGraph } = useGraphSession();
 
-  const tableNames = dataModel
-    .filter((table) => table.semanticType === 'person')
-    .map((table) => table.name)
-    .sort((a, b) => a.localeCompare(b));
+  const tableNames = dataModel.map((table) => table.name).sort((a, b) => a.localeCompare(b));
 
   return (
     <Page.Content className="min-h-0 flex-1" width="fluid">