From 34f909b7e42b1ae6a15cb7c9d9f85c60c9e1df8b Mon Sep 17 00:00:00 2001 From: manikyaswathi <38359678+manikyaswathi@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:51:17 -0500 Subject: [PATCH] first changes --- .../package-lock.json | 10 + lib/icicle-tapisui-extension/package.json | 3 +- lib/icicle-tapisui-extension/src/gen/index.ts | 11 +- .../src/gen/test-function-2.ts | 32 +-- .../src/gen/test-function.ts | 34 +-- lib/icicle-tapisui-extension/src/index.ts | 74 +++--- .../src/pages/JupyterLab/JupyterLab.tsx | 8 +- .../src/pages/MLEdge/MLEdge.tsx | 6 +- .../src/pages/index.tsx | 32 +-- lib/tapisui-api/package-lock.json | 147 ++++++------ lib/tapisui-common/package-lock.json | 225 +++++++++--------- lib/tapisui-extensions-core/package-lock.json | 1 + lib/tapisui-hooks/package-lock.json | 190 +++++++-------- package-lock.json | 55 ++++- package.json | 7 +- src/app/Apps/_Layout/Layout.tsx | 10 +- src/app/_Router/Router.tsx | 41 ++-- src/app/_components/Sidebar/Sidebar.tsx | 39 +-- src/extensions/useExtension.ts | 11 +- 19 files changed, 489 insertions(+), 447 deletions(-) diff --git a/lib/icicle-tapisui-extension/package-lock.json b/lib/icicle-tapisui-extension/package-lock.json index ef6495e5c..bbabafd3c 100644 --- a/lib/icicle-tapisui-extension/package-lock.json +++ b/lib/icicle-tapisui-extension/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.1", "license": "ISC", "dependencies": { + "22": "^0.0.0", "@tapis/tapis-typescript": "^0.0.32", "@tapis/tapisui-common": "file:../tapisui-common", "@tapis/tapisui-extensions-core": "file:../tapisui-extensions-core", @@ -20,6 +21,7 @@ } }, "../tapisui-common": { + "name": "@tapis/tapisui-common", "version": "0.0.9", "license": "ISC", "dependencies": { @@ -73,6 +75,7 @@ } }, "../tapisui-extensions-core": { + "name": "@tapis/tapisui-extensions-core", "version": "0.1.10", "license": "ISC", "dependencies": { @@ -89,6 +92,7 @@ "version": "0.0.32", "resolved": "https://registry.npmjs.org/@tapis/tapis-typescript/-/tapis-typescript-0.0.32.tgz", "integrity": "sha512-69DBAOIu/l7i/LIFLwl6rvthFsJPwM8N6LQIm0H4TqJQ6Q7+l3E7pF0VKGKuCdRHD3tT6oxgl6MKIC6ycWf2jQ==", + "license": "ISC", "dependencies": { "@tapis/tapis-typescript-actors": "^0.0.3", "@tapis/tapis-typescript-apps": "^0.0.8", @@ -195,6 +199,12 @@ "undici-types": "~5.26.4" } }, + "node_modules/22": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/22/-/22-0.0.0.tgz", + "integrity": "sha512-MdBPNDaCFY4fZVpp14n3Mt4isZ2yS1DrIiOig/iMLljr4zDa0g/583xf/lFXNPwhxCfGKYvyWJSrYyS8jNk2mQ==", + "license": "MIT" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/lib/icicle-tapisui-extension/package.json b/lib/icicle-tapisui-extension/package.json index b789cdda0..8b45f231d 100644 --- 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 index 7e46f6cf5..4a2666b0d 100644 --- 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.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.FunctionTaskFromJSON(task0),Workflows.FunctionTaskFromJSON(task1),] \ No newline at end of file diff --git a/lib/icicle-tapisui-extension/src/gen/test-function-2.ts b/lib/icicle-tapisui-extension/src/gen/test-function-2.ts index e98411905..27bd58251 100644 --- a/lib/icicle-tapisui-extension/src/gen/test-function-2.ts +++ b/lib/icicle-tapisui-extension/src/gen/test-function-2.ts @@ -1,19 +1,21 @@ export const task = { - id: 'test-function-2', - type: 'function', - execution_profile: { - flavor: 'c1tiny', + "id": "test-function-2", + "type": "function", + "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: [ + "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', - }, + "url": "https://github.com/tapis-project/tapis-workflows-task-templates.git", + "branch": "master", + "directory": "tapis-owe-functions" + } ], - code: '"""Transfers data files from the Remote Outbox to the Local Inbox"""

