Merge stable into develop #6454

bilalabbad · web-flow · commit 43e4cdbb027b · 2025-05-13T16:35:46.000+02:00
Merge stable into develop
diff --git a/frontend/app/cypress/support/component.tsx b/frontend/app/cypress/support/component.tsx
@@ -8,7 +8,7 @@ import { QueryParamProvider } from "use-query-params";
 
 import "../../src/app/styles/index.css";
 import { queryClient } from "../../src/shared/api/rest/client";
-import { ReactRouter7Adapter } from "../../src/shared/lib/use-query-params";
+import { ReactRouter7Adapter } from "../../src/shared/libs/use-query-params";
 
 import "./commands";
 
diff --git a/frontend/app/src/app/router.tsx b/frontend/app/src/app/router.tsx
@@ -7,7 +7,7 @@ import { RESOURCE_GENERIC_KIND } from "@/entities/resource-manager/constants";
 import { SchemaProvider } from "@/entities/schema/ui/providers/schema-provider";
 import { constructPath } from "@/shared/api/rest/fetch";
 import { ErrorBoundaryRouter } from "@/shared/components/errors/error-boundary-router";
-import { ReactRouter7Adapter } from "@/shared/lib/use-query-params";
+import { ReactRouter7Adapter } from "@/shared/libs/use-query-params";
 import queryString from "query-string";
 import { Navigate, Outlet, UIMatch, createBrowserRouter } from "react-router";
 import { Slide, ToastContainer } from "react-toastify";
