feat(catalog): feat expose helpers and static (#1531)

Because - expose helpers and static
instill-ai · Oct 11, 2024 · 1235d62 · 1235d62
1 parent e6c5381
commit 1235d62
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/packages/sdk/src/application/ApplicationClient.ts b/packages/sdk/src/application/ApplicationClient.ts
@@ -62,7 +62,7 @@ export class ApplicationClient extends APIResource {
       const applications: Application[] = [];
 
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps`,
+        baseURL: `/namespaces/${ownerId}/apps`,
         pageSize,
         pageToken,
         view,
@@ -118,7 +118,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps`,
+        baseURL: `/namespaces/${ownerId}/apps`,
       });
 
       const data = await this._client.post<CreateApplicationResponse>(
@@ -141,7 +141,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}`,
       });
 
       const data = await this._client.put<UpdateApplicationResponse>(
@@ -163,7 +163,7 @@ export class ApplicationClient extends APIResource {
   }: DeleteApplicationRequest): Promise<void> {
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}`,
       });
 
       await this._client.delete(queryString);
@@ -199,7 +199,7 @@ export class ApplicationClient extends APIResource {
       const conversations: Conversation[] = [];
 
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}/conversations`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}/conversations`,
         pageSize,
         pageToken,
       });
@@ -238,7 +238,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}/conversations`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}/conversations`,
       });
 
       const response = await this._client.post<CreateConversationResponse>(
@@ -260,7 +260,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${namespaceId}/apps/${appId}/conversations/${conversationId}`,
+        baseURL: `/namespaces/${namespaceId}/apps/${appId}/conversations/${conversationId}`,
       });
 
       const response = await this._client.put<UpdateConversationResponse>(
@@ -280,7 +280,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}/conversations/${conversationId}`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}/conversations/${conversationId}`,
       });
 
       await this._client.delete(queryString);
@@ -317,7 +317,7 @@ export class ApplicationClient extends APIResource {
       const messages: Message[] = [];
 
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}/conversations/${conversationId}/messages`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}/conversations/${conversationId}/messages`,
       });
 
       const data = await this._client.get<ListMessagesResponse>(queryString);
@@ -354,7 +354,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}/conversations/${conversationId}/messages`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}/conversations/${conversationId}/messages`,
       });
 
       const response = await this._client.post<CreateMessageResponse>(
@@ -376,7 +376,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}/conversations/${conversationId}/messages/${messageUid}`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}/conversations/${conversationId}/messages/${messageUid}`,
       });
 
       const response = await this._client.put<UpdateMessageResponse>(
@@ -396,7 +396,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}/conversations/${conversationId}/messages/${messageUid}`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}/conversations/${conversationId}/messages/${messageUid}`,
       });
 
       await this._client.delete(queryString);
@@ -413,7 +413,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}/ai_assistant_playground/conversation`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}/ai_assistant_playground/conversation`,
       });
 
       const response =
@@ -431,7 +431,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}/ai_assistant_playground/restart`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}/ai_assistant_playground/restart`,
       });
 
       const response =
@@ -449,7 +449,7 @@ export class ApplicationClient extends APIResource {
 
     try {
       const queryString = getQueryString({
-        baseURL: `/v1alpha/namespaces/${ownerId}/apps/${appId}/chat`,
+        baseURL: `/namespaces/${ownerId}/apps/${appId}/chat`,
       });
 
       const additionalHeaders = getInstillAdditionalHeaders({

diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@instill-ai/toolkit",
-  "version": "0.106.3",
+  "version": "0.106.3-rc.7",
   "description": "Instill AI's frontend toolkit",
   "repository": "https://github.com/instill-ai/design-system.git",
   "bugs": "https://github.com/instill-ai/design-system/issues",

diff --git a/packages/toolkit/src/lib/vdp-sdk/index.ts b/packages/toolkit/src/lib/vdp-sdk/index.ts
@@ -63,13 +63,10 @@ export function getInstillApplicationAPIClient({
   accessToken?: string;
 }) {
   if (!instillApplicationAPIClient) {
-    const apiGatewayUrl =
-      process.env.NEXT_PUBLIC_API_GATEWAY_URL ||
-      "https://api-d0.instill-inc.tech";
-    const apiVersion =
-      process.env.NEXT_PUBLIC_APPLICATION_API_VERSION || "v1alpha";
-
-    const baseURL = `${apiGatewayUrl}/${apiVersion}`;
+    const baseURL = `${
+      process.env.NEXT_SERVER_API_GATEWAY_URL ??
+      env("NEXT_PUBLIC_API_GATEWAY_URL")
+    }/${env("NEXT_PUBLIC_APPLICATION_API_VERSION")}`;
 
     instillApplicationAPIClient = new InstillAPIClient({
       baseURL,

diff --git a/packages/toolkit/src/view/catalog/components/FileTableRow.tsx b/packages/toolkit/src/view/catalog/components/FileTableRow.tsx
@@ -7,7 +7,7 @@ import { Button, Dialog, Icons, Tag } from "@instill-ai/design-system";
 import { File } from "../../../lib/react-query-service/catalog/types";
 import {
   convertFileType,
-  formatDate,
+  formatDateFileTableRow,
   formatFileSize,
   truncateName,
 } from "./lib/helpers";
@@ -63,7 +63,7 @@ export const FileTableRow = ({
           <div>{`${item.totalChunks ?? "N/A"} chunks, ${item.totalTokens} tokens`}</div>
         </div>
         <div className="flex items-center justify-center text-semantic-bg-secondary-alt-primary product-body-text-3-regular">
-          {formatDate(item.createTime)}
+          {formatDateFileTableRow(item.createTime)}
         </div>
         <div className="flex items-center justify-center">
           <Button

diff --git a/packages/toolkit/src/view/catalog/components/index.ts b/packages/toolkit/src/view/catalog/components/index.ts
@@ -19,3 +19,4 @@ export * from "./CatalogCardMenu";
 export * from "./WarnDiscardFilesDialog";
 export * from "./CloneCatalogDialog";
 export * from "./DragAndDropUpload";
+export * from "./lib";
diff --git a/packages/toolkit/src/view/catalog/components/lib/helpers.tsx b/packages/toolkit/src/view/catalog/components/lib/helpers.tsx
@@ -230,7 +230,7 @@ export const formatFileSize = (bytes: number | undefined): string => {
   return (bytes / Math.pow(1024, i)).toFixed(2) + " " + sizes[i];
 };
 
-export const formatDate = (dateString: string): string => {
+export const formatDateFileTableRow = (dateString: string): string => {
   const date = new Date(dateString);
   return date.toLocaleString();
 };

diff --git a/packages/toolkit/src/view/catalog/components/lib/index.ts b/packages/toolkit/src/view/catalog/components/lib/index.ts
@@ -1 +1,2 @@
 export * from "./helpers";
+export * from "./constant";
diff --git a/packages/toolkit/src/view/catalog/index.ts b/packages/toolkit/src/view/catalog/index.ts
@@ -1 +1,2 @@
 export * from "./CatalogMainView";
+export * from "./components";
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from "./helpers";
		export * from "./constant";
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from "./CatalogMainView";
		export * from "./components";