Merge branch 'task/TUI-386--implict' into dev

lib/icicle-tapisui-extension/src/index.ts

@@ -3,15 +3,23 @@ import {
   EnumTapisCoreService,
 } from '@tapis/tapisui-extensions-core';
 import { tasks as generatedTasks } from './gen';
-import { MLEdge, SmartScheduler, JupyterLab, OpenWebUI } from './pages';
+import {
+  MLEdge,
+  DataLabeler,
+  JupyterLab,
+  OpenWebUI,
+  DigitalAg,
+  VisualAnalytics,
+} from './pages';
 
 const extension = createExtension({
   allowMultiTenant: false,
   authentication: {
+    password: true,
     implicit: {
-      authorizationPath: 'https://dev.develop.tapis.io/v3/oauth2/authorize',
-      clientId: 'myclientid',
-      redirectURI: 'https://dev.develop.tapis.io/tapis-ui/#/oauth2/callback',
+      authorizationPath: 'https://icicleai.tapis.io/v3/oauth2/authorize',
+      clientId: 'tapisui-implicit-client',
+      redirectURI: 'https://icicleai.tapis.io/tapis-ui/#/oauth2',
       responseType: 'token',
     },
   },
@@ -23,7 +31,9 @@ const extension = createExtension({
     'ml-edge',
     'open-web-ui',
     'jupyter-lab',
-    'smart-scheduler',
+    'data-labeler',
+    'digital-ag',
+    'visual-analytics',
   ],
   authMethods: ['implicit', 'password'],
   logo: {
@@ -48,10 +58,10 @@ extension.registerService({
 });
 
 extension.registerService({
-  id: 'smart-scheduler',
-  sidebarDisplayName: 'Smart Scheduler',
+  id: 'data-labeler',
+  sidebarDisplayName: 'Data Labeler',
   iconName: 'bar-graph',
-  component: SmartScheduler,
+  component: DataLabeler,
 });
 
 extension.registerService({
@@ -68,6 +78,20 @@ extension.registerService({
   component: OpenWebUI,
 });
 
+extension.registerService({
+  id: 'digital-ag',
+  sidebarDisplayName: 'Digital Ag',
+  iconName: 'globe',
+  component: DigitalAg,
+});
+
+extension.registerService({
+  id: 'visual-analytics',
+  sidebarDisplayName: 'Visual Analytics',
+  iconName: 'globe',
+  component: VisualAnalytics,
+});
+
 extension.serviceCustomizations.workflows.dagTasks = generatedTasks;
 
 export { extension };

lib/icicle-tapisui-extension/src/pages/index.tsx

@@ -1,14 +1,15 @@
 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 SmartScheduler: React.FC = () => {
+export const DataLabeler: React.FC = () => {
   return (
     <div>
-      <SectionHeader>Smart Scheduler</SectionHeader>
+      <SectionHeader>Data Labeler</SectionHeader>
     </div>
   );
 };
@@ -51,3 +52,34 @@ export const OpenWebUI: React.FC = () => {
     </div>
   );
 };
+
+export const DigitalAg: React.FC = () => {
+  return (
+    <div>
+      <SectionHeader>Digital Ag</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>
+  );
+};