first changes

tapis-project · Jul 9, 2024 · 34f909b · 34f909b
1 parent 9efbec8
commit 34f909b
Show file tree

Hide file tree

Showing 19 changed files with 489 additions and 447 deletions.
diff --git a/lib/icicle-tapisui-extension/package-lock.json b/lib/icicle-tapisui-extension/package-lock.json
diff --git a/lib/icicle-tapisui-extension/package.json b/lib/icicle-tapisui-extension/package.json
@@ -33,9 +33,10 @@
   },
   "homepage": "https://github.com/ICICLE-ai/tapisui-extension-icicle#readme",
   "dependencies": {
+    "22": "^0.0.0",
     "@tapis/tapis-typescript": "^0.0.32",
-    "@tapis/tapisui-extensions-core": "file:../tapisui-extensions-core",
     "@tapis/tapisui-common": "file:../tapisui-common",
+    "@tapis/tapisui-extensions-core": "file:../tapisui-extensions-core",
     "react": "^18.3.1"
   },
   "devDependencies": {

diff --git a/lib/icicle-tapisui-extension/src/gen/index.ts b/lib/icicle-tapisui-extension/src/gen/index.ts
@@ -1,7 +1,4 @@
-import { Workflows } from '@tapis/tapis-typescript';
-import { task as task0 } from './test-function';
-import { task as task1 } from './test-function-2';
-export const tasks: Array<Workflows.Task> = [
-  Workflows.FunctionTaskFromJSON(task0),
-  Workflows.FunctionTaskFromJSON(task1),
-];
+import { Workflows } from "@tapis/tapis-typescript"
+import { task as task0 } from "./test-function"
+import { task as task1 } from "./test-function-2"
+export const tasks: Array<Workflows.Task> = [Workflows.FunctionTaskFromJSON(task0),Workflows.FunctionTaskFromJSON(task1),]
diff --git a/lib/icicle-tapisui-extension/src/gen/test-function-2.ts b/lib/icicle-tapisui-extension/src/gen/test-function-2.ts
diff --git a/lib/icicle-tapisui-extension/src/gen/test-function.ts b/lib/icicle-tapisui-extension/src/gen/test-function.ts
@@ -1,19 +1,21 @@
 export const task = {
-  id: 'test-function',
-  type: 'function',
-  code: 'test',
-  execution_profile: {
-    flavor: 'c1tiny',
+  "id": "test-function",
+  "type": "function",
+  "code": "test",
+  "execution_profile": {
+    "flavor": "c1tiny"
   },
-  installer: 'pip',
-  packages: ['tapipy'],
-  runtime: 'python:3.9',
-  entrypoint: 'tapis-owe-functions/functions/tapis-etl-push-pull-data.py',
-  git_repositories: [
-    {
-      url: 'https://github.com/tapis-project/tapis-workflows-task-templates.git',
-      branch: 'master',
-      directory: 'tapis-owe-functions',
-    },
+  "installer": "pip",
+  "packages": [
+    "tapipy"
   ],
-};
+  "runtime": "python:3.9",
+  "entrypoint": "tapis-owe-functions/functions/tapis-etl-push-pull-data.py",
+  "git_repositories": [
+    {
+      "url": "https://github.com/tapis-project/tapis-workflows-task-templates.git",
+      "branch": "master",
+      "directory": "tapis-owe-functions"
+    }
+  ]
+}
diff --git a/lib/icicle-tapisui-extension/src/index.ts b/lib/icicle-tapisui-extension/src/index.ts
@@ -1,44 +1,44 @@
 import {
   createExtension,
   EnumTapisCoreService,
-} from '@tapis/tapisui-extensions-core';
-import { tasks as generatedTasks } from './gen';
+} from "@tapis/tapisui-extensions-core";
+import { tasks as generatedTasks } from "./gen";
 import {
   MLEdge,
   DataLabeler,
   JupyterLab,
   OpenWebUI,
   DigitalAg,
   VisualAnalytics,
-} from './pages';
+} from "./pages";
 
 const extension = createExtension({
   allowMultiTenant: false,
   authentication: {
     password: true,
     implicit: {
-      authorizationPath: 'https://icicleai.tapis.io/v3/oauth2/authorize',
-      clientId: 'tapisui-implicit-client',
-      redirectURI: 'https://icicleai.tapis.io/tapis-ui/#/oauth2',
-      responseType: 'token',
+      authorizationPath: "https://icicleai.tapis.io/v3/oauth2/authorize",
+      clientId: "tapisui-implicit-client",
+      redirectURI: "https://icicleai.tapis.io/tapis-ui/#/oauth2",
+      responseType: "token",
     },
   },
   removeServices: [EnumTapisCoreService.Apps],
   mainSidebarServices: [
-    'workflows',
-    'pods',
-    'ml-hub',
-    'ml-edge',
-    'open-web-ui',
-    'jupyter-lab',
-    'data-labeler',
-    'digital-ag',
-    'visual-analytics',
+    "workflows",
+    "pods",
+    "ml-hub",
+    "ml-edge",
+    "open-web-ui",
+    "jupyter-lab",
+    "data-labeler",
+    "digital-ag",
+    "visual-analytics",
   ],
-  authMethods: ['implicit', 'password'],
+  authMethods: ["implicit", "password"],
   logo: {
-    url: 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRfQCeZ-pHyZXArXjYUMjl9TuEwePvsERPcDQ&s',
-    logoText: 'ICICLE AI',
+    url: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRfQCeZ-pHyZXArXjYUMjl9TuEwePvsERPcDQ&s",
+    logoText: "ICICLE AI",
   },
   serviceCustomizations: {
     workflows: {
@@ -51,44 +51,44 @@ const extension = createExtension({
 });
 
 extension.registerService({
-  id: 'ml-edge',
-  sidebarDisplayName: 'ML Edge',
-  iconName: 'simulation',
+  id: "ml-edge",
+  sidebarDisplayName: "ML Edge",
+  iconName: "simulation",
   component: MLEdge,
 });
 
 extension.registerService({
-  id: 'data-labeler',
-  sidebarDisplayName: 'Data Labeler',
-  iconName: 'bar-graph',
+  id: "data-labeler",
+  sidebarDisplayName: "Data Labeler",
+  iconName: "bar-graph",
   component: DataLabeler,
 });
 
 extension.registerService({
-  id: 'jupyter-lab',
-  sidebarDisplayName: 'JupyterLab',
-  iconName: 'jupyter',
+  id: "jupyter-lab",
+  sidebarDisplayName: "JupyterLab",
+  iconName: "jupyter",
   component: JupyterLab,
 });
 
 extension.registerService({
-  id: 'open-web-ui',
-  sidebarDisplayName: 'Open WebUI',
-  iconName: 'multiple-coversation',
+  id: "open-web-ui",
+  sidebarDisplayName: "Open WebUI",
+  iconName: "multiple-coversation",
   component: OpenWebUI,
 });
 
 extension.registerService({
-  id: 'digital-ag',
-  sidebarDisplayName: 'Digital Ag',
-  iconName: 'globe',
+  id: "digital-ag",
+  sidebarDisplayName: "Digital Ag",
+  iconName: "globe",
   component: DigitalAg,
 });
 
 extension.registerService({
-  id: 'visual-analytics',
-  sidebarDisplayName: 'Visual Analytics',
-  iconName: 'globe',
+  id: "visual-analytics",
+  sidebarDisplayName: "Visual Analytics",
+  iconName: "globe",
   component: VisualAnalytics,
 });
 

diff --git a/lib/icicle-tapisui-extension/src/pages/JupyterLab/JupyterLab.tsx b/lib/icicle-tapisui-extension/src/pages/JupyterLab/JupyterLab.tsx
@@ -1,12 +1,12 @@
-import * as React from 'react';
-import { SectionHeader } from '@tapis/tapisui-common';
+import * as React from "react";
+import { SectionHeader } from "@tapis/tapisui-common";
 
 const JupyterLab: React.FC = () => {
   return (
     <div>
-      <SectionHeader>Jupyter Lab</SectionHeader>
+      <SectionHeader>Jupyter Lab 1234</SectionHeader>
       <iframe
-        style={{ width: '100%', height: '800px', border: 'none' }}
+        style={{ width: "100%", height: "800px", border: "none" }}
         src="https://jupyterlab.pods.tacc.develop.tapis.io/"
       />
     </div>

diff --git a/lib/icicle-tapisui-extension/src/pages/MLEdge/MLEdge.tsx b/lib/icicle-tapisui-extension/src/pages/MLEdge/MLEdge.tsx
@@ -1,10 +1,10 @@
-import * as React from 'react';
-import { SectionHeader } from '@tapis/tapisui-common';
+import * as React from "react";
+import { SectionHeader } from "@tapis/tapisui-common";
 
 const MLEdge: React.FC = () => {
   return (
     <div>
-      <SectionHeader>ML Edge</SectionHeader>
+      <SectionHeader>ML Edge 1234</SectionHeader>
     </div>
   );
 };

diff --git a/lib/icicle-tapisui-extension/src/pages/index.tsx b/lib/icicle-tapisui-extension/src/pages/index.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react';
-import { SectionHeader } from '@tapis/tapisui-common';
-import { Component } from '@tapis/tapisui-extensions-core';
+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';
@@ -19,7 +19,7 @@ export const JupyterLab: React.FC = () => {
     <div>
       <SectionHeader>Jupyter Lab</SectionHeader>
       <iframe
-        style={{ width: '100%', height: '800px', border: 'none' }}
+        style={{ width: "100%", height: "800px", border: "none" }}
         src="https://jupyterlab.pods.tacc.develop.tapis.io/"
       />
     </div>
@@ -38,15 +38,15 @@ export const OpenWebUI: React.FC = () => {
   return (
     <div
       style={{
-        width: '100%',
-        height: '100%',
-        display: 'flex',
-        flexDirection: 'column',
-        overflow: 'hidden',
+        width: "100%",
+        height: "100%",
+        display: "flex",
+        flexDirection: "column",
+        overflow: "hidden",
       }}
     >
       <iframe
-        style={{ flexGrow: 1, border: 'none' }}
+        style={{ flexGrow: 1, border: "none" }}
         src="https://openwebui.pods.tacc.develop.tapis.io/"
       />
     </div>
@@ -65,16 +65,16 @@ export const VisualAnalytics: Component = ({ accessToken }) => {
   return (
     <div
       style={{
-        width: '100%',
-        height: '100%',
-        display: 'flex',
-        flexDirection: 'column',
-        overflow: 'hidden',
+        width: "100%",
+        height: "100%",
+        display: "flex",
+        flexDirection: "column",
+        overflow: "hidden",
       }}
     >
       {accessToken ? (
         <iframe
-          style={{ flexGrow: 1, border: 'none' }}
+          style={{ flexGrow: 1, border: "none" }}
           src={`https://vaapibackenddev.pods.icicle.tapis.io/tapisui-entry?jwt=${accessToken}`}
         />
       ) : (