Extract get schema icon logic into a utils function (#6451)

Author: bilalabbad

frontend/app/src/entities/nodes/object/ui/node-description.tsx

@@ -2,6 +2,7 @@ import { getNodeLabel } from "@/entities/nodes/object/utils/get-node-label";
 import { NodeCore } from "@/entities/nodes/types";
 import { getObjectDetailsUrl } from "@/entities/nodes/utils";
 import { useSchema } from "@/entities/schema/ui/hooks/useSchema";
+import { getSchemaIcon } from "@/entities/schema/utils/get-schema-icon";
 import { classNames } from "@/shared/utils/common";
 import { Icon } from "@iconify-icon/react";
 import { InputHTMLAttributes } from "react";
@@ -18,7 +19,7 @@ export function NodeDescription({ node, className, ...props }: ObjectInlineDispl
   return (
     <div className={classNames("flex flex-col text-sm", className)} {...props}>
       <div className="flex items-center gap-1">
-        <Icon icon={schema?.icon ?? "mdi:cube-outline"} className="text-gray-400 text-xs" />
+        <Icon icon={getSchemaIcon(schema)} className="text-gray-400 text-xs" />
         {schemaLabel}
       </div>
 

frontend/app/src/entities/nodes/object/ui/object-table/cells/table-column-header-icon.tsx

@@ -1,5 +1,6 @@
 import { AttributeKind, AttributeSchema, RelationshipSchema } from "@/entities/schema/types";
 import { useSchema } from "@/entities/schema/ui/hooks/useSchema";
+import { getSchemaIcon } from "@/entities/schema/utils/get-schema-icon";
 import { Icon } from "@iconify-icon/react";
 
 const ATTRIBUTE_ICONS: Record<AttributeKind, string> = {
@@ -52,5 +53,5 @@ export function RelationshipTableColumnHeaderIcon({
 }: { relationshipSchema: RelationshipSchema }) {
   const { schema } = useSchema(relationshipSchema.peer);
 
-  return <Icon icon={schema?.icon ?? "mdi:cube-outline"} className="text-stone-400" />;
+  return <Icon icon={getSchemaIcon(schema)} className="text-stone-400" />;
 }

frontend/app/src/entities/nodes/object/ui/object-table/cells/table-relationship-cell.tsx

@@ -8,6 +8,7 @@ import {
 import { getObjectDetailsUrl } from "@/entities/nodes/utils";
 import { RelationshipSchema } from "@/entities/schema/types";
 import { useSchema } from "@/entities/schema/ui/hooks/useSchema";
+import { getSchemaIcon } from "@/entities/schema/utils/get-schema-icon";
 import { LinkButton } from "@/shared/components/buttons/button-primitive";
 import { Icon } from "@iconify-icon/react";
 
@@ -49,7 +50,7 @@ export function RelationshipNodeDisplay({ node }: { node: NodeCore }) {
       to={getObjectDetailsUrl(node.__typename, node.id)}
       className="rounded-full truncate hover:underline hover:border-custom-blue-700 pr-2.5"
     >
-      <Icon icon={schema.icon ?? "mdi:cube-outline"} className="mr-1 text-custom-blue-800" />
+      <Icon icon={getSchemaIcon(schema)} className="mr-1 text-custom-blue-800" />
       {getNodeLabel(node)}
     </LinkButton>
   );

frontend/app/src/entities/schema/utils/get-schema-icon.test.ts

@@ -0,0 +1,49 @@
+import { getSchemaIcon } from "@/entities/schema/utils/get-schema-icon";
+import { describe, expect, it } from "vitest";
+import { generateNodeSchema } from "../../../../tests/fake/schema";
+
+describe("getSchemaIcon", () => {
+  it("should return default icon when schema is null", () => {
+    // GIVEN
+    const schema = null;
+
+    // WHEN
+    const result = getSchemaIcon(schema);
+
+    // THEN
+    expect(result).toBe("mdi:cube-outline");
+  });
+
+  it("should return default icon when schema is undefined", () => {
+    // GIVEN
+    const schema = undefined;
+
+    // WHEN
+    const result = getSchemaIcon(schema);
+
+    // THEN
+    expect(result).toBe("mdi:cube-outline");
+  });
+
+  it("should return default icon when schema has no icon property", () => {
+    // GIVEN
+    const schema = generateNodeSchema({ icon: undefined });
+
+    // WHEN
+    const result = getSchemaIcon(schema);
+
+    // THEN
+    expect(result).toBe("mdi:cube-outline");
+  });
+
+  it("should return schema icon when it exists", () => {
+    // GIVEN
+    const schema = generateNodeSchema({ icon: "mdi:icon" });
+
+    // WHEN
+    const result = getSchemaIcon(schema);
+
+    // THEN
+    expect(result).toBe("mdi:icon");
+  });
+});

frontend/app/src/entities/schema/utils/get-schema-icon.ts

@@ -0,0 +1,6 @@
+import { ModelSchema } from "@/entities/schema/types";
+
+export function getSchemaIcon(schema: ModelSchema | null | undefined): string {
+  if (!schema?.icon) return "mdi:cube-outline";
+  return schema.icon;
+}