more cleaning

frontend/app/src/entities/diff/checks/conflict.tsx

@@ -1,7 +1,7 @@
 import { DATA_CHECK_OBJECT } from "@/config/constants";
 import { QSP } from "@/config/qsp";
 import { currentBranchAtom } from "@/entities/branches/stores";
-import { diffContent, getBadgeType } from "@/entities/diff/diff";
+import { diffContent, getBadgeType } from "@/entities/diff/utils";
 import { updateObjectWithId } from "@/entities/nodes/api/updateObjectWithId";
 import { getObjectDetailsUrl } from "@/entities/nodes/utils";
 import graphqlClient from "@/shared/api/graphql/graphqlClientApollo";

frontend/app/src/entities/diff/node-diff/comments.tsx

@@ -4,7 +4,7 @@ import {
 } from "@/config/constants";
 import { useAuth } from "@/entities/authentication/ui/useAuth";
 import { currentBranchAtom } from "@/entities/branches/stores";
-import { getThreadLabel } from "@/entities/diff/diff";
+import { getThreadLabel } from "@/entities/diff/utils";
 import { createObject } from "@/entities/nodes/api/createObject";
 import { deleteObject } from "@/entities/nodes/api/deleteObject";
 import { getProposedChangesObjectThreadComments } from "@/entities/proposed-changes/api/getProposedChangesObjectThreadComments";

frontend/app/src/entities/diff/node-diff/index.tsx

@@ -3,11 +3,11 @@ import { QSP } from "@/config/qsp";
 import { useAuth } from "@/entities/authentication/ui/useAuth";
 import { BRANCH_REBASE } from "@/entities/branches/api/rebaseBranch";
 import { DIFF_UPDATE } from "@/entities/diff/api/diff-update";
-import DiffTree from "@/entities/diff/diff-tree";
 import { DIFF_STATUS, DiffNode as DiffNodeType } from "@/entities/diff/node-diff/types";
-import { DiffBadge } from "@/entities/diff/node-diff/utils";
 import { DiffComputing } from "@/entities/diff/ui/diff-computing";
 import { DiffEmpty } from "@/entities/diff/ui/diff-empty";
+import { DiffNoFound } from "@/entities/diff/ui/diff-no-found";
+import DiffTree from "@/entities/diff/ui/diff-tree";
 import { getProposedChangesDiffTree } from "@/entities/proposed-changes/api/getProposedChangesDiffTree";
 import { proposedChangedState } from "@/entities/proposed-changes/stores/proposedChanges.atom";
 import { schemaState } from "@/entities/schema/stores/schema.atom";
@@ -20,7 +20,6 @@ import LoadingScreen from "@/shared/components/loading-screen";
 import { ALERT_TYPES, Alert } from "@/shared/components/ui/alert";
 import { datetimeAtom } from "@/shared/stores/time.atom";
 import { NetworkStatus, useMutation } from "@apollo/client";
-import { Icon } from "@iconify-icon/react";
 import { useAtomValue } from "jotai";
 import { createContext, useState } from "react";
 import { toast } from "react-toastify";
@@ -189,22 +188,7 @@ export const NodeDiff = ({ branchName, filters }: NodeDiffProps) => {
         </div>
 
         <div className="space-y-4 p-4 col-start-2 col-end-5 overflow-auto bg-stone-100">
-          {nodes.length === 0 && qspStatus && (
-            <div className="flex flex-col items-center mt-10 gap-5">
-              <div className="p-3 rounded-full bg-white inline-flex">
-                <Icon icon="mdi:circle-off-outline" className="text-2xl text-custom-blue-800" />
-              </div>
-
-              <div className="text-center">
-                <h1 className="font-semibold">
-                  No matches found for the status <DiffBadge status={qspStatus} />
-                </h1>
-                <p>Try adjusting the filter settings to include more results.</p>
-              </div>
-            </div>
-          )}
-
-          {!!nodes.length &&
+          {nodes.length ? (
             nodes
               .filter(({ status }) => status !== "UNCHANGED")
               .map((node) => (
@@ -214,7 +198,10 @@ export const NodeDiff = ({ branchName, filters }: NodeDiffProps) => {
                   sourceBranch={diffTreeData?.base_branch}
                   destinationBranch={diffTreeData?.diff_branch}
                 />
-              ))}
+              ))
+          ) : (
+            <DiffNoFound diffStatus={qspStatus as string} />
+          )}
         </div>
       </div>
     </div>

frontend/app/src/entities/diff/node-diff/node-attribute.tsx

@@ -3,7 +3,7 @@ import { DiffThread } from "@/entities/diff/node-diff/thread";
 import { DiffAttribute, DiffStatus } from "@/entities/diff/node-diff/types";
 import { DiffRow } from "@/entities/diff/node-diff/utils";
 import { useParams } from "react-router-dom";
