Merge pull request #82 from TukaTek/feature/middleware/TUK-112

Feature/middleware/tuk 112

Author: AnkitTukatek

web/src/app/admin/documents/sets/page.tsx

@@ -126,11 +126,11 @@ const EditRow = ({
             <div
               className={`
               text-text-darkerfont-medium my-auto p-1 hover:bg-accent-background flex items-center select-none
-              ${documentSet.is_up_to_date ? "cursor-pointer" : "cursor-default"}
+              ${documentSet?.is_up_to_date ? "cursor-pointer" : "cursor-default"}
             `}
               style={{ wordBreak: "normal", overflowWrap: "break-word" }}
               onClick={() => {
-                if (documentSet.is_up_to_date) {
+                if (documentSet?.is_up_to_date) {
                   router.push(`/admin/documents/sets/${documentSet.id}`);
                 }
               }}
@@ -221,7 +221,7 @@ const DocumentSetTable = ({
                   </TableCell>
                   <TableCell>
                     <div>
-                      {documentSet.cc_pair_descriptors.map(
+                      {documentSet?.cc_pair_descriptors?.map(
                         (ccPairDescriptor:any, ind:any) => {
                           return (
                             <div
@@ -248,11 +248,11 @@ const DocumentSetTable = ({
                     </div>
                   </TableCell>
                   <TableCell>
-                    {documentSet.is_up_to_date ? (
+                    {documentSet?.is_up_to_date ? (
                       <Badge variant="success" icon={FiCheckCircle}>
                         Up to Date
                       </Badge>
-                    ) : documentSet.cc_pair_descriptors.length > 0 ? (
+                    ) : documentSet?.cc_pair_descriptors?.length > 0 ? (
                       <Badge variant="in_progress" icon={FiClock}>
                         Syncing
                       </Badge>
@@ -375,7 +375,7 @@ const Main = () => {
         />
       </div>
 
-      {documentSets.length > 0 && (
+      {documentSets?.length > 0 && (
         <>
           <Separator />
           <DocumentSetTable

web/src/components/health/healthcheck.tsx

@@ -11,9 +11,10 @@ import { NEXT_PUBLIC_CUSTOM_REFRESH_URL } from "@/lib/constants";
 import { Button } from "../ui/button";
 import { logout } from "@/lib/user";
 import { usePathname, useRouter } from "next/navigation";
+import { middlewareUrl } from "@/utils/constant";
 export const HealthCheckBanner = () => {
   const router = useRouter();
-  const { error } = useSWR("/api/health", errorHandlingFetcher);
+  const { error } = useSWR(middlewareUrl+"/health", errorHandlingFetcher);
   const [expired, setExpired] = useState(false);
   const [showLoggedOutModal, setShowLoggedOutModal] = useState(false);
   const pathname = usePathname();
@@ -25,7 +26,9 @@ export const HealthCheckBanner = () => {
     data: user,
     mutate: mutateUser,
     error: userError,
-  } = useSWR<User>("/api/me", errorHandlingFetcher, {
+  // } = useSWR<User>("/api/me", errorHandlingFetcher, {
+  } = useSWR<User>(middlewareUrl+"/me", errorHandlingFetcher, {
+
     revalidateOnFocus: false,
     revalidateOnReconnect: false,
     dedupingInterval: 30000, // 30 seconds

web/src/lib/user.ts

@@ -8,7 +8,7 @@ export const getCurrentUser = async (
   includePreferences: boolean = true,
   includeTenantInfo: boolean = true
 ): Promise<User | null> => {
-  const url = new URL(middlewareUrl+"/api/me", window.location.origin);
+  const url = new URL(middlewareUrl+"/me", window.location.origin);
   url.searchParams.set("include_preferences", String(includePreferences));
   url.searchParams.set("include_tenant_info", String(includeTenantInfo));