#-------- Workflow Context import: DO NOT REMOVE ----------------
from owe_python_sdk.runtime import execution_context as ctx
#-------- Workflow Context import: DO NOT REMOVE ----------------

import json, os

from constants.etl import LOCKFILE_FILENAME
from utils.etl import (
    ManifestModel,
    ManifestsLock,
    EnumManifestStatus,
    EnumPhase,
    poll_transfer_task,
    get_tapis_file_contents_json,
    fetch_system_files,
    validate_manifest_data_files,
    cleanup
)
from utils.tapis import get_client


# Instantiate a Tapis client
try:
    client = get_client(
        ctx.get_input("TAPIS_BASE_URL"),
        username=ctx.get_input("TAPIS_USERNAME"),
        password=ctx.get_input("TAPIS_PASSWORD"),
        jwt=ctx.get_input("TAPIS_JWT")
    )
except Exception as e:
    ctx.stderr(str(e))

# Deserialize system details
try:
    egress_system = json.loads(ctx.get_input("EGRESS_SYSTEM"))
    ingress_system = json.loads(ctx.get_input("INGRESS_SYSTEM"))
except json.JSONDecodeError as e:
    ctx.stderr(1, f"{e}")

# Set the phase-dependent variables
phase = ctx.get_input("PHASE")

# The that has the manifest files for this phase of the pipeline
manifests_system = ingress_system if phase == EnumPhase.Ingress else egress_system

try:
    # Lock the manifests directory to prevent other concurrent pipeline runs
    # from mutating manifest files
    lock = ManifestsLock(client, manifests_system)
    lock.acquire()

    # Register the lock release hook to be called on called to stderr and
    # stdout. This will unlock the manifests lock when the program exits with any
    # code
    ctx.add_hook(1, lock.release)
    ctx.add_hook(0, lock.release)
except Exception as e:
    ctx.stderr(1, f"Failed to lock pipeline: {str(e)}")

# Load all manfiest files from the manifests directory of the manifests system
try:
    manifest_files = fetch_system_files(
        system_id=manifests_system.get("manifests").get("system_id"),
        path=manifests_system.get("manifests").get("path"),
        client=client,
        include_patterns=manifests_system.get("manifests").get("include_patterns"),
        exclude_patterns=[
            *manifests_system.get("manifests").get("exclude_patterns"),
            LOCKFILE_FILENAME # Ignore the lockfile.
        ]
    )
except Exception as e:
    ctx.stderr(1, f"Failed to fetch manifest files: {e}")

# Load manifests that have the current phase
try:
    manifests = []
    for manifest_file in manifest_files:
        manifest = ManifestModel(
            filename=manifest_file.name,
            path=manifest_file.path,
            url=manifest_file.url,
            **json.loads(
                get_tapis_file_contents_json(
                    client,
                    manifests_system.get("manifests").get("system_id"),
                    manifest_file.path
                )
            )
        )

        if (
            manifest.phase == phase
            and manifest.status != EnumManifestStatus.Completed
        ):
            manifests.append(manifest)
except Exception as e:
    ctx.stderr(1, f"Failed to initialize manifests: {e}")

