Fixing tapisui-extension pages bug

tapis-project · Aug 2, 2024 · e45cfe1 · e45cfe1
1 parent 5510090
commit e45cfe1
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 95 deletions.
diff --git a/packages/icicle-tapisui-extension/src/pages/DataLabeler/DataLabeler.tsx b/packages/icicle-tapisui-extension/src/pages/DataLabeler/DataLabeler.tsx
@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { SectionHeader } from '@tapis/tapisui-common';
+
+export const DataLabeler: React.FC = () => {
+  return (
+    <div>
+      <SectionHeader>Data Labeler</SectionHeader>
+    </div>
+  );
+};
+
+export default DataLabeler;
diff --git a/packages/icicle-tapisui-extension/src/pages/DataLabeler/index.ts b/packages/icicle-tapisui-extension/src/pages/DataLabeler/index.ts
@@ -0,0 +1 @@
+export { default as DataLabeler } from './DataLabeler';
diff --git a/packages/icicle-tapisui-extension/src/pages/DigitalAg/DigitalAg.tsx b/packages/icicle-tapisui-extension/src/pages/DigitalAg/DigitalAg.tsx
@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { SectionHeader } from '@tapis/tapisui-common';
+
+export const DigitalAg: React.FC = () => {
+  return (
+    <div>
+      <SectionHeader>Digital Ag</SectionHeader>
+    </div>
+  );
+};
+
+export default DigitalAg;
diff --git a/packages/icicle-tapisui-extension/src/pages/DigitalAg/index.ts b/packages/icicle-tapisui-extension/src/pages/DigitalAg/index.ts
@@ -0,0 +1 @@
+export { default as DigitalAg } from './DigitalAg';
diff --git a/packages/icicle-tapisui-extension/src/pages/OpenWebUI/OpenWebUI.tsx b/packages/icicle-tapisui-extension/src/pages/OpenWebUI/OpenWebUI.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-const OpenWebUI: React.FC = () => {
+export const OpenWebUI: React.FC = () => {
   return (
     <div
       style={{

diff --git a/packages/icicle-tapisui-extension/src/pages/VisualAnalytics/VisualAnalytics.tsx b/packages/icicle-tapisui-extension/src/pages/VisualAnalytics/VisualAnalytics.tsx
@@ -0,0 +1,28 @@
+import * as React from 'react';
+import { SectionHeader } from '@tapis/tapisui-common';
+import { Component } from '@tapis/tapisui-extensions-core';
+
+export const VisualAnalytics: Component = ({ accessToken }) => {
+  return (
+    <div
+      style={{
+        width: '100%',
+        height: '100%',
+        display: 'flex',
+        flexDirection: 'column',
+        overflow: 'hidden',
+      }}
+    >
+      {accessToken ? (
+        <iframe
+          style={{ flexGrow: 1, border: 'none' }}
+          src={`https://vaapibackenddev.pods.icicle.tapis.io/tapisui-entry?jwt=${accessToken}`}
+        />
+      ) : (
+        <>Invalid JWT. Log out of TapisUI then log back in</>
+      )}
+    </div>
+  );
+};
+
+export default VisualAnalytics;
diff --git a/packages/icicle-tapisui-extension/src/pages/VisualAnalytics/index.ts b/packages/icicle-tapisui-extension/src/pages/VisualAnalytics/index.ts
@@ -0,0 +1 @@
+export { default as VisualAnalytics } from './VisualAnalytics';
diff --git a/packages/icicle-tapisui-extension/src/pages/index.tsx b/packages/icicle-tapisui-extension/src/pages/index.tsx
@@ -1,93 +1,8 @@
-import * as React from 'react';
-import { SectionHeader } from '@tapis/tapisui-common';
-import { Component } from '@tapis/tapisui-extensions-core';
-// export { JupyterLab } from './JupyterLab';
-// import { OpenWebUI } from './OpenWebUI';
-// export { MLEdge } from './MLEdge';
-// export { SmartScheduler } from './SmartScheduler';
-
-export const DataLabeler: React.FC = () => {
-  return (
-    <div>
-      <SectionHeader>Data Labeler</SectionHeader>
-    </div>
-  );
-};
-
-export const JupyterLab: React.FC = () => {
-  return (
-    <div>
-      <SectionHeader>Jupyter Lab</SectionHeader>
-      <iframe
-        style={{ width: '100%', height: '800px', border: 'none' }}
-        src="https://jupyterlab.pods.tacc.develop.tapis.io/"
-      />
-    </div>
-  );
-};
-
-export const MLEdge: React.FC = () => {
-  return (
-    <div>
-      <SectionHeader>ML Edge</SectionHeader>
-    </div>
-  );
-};
-
-export const OpenWebUI: React.FC = () => {
-  return (
-    <div
-      style={{
-        width: '100%',
-        height: '100%',
-        display: 'flex',
-        flexDirection: 'column',
-        overflow: 'hidden',
-      }}
-    >
-      <iframe
-        style={{ flexGrow: 1, border: 'none' }}
-        src="https://openwebui.pods.tacc.develop.tapis.io/"
-      />
-    </div>
-  );
-};
-
-export const DigitalAg: React.FC = () => {
-  return (
-    <div>
-      <SectionHeader>Digital Ag</SectionHeader>
-    </div>
-  );
-};
-
-export const SmartScheduler: React.FC = () => {
-  return (
-    <div>
-      <SectionHeader>Smart Scheduler</SectionHeader>
-    </div>
-  );
-};
-
-export const VisualAnalytics: Component = ({ accessToken }) => {
-  return (
-    <div
-      style={{
-        width: '100%',
-        height: '100%',
-        display: 'flex',
-        flexDirection: 'column',
-        overflow: 'hidden',
-      }}
-    >
-      {accessToken ? (
-        <iframe
-          style={{ flexGrow: 1, border: 'none' }}
-          src={`https://vaapibackenddev.pods.icicle.tapis.io/tapisui-entry?jwt=${accessToken}`}
-        />
-      ) : (
-        <>Invalid JWT. Log out of TapisUI then log back in</>
-      )}
-    </div>
-  );
-};
+export { DataLabeler } from './DataLabeler';
+export { JupyterLab } from './JupyterLab';
+export { OpenWebUI } from './OpenWebUI';
+export { MLEdge } from './MLEdge';
+export { DigitalAg } from './DigitalAg';
+export { SmartScheduler } from './SmartScheduler';
+export { VisualAnalytics } from './VisualAnalytics';
+export { TrainingCatalog } from './TrainingCatalog';
diff --git a/packages/icicle-tapisui-extension/tsconfig.json b/packages/icicle-tapisui-extension/tsconfig.json
@@ -11,7 +11,16 @@
     "lib": ["dom", "esnext", "dom.iterable"],
     "types": ["node"],
     "typeRoots": ["./types", "node_modules/@types"],
-    "incremental": true
+    "incremental": true,
+    "esModuleInterop": true, // required or pages won't import
+    // "baseUrl": "src",
+    // "allowJs": true,
+    // // "allowSyntheticDefaultImports": true,
+    // "strict": false,
+    // "forceConsistentCasingInFileNames": true,
+    // "resolveJsonModule": true,
+    // "isolatedModules": true,
+    // "noEmit": false,
   },
   "include": ["src"],
   "exclude": ["node_modules", "dist", "bundle.ts", "tasks.ts"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { default as DataLabeler } from './DataLabeler';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { default as DigitalAg } from './DigitalAg';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { default as VisualAnalytics } from './VisualAnalytics';