Merge pull request #205 from pixlie/fixes/admin_ui_domain_node_error

Fixes for domain node name issues

Author: brainless

admin/src/routes/RouteList.tsx

@@ -88,7 +88,7 @@ const PerProjectRoutes: Component = () => {
           },
           {
             label: "Crawl",
-            children: ["Domain", "Link"].map((label) => ({
+            children: ["DomainName", "Link"].map((label) => ({
               label: `${label}s`,
               href: `/p/${params.projectId}/crawl?label=${label}`,
               isActive:
@@ -102,8 +102,9 @@ const PerProjectRoutes: Component = () => {
               label: `${label}s`.replace(/([a-z])([A-Z])/g, "$1 $2"),
               href: `/p/${params.projectId}/results?label=${label}`,
               isActive:
-                location.pathname.startsWith(`/p/${params.projectId}/results`) &&
-                location.search.includes(`label=${label}`),
+                location.pathname.startsWith(
+                  `/p/${params.projectId}/results`,
+                ) && location.search.includes(`label=${label}`),
             })),
           },
         ]

admin/src/routes/projects/Crawl.tsx

@@ -6,7 +6,7 @@ import Heading from "../../widgets/typography/Heading";
 import { NodeLabel } from "../../api_types/NodeLabel";
 import ResultsCount from "../../widgets/generic/ResultsCount";
 
-const labelTypes: string[] = ["Domain", "Link"];
+const labelTypes: string[] = ["DomainName", "Link"];
 type LabelType = (typeof labelTypes)[number];
 
 const Crawl: Component = () => {
@@ -31,10 +31,10 @@ const Crawl: Component = () => {
         .filter((x) => x.labels.includes(searchParams.label as NodeLabel))
         .map((x) => x.id);
     }
-    if (searchParams.label === "Link") {
+    if (searchParams.label === ("Link" as NodeLabel)) {
       setLinkCount(items.length);
     }
-    if (searchParams.label === "Domain") {
+    if (searchParams.label === ("DomainName" as NodeLabel)) {
       setDomainCount(items.length);
     }
     return items;
@@ -56,7 +56,7 @@ const Crawl: Component = () => {
             <ResultsCount count={linkCount()} />
           </>
         )}
-        {searchParams.label === "Domain" && (
+        {searchParams.label === ("DomainName" as NodeLabel) && (
           <>
             <Heading size={3}>Domains</Heading>
             <ResultsCount count={domainCount()} />

admin/src/widgets/node/DomainNode.tsx

@@ -25,7 +25,7 @@ const DomainNode: Component<INodeProps> = (props) => {
     if (getProject() && props.nodeId in getProject()!.nodes) {
       let node = getProject()!.nodes[props.nodeId];
       if (
-        node.labels.includes("Domain" as NodeLabel) &&
+        node.labels.includes("DomainName" as NodeLabel) &&
         node.payload.type === "Text"
       ) {
         return node.payload.data as string;

admin/src/widgets/node/NodeGrid.tsx

@@ -7,6 +7,7 @@ import ContentContainerNode from "./ContentContainerNode.tsx";
 import { INodeListItemProps } from "../../utils/types.tsx";
 import WebPageNode from "./WebPageNode.tsx";
 import URLNode from "./URLNode.tsx";
+import { NodeLabel } from "../../api_types/NodeLabel.ts";
 
 const NodeGrid: Component<INodeListItemProps> = (props) => {
   const getN = createMemo<Array<number>>(() => {
@@ -17,21 +18,21 @@ const NodeGrid: Component<INodeListItemProps> = (props) => {
     <>
       {props.nodeType ? (
         <>
-          {props.nodeType === "Link" && (
+          {props.nodeType === ("Link" as NodeLabel) && (
             <div class="grid grid-cols-1 gap-2 pt-1 pb-8">
               <For each={getN()}>
                 {(nodeId) => <LinkNode nodeId={nodeId} showFlags={true} />}
               </For>
             </div>
           )}
-          {props.nodeType === "Domain" && (
+          {props.nodeType === ("DomainName" as NodeLabel) && (
             <div class="grid grid-cols-[1fr_auto] gap-2 pt-1 pb-8">
               <For each={getN()}>
                 {(nodeId) => <DomainNode nodeId={nodeId} />}
               </For>
             </div>
           )}
-          {props.nodeType === "SearchTerm" && (
+          {props.nodeType === ("SearchTerm" as NodeLabel) && (
             <div class="grid grid-cols-[1fr_auto] gap-2">
               <For each={props.source()}>
                 {(nodeId) => (
@@ -40,14 +41,14 @@ const NodeGrid: Component<INodeListItemProps> = (props) => {
               </For>
             </div>
           )}
-          {props.nodeType === "Topic" && (
+          {props.nodeType === ("Topic" as NodeLabel) && (
             <div class="grid grid-cols-[1fr_auto] gap-2">
               <For each={props.source()}>
                 {(nodeId) => <TopicNode nodeId={nodeId} mode={props.mode} />}
               </For>
             </div>
           )}
-          {props.nodeType === "Search" && (
+          {props.nodeType === ("Search" as NodeLabel) && (
             <div class="grid grid-cols-1 gap-2">
               <For each={getN()}>
                 {(nodeId) => (
@@ -61,7 +62,7 @@ const NodeGrid: Component<INodeListItemProps> = (props) => {
               </For>
             </div>
           )}
-          {props.nodeType === "WebPage" && (
+          {props.nodeType === ("WebPage" as NodeLabel) && (
             <div class="columns-1 lg:columns-3 space-y-8 gap-8 mt-2 pb-4">
               <For each={getN()}>
                 {(nodeId) => (