# Transfer all files in each manifest to the data directory of the ingress system
for manifest in manifests:
    # Which property contains the correct data files depends on the phase. For the
    # ingress phase it's remote_files and for egress it's local_files
    data_files = getattr(manifest, "local_files")
    if phase == EnumPhase.Ingress:
        data_files = getattr(manifest, "remote_files")

    # Check to see if the data files in the manifests pass data integrity checks
    try:
        validated, err = validate_manifest_data_files(
            egress_system,
            data_files,
            client
        )
    except Exception as e:
        ctx.stderr(1, f"Error validating data integrity: {e}")

    try:
        # Log the failed data integrity check in the manifest
        if not validated:
            manifest.log(f"Data integrity checks failed | {err}")
            manifest.set_status(EnumManifestStatus.IntegrityCheckFailed)
            manifest.save(ingress_system.get("manifests").get("system_id"), client)
            continue
        
        manifest.log(f"Data integrity checks successful")
        manifest.save(ingress_system.get("manifests").get("system_id"), client)
    except Exception as e:
        ctx.stderr(1, f"Error updating manifest: {e}")

    elements = []
    for data_file in data_files:
        # Build the transfer elements
        url = data_file.get("url")
        destination_system_id = ingress_system.get("data").get("system_id")
        destination_path = ingress_system.get("data").get("path")
        destination_filename = url.rsplit("/", 1)[1]
        destination_uri = f"tapis://{destination_system_id}/{os.path.join(destination_path.strip('/'), destination_filename)}"
        elements.append({
            "sourceURI": data_file.get("url"),
            "destinationURI": destination_uri
        })

    # Transfer elements
    try:
        manifest.log(f"Starting transfer of {len(elements)} data files from the remote outbox to the local inbox")
        # Start the transfer task and poll until terminal state
        task = client.files.createTransferTask(elements=elements)
        task = poll_transfer_task(client, task)
    except Exception as e:
        ctx.stderr(1, f"Error transferring files: {e}")
    
    # Add the transfer data to the manfiest
    manifest.transfers.append(task.uuid)

    try:
        if task.status != "COMPLETED":
            task_err = f"Transfer task failed | Task UUID: {task.uuid} | Status: '{task.status}' | Error: {task.errorMessage}"
            manifest.set_status(EnumManifestStatus.Failed)
            manifest.log(task_err)
            manifest.save(manifests_system.get("manifests").get("system_id"), client)
            ctx.stderr(1, task_err)

        manifest.log(f"Transfer task completed | Task UUID: {task.uuid}")
        manifest.set_status(EnumManifestStatus.Completed)
        manifest.save(manifests_system.get("manifests").get("system_id"), client)
    except Exception as e:
        ctx.stderr(1, f"Error updating manifests after transfer: {e}")

try:
    if phase == EnumPhase.Ingress:
        # Modify the path and url of the files tracked in the manifest to replace
        # egress system path and system id with the ingress system data path and 
        # ingress system transform system id
        unconverted_manifests = [
            manifest for manifest in manifests
            if (
                manifest.phase == EnumPhase.Ingress
                and manifest.status == EnumManifestStatus.Completed
            )
        ]

        for unconverted_manifest in unconverted_manifests:
            modified_data_files = []
            for data_file in unconverted_manifest.remote_files:
                ingress_system_id = ingress_system.get("data").get("system_id")
                ingress_data_files_path = ingress_system.get("data").get("path")
                path = os.path.join(f"/{ingress_data_files_path.strip('/')}", data_file["name"])
                modified_data_files.append({
                    **data_file,
                    "url": f'tapis://{ingress_system_id}/{os.path.join(path, data_file["name"]).strip("/")}',
                    "path": path
                })
            
            unconverted_manifest.local_files = modified_data_files
            unconverted_manifest.set_phase(EnumPhase.Transform)
            unconverted_manifest.save(ingress_system.get("manifests").get("system_id"), client)
except Exception as e:
    ctx.stderr(1, f"Error converting manifest: {e}")

cleanup(ctx)

', -}; + "code": """"Transfers data files from the Remote Outbox to the Local Inbox"""