diff --git a/frontend/app/src/entities/artifacts/api/getArtifacts.ts b/frontend/app/src/entities/artifacts/api/getArtifacts.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getArtifactDetails = Handlebars.compile(`
 query CoreArtifact {
diff --git a/frontend/app/src/entities/artifacts/ui/artifact-details.tsx b/frontend/app/src/entities/artifacts/ui/artifact-details.tsx
@@ -1,11 +1,11 @@
 import { CONFIG } from "@/config/config";
 import { ArtifactFile } from "@/entities/artifacts/ui/artifact-file";
 import { NodeEvents } from "@/entities/events/ui/node-details-events";
-import { useObjectDetails } from "@/entities/nodes/hooks/useObjectDetails";
+import { useGetObject } from "@/entities/nodes/object/domain/get-object.query";
 import { NodeDescription } from "@/entities/nodes/object/ui/node-description";
 import { ModelSchema } from "@/entities/schema/types";
+import { CoreArtifact } from "@/shared/api/graphql/generated/graphql";
 import ErrorScreen from "@/shared/components/errors/error-screen";
-import NoDataFound from "@/shared/components/errors/no-data-found";
 import Content from "@/shared/components/layout/content";
 import { LoadingIndicator } from "@/shared/components/loading/loading-indicator";
 import { Card } from "@/shared/components/ui/card";
@@ -19,20 +19,20 @@ export interface ArtifactsDetailsProps {
 
 export function ArtifactsDetails({ artifactId, artifactSchema }: ArtifactsDetailsProps) {
   const artifactKind = artifactSchema.kind as string;
-  const { loading, error, data } = useObjectDetails(artifactSchema, artifactId);
+  const { isPending, error, data } = useGetObject({
+    objectSchema: artifactSchema,
+    objectId: artifactId,
+  });
 
-  if (loading) {
+  if (isPending) {
     return <LoadingIndicator className="h-full" />;
   }
 
   if (error) {
-    return <ErrorScreen message={`Something went wrong when fetching artifact ${artifactId}`} />;
+    return <ErrorScreen message={error.message} />;
   }
 
-  const objectDetailsData = data?.[artifactKind]?.edges?.[0]?.node;
-  if (!objectDetailsData) {
-    return <NoDataFound message={`No artifact found with id ${artifactId}`} />;
-  }
+  const objectDetailsData = data as unknown as CoreArtifact;
 
   const fileUrl: string = CONFIG.ARTIFACTS_CONTENT_URL(objectDetailsData?.storage_id?.value);
   const contentType = objectDetailsData.content_type?.value;
diff --git a/frontend/app/src/entities/diff/api/getValidatorDetails.ts b/frontend/app/src/entities/diff/api/getValidatorDetails.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getValidatorDetails = Handlebars.compile(`
 query GET_VALIDATOR_DETAILS {
diff --git a/frontend/app/src/entities/diff/api/runCheck.ts b/frontend/app/src/entities/diff/api/runCheck.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const runCheck = Handlebars.compile(`
 mutation {
diff --git a/frontend/app/src/entities/groups/api/getGroups.ts b/frontend/app/src/entities/groups/api/getGroups.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getGroupsQuery = Handlebars.compile(`
 query GET_GROUPS {
diff --git a/frontend/app/src/entities/groups/ui/add-group-trigger-button.tsx b/frontend/app/src/entities/groups/ui/add-group-trigger-button.tsx
@@ -1,6 +1,6 @@
 import { GroupDataFromAPI } from "@/entities/groups/api/types";
 import AddGroupForm from "@/entities/groups/ui/add-group-form";
-import { useObjectDetails } from "@/entities/nodes/hooks/useObjectDetails";
+import { useGetObject } from "@/entities/nodes/object/domain/get-object.query";
 import { Permission } from "@/entities/permission/types";
 import { NodeSchema } from "@/entities/schema/types";
 import graphqlClient from "@/shared/api/graphql/graphqlClientApollo";
@@ -25,9 +25,7 @@ export default function AddGroupTriggerButton({
 }: AddGroupTriggerButtonProps) {
   const [isAddGroupFormOpen, setIsAddGroupFormOpen] = useState(false);
 
-  const { data } = useObjectDetails(schema, objectId);
-
-  const objectDetailsData = schema && data && data[schema.kind!]?.edges[0]?.node;
+  const { data: objectDetailsData } = useGetObject({ objectSchema: schema, objectId });
 
   return (
     <>
diff --git a/frontend/app/src/entities/groups/ui/groups-manager-trigger-button.tsx b/frontend/app/src/entities/groups/ui/groups-manager-trigger-button.tsx
@@ -1,5 +1,5 @@
 import { GroupsManager, GroupsManagerProps } from "@/entities/groups/ui/groups-manager";
-import { useObjectDetails } from "@/entities/nodes/hooks/useObjectDetails";
+import { useGetObject } from "@/entities/nodes/object/domain/get-object.query";
 import { ButtonProps, ButtonWithTooltip } from "@/shared/components/buttons/button-primitive";
 import SlideOver, { SlideOverTitle } from "@/shared/components/display/slide-over";
 import { Icon } from "@iconify-icon/react";
@@ -15,9 +15,7 @@ export const GroupsManagerTriggerButton = ({
 }: GroupsManagerTriggerProps) => {
   const [isManageGroupsDrawerOpen, setIsManageGroupsDrawerOpen] = useState(false);
 
-  const { data } = useObjectDetails(schema, objectId);
-
-  const objectDetailsData = schema && data && data[schema.kind!]?.edges[0]?.node;
+  const { data: objectDetailsData } = useGetObject({ objectSchema: schema, objectId });
 
   return (
     <>
diff --git a/frontend/app/src/entities/nodes/api/createObject.ts b/frontend/app/src/entities/nodes/api/createObject.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const createObject = Handlebars.compile(`mutation {{kind}}Create {
   {{kind}}Create (data: {{{data}}}) {
diff --git a/frontend/app/src/entities/nodes/api/deleteObject.ts b/frontend/app/src/entities/nodes/api/deleteObject.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const deleteObject = Handlebars.compile(`
 mutation {{kind}}Delete {
diff --git a/frontend/app/src/entities/nodes/api/dropdownOptions.ts b/frontend/app/src/entities/nodes/api/dropdownOptions.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getDropdownOptions = Handlebars.compile(`query DropdownOptions {
   {{kind}}{{#if parentFilter}}({{{parentFilter}}}){{/if}}  {
diff --git a/frontend/app/src/entities/nodes/api/getObjectDetails.ts b/frontend/app/src/entities/nodes/api/getObjectDetails.ts
@@ -1,5 +1,4 @@
-import "@/shared/utils/handlebars"; // Import handlebars utils
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getObjectDetailsPaginated = Handlebars.compile(`
 query {{kind}} {
diff --git a/frontend/app/src/entities/nodes/api/getObjectDisplayLabel.ts b/frontend/app/src/entities/nodes/api/getObjectDisplayLabel.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getObjectDisplayLabel = Handlebars.compile(`
 query {{kind}}($ids: [ID]) {
diff --git a/frontend/app/src/entities/nodes/api/getProfiles.ts b/frontend/app/src/entities/nodes/api/getProfiles.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getProfiles = Handlebars.compile(`
   query GetProfiles {
diff --git a/frontend/app/src/entities/nodes/api/getRelationshipParent.ts b/frontend/app/src/entities/nodes/api/getRelationshipParent.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getRelationshipParent = Handlebars.compile(`
   query GET_RELATIONSHIP_PARENT {
diff --git a/frontend/app/src/entities/nodes/api/objectTreeQuery.tsx b/frontend/app/src/entities/nodes/api/objectTreeQuery.tsx
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const objectTopLevelTreeQuery = Handlebars.compile(`
   query GET_{{kind}}_TOP_LEVEL_TREE {
diff --git a/frontend/app/src/entities/nodes/api/updateObjectWithId.ts b/frontend/app/src/entities/nodes/api/updateObjectWithId.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const updateObjectWithId = Handlebars.compile(`
 mutation {{kind}}Update {
diff --git a/frontend/app/src/entities/nodes/object/ui/CoreGraphQLQuery/graphql-query-details.tsx b/frontend/app/src/entities/nodes/object/ui/CoreGraphQLQuery/graphql-query-details.tsx
@@ -2,11 +2,11 @@ import { GraphqlQueryActivities } from "@/entities/graphql/ui/graphql-query-acti
 import GraphqlQueryDetailsCard from "@/entities/graphql/ui/graphql-query-details-card";
 import GraphQLQueryDetailsPageSkeleton from "@/entities/graphql/ui/graphql-query-details-page-skeleton";
 import GraphqlQueryViewerCard from "@/entities/graphql/ui/graphql-query-viewer-card";
-import { useObjectDetails } from "@/entities/nodes/hooks/useObjectDetails";
+import { useGetObject } from "@/entities/nodes/object/domain/get-object.query";
 import { Permission } from "@/entities/permission/types";
 import { ModelSchema } from "@/entities/schema/types";
 import { CoreGraphQlQuery } from "@/shared/api/graphql/generated/graphql";
-import NoDataFound from "@/shared/components/errors/no-data-found";
+import ErrorScreen from "@/shared/components/errors/error-screen";
 
 export function GraphqlQueryDetails({
   graphqlQueryId,
@@ -17,14 +17,20 @@ export function GraphqlQueryDetails({
   graphqlQuerySchema: ModelSchema;
   permission: Permission;
 }) {
-  const { loading, data, refetch } = useObjectDetails(graphqlQuerySchema, graphqlQueryId);
+  const { isPending, error, data, refetch } = useGetObject({
+    objectSchema: graphqlQuerySchema,
+    objectId: graphqlQueryId,
+  });
 
-  if (loading) return <GraphQLQueryDetailsPageSkeleton />;
+  if (isPending) {
+    return <GraphQLQueryDetailsPageSkeleton />;
+  }
 
-  const graphqlQueries = data && data.CoreGraphQLQuery.edges;
-  if (graphqlQueries.length === 0) return <NoDataFound />;
+  if (error) {
+    return <ErrorScreen message={error.message} />;
+  }
 
-  const graphqlQuery: CoreGraphQlQuery = graphqlQueries[0].node;
+  const graphqlQuery: CoreGraphQlQuery = data as unknown as CoreGraphQlQuery;
 
   return (
     <section className="grid grid-cols-1 lg:grid-cols-2 gap-2 p-2">
diff --git a/frontend/app/src/entities/nodes/object/ui/node-description.tsx b/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>
 
diff --git a/frontend/app/src/entities/nodes/object/ui/object-table/cells/table-column-header-icon.tsx b/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" />;
 }
diff --git a/frontend/app/src/entities/nodes/object/ui/object-table/cells/table-relationship-cell.tsx b/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>
   );
diff --git a/frontend/app/src/entities/proposed-changes/api/getProposedChangesArtifactsThreads.ts b/frontend/app/src/entities/proposed-changes/api/getProposedChangesArtifactsThreads.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getProposedChangesArtifactsThreads = Handlebars.compile(`
 query {
diff --git a/frontend/app/src/entities/proposed-changes/api/getProposedChangesChecks.ts b/frontend/app/src/entities/proposed-changes/api/getProposedChangesChecks.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getProposedChangesChecks = Handlebars.compile(`
 query {
diff --git a/frontend/app/src/entities/proposed-changes/api/getProposedChangesFilesThreads.ts b/frontend/app/src/entities/proposed-changes/api/getProposedChangesFilesThreads.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getProposedChangesFilesThreads = Handlebars.compile(`
 query {
diff --git a/frontend/app/src/entities/proposed-changes/api/getProposedChangesObjectThreadComments.ts b/frontend/app/src/entities/proposed-changes/api/getProposedChangesObjectThreadComments.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getProposedChangesObjectThreadComments = Handlebars.compile(`
 query getProposedChangesObjectThreadCommentsFor{{kind}}{
diff --git a/frontend/app/src/entities/proposed-changes/api/getProposedChangesObjectThreads.ts b/frontend/app/src/entities/proposed-changes/api/getProposedChangesObjectThreads.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getProposedChangesObjectThreads = Handlebars.compile(`
 query getProposedChangesThreadsFor{{kind}} {
diff --git a/frontend/app/src/entities/proposed-changes/api/getProposedChangesThreads.ts b/frontend/app/src/entities/proposed-changes/api/getProposedChangesThreads.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getProposedChangesThreads = Handlebars.compile(`
 query {
diff --git a/frontend/app/src/entities/schema/utils/get-schema-icon.test.ts b/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");
+  });
+});
diff --git a/frontend/app/src/entities/schema/utils/get-schema-icon.ts b/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;
+}
diff --git a/frontend/app/src/entities/tasks/api/getTasksItemDetailsTitle.ts b/frontend/app/src/entities/tasks/api/getTasksItemDetailsTitle.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getTaskItemDetailsTitle = Handlebars.compile(`
 query GetTaskDetails {
diff --git a/frontend/app/src/entities/user-profile/api/getProfileDetails.ts b/frontend/app/src/entities/user-profile/api/getProfileDetails.ts
@@ -1,4 +1,4 @@
-import Handlebars from "handlebars";
+import Handlebars from "@/shared/libs/handlebars";
 
 export const getProfileDetails = Handlebars.compile(`
 query GET_PROFILE_DETAILS {
diff --git a/frontend/app/src/shared/components/layout/breadcrumb-navigation/items/breadcrumb-object-selector.tsx b/frontend/app/src/shared/components/layout/breadcrumb-navigation/items/breadcrumb-object-selector.tsx
diff --git a/frontend/app/src/shared/components/search/search-anywhere-dialog.tsx b/frontend/app/src/shared/components/search/search-anywhere-dialog.tsx
diff --git a/frontend/app/src/shared/components/search/search-nodes.tsx b/frontend/app/src/shared/components/search/search-nodes.tsx
diff --git a/frontend/app/src/shared/libs/handlebars.ts b/frontend/app/src/shared/libs/handlebars.ts
diff --git a/frontend/app/src/shared/libs/use-query-params.ts b/frontend/app/src/shared/libs/use-query-params.ts
diff --git a/frontend/app/tests/components/render.tsx b/frontend/app/tests/components/render.tsx
diff --git a/frontend/app/tests/e2e/search.spec.ts b/frontend/app/tests/e2e/search.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import Handlebars from "handlebars";`
	`1`	`+import Handlebars from "@/shared/libs/handlebars";`
`2`	`2`
`3`	`3`	export const getArtifactDetails = Handlebars.compile(`
`4`	`4`	`query CoreArtifact {`