Merge pull request #25 from moh-kenya/swr-base-url

Update api base url and table pagination

.env.example

@@ -1,3 +1,3 @@
-API_URL=http://localhost:8000/api
+NEXT_PUBLIC_API_URL=http://41.89.92.186:8000
 APP_DEBUG=true
 USE_MOCK_API=false

.gitignore

@@ -27,6 +27,7 @@ yarn-error.log*
 
 # local env files
 .env*.local
+.env
 
 # vercel
 .vercel

pages/api/search.js

@@ -1,5 +1,6 @@
 
 import useSWR from "swr";
+import { API_BASE_URL } from '../index';
 
 export const searchConcepts = (searchParams) => {
     const fetcher = (url) => fetch(url).then((res) => res.json());
@@ -10,7 +11,7 @@ export const searchConcepts = (searchParams) => {
         isError,
         mutate,
     } = useSWR(
-        `https://nhdd-staging-api.health.go.ke/concepts/?q=${searchParams}&verbose=false&includeRetired=false&includeInverseMappings=false`,
+        `${API_BASE_URL}/concepts/?q=${searchParams}&limit=1000&verbose=false&includeRetired=false&includeInverseMappings=false`,
         fetcher,
         { revalidateOnFocus: false, revalidateOnReconnect: false }
     );

pages/index.js

@@ -24,6 +24,8 @@ import { useRouter } from "next/router";
 
 const inter = Inter({ subsets: ["latin"] });
 
+export const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL;
+
 export default function Home() {
   const router = useRouter();
   const [activeTab, setActiveTab] = useState("1");

pages/search/index.js

@@ -24,7 +24,7 @@ function SearchResults() {
   const columns = [
     "id",
     "display_name",
-    "type",
+    "concept_class",
     "datatype",
     "source",
     "retired",
@@ -92,6 +92,7 @@ function SearchResults() {
       <Box my={2} sx={{ width: "100%" }}>
         <DataGrid
           rows={Object.values(data)}
+          getRowId={(row) => row.uuid}
           columns={columns.map((key) => {
             return {
               field: key.toLowerCase(),
@@ -118,8 +119,9 @@ function SearchResults() {
             };
           })}
           initialState={{
-            pagination: { pageSize: 25 },
+            pagination: { paginationModel: { pageSize: 25 } },
           }}
+          pageSizeOptions={[25, 50, 100, 250]}
           onRowClick={(row) => {
             // TODO: go to the resource's page
             router.push("/" + row.row.type + "/" + row.row.id);

utilities/index.js

@@ -1,5 +1,5 @@
 let debug = process.env.APP_ENV || false;
-let api_url = process.env.API_URL
+let api_url = process.env.NEXT_PUBLIC_API_URL
 console.log("api url", api_url)
 let cookie_suffix = '';