fix: admin ui TS issues while build (#720)

* fix: admin ui TS issues while build * fix: add optional chaining
raystack · Aug 12, 2024 · 5df6a23 · 5df6a23
1 parent 720b7d4
commit 5df6a23
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 156 deletions.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/src/containers/organisations.list/billingaccounts/tokens/add.tsx b/ui/src/containers/organisations.list/billingaccounts/tokens/add.tsx
@@ -142,8 +142,8 @@ export default function AddTokens() {
                         <Select.Content style={{ width: "320px" }}>
                           <Select.Group>
                             {products.map((p) => (
-                              <Select.Item key={p.id} value={p.id}>
-                                {p.title || p.name}
+                              <Select.Item key={p?.id} value={p?.id || ""}>
+                                {p?.title || p?.name}
                               </Select.Item>
                             ))}
                           </Select.Group>

diff --git a/ui/src/containers/organisations.list/serviceusers/tokens/list.tsx b/ui/src/containers/organisations.list/serviceusers/tokens/list.tsx
@@ -62,6 +62,10 @@ function DeleteConfirmDialog({
   function onClick() {
     onConfirm(tokenId);
   }
+
+  function onCheckedChange(value: boolean) {
+    setIsAcknowledged(value);
+  }
   return (
     <Dialog open={open}>
       {/* @ts-ignore */}
@@ -83,9 +87,8 @@ function DeleteConfirmDialog({
           </Text>
           <Flex>
             <Checkbox
-              //@ts-ignore
               checked={isAcknowledged}
-              onCheckedChange={setIsAcknowledged}
+              onCheckedChange={onCheckedChange}
             ></Checkbox>
             <Text size={2}>I acknowledge to delete the service user token</Text>
           </Flex>

diff --git a/ui/src/containers/organisations.list/users/columns.tsx b/ui/src/containers/organisations.list/users/columns.tsx
@@ -1,6 +1,5 @@
 import {
   DotsHorizontalIcon,
-  Pencil2Icon,
   TrashIcon,
   UpdateIcon,
 } from "@radix-ui/react-icons";
@@ -12,7 +11,7 @@ import {
   V1Beta1User,
 } from "@raystack/frontier";
 import type { ColumnDef } from "@tanstack/react-table";
-import { Link, NavLink } from "react-router-dom";
+import { Link } from "react-router-dom";
 import * as R from "ramda";
 import { useFrontier } from "@raystack/frontier/react";
 import { toast } from "sonner";
@@ -132,13 +131,11 @@ const MembersActions = ({
     try {
       const resource = `app/organization:${organizationId}`;
       const principal = `app/user:${member?.id}`;
-      const {
-        // @ts-ignore
-        data: { policies = [] },
-      } = await client?.frontierServiceListPolicies({
+      const resp = await client?.frontierServiceListPolicies({
         org_id: organizationId,
         user_id: member.id,
       });
+      const policies = resp?.data?.policies || [];
       const deletePromises = policies.map((p: V1Beta1Policy) =>
         client?.frontierServiceDeletePolicy(p.id as string)
       );
@@ -160,6 +157,7 @@ const MembersActions = ({
   }
 
   return (
+    // @ts-ignore
     <DropdownMenu style={{ padding: "0 !important" }}>
       <DropdownMenu.Trigger asChild style={{ cursor: "pointer" }}>
         <DotsHorizontalIcon />