add pageprops

jinjat-data · May 18, 2024 · b3b7809 · b3b7809
1 parent cef05fa
commit b3b7809
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/ui/packages/core/src/components/pages/exposure.tsx b/src/ui/packages/core/src/components/pages/exposure.tsx
@@ -18,9 +18,10 @@ export function ExposurePage() {
     }
 
     const spread = typeof dbt == "string" ? [dbt] : (dbt || [])
-    const [_, package_name, version, name, action, id] = spread
+    const [feature, package_name, version, name, action, id] = spread
 
-    const {resource} = useResource(`exposure.${package_name}.${name}`);
+    const {resource} = useResource(`${feature}.${package_name}.${name}`);
+    debugger
     const type = resource?.meta?.type;
     const schemaProvider = useJinjatProvider();
 
@@ -80,12 +81,13 @@ export function ExposurePage() {
             }
 
             if (data.method == 'get') {
+                debugger
                 return <JinjatList title={resource?.meta?.label || spread[1]}
                                    logo={resource?.meta?.jinjat.logo || <div/>} packageName={package_name}
                                    resources={{list: analysis_name}}
                                    enableActions={false}
                                    version={version}
-                                   {...resource?.meta?.jinjat?.refine?.props.get} />
+                                   {...resource?.meta?.jinjat?.refine?.props?.get} />
             } else {
                 return <JinjatCreate title={resource?.meta?.label || spread[1]}
                                      logo={resource?.meta?.jinjat.logo || <div/>} packageName={package_name}
@@ -102,6 +104,7 @@ export function ExposurePage() {
         }
     }
 
+    debugger
     return <div>404</div>;
 }
 

diff --git a/src/ui/packages/nextjs-spa/pages/_app.tsx b/src/ui/packages/nextjs-spa/pages/_app.tsx
@@ -1,9 +1,11 @@
-import { JinjatApp } from "@jinjatdata/core";
+import { ExtendedAppProps, JinjatApp } from "@jinjatdata/core";
 import { useMemo } from "react";
 
-export default function App ({...props}) {
+export default function App ({Component, pageProps} : ExtendedAppProps) {
+    const host = process.env.JINJAT_HOST || "http://127.0.0.1:8581"
+
     return useMemo(
-        () => <JinjatApp {...props} apiUrl={process.env.JINJAT_HOST}/>,
-        [props]
+        () => <JinjatApp Component={Component} pageProps={pageProps} apiUrl={host}/>,
+        [pageProps]
       );
 }