add region and hardware title getters, fix pagination

instill-ai · May 10, 2024 · 40d46a1 · 40d46a1
1 parent 69ecffd
commit 40d46a1
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 11 deletions.
diff --git a/packages/design-system/src/ui-helpers/getModelHardwareToolkit.ts b/packages/design-system/src/ui-helpers/getModelHardwareToolkit.ts
@@ -0,0 +1,12 @@
+export const getModelHardwareToolkit = (hardwareName: string) => {
+  switch (hardwareName) {
+    case 'CPU':
+      return 'CPU';
+    case 'NVIDIA_TESLA_T4':
+      return 'Nvidia Tesla T4';
+    case 'NVIDIA_L4':
+      return 'Nvidia L4';
+    case 'NVIDIA_A100':
+      return 'Nvidia A100';
+  }
+}
diff --git a/packages/design-system/src/ui-helpers/getModelRegionToolkit.ts b/packages/design-system/src/ui-helpers/getModelRegionToolkit.ts
@@ -0,0 +1,6 @@
+export const getModelRegionToolkit = (regionName: string) => {
+  switch (regionName) {
+    case 'REGION_GCP_EUROPE_WEST4':
+      return 'GCP Europe-West4'
+  }
+}
diff --git a/packages/design-system/src/ui-helpers/index.ts b/packages/design-system/src/ui-helpers/index.ts
@@ -1,3 +1,5 @@
 export { getModelInstanceTaskToolkit } from "./getModelInstanceTaskToolkit";
 export { getModelDefinitionToolkit } from "./getModelDefinitionToolkit";
 export { getPipelineModeToolkit } from "./getPipelineModeToolkit";
+export { getModelRegionToolkit } from './getModelRegionToolkit';
+export { getModelHardwareToolkit } from './getModelHardwareToolkit';
diff --git a/packages/toolkit/src/components/card-model/CardModel.tsx b/packages/toolkit/src/components/card-model/CardModel.tsx
@@ -5,9 +5,8 @@ import { Menu } from "./Menu";
 import { Tags } from "./Tags";
 import { Stats } from "./Stats";
 import { Model, Nullable, sendAmplitudeData, useAmplitudeCtx, useDeleteModel } from "../../lib";
-import { generateRegionTitle } from "../../lib/generateRegionTitle";
 import React from "react";
-import { useToast } from "@instill-ai/design-system";
+import { useToast, getModelHardwareToolkit, getModelRegionToolkit } from "@instill-ai/design-system";
 import axios from "axios";
 import { useParams } from "next/navigation";
 
@@ -91,8 +90,8 @@ export const CardModel = (props: CardModelProps) => {
           <a href={`/${entity}/models/${model.id}`} className="break-all text-semantic-accent-default hover:!underline font-medium">{model.id}</a>
           <Tags
             isPrivate={model.visibility === 'VISIBILITY_PRIVATE'}
-            region={generateRegionTitle(model.region)}
-            hardware={model.hardware}
+            region={getModelRegionToolkit(model.region)}
+            hardware={getModelHardwareToolkit(model.hardware)}
           />
           <Menu handleDeleteModel={handleDeleteModel} model={model} />
         </div>

diff --git a/packages/toolkit/src/lib/generateRegionTitle.ts b/packages/toolkit/src/lib/generateRegionTitle.ts
diff --git a/packages/toolkit/src/view/model/ModelHubListPageMainView.tsx b/packages/toolkit/src/view/model/ModelHubListPageMainView.tsx
@@ -99,9 +99,9 @@ export const ModelHubListPageMainView = (
             </Select.Trigger>
             <Select.Content>
               <Select.Group>
-                <Select.Item value="VISIBILITY_UNSPECIFIED">All</Select.Item>
-                <Select.Item value="VISIBILITY_PUBLIC">Public</Select.Item>
-                <Select.Item value="VISIBILITY_PRIVATE">Private</Select.Item>
+                <Select.Item value="VISIBILITY_UNSPECIFIED" label="All" />
+                <Select.Item value="VISIBILITY_PUBLIC" label="Public" />
+                <Select.Item value="VISIBILITY_PRIVATE" label="Private" />
               </Select.Group>
             </Select.Content>
           </Select.Root>

diff --git a/packages/toolkit/src/view/model/ModelsListPagination.tsx b/packages/toolkit/src/view/model/ModelsListPagination.tsx
@@ -40,7 +40,7 @@ export const ModelsListPagination = ({ models, pageNumber, setPageNumber }: Mode
     }
   }, [models, pageNumber])
 
-  if (!models.data || paginationProps.totalPages === 0) {
+  if (!models.data || paginationProps.totalPages <= 1) {
     return null;
   }