From 4a0e2aede00dd95fa83ad1f14b76d448397355bd Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Fri, 18 Oct 2024 11:35:17 +0100 Subject: [PATCH] fix(frontend): eslint imports order --- frontend/.eslintrc.json | 3 ++- frontend/src/components/categories/index.tsx | 3 ++- frontend/src/components/inbox/components/Chat.tsx | 5 +++-- .../src/components/inbox/hooks/useInfiniteLiveMessages.ts | 3 ++- frontend/src/components/visual-editor/BlockDialog.tsx | 3 ++- .../visual-editor/form/inputs/triggers/PatternsInput.tsx | 3 ++- frontend/src/components/visual-editor/v2/Diagrams.tsx | 3 ++- frontend/src/hooks/crud/useCreate.tsx | 3 ++- frontend/src/hooks/crud/useDelete.tsx | 3 ++- frontend/src/hooks/crud/useDeleteMany.tsx | 3 ++- frontend/src/hooks/crud/useFind.tsx | 5 +++-- frontend/src/hooks/crud/useGet.tsx | 3 ++- frontend/src/hooks/crud/useInfiniteFind.ts | 3 ++- frontend/src/hooks/crud/useNormalizedInfiniteQuery.ts | 5 +++-- frontend/src/hooks/crud/useUpdate.tsx | 3 ++- frontend/src/hooks/crud/useUpload.tsx | 3 ++- 16 files changed, 35 insertions(+), 19 deletions(-) diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json index 07323aa6..5046ccbc 100644 --- a/frontend/.eslintrc.json +++ b/frontend/.eslintrc.json @@ -20,7 +20,8 @@ "unknown", // <- unknown "index", // <- index imports "internal", // <- Absolute imports - ["sibling", "parent"] // <- Relative imports, the sibling and parent types they can be mingled together + "parent", // <- Relative imports, the sibling and parent types they can be mingled together + "sibling" ], "newlines-between": "always", "alphabetize": { diff --git a/frontend/src/components/categories/index.tsx b/frontend/src/components/categories/index.tsx index d9126643..d9976536 100644 --- a/frontend/src/components/categories/index.tsx +++ b/frontend/src/components/categories/index.tsx @@ -34,9 +34,10 @@ import { EntityType } from "@/services/types"; import { PermissionAction } from "@/types/permission.types"; import { getDateTimeFormatter } from "@/utils/date"; -import { CategoryDialog } from "./CategoryDialog"; import { ICategory } from "../../types/category.types"; +import { CategoryDialog } from "./CategoryDialog"; + export const Categories = () => { const { t } = useTranslate(); const { toast } = useToast(); diff --git a/frontend/src/components/inbox/components/Chat.tsx b/frontend/src/components/inbox/components/Chat.tsx index 42216e49..5e5ff1d6 100644 --- a/frontend/src/components/inbox/components/Chat.tsx +++ b/frontend/src/components/inbox/components/Chat.tsx @@ -23,8 +23,6 @@ import { useConfig } from "@/hooks/useConfig"; import { useTranslate } from "@/hooks/useTranslate"; import { EntityType } from "@/services/types"; -import { ChatActions } from "./ChatActions"; -import { ChatHeader } from "./ChatHeader"; import { getAvatarSrc, getMessageContent, @@ -33,6 +31,9 @@ import { import { useChat } from "../hooks/ChatContext"; import { useInfinitedLiveMessages } from "../hooks/useInfiniteLiveMessages"; +import { ChatActions } from "./ChatActions"; +import { ChatHeader } from "./ChatHeader"; + export function Chat() { const { apiUrl } = useConfig(); const { t, i18n } = useTranslate(); diff --git a/frontend/src/components/inbox/hooks/useInfiniteLiveMessages.ts b/frontend/src/components/inbox/hooks/useInfiniteLiveMessages.ts index a2f9b473..e86a6bee 100644 --- a/frontend/src/components/inbox/hooks/useInfiniteLiveMessages.ts +++ b/frontend/src/components/inbox/hooks/useInfiniteLiveMessages.ts @@ -14,9 +14,10 @@ import { useNormalizedInfiniteQuery } from "@/hooks/crud/useNormalizedInfiniteQu import { EntityType, QueryType } from "@/services/types"; import { useSubscribe } from "@/websocket/socket-hooks"; -import { useChat } from "./ChatContext"; import { SocketMessageEvents } from "../types"; +import { useChat } from "./ChatContext"; + export const useInfinitedLiveMessages = () => { const { subscriber: activeChat } = useChat(); const queryClient = useQueryClient(); diff --git a/frontend/src/components/visual-editor/BlockDialog.tsx b/frontend/src/components/visual-editor/BlockDialog.tsx index d86cc445..5088621e 100644 --- a/frontend/src/components/visual-editor/BlockDialog.tsx +++ b/frontend/src/components/visual-editor/BlockDialog.tsx @@ -35,11 +35,12 @@ import { useTranslate } from "@/hooks/useTranslate"; import { EntityType } from "@/services/types"; import { OutgoingMessageFormat } from "@/types/message.types"; +import { IBlockAttributes, IBlock } from "../../types/block.types"; + import BlockFormProvider from "./form/BlockFormProvider"; import { MessageForm } from "./form/MessageForm"; import { OptionsForm } from "./form/OptionsForm"; import { TriggersForm } from "./form/TriggersForm"; -import { IBlockAttributes, IBlock } from "../../types/block.types"; export type BlockDialogProps = DialogControlProps; type TSelectedTab = "triggers" | "options" | "messages"; diff --git a/frontend/src/components/visual-editor/form/inputs/triggers/PatternsInput.tsx b/frontend/src/components/visual-editor/form/inputs/triggers/PatternsInput.tsx index 880f0cca..87c6fe48 100644 --- a/frontend/src/components/visual-editor/form/inputs/triggers/PatternsInput.tsx +++ b/frontend/src/components/visual-editor/form/inputs/triggers/PatternsInput.tsx @@ -17,9 +17,10 @@ import { Pattern } from "@/types/block.types"; import { SXStyleOptions } from "@/utils/SXStyleOptions"; import { createValueWithId, ValueWithId } from "@/utils/valueWithId"; -import PatternInput from "./PatternInput"; import { getInputControls } from "../../utils/inputControls"; +import PatternInput from "./PatternInput"; + type PatternsInputProps = { value: Pattern[]; onChange: (patterns: Pattern[]) => void; diff --git a/frontend/src/components/visual-editor/v2/Diagrams.tsx b/frontend/src/components/visual-editor/v2/Diagrams.tsx index 69031893..370337c2 100644 --- a/frontend/src/components/visual-editor/v2/Diagrams.tsx +++ b/frontend/src/components/visual-editor/v2/Diagrams.tsx @@ -52,11 +52,12 @@ import { IBlock } from "@/types/block.types"; import { ICategory } from "@/types/category.types"; import { BlockPorts } from "@/types/visual-editor.types"; -import { AdvancedLinkModel } from "./AdvancedLink/AdvancedLinkModel"; import BlockDialog from "../BlockDialog"; import { ZOOM_LEVEL } from "../constants"; import { useVisualEditor } from "../hooks/useVisualEditor"; +import { AdvancedLinkModel } from "./AdvancedLink/AdvancedLinkModel"; + const Diagrams = () => { const { t } = useTranslate(); const [model, setModel] = useState< diff --git a/frontend/src/hooks/crud/useCreate.tsx b/frontend/src/hooks/crud/useCreate.tsx index 3f3ecb45..63871223 100644 --- a/frontend/src/hooks/crud/useCreate.tsx +++ b/frontend/src/hooks/crud/useCreate.tsx @@ -11,9 +11,10 @@ import { useMutation, useQueryClient } from "react-query"; import { QueryType, TMutationOptions } from "@/services/types"; import { IBaseSchema, IDynamicProps, TType } from "@/types/base.types"; -import { isSameEntity, useNormalizeAndCache } from "./helpers"; import { useEntityApiClient } from "../useApiClient"; +import { isSameEntity, useNormalizeAndCache } from "./helpers"; + export const useCreate = < TEntity extends IDynamicProps["entity"], TAttr = TType["attributes"], diff --git a/frontend/src/hooks/crud/useDelete.tsx b/frontend/src/hooks/crud/useDelete.tsx index 38450056..1becb844 100644 --- a/frontend/src/hooks/crud/useDelete.tsx +++ b/frontend/src/hooks/crud/useDelete.tsx @@ -16,9 +16,10 @@ import { TType, } from "@/types/base.types"; -import { isSameEntity } from "./helpers"; import { useEntityApiClient } from "../useApiClient"; +import { isSameEntity } from "./helpers"; + export const useDelete = < TEntity extends IDynamicProps["entity"], TAttr = TType["attributes"], diff --git a/frontend/src/hooks/crud/useDeleteMany.tsx b/frontend/src/hooks/crud/useDeleteMany.tsx index ee5b8921..d4786a37 100644 --- a/frontend/src/hooks/crud/useDeleteMany.tsx +++ b/frontend/src/hooks/crud/useDeleteMany.tsx @@ -11,9 +11,10 @@ import { useMutation, useQueryClient } from "react-query"; import { QueryType, TMutationOptions } from "@/services/types"; import { IBaseSchema, IDynamicProps, TType } from "@/types/base.types"; -import { isSameEntity } from "./helpers"; import { useEntityApiClient } from "../useApiClient"; +import { isSameEntity } from "./helpers"; + export const useDeleteMany = < TEntity extends IDynamicProps["entity"], TAttr = TType["attributes"], diff --git a/frontend/src/hooks/crud/useFind.tsx b/frontend/src/hooks/crud/useFind.tsx index 0bde4fa5..4eae0130 100644 --- a/frontend/src/hooks/crud/useFind.tsx +++ b/frontend/src/hooks/crud/useFind.tsx @@ -23,11 +23,12 @@ import { TType, } from "@/types/base.types"; +import { useEntityApiClient } from "../useApiClient"; +import { usePagination } from "../usePagination"; + import { useNormalizeAndCache } from "./helpers"; import { useCount } from "./useCount"; import { useGetFromCache } from "./useGet"; -import { useEntityApiClient } from "../useApiClient"; -import { usePagination } from "../usePagination"; export const useFind = < TDynamicProps extends IDynamicProps, diff --git a/frontend/src/hooks/crud/useGet.tsx b/frontend/src/hooks/crud/useGet.tsx index 3206722e..5f8b9066 100644 --- a/frontend/src/hooks/crud/useGet.tsx +++ b/frontend/src/hooks/crud/useGet.tsx @@ -18,9 +18,10 @@ import { TType, } from "@/types/base.types"; -import { useNormalizeAndCache } from "./helpers"; import { useEntityApiClient } from "../useApiClient"; +import { useNormalizeAndCache } from "./helpers"; + export const useGet = < TDynamicProps extends IDynamicProps, TAttr = TType["attributes"], diff --git a/frontend/src/hooks/crud/useInfiniteFind.ts b/frontend/src/hooks/crud/useInfiniteFind.ts index aefcc629..4d4cfc9b 100644 --- a/frontend/src/hooks/crud/useInfiniteFind.ts +++ b/frontend/src/hooks/crud/useInfiniteFind.ts @@ -23,9 +23,10 @@ import { TType, } from "@/types/base.types"; +import { useEntityApiClient } from "../useApiClient"; + import { useNormalizeAndCache } from "./helpers"; import { useGetFromCache } from "./useGet"; -import { useEntityApiClient } from "../useApiClient"; export const useInfiniteFind = < TDynamicProps extends IDynamicProps, diff --git a/frontend/src/hooks/crud/useNormalizedInfiniteQuery.ts b/frontend/src/hooks/crud/useNormalizedInfiniteQuery.ts index cec56b6b..5e42382e 100644 --- a/frontend/src/hooks/crud/useNormalizedInfiniteQuery.ts +++ b/frontend/src/hooks/crud/useNormalizedInfiniteQuery.ts @@ -23,11 +23,12 @@ import { TType, } from "@/types/base.types"; -import { useNormalizeAndCache } from "./helpers"; -import { useGetFromCache } from "./useGet"; import { useEntityApiClient } from "../useApiClient"; import { toPageQueryPayload } from "../usePagination"; +import { useNormalizeAndCache } from "./helpers"; +import { useGetFromCache } from "./useGet"; + const PAGE_SIZE = 20; export const useNormalizedInfiniteQuery = < diff --git a/frontend/src/hooks/crud/useUpdate.tsx b/frontend/src/hooks/crud/useUpdate.tsx index f272baa4..c0c0b90e 100644 --- a/frontend/src/hooks/crud/useUpdate.tsx +++ b/frontend/src/hooks/crud/useUpdate.tsx @@ -17,9 +17,10 @@ import { } from "@/types/base.types"; import { merge } from "@/utils/object"; +import { useEntityApiClient } from "../useApiClient"; + import { useNormalizeAndCache } from "./helpers"; import { useGetFromCache } from "./useGet"; -import { useEntityApiClient } from "../useApiClient"; export const useUpdate = < TEntity extends IDynamicProps["entity"], diff --git a/frontend/src/hooks/crud/useUpload.tsx b/frontend/src/hooks/crud/useUpload.tsx index 88c2175f..357c97b5 100644 --- a/frontend/src/hooks/crud/useUpload.tsx +++ b/frontend/src/hooks/crud/useUpload.tsx @@ -11,9 +11,10 @@ import { useMutation, useQueryClient } from "react-query"; import { QueryType, TMutationOptions } from "@/services/types"; import { IBaseSchema, IDynamicProps, TType } from "@/types/base.types"; -import { isSameEntity, useNormalizeAndCache } from "./helpers"; import { useEntityApiClient } from "../useApiClient"; +import { isSameEntity, useNormalizeAndCache } from "./helpers"; + export const useUpload = < TEntity extends IDynamicProps["entity"], TAttr = TType["attributes"],