-import { BadgeConflict } from "../diff-badge";
+import { BadgeConflict } from "../ui/diff-badge";
 import { Conflict } from "./conflict";
 
 type DiffNodeAttributeProps = {

frontend/app/src/entities/diff/node-diff/node-property.tsx

@@ -1,6 +1,6 @@
-import { BadgeConflict } from "@/entities/diff/diff-badge";
 import { DiffProperty, DiffStatus } from "@/entities/diff/node-diff/types";
 import { DiffRow, formatPropertyName, formatValue } from "@/entities/diff/node-diff/utils";
+import { BadgeConflict } from "@/entities/diff/ui/diff-badge";
 import { Badge } from "@/shared/components/ui/badge";
 import { classNames } from "@/shared/utils/common";
 import { Icon } from "@iconify-icon/react";

frontend/app/src/entities/diff/node-diff/node-relationship-element.tsx

@@ -1,7 +1,7 @@
-import { BadgeConflict } from "@/entities/diff/diff-badge";
 import { DiffThread } from "@/entities/diff/node-diff/thread";
 import { DiffRelationshipElement, DiffStatus } from "@/entities/diff/node-diff/types";
 import { DiffBadge, DiffRow } from "@/entities/diff/node-diff/utils";
+import { BadgeConflict } from "@/entities/diff/ui/diff-badge";
 import { useParams } from "react-router-dom";
 import { DiffNodeProperty } from "./node-property";
 

frontend/app/src/entities/diff/node-diff/thread.tsx

@@ -1,5 +1,5 @@
 import { PROPOSED_CHANGES_OBJECT_THREAD_OBJECT } from "@/config/constants";
-import { getThreadLabel, getThreadTitle } from "@/entities/diff/diff";
+import { getThreadLabel, getThreadTitle } from "@/entities/diff/utils";
 import { getProposedChangesObjectThreads } from "@/entities/proposed-changes/api/getProposedChangesObjectThreads";
 import { schemaState } from "@/entities/schema/stores/schema.atom";
 import useQuery from "@/shared/api/graphql/useQuery";

frontend/app/src/entities/diff/node-diff/utils.tsx

@@ -11,7 +11,7 @@ import {
   BadgeUnchanged,
   BadgeUpdated,
   DiffBadgeProps,
-} from "../diff-badge";
+} from "../ui/diff-badge";
 
 export const diffBadges: { [key: string]: BadgeType } = {
   ADDED: BadgeAdded,

frontend/app/src/entities/diff/ui/diff-no-found.tsx

@@ -0,0 +1,23 @@
+import { DiffBadge } from "@/entities/diff/node-diff/utils";
+import { Icon } from "@iconify-icon/react";
+
+export interface DiffNoFoundProps {
+  diffStatus: string;
+}
+
+export function DiffNoFound({ diffStatus }: DiffNoFoundProps) {
+  return (
+    <div className="flex flex-col items-center mt-10 gap-5">
+      <div className="p-3 rounded-full bg-white inline-flex">
+        <Icon icon="mdi:circle-off-outline" className="text-2xl text-custom-blue-800" />
+      </div>
+
+      <div className="text-center">
+        <h1 className="font-semibold">
+          No matches found for the status <DiffBadge status={diffStatus} />
+        </h1>
+        <p>Try adjusting the filter settings to include more results.</p>
+      </div>
+    </div>
+  );
+}

frontend/app/src/entities/proposed-changes/ui/diff-filter.tsx

@@ -3,14 +3,14 @@ import useQuery from "@/shared/api/graphql/useQuery";
 import ErrorScreen from "@/shared/components/errors/error-screen";
 
 import { QSP } from "@/config/qsp";
+import { DIFF_STATUS } from "@/entities/diff/node-diff/types";
+import { DiffBadge } from "@/entities/diff/node-diff/utils";
 import {
   CloseBadgeAdded,
   CloseBadgeConflict,
   CloseBadgeRemoved,
   CloseBadgeUpdated,
-} from "@/entities/diff/diff-badge";
-import { DIFF_STATUS } from "@/entities/diff/node-diff/types";
-import { DiffBadge } from "@/entities/diff/node-diff/utils";
+} from "@/entities/diff/ui/diff-badge";
 import { Button, ButtonProps } from "@/shared/components/buttons/button-primitive";
 import { ALERT_TYPES, Alert } from "@/shared/components/ui/alert";
 import { classNames } from "@/shared/utils/common";

frontend/app/src/shared/components/conversations/thread.tsx

@@ -1,7 +1,7 @@
 import { PROPOSED_CHANGES_THREAD_COMMENT_OBJECT } from "@/config/constants";
 import { useAuth } from "@/entities/authentication/ui/useAuth";
 import { currentBranchAtom } from "@/entities/branches/stores";
-import { getThreadTitle } from "@/entities/diff/diff";
+import { getThreadTitle } from "@/entities/diff/utils";
 import { createObject } from "@/entities/nodes/api/createObject";
 import { updateObjectWithId } from "@/entities/nodes/api/updateObjectWithId";
 import { getObjectPermissionsQuery } from "@/entities/permission/queries/getObjectPermissions";

frontend/app/tests/unit/diff/diff-tree/formatDiffNodesToDiffTree.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
-import { formatDiffNodesToDiffTree } from "../../../../src/entities/diff/diff-tree";
 import { DiffNode } from "../../../../src/entities/diff/node-diff/types";
+import { formatDiffNodesToDiffTree } from "../../../../src/entities/diff/ui/diff-tree";
 import { TREE_ROOT_ID } from "../../../../src/entities/ipam/constants";
 
 describe("Format diff nodes to diff tree", () => {

frontend/app/tests/unit/diff/diff-tree/generateRootCategoryNodeForDiffTree.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { generateRootCategoryNodeForDiffTree } from "../../../../src/entities/diff/diff-tree";
+import { generateRootCategoryNodeForDiffTree } from "../../../../src/entities/diff/ui/diff-tree";
 import { TREE_ROOT_ID } from "../../../../src/entities/ipam/constants";
 import { TreeProps } from "../../../../src/shared/components/ui/tree";