Skip to content

Fix default icon for no-type vertices #1781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
P-r-e-m-i-u-m wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix default icon for no-type vertices #1781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions packages/graph-explorer/src/core/StateProvider/userPreferences.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ import { atom, useAtomValue, useSetAtom } from "jotai";
import { atomFamily } from "jotai-family";
import { useDeferredValue } from "react";

import { RESERVED_ID_PROPERTY, RESERVED_TYPES_PROPERTY } from "@/utils";
import { LABELS, RESERVED_ID_PROPERTY, RESERVED_TYPES_PROPERTY } from "@/utils";
import DEFAULT_ICON_URL from "@/utils/defaultIconUrl";

import type { EdgeType, VertexType } from "../entities";

import { createVertexType, type EdgeType, type VertexType } from "../entities";
import { useActiveSchema } from "./schema";
import { userStylingAtom } from "./storageAtoms";

Expand Down Expand Up @@ -216,7 +215,14 @@ export function createEdgePreference(
export function useAllVertexPreferences(): VertexPreferences[] {
const prefs = useAtomValue(vertexPreferencesAtom);
const { vertices: allSchemas } = useActiveSchema();
return allSchemas.map(({ type }) => prefs.get(type));
const vertexTypes = allSchemas.map(({ type }) => type);
const missingType = createVertexType(LABELS.MISSING_TYPE);

if (!vertexTypes.includes(missingType)) {
vertexTypes.push(missingType);
}

return vertexTypes.map(type => prefs.get(type));
}

/** Returns an array of edge preferences based on the known edge types in the schema. */
Expand Down
19 changes: 19 additions & 0 deletions packages/graph-explorer/src/modules/GraphViewer/useGraphStyles.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
import type { GraphProps } from "@/components/Graph";

import { createEdgeType, createVertexType } from "@/core";
import { LABELS } from "@/utils";
import {
createRandomEdgeTypeConfig,
createRandomVertexTypeConfig,
Expand Down Expand Up @@ -71,6 +72,24 @@ describe("useGraphStyles", () => {
});
});

it("should generate a default style for vertices without a schema type", async () => {
const { result } = renderHookWithState(() => useGraphStyles(), dbState);

await waitFor(() => {
const vertexStyle = getStyles(result)[
`node[type="${LABELS.MISSING_TYPE}"]`
] as any;
expect(vertexStyle).toMatchObject({
"background-image": "data:image/svg+xml;utf8,<svg></svg>",
"background-color": "#128EE5",
"background-opacity": 0.4,
shape: "ellipse",
width: 24,
height: 24,
});
});
});

it("should generate edge styles correctly", () => {
const edgeConfig = {
...createRandomEdgeTypeConfig(),
Expand Down