move type back

instill-ai · Jul 31, 2024 · dd15357 · dd15357
1 parent 9a0d561
commit dd15357
Show file tree

Hide file tree

Showing 25 changed files with 27 additions and 36 deletions.
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@instill-ai/toolkit",
-  "version": "0.97.0-rc.28",
+  "version": "0.97.0-rc.29",
   "description": "Instill AI's frontend toolkit",
   "repository": "https://github.com/instill-ai/design-system.git",
   "bugs": "https://github.com/instill-ai/design-system/issues",
@@ -170,4 +170,4 @@
       "eslint --cache --fix"
     ]
   }
-}
+}
diff --git a/packages/sdk/src/knowledge/types.ts → ...ib/react-query-service/knowledge/types.ts b/packages/sdk/src/knowledge/types.ts → ...ib/react-query-service/knowledge/types.ts
diff --git a/packages/toolkit/src/lib/react-query-service/knowledge/useCreateKnowledgeBase.ts b/packages/toolkit/src/lib/react-query-service/knowledge/useCreateKnowledgeBase.ts
@@ -1,7 +1,7 @@
 import { useMutation } from "@tanstack/react-query";
 
-import { KnowledgeBase } from "../../../../../sdk/src/knowledge/types";
 import { createInstillAxiosClient } from "../../vdp-sdk/helper";