#-------- Workflow Context import: DO NOT REMOVE ----------------
from owe_python_sdk.runtime import execution_context as ctx
#-------- Workflow Context import: DO NOT REMOVE ----------------

import json, os

from constants.etl import LOCKFILE_FILENAME
from utils.etl import (
    ManifestModel,
    ManifestsLock,
    EnumManifestStatus,
    EnumPhase,
    poll_transfer_task,
    get_tapis_file_contents_json,
    fetch_system_files,
    validate_manifest_data_files,
    cleanup
)
from utils.tapis import get_client


# Instantiate a Tapis client
try:
    client = get_client(
        ctx.get_input("TAPIS_BASE_URL"),
        username=ctx.get_input("TAPIS_USERNAME"),
        password=ctx.get_input("TAPIS_PASSWORD"),
        jwt=ctx.get_input("TAPIS_JWT")
    )
except Exception as e:
    ctx.stderr(str(e))

# Deserialize system details
try:
    egress_system = json.loads(ctx.get_input("EGRESS_SYSTEM"))
    ingress_system = json.loads(ctx.get_input("INGRESS_SYSTEM"))
except json.JSONDecodeError as e:
    ctx.stderr(1, f"{e}")

# Set the phase-dependent variables
phase = ctx.get_input("PHASE")

# The that has the manifest files for this phase of the pipeline
manifests_system = ingress_system if phase == EnumPhase.Ingress else egress_system

try:
    # Lock the manifests directory to prevent other concurrent pipeline runs
    # from mutating manifest files
    lock = ManifestsLock(client, manifests_system)
    lock.acquire()

    # Register the lock release hook to be called on called to stderr and
    # stdout. This will unlock the manifests lock when the program exits with any
    # code
    ctx.add_hook(1, lock.release)
    ctx.add_hook(0, lock.release)
except Exception as e:
    ctx.stderr(1, f"Failed to lock pipeline: {str(e)}")

# Load all manfiest files from the manifests directory of the manifests system
try:
    manifest_files = fetch_system_files(
        system_id=manifests_system.get("manifests").get("system_id"),
        path=manifests_system.get("manifests").get("path"),
        client=client,
        include_patterns=manifests_system.get("manifests").get("include_patterns"),
        exclude_patterns=[
            *manifests_system.get("manifests").get("exclude_patterns"),
            LOCKFILE_FILENAME # Ignore the lockfile.
        ]
    )
except Exception as e:
    ctx.stderr(1, f"Failed to fetch manifest files: {e}")

# Load manifests that have the current phase
try:
    manifests = []
    for manifest_file in manifest_files:
        manifest = ManifestModel(
            filename=manifest_file.name,
            path=manifest_file.path,
            url=manifest_file.url,
            **json.loads(
                get_tapis_file_contents_json(
                    client,
                    manifests_system.get("manifests").get("system_id"),
                    manifest_file.path
                )
            )
        )

        if (
            manifest.phase == phase
            and manifest.status != EnumManifestStatus.Completed
        ):
            manifests.append(manifest)
except Exception as e:
    ctx.stderr(1, f"Failed to initialize manifests: {e}")

