@gen3/frontend 0.10.87 → 0.10.89

package/dist/cjs/index.js

@@ -11972,11 +11972,11 @@ const TextDescription = ({ description })=>{
         children: [
             !extend ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
                 ref: textRef,
-                size: "sm",
+                size: "md",
                 lineClamp: 4,
                 children: description
             }) : /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
-                size: "sm",
+                size: "md",
                 children: description
             }),
             isClamped && /*#__PURE__*/ jsxRuntime.jsx("button", {
@@ -11997,7 +11997,7 @@ const TextDescription = ({ description })=>{
     });
 };
 
-const AnalysisCard = ({ title, description, type, icon, image, hasDemo, loginRequired, href })=>{
+const AnalysisCard = ({ title, description, type, icon, image, hasDemo, loginRequired, href, btnText })=>{
     return /*#__PURE__*/ jsxRuntime.jsx(core$1.Stack, {
         children: /*#__PURE__*/ jsxRuntime.jsxs("div", {
             className: "rounded-sm bg-base-max",
@@ -12065,7 +12065,7 @@ const AnalysisCard = ({ title, description, type, icon, image, hasDemo, loginReq
                                             root: 'bg-accent text-accent-contrast hover:bg-accent-darker p-2 rounded-sm',
                                             label: 'text-sm font-semibold'
                                         },
-                                        label: `Run ${type === 'application' ? 'App' : 'Notebook'}`
+                                        label: btnText ? btnText : `Run ${type === 'application' ? 'App' : 'Notebook'}`
                                     }),
                                     hasDemo && /*#__PURE__*/ jsxRuntime.jsx("button", {
                                         className: "ml-2 p-1.5 rounded-sm text-sm font-semibold",
@@ -12149,7 +12149,7 @@ const AnalysisCenter = ({ tools, showFilterAndSort = false })=>{
             /*#__PURE__*/ jsxRuntime.jsx("div", {
                 children: /*#__PURE__*/ jsxRuntime.jsx("div", {
                     className: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6 p-1 mx-4 overflow-y-scroll",
-                    children: tools.map(({ title, description, type, icon, image, hasDemo, loginRequired, href }, key)=>{
+                    children: tools.map(({ title, description, type, icon, image, hasDemo, loginRequired, href, btnText }, key)=>{
                         return /*#__PURE__*/ jsxRuntime.jsx(AnalysisCard, {
                             title,
                             description,
@@ -12159,7 +12159,8 @@ const AnalysisCenter = ({ tools, showFilterAndSort = false })=>{
                             hasDemo,
                             loginRequired,
                             href,
-                            cardType: 'regular'
+                            cardType: 'regular',
+                            btnText
                         }, title);
                     })
                 })
@@ -12168,7 +12169,7 @@ const AnalysisCenter = ({ tools, showFilterAndSort = false })=>{
     });
 };
 
-const AnalysisCardCompact = ({ title, description, type = 'application', icon, hasDemo = false, loginRequired = false, href, count, countUnits })=>{
+const AnalysisCardCompact = ({ title, description, type = 'application', icon, hasDemo = false, loginRequired = false, href, count, countUnits, btnText })=>{
     return /*#__PURE__*/ jsxRuntime.jsxs(core$1.Stack, {
         gap: "xs",
         classNames: {
@@ -12176,12 +12177,12 @@ const AnalysisCardCompact = ({ title, description, type = 'application', icon, h
         },
         children: [
             /*#__PURE__*/ jsxRuntime.jsx("div", {
-                className: "rounded-t-lg bg-secondary border-b-4 border-accent-warm h-12"
+                className: "rounded-t-lg bg-secondary border-b-4 border-accent-warm h-10"
             }),
             /*#__PURE__*/ jsxRuntime.jsx("div", {
-                className: "flex relative -mt-10 z-10 p-2 max-w-90",
+                className: "flex relative -mt-10 z-10 p-1 max-w-90",
                 children: /*#__PURE__*/ jsxRuntime.jsx("div", {
-                    className: "relative rounded-lg bg-base-lightest ml-5 border-4 border-base-light mx-2 w-1/4 aspect-square",
+                    className: "relative rounded-lg bg-base-lightest ml-5 border-4 border-base-light mx-1 w-1/4 aspect-square",
                     children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Image, {
                         component: Image,
                         src: `${icon}`,
@@ -12193,7 +12194,7 @@ const AnalysisCardCompact = ({ title, description, type = 'application', icon, h
                 })
             }),
             /*#__PURE__*/ jsxRuntime.jsxs("div", {
-                className: "flex flex-col ml-2 px-4 pb-2 h-full justify-between",
+                className: "flex flex-col ml-2 px-4 h-4/6 justify-between",
                 children: [
                     /*#__PURE__*/ jsxRuntime.jsxs("div", {
                         className: "flex flex-col",
@@ -12201,11 +12202,11 @@ const AnalysisCardCompact = ({ title, description, type = 'application', icon, h
                             /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
                                 fw: "bold",
                                 classNames: {
-                                    root: 'font-header sm:text-xl lg:text-2xl'
+                                    root: 'font-header sm:text-lg lg:text-xl'
                                 },
                                 children: title
                             }),
-                            /*#__PURE__*/ jsxRuntime.jsxs(core$1.Text, {
+                            count && /*#__PURE__*/ jsxRuntime.jsxs(core$1.Text, {
                                 size: "md",
                                 fw: "semibold",
                                 c: "base-contrast.5",
@@ -12216,7 +12217,7 @@ const AnalysisCardCompact = ({ title, description, type = 'application', icon, h
                                 ]
                             }),
                             /*#__PURE__*/ jsxRuntime.jsx("div", {
-                                className: "py-2 min-h-24 h-full",
+                                className: count ? 'pt-2 min-h-20 h-full' : 'pt-7 min-h-20 h-full',
                                 children: /*#__PURE__*/ jsxRuntime.jsx(TextDescription, {
                                     description: description
                                 })
@@ -12224,14 +12225,11 @@ const AnalysisCardCompact = ({ title, description, type = 'application', icon, h
                         ]
                     }),
                     /*#__PURE__*/ jsxRuntime.jsxs(core$1.Group, {
-                        className: "mb-4",
+                        className: "mb-6",
                         children: [
-                            /*#__PURE__*/ jsxRuntime.jsxs(core$1.Button, {
+                            /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
                                 color: "primary.4",
-                                children: [
-                                    "Run ",
-                                    type === 'application' ? 'App' : 'Notebook'
-                                ]
+                                children: btnText ? btnText : `Run ${type === 'application' ? 'App' : 'Notebook'}`
                             }),
                             hasDemo && /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
                                 variant: "outline",
@@ -12264,8 +12262,8 @@ const AnalysisCardCompact = ({ title, description, type = 'application', icon, h
  * @returns {ReactElement} A React element that renders the analysis panel with sections.
  */ const AnalysisCenterWithSections = ({ sections, classNames })=>{
     const rootClassNamesDefaults = {
-        title: 'font-header font-bold text-2xl uppercase',
-        divider: 'text-accent w-[100px] border-accent mb-4'
+        title: 'font-header font-bold text-2xl uppercase mt-2',
+        divider: 'text-accent w-[70px] border-accent mb-4'
     };
     const mergedGlobalClassnames = mergeDefaultTailwindClassnames(rootClassNamesDefaults, classNames ?? {});
     const sectionPanels = React.useMemo(()=>sections.map((section)=>{
@@ -12274,6 +12272,7 @@ const AnalysisCardCompact = ({ title, description, type = 'application', icon, h
                 gap: "xs",
                 children: [
                     /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
+                        color: "primary.4",
                         classNames: {
                             root: sectionClassnames['title']
                         },
@@ -12301,6 +12300,7 @@ const AnalysisCardCompact = ({ title, description, type = 'application', icon, h
         sections
     ]);
     return /*#__PURE__*/ jsxRuntime.jsx(core$1.Stack, {
+        gap: "xl",
         children: sectionPanels
     });
 };
@@ -12310,7 +12310,7 @@ const myGlob = (dir, filter)=>{
         const files = fs.readdirSync(dir);
         return files.filter((file)=>file.search(filter) !== -1);
     } catch (error) {
-        console.log('myGlow error', error, dir);
+        console.log('myGlob error', error, dir);
     }
     return [];
 };
@@ -12322,15 +12322,15 @@ class FilesystemContent {
         try {
             return await JSON.parse(fs.readFileSync(path.join(this.rootPath, filepath)).toString('utf8'));
         } catch (err) {
-            throw new Error(`Cannot process ${filepath}`);
+            throw new Error(`Cannot process ${filepath} `);
         }
     }
     async getAll(filepath, filter) {
         try {
             const files = myGlob(path.join(this.rootPath, filepath), filter);
-            return Promise.all(files.map((file)=>this.get(path.join(this.rootPath, filepath, file))));
+            return Promise.all(files.map((file)=>this.get(path.join(filepath, file))));
         } catch (err) {
-            throw new Error(`getAllCannot process ${filepath}/${filter}`);
+            throw new Error(`getAllCannot process ${path.join(this.rootPath, filepath)}/${filter}`);
         }
     }
 }
@@ -12349,30 +12349,46 @@ class ContentDatabase {
     }
 }
 
-const GEN3_FRONTEND_CONFIGURATION_ROOT = process.env.GEN3_FRONTEND_CONFIGURATION_ROOT || './';
+const GEN3_FRONTEND_CONFIGURATION_ROOT = process.env.GEN3_FRONTEND_CONFIGURATION_ROOT || './config/';
 
-const ContentRoot = GEN3_FRONTEND_CONFIGURATION_ROOT;
-const setup = ()=>{
-    const config = {
-        store: new FilesystemContent({
-            rootPath: ContentRoot
-        })
-    };
-    return new ContentDatabase(config);
-};
-const ContentSource = setup();
+class ContentSource {
+    static{
+        this.instance = null;
+    }
+    constructor(){
+        const config = {
+            store: new FilesystemContent({
+                rootPath: GEN3_FRONTEND_CONFIGURATION_ROOT
+            })
+        };
+        this.contentDatabase = new ContentDatabase(config);
+    }
+    static getInstance() {
+        if (!ContentSource.instance) {
+            ContentSource.instance = new ContentSource();
+        }
+        return ContentSource.instance;
+    }
+    // Add methods to access the ContentDatabase functionality
+    // For example:
+    getContentDatabase() {
+        return this.contentDatabase;
+    }
+}
+// Export a singleton instance
+var ContentSource$1 = ContentSource.getInstance();
 
 /**
  * Retrieves navigation page layout properties from configuration.
  * Note: GEN3_COMMONS_NAME depends on siteConfig.json value in the data commons package
  * @returns A Promise resolving to an object containing header and footer props.
  */ const getNavPageLayoutPropsFromConfig = async ()=>{
-    const navigationConfigJSON = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/navigation.json`);
+    const navigationConfigJSON = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/navigation.json`);
     let bannerConfigJSON = [];
     try {
-        bannerConfigJSON = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/banner.json`);
+        bannerConfigJSON = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/banner.json`);
     } catch (e) {
-        console.warn('No banner config found at: ', `config/${core.GEN3_COMMONS_NAME}/banner.json`);
+        console.warn('No banner config found at: ', `${core.GEN3_COMMONS_NAME}/banner.json`);
     }
     const { topBar, navigation, type = 'original' } = navigationConfigJSON;
     const headerProps = {
@@ -12381,7 +12397,7 @@ const ContentSource = setup();
         banners: bannerConfigJSON,
         type
     };
-    const footerProps = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/footer.json`);
+    const footerProps = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/footer.json`);
     return {
         headerProps,
         footerProps,
@@ -15320,7 +15336,7 @@ const DiscoveryPage = ({ headerProps, footerProps, discoveryConfig })=>{
 
 const DiscoveryPageGetServerSideProps = async ()=>{
     try {
-        const discoveryConfig = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/discovery.json`);
+        const discoveryConfig = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/discovery.json`);
         return {
             props: {
                 ...await getNavPageLayoutPropsFromConfig(),
@@ -15369,7 +15385,7 @@ const QueryPage = ({ headerProps, footerProps, queryProps })=>{
 };
 
 const QueryPageGetServerSideProps = async ()=>{
-    const queryProps = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/query.json`);
+    const queryProps = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/query.json`);
     return {
         props: {
             ...await getNavPageLayoutPropsFromConfig(),
@@ -15544,9 +15560,9 @@ const LandingPage = ({ headerProps, footerProps, landingPage })=>{
 };
 
 // should move this thing into _app.tsx and make a dedicated layout component after https://github.com/vercel/next.js/discussions/10949 is addressed
-const LandingPageGetStaticProps = async ()=>{
+const LandingPageGetServerSideProps = async ()=>{
     const navPageLayoutProps = await getNavPageLayoutPropsFromConfig();
-    const landingPage = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/landingPage.json`);
+    const landingPage = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/landingPage.json`);
     return {
         props: {
             ...navPageLayoutProps,
@@ -15625,7 +15641,7 @@ const GetSharedFieldMapping = async (cohortBuilderConfiguration)=>{
 };
 const ExplorerPageGetServerSideProps = async ()=>{
     try {
-        const cohortBuilderConfiguration = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/explorer.json`);
+        const cohortBuilderConfiguration = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/explorer.json`);
         if (lodash.isArray(cohortBuilderConfiguration)) {
             // older config layout
             // TODO: remove this
@@ -15660,7 +15676,7 @@ const ExplorerPageGetServerSideProps = async ()=>{
 const ExplorerPageGetServerSidePropsForConfigId = async (context)=>{
     const configId = context.query.configId;
     try {
-        const cohortBuilderConfiguration = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/explorer/${configId}.json`);
+        const cohortBuilderConfiguration = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/explorer/${configId}.json`);
         if (lodash.isArray(cohortBuilderConfiguration)) {
             // older config layout
             // TODO: remove this
@@ -16620,7 +16636,7 @@ const ProfilePage = ({ headerProps, footerProps, profileConfig })=>{
 };
 
 const ProfilePageGetServerSideProps = async ()=>{
-    const profileConfig = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/profile.json`);
+    const profileConfig = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/profile.json`);
     return {
         props: {
             ...await getNavPageLayoutPropsFromConfig(),
@@ -16647,7 +16663,7 @@ const LoginPage = ({ headerProps, footerProps, loginConfig })=>{
 };
 
 const LoginPageGetServerSideProps = async ()=>{
-    const loginConfig = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/login.json`);
+    const loginConfig = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/login.json`);
     return {
         props: {
             ...await getNavPageLayoutPropsFromConfig(),
@@ -16678,7 +16694,7 @@ const DictionaryPage = ({ headerProps, footerProps, config })=>{
 
 const DictionaryPageGetServerSideProps = async ()=>{
     try {
-        const cohortBuilderProps = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/dictionary.json`);
+        const cohortBuilderProps = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/dictionary.json`);
         return {
             props: {
                 ...await getNavPageLayoutPropsFromConfig(),
@@ -17401,7 +17417,7 @@ const AuthzPage = ({ headerProps, footerProps, authz })=>{
 };
 
 const AdminAuthZPageGetServerSideProps = async ()=>{
-    const rootPath = `config/${core.GEN3_COMMONS_NAME}/`;
+    const rootPath = `${core.GEN3_COMMONS_NAME}/`;
     const filepath = 'user.yaml';
     let data = {};
     try {
@@ -17729,7 +17745,7 @@ const SubmissionPage = ({ submissionConfig, headerProps, footerProps })=>{
 
 const SubmissionPageGetServerSideProps = async ()=>{
     try {
-        const submissionConfig = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/submission.json`);
+        const submissionConfig = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/submission.json`);
         return {
             props: {
                 ...await getNavPageLayoutPropsFromConfig(),
@@ -17794,7 +17810,7 @@ const WorkspaceNoAccessPage = ({ headerProps, footerProps })=>{
 };
 
 const WorkspacePageGetServerSideProps = async (_context)=>{
-    const workspaceProps = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/workspace.json`);
+    const workspaceProps = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/workspace.json`);
     try {
         return {
             props: {
@@ -17856,7 +17872,7 @@ const AnalysisPage = ({ headerProps, footerProps, tools, sections, classNames })
 
 const AnalysisPageGetServerSideProps = async ()=>{
     try {
-        const analysisConfig = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/analysisTools.json`);
+        const analysisConfig = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/analysisTools.json`);
         return {
             props: {
                 ...await getNavPageLayoutPropsFromConfig(),
@@ -18491,7 +18507,7 @@ const AnalysisEditorPage = ({ headerProps, footerProps, analysisFile })=>{
 };
 
 const AnalysisEditorPageGetServerSideProps = async ()=>{
-    // const rootPath = `config/${GEN3_COMMONS_NAME}/`;
+    // const rootPath = `${GEN3_COMMONS_NAME}/`;
     // const filepath = 'user.yaml';
     // let data: Record<string, any> = {};
     // try {
@@ -20399,7 +20415,7 @@ const DataLibraryPage = ({ headerProps, footerProps, config })=>{
 
 const DataLibraryPageGetServerSideProps = async ()=>{
     try {
-        const datalibraryConfig = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/dataLibrary.json`);
+        const datalibraryConfig = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/dataLibrary.json`);
         return {
             props: {
                 ...await getNavPageLayoutPropsFromConfig(),
@@ -20691,7 +20707,7 @@ const CrosswalkPage = ({ headerProps, footerProps, config })=>{
 
 const CrosswalkPageGetServerSideProps = async ()=>{
     try {
-        const initialConfig = await ContentSource.get(`config/${core.GEN3_COMMONS_NAME}/crosswalk.json`);
+        const initialConfig = await ContentSource$1.getContentDatabase().get(`${core.GEN3_COMMONS_NAME}/crosswalk.json`);
         const regex = /->/g;
         const processedConfig = {
             showSubmittedIdInTable: initialConfig.showSubmittedIdInTable,
@@ -21044,10 +21060,11 @@ exports.AuthzPage = AuthzPage;
 exports.BaseModal = BaseModal;
 exports.Charts = Charts;
 exports.CohortBuilder = CohortBuilder;
+exports.CohortManager = CohortManager;
 exports.CollapsableSidebar = CollapsableSidebar;
 exports.ColorThemePage = ColorThemePage;
 exports.ColorThemePageGetServerSideProps = ColorThemePageGetServerSideProps;
-exports.ContentSource = ContentSource;
+exports.ContentSource = ContentSource$1;
 exports.CreateCredentialsAPIKeyModal = CreateCredentialsAPIKeyModal;
 exports.CrosswalkPage = CrosswalkPage;
 exports.CrosswalkPageGetServerSideProps = CrosswalkPageGetServerSideProps;
@@ -21081,7 +21098,7 @@ exports.GqlQueryEditor = GqlQueryEditor$1;
 exports.Header = Header;
 exports.HoverLink = HoverLink;
 exports.LandingPage = LandingPage;
-exports.LandingPageGetStaticProps = LandingPageGetStaticProps;
+exports.LandingPageGetServerSideProps = LandingPageGetServerSideProps;
 exports.LoginButton = LoginButton$1;
 exports.LoginPage = LoginPage;
 exports.LoginPageGetServerSideProps = LoginPageGetServerSideProps;