+import { KnowledgeBase } from "./types";
 
 async function createKnowledgeBaseMutation({
   payload,

diff --git a/packages/toolkit/src/lib/react-query-service/knowledge/useDeleteKnowledgeBase.ts b/packages/toolkit/src/lib/react-query-service/knowledge/useDeleteKnowledgeBase.ts
@@ -1,7 +1,7 @@
 import { useMutation } from "@tanstack/react-query";
 
-import { KnowledgeBase } from "../../../../../sdk/src/knowledge/types";
 import { createInstillAxiosClient } from "../../vdp-sdk/helper";
+import { KnowledgeBase } from "./types";
 
 async function deleteKnowledgeBaseMutation({
   ownerId,

diff --git a/packages/toolkit/src/lib/react-query-service/knowledge/useGetFileDetails.ts b/packages/toolkit/src/lib/react-query-service/knowledge/useGetFileDetails.ts
@@ -2,8 +2,8 @@ import { useQuery } from "@tanstack/react-query";
 
 import { Nullable } from "@instill-ai/toolkit";
 
-import { File } from "../../../../../sdk/src/knowledge/types";
 import { createInstillAxiosClient } from "../../vdp-sdk/helper";
+import { File } from "./types";
 
 export function useGetFileDetails({
   fileUid,

diff --git a/packages/toolkit/src/lib/react-query-service/knowledge/useGetKnowledgeBases.ts b/packages/toolkit/src/lib/react-query-service/knowledge/useGetKnowledgeBases.ts
@@ -1,7 +1,7 @@
 import { useQuery } from "@tanstack/react-query";
 
-import { KnowledgeBase } from "../../../../../sdk/src/knowledge/types";
 import { createInstillAxiosClient } from "../../vdp-sdk/helper";
+import { KnowledgeBase } from "./types";
 
 async function getKnowledgeBases({
   ownerId,

diff --git a/packages/toolkit/src/lib/react-query-service/knowledge/useListKnowledgeBaseFiles.ts b/packages/toolkit/src/lib/react-query-service/knowledge/useListKnowledgeBaseFiles.ts
@@ -2,8 +2,8 @@ import { useQuery } from "@tanstack/react-query";
 
 import { Nullable } from "@instill-ai/toolkit";
 
-import { File } from "../../../../../sdk/src/knowledge/types";
 import { createInstillAxiosClient } from "../../vdp-sdk/helper";
+import { File } from "./types";
 
 export function useListKnowledgeBaseFiles({
   namespaceId,

diff --git a/packages/toolkit/src/lib/react-query-service/knowledge/useProcessKnowledgeBaseFiles.ts b/packages/toolkit/src/lib/react-query-service/knowledge/useProcessKnowledgeBaseFiles.ts
@@ -2,8 +2,8 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import { Nullable } from "@instill-ai/toolkit";
 
-import { File } from "../../../../../sdk/src/knowledge/types";
 import { createInstillAxiosClient } from "../../vdp-sdk/helper";
+import { File } from "./types";
 
 export function useProcessKnowledgeBaseFiles() {
   const queryClient = useQueryClient();

diff --git a/packages/toolkit/src/lib/react-query-service/knowledge/useUpdateChunk.ts b/packages/toolkit/src/lib/react-query-service/knowledge/useUpdateChunk.ts
@@ -2,8 +2,8 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import { Nullable } from "@instill-ai/toolkit";
 
-import { Chunk } from "../../../../../sdk/src/knowledge/types";
 import { createInstillAxiosClient } from "../../vdp-sdk/helper";
+import { Chunk } from "./types";
 
 export function useUpdateChunk() {
   const queryClient = useQueryClient();

diff --git a/packages/toolkit/src/lib/react-query-service/knowledge/useUploadKnowledgeBaseFile.ts b/packages/toolkit/src/lib/react-query-service/knowledge/useUploadKnowledgeBaseFile.ts
@@ -2,8 +2,8 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import { Nullable } from "@instill-ai/toolkit";
 
-import { File } from "../../../../../sdk/src/knowledge/types";
 import { createInstillAxiosClient } from "../../vdp-sdk/helper";
+import { File } from "./types";
 
 export function useUploadKnowledgeBaseFile() {
   const queryClient = useQueryClient();

diff --git a/packages/toolkit/src/view/knowledge/KnowledgeBaseView.tsx b/packages/toolkit/src/view/knowledge/KnowledgeBaseView.tsx
@@ -5,7 +5,6 @@ import { Nullable } from "@instill-ai/toolkit";
 import {
   GeneralAppPageProp,
   InstillStore,
-  useAuthenticatedUser,
   useInstillStore,
   useShallow,
 } from "../../lib";
@@ -14,7 +13,7 @@ import {
   useGetKnowledgeBases,
   useListKnowledgeBaseFiles,
 } from "../../lib/react-query-service/knowledge";
-import { KnowledgeBase } from "../../../../sdk/src/knowledge/types";
+import { KnowledgeBase } from "../../lib/react-query-service/knowledge/types";
 import { DeleteKnowledgeBaseNotification, CreditUsageFileNotification } from "./components/notifications";
 import { Sidebar } from "./components";
 import { CatalogFilesTab, ChunkTab, ImageTab, KnowledgeBaseTab, MarkdownTab, RetrieveTestTab, UploadExploreTab } from "./components/tabs";
@@ -47,11 +46,6 @@ export const KnowledgeBaseView = (props: KnowledgeBaseViewProps) => {
     })),
   );
 
-  const me = useAuthenticatedUser({
-    enabled: enabledQuery,
-    accessToken,
-  });
-
   const deleteKnowledgeBase = useDeleteKnowledgeBase();
   const { refetch: refetchKnowledgeBases } = useGetKnowledgeBases({
     accessToken,

diff --git a/packages/toolkit/src/view/knowledge/components/ChunkCard.tsx b/packages/toolkit/src/view/knowledge/components/ChunkCard.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 
 import { Icons, Separator, Switch, Tag } from "@instill-ai/design-system";
 
-import { Chunk } from "../../../../../sdk/src/knowledge/types";
+import { Chunk } from "../../../lib/react-query-service/knowledge/types";
 
 type ChunkCardProps = {
   chunk: Chunk;

diff --git a/packages/toolkit/src/view/knowledge/components/CreateKnowledgeBaseCard.tsx b/packages/toolkit/src/view/knowledge/components/CreateKnowledgeBaseCard.tsx
@@ -11,7 +11,7 @@ import {
 
 import { InstillStore, useInstillStore, useShallow } from "../../../lib";
 import { useListChunks } from "../../../lib/react-query-service/knowledge";
-import { KnowledgeBase } from "../../../../../sdk/src/knowledge/types";
+import { KnowledgeBase } from "../../../lib/react-query-service/knowledge/types";
 import { EditKnowledgeDialog } from "./EditKnowledgeDialog";
 
 type EditKnowledgeDialogData = {

diff --git a/packages/toolkit/src/view/knowledge/components/FileChunks.tsx b/packages/toolkit/src/view/knowledge/components/FileChunks.tsx
@@ -10,7 +10,7 @@ import {
   Chunk,
   KnowledgeBase,
   KnowledgeFile,
-} from "../../../../../sdk/src/knowledge/types";
+} from "../../../lib/react-query-service/knowledge/types";
 import ChunkCard from "./ChunkCard";
 
 type FileChunksProps = {

diff --git a/packages/toolkit/src/view/knowledge/components/FileTable.tsx b/packages/toolkit/src/view/knowledge/components/FileTable.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { File, FileStatus } from "../../../../../sdk/src/knowledge/types";
+import { File, FileStatus } from "../../../lib/react-query-service/knowledge/types";
 import { FileTableRow } from "./FileTableRow";
 import { FileTableHeader } from "./FileTableHeader";
 

diff --git a/packages/toolkit/src/view/knowledge/components/FileTableHeader.tsx b/packages/toolkit/src/view/knowledge/components/FileTableHeader.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { Button, Icons } from "@instill-ai/design-system";
-import { File } from "../../../../../sdk/src/knowledge/types";
+import { File } from "../../../lib/react-query-service/knowledge/types";
 
 type FileTableHeaderProps = {
     sortConfig: {

diff --git a/packages/toolkit/src/view/knowledge/components/FileTableRow.tsx b/packages/toolkit/src/view/knowledge/components/FileTableRow.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { Button, Icons } from "@instill-ai/design-system";
-import { File } from "../../../../../sdk/src/knowledge/types";
+import { File } from "../../../lib/react-query-service/knowledge/types";
 import { StatusTag } from "./StatusTag";
 
 type FileTableRowProps = {
@@ -18,9 +18,8 @@ export const FileTableRow: React.FC<FileTableRowProps> = ({
 }) => {
   return (
     <div
-      className={`grid h-[72px] grid-cols-[minmax(0,3fr)_1fr_1fr_1fr_1fr_2fr_1fr] items-center bg-semantic-bg-primary border border-semantic-bg-line ${
-        index !== 0 ? "" : ""
-      }`}
+      className={`grid h-[72px] grid-cols-[minmax(0,3fr)_1fr_1fr_1fr_1fr_2fr_1fr] items-center bg-semantic-bg-primary border border-semantic-bg-line ${index !== 0 ? "" : ""
+        }`}
     >
       <div
         className="flex items-center justify-center px-4 truncate cursor-pointer text-semantic-bg-secondary-alt-primary product-body-text-3-regular"

diff --git a/packages/toolkit/src/view/knowledge/components/Sidebar.tsx b/packages/toolkit/src/view/knowledge/components/Sidebar.tsx
@@ -4,7 +4,7 @@ import { useRouter } from "next/navigation";
 
 import { Icons } from "@instill-ai/design-system";
 
-import { KnowledgeBase } from "../../../../../sdk/src/knowledge/types";
+import { KnowledgeBase } from "../../../lib/react-query-service/knowledge/types";
 
 type SidebarProps = {
   activeTab: string;

diff --git a/packages/toolkit/src/view/knowledge/components/tabs/CatalogFilesTab.tsx b/packages/toolkit/src/view/knowledge/components/tabs/CatalogFilesTab.tsx
@@ -10,7 +10,7 @@ import {
   useDeleteKnowledgeBaseFile,
   useListKnowledgeBaseFiles,
 } from "../../../../lib/react-query-service/knowledge";
-import { File, KnowledgeBase } from "../../../../../../sdk/src/knowledge/types";
+import { File, KnowledgeBase } from "../../../../lib/react-query-service/knowledge/types";
 import FileDetailsOverlay from "../FileDetailsOverlay";
 import { DELETE_FILE_TIMEOUT } from "../lib/undoDeleteTime";
 import { DeleteFileNotification } from "../notifications";

diff --git a/packages/toolkit/src/view/knowledge/components/tabs/ChunkTab.tsx b/packages/toolkit/src/view/knowledge/components/tabs/ChunkTab.tsx
@@ -15,7 +15,7 @@ import {
 } from "../../../../lib/react-query-service/knowledge";
 import FileChunks from "../FileChunks";
 import FileDetailsOverlay from "../FileDetailsOverlay";
-import { Chunk, KnowledgeBase, KnowledgeFile } from "../../../../../../sdk/src/knowledge/types";
+import { Chunk, KnowledgeBase, KnowledgeFile } from "../../../../lib/react-query-service/knowledge/types";
 
 type ChunkTabProps = {
   knowledgeBase: KnowledgeBase;

diff --git a/packages/toolkit/src/view/knowledge/components/tabs/ImageTab.tsx b/packages/toolkit/src/view/knowledge/components/tabs/ImageTab.tsx
@@ -9,7 +9,7 @@ import {
   Tag,
 } from "@instill-ai/design-system";
 
-import { KnowledgeBase } from "../../../../../../sdk/src/knowledge/types";
+import { KnowledgeBase } from "../../../../lib/react-query-service/knowledge/types";
 import MetadataPreview from "../MetadataPreview";
 
 type ImageTabProps = {

diff --git a/packages/toolkit/src/view/knowledge/components/tabs/KnowledgeBaseTab.tsx b/packages/toolkit/src/view/knowledge/components/tabs/KnowledgeBaseTab.tsx
@@ -5,7 +5,6 @@ import { Separator, Skeleton } from "@instill-ai/design-system";
 
 import {
   InstillStore,
-  useAuthenticatedUser,
   useInstillStore,
   useShallow,
 } from "../../../../lib";
@@ -14,7 +13,7 @@ import {
   useGetKnowledgeBases,
   useUpdateKnowledgeBase,
 } from "../../../../lib/react-query-service/knowledge";
-import { KnowledgeBase } from "../../../../../../sdk/src/knowledge/types";
+import { KnowledgeBase } from "../../../../lib/react-query-service/knowledge/types";
 import { CreateKnowledgeBaseCard } from "../CreateKnowledgeBaseCard";
 import { CreateKnowledgeDialog } from "../CreateKnowledgeDialog";
 import { KnowledgeBaseCard } from "../KnowledgeBaseCard";
@@ -63,7 +62,6 @@ export const KnowledgeBaseTab = ({
     }))
   );
 
-  console.log("selectedNamespace", selectedNamespace);
   const {
     data: knowledgeBases,
     isLoading,

diff --git a/packages/toolkit/src/view/knowledge/components/tabs/MarkdownTab.tsx b/packages/toolkit/src/view/knowledge/components/tabs/MarkdownTab.tsx
@@ -10,7 +10,7 @@ import {
   Textarea,
 } from "@instill-ai/design-system";
 
-import { KnowledgeBase } from "../../../../../../sdk/src/knowledge/types";
+import { KnowledgeBase } from "../../../../lib/react-query-service/knowledge/types";
 
 type MarkdownTabProps = {
   knowledgeBase: KnowledgeBase;

diff --git a/packages/toolkit/src/view/knowledge/components/tabs/RetrieveTestTab.tsx b/packages/toolkit/src/view/knowledge/components/tabs/RetrieveTestTab.tsx
@@ -3,7 +3,7 @@ import { Separator } from "@instill-ai/design-system";
 import { CodeBlock } from "../../../../components";
 import { CodeString } from "../../../../components/CodeString";
 import { defaultCodeSnippetStyles } from "../../../../constant";
-import { KnowledgeBase } from "../../../../../../sdk/src/knowledge/types";
+import { KnowledgeBase } from "../../../../lib/react-query-service/knowledge/types";
 
 type RetrieveTestTabProps = {
   knowledgeBase: KnowledgeBase;

diff --git a/packages/toolkit/src/view/knowledge/components/tabs/UploadExploreTab.tsx b/packages/toolkit/src/view/knowledge/components/tabs/UploadExploreTab.tsx
@@ -25,7 +25,7 @@ import {
   useProcessKnowledgeBaseFiles,
   useUploadKnowledgeBaseFile,
 } from "../../../../lib/react-query-service/knowledge";
-import { KnowledgeBase } from "../../../../../../sdk/src/knowledge/types";
+import { KnowledgeBase } from "../../../../lib/react-query-service/knowledge/types";
 // import FilePreview from "./FilePreview";
 import { IncorrectFormatFileNotification, DuplicateFileNotification, FileSizeNotification } from "../notifications";
 import { FILE_ERROR_TIMEOUT } from "../lib/undoDeleteTime";