# Transfer all files in each manifest to the data directory of the ingress system
for manifest in manifests:
    # Which property contains the correct data files depends on the phase. For the
    # ingress phase it's remote_files and for egress it's local_files
    data_files = getattr(manifest, "local_files")
    if phase == EnumPhase.Ingress:
        data_files = getattr(manifest, "remote_files")

    # Check to see if the data files in the manifests pass data integrity checks
    try:
        validated, err = validate_manifest_data_files(
            egress_system,
            data_files,
            client
        )
    except Exception as e:
        ctx.stderr(1, f"Error validating data integrity: {e}")

    try:
        # Log the failed data integrity check in the manifest
        if not validated:
            manifest.log(f"Data integrity checks failed | {err}")
            manifest.set_status(EnumManifestStatus.IntegrityCheckFailed)
            manifest.save(ingress_system.get("manifests").get("system_id"), client)
            continue
        
        manifest.log(f"Data integrity checks successful")
        manifest.save(ingress_system.get("manifests").get("system_id"), client)
    except Exception as e:
        ctx.stderr(1, f"Error updating manifest: {e}")

    elements = []
    for data_file in data_files:
        # Build the transfer elements
        url = data_file.get("url")
        destination_system_id = ingress_system.get("data").get("system_id")
        destination_path = ingress_system.get("data").get("path")
        destination_filename = url.rsplit("/", 1)[1]
        destination_uri = f"tapis://{destination_system_id}/{os.path.join(destination_path.strip('/'), destination_filename)}"
        elements.append({
            "sourceURI": data_file.get("url"),
            "destinationURI": destination_uri
        })

    # Transfer elements
    try:
        manifest.log(f"Starting transfer of {len(elements)} data files from the remote outbox to the local inbox")
        # Start the transfer task and poll until terminal state
        task = client.files.createTransferTask(elements=elements)
        task = poll_transfer_task(client, task)
    except Exception as e:
        ctx.stderr(1, f"Error transferring files: {e}")
    
    # Add the transfer data to the manfiest
    manifest.transfers.append(task.uuid)

    try:
        if task.status != "COMPLETED":
            task_err = f"Transfer task failed | Task UUID: {task.uuid} | Status: '{task.status}' | Error: {task.errorMessage}"
            manifest.set_status(EnumManifestStatus.Failed)
            manifest.log(task_err)
            manifest.save(manifests_system.get("manifests").get("system_id"), client)
            ctx.stderr(1, task_err)

        manifest.log(f"Transfer task completed | Task UUID: {task.uuid}")
        manifest.set_status(EnumManifestStatus.Completed)
        manifest.save(manifests_system.get("manifests").get("system_id"), client)
    except Exception as e:
        ctx.stderr(1, f"Error updating manifests after transfer: {e}")

try:
    if phase == EnumPhase.Ingress:
        # Modify the path and url of the files tracked in the manifest to replace
        # egress system path and system id with the ingress system data path and 
        # ingress system transform system id
        unconverted_manifests = [
            manifest for manifest in manifests
            if (
                manifest.phase == EnumPhase.Ingress
                and manifest.status == EnumManifestStatus.Completed
            )
        ]

        for unconverted_manifest in unconverted_manifests:
            modified_data_files = []
            for data_file in unconverted_manifest.remote_files:
                ingress_system_id = ingress_system.get("data").get("system_id")
                ingress_data_files_path = ingress_system.get("data").get("path")
                path = os.path.join(f"/{ingress_data_files_path.strip('/')}", data_file["name"])
                modified_data_files.append({
                    **data_file,
                    "url": f'tapis://{ingress_system_id}/{os.path.join(path, data_file["name"]).strip("/")}',
                    "path": path
                })
            
            unconverted_manifest.local_files = modified_data_files
            unconverted_manifest.set_phase(EnumPhase.Transform)
            unconverted_manifest.save(ingress_system.get("manifests").get("system_id"), client)
except Exception as e:
    ctx.stderr(1, f"Error converting manifest: {e}")

cleanup(ctx)

" +} \ No newline at end of file diff --git a/lib/icicle-tapisui-extension/src/gen/test-function.ts b/lib/icicle-tapisui-extension/src/gen/test-function.ts index 8e6e56653..5ae570fe3 100644 --- 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" + } + ] +} \ No newline at end of file diff --git a/lib/icicle-tapisui-extension/src/index.ts b/lib/icicle-tapisui-extension/src/index.ts index a126c6cb3..e423f0a11 100644 --- a/lib/icicle-tapisui-extension/src/index.ts +++ b/lib/icicle-tapisui-extension/src/index.ts @@ -1,8 +1,8 @@ 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, @@ -10,35 +10,35 @@ import { 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 index 52efed183..72dfcd7ca 100644 --- 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 (
- Jupyter Lab + Jupyter Lab 1234