@gen3/workspaces 0.12.62 → 0.12.64

package/dist/index/esm/index.js

@@ -1,15 +1,15 @@
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import React, { useCallback, useMemo, useState, useRef, useEffect, createContext, useImperativeHandle, forwardRef } from 'react';
 import { mergeDefaultTailwindClassnames, ACTIVITY_CHANNEL, convertSecondsToMilliseconds, InfoRolloverButton, OverflowTooltippedLabel, PanelErrorBoundary, ProtectedContent, FixedNavPageLayout, ContentSource, getNavPageLayoutPropsFromConfig } from '@gen3/frontend';
-import { Card, Stack, Badge, Text, List, Group, Tooltip, Button, Container, SimpleGrid, LoadingOverlay, Alert, Loader, Divider, Select, ActionIcon, TextInput, Textarea, Table, Scroller, Tabs, Center } from '@mantine/core';
+import { Card, Stack, Badge, Text, List, Group, Tooltip, Button, Container, SimpleGrid, LoadingOverlay, Loader, Alert, Select, Divider, ActionIcon, TextInput, Textarea, Table, Scroller, Tabs, Center } from '@mantine/core';
 import { Icon } from '@iconify-icon/react';
 import { useInterval, useElementSize, useDisclosure, useResizeObserver } from '@mantine/hooks';
 import { GEN3_API, GEN3_WORKSPACE_API, gen3Api, useCoreSelector, selectJEGActiveWorkspaceStatus, useCoreDispatch, setJEGActiveWorkspaceStatus, WorkspaceStatus, setJEGRequestedWorkspaceStatus, RequestedWorkspaceStatus, setJEGActiveWorkspaceId, isFetchBaseQueryError, selectJEGRequestedWorkspaceStatus, selectJEGRequestedWorkspaceStatusTimestamp, isTimeGreaterThan, formatUptimeInMinutes, selectJEGKernelIds, removeManyJEGActiveKernels, upsertManyJEGActiveKernels, normalizeRtkError, selectAllJEGKernels, addJEGActiveKernel, selectWorkspaceTier, setWorkspaceTier, selectWorkspaceFullscreen, setWorkspaceFullscreen, useGetDictionaryFromUrlQuery, useUserAuth, GEN3_COMMONS_NAME } from '@gen3/core';
 import { useDeepCompareEffect } from 'use-deep-compare';
 import { notifications } from '@mantine/notifications';
+import { MdExpandMore, MdKeyboardArrowDown, MdKeyboardArrowRight } from 'react-icons/md';
 import { IoSettingsSharp } from 'react-icons/io5';
 import { BsFillInfoCircleFill } from 'react-icons/bs';
-import { MdKeyboardArrowDown, MdKeyboardArrowRight } from 'react-icons/md';
 import { merge } from 'lodash';
 
 const WorkspaceTierCard = ({ label, description, tier, tierLabel = undefined, features = [], tooltip = 'Launch workspace', buttonLabel = 'Launch', onSelectTier, baseColor })=>{
@@ -619,12 +619,18 @@ const { useDoesHatcheryOptionExistsQuery, useHatcheryOptionsQuery, useLazyHatche
         isWorkspaceLaunchError,
         isTerminateError
     ]);
-    const launch = useCallback(async ()=>{
+    const launch = useCallback(async (tag)=>{
         if (!enabled || workspaceContainerStatus === WorkspaceStatus.Launching || workspaceContainerStatus === WorkspaceStatus.Running) return; // already running or launching so ignore
+        const isTagString = tag && typeof tag === 'string';
+        if (isTagString) {
+            // set hash to passed in tag
+            setContainerHash(tag);
+        }
         try {
             coreDispatch(setJEGRequestedWorkspaceStatus(RequestedWorkspaceStatus.Launch));
             coreDispatch(setJEGActiveWorkspaceStatus(WorkspaceStatus.Launching));
-            const query = containerHash ? encodeURIComponent(containerHash) : '';
+            // use tag if provided to prevent race condition with setContainerHash
+            const query = isTagString ? encodeURIComponent(tag) : containerHash ? encodeURIComponent(containerHash) : '';
             const launchResults = await launchTrigger(query).unwrap();
             if (!launchResults) {
                 // launch error, will show error message and then reset
@@ -945,8 +951,10 @@ const icon = /*#__PURE__*/ jsx(Icon, {
  * The iframe and KernelLifecyclePanel are rendered by the PARENT only when
  * status === 'running' && useJupyterReady.ready === true.
  */ const PanelStyle$2 = 'h-full w-full flex flex-col items-center justify-start gap-6 px-6 mt-20';
-const MicroContainerReduxPanel = ()=>{
-    const { launch, terminate } = useMicroContainerReduxContext();
+const MicroContainerReduxPanel = ({ enableOptions = false })=>{
+    const { launch, terminate, containerHash } = useMicroContainerReduxContext();
+    const { data: hatcheryOptions, isLoading: isHatcheryOptionsLoading, isError: isHatcheryOptionsError } = useHatcheryOptionsQuery();
+    const [workspaceOptionSelected, setWorkspaceOptionSelected] = useState(null);
     const status = useCoreSelector(selectJEGActiveWorkspaceStatus);
     const requestedStatusTimestamp = useCoreSelector(selectJEGRequestedWorkspaceStatusTimestamp);
     const coreDispatch = useCoreDispatch();
@@ -980,6 +988,72 @@ const MicroContainerReduxPanel = ()=>{
         status,
         resetStatus
     ]);
+    const simpleLaunchWorkspaceBtn = /*#__PURE__*/ jsx(Button, {
+        variant: "outline",
+        color: "accent.3",
+        onClick: ()=>launch(),
+        children: "Launch Workspace"
+    });
+    const launchWorkspaceBtn = useMemo(()=>{
+        if (isHatcheryOptionsLoading) {
+            return /*#__PURE__*/ jsx(Loader, {
+                size: 24
+            });
+        }
+        if (isHatcheryOptionsError) {
+            return /*#__PURE__*/ jsx(Alert, {
+                variant: "light",
+                color: "accentWarm.4",
+                title: "Options API Error",
+                icon: icon,
+                children: "Failed to Fetch Options"
+            });
+        }
+        if (hatcheryOptions && hatcheryOptions.length > 1) {
+            const workspaceOptionLaunch = ()=>{
+                if (workspaceOptionSelected?.value) {
+                    launch(workspaceOptionSelected.value);
+                }
+            };
+            const hatcheryOptionForSelect = hatcheryOptions.map((obj)=>({
+                    label: obj.name,
+                    value: obj.id
+                }));
+            return /*#__PURE__*/ jsxs("div", {
+                className: "flex",
+                children: [
+                    /*#__PURE__*/ jsx(Select, {
+                        rightSection: /*#__PURE__*/ jsx(MdExpandMore, {
+                            className: "text-accent",
+                            size: "1.5em",
+                            "aria-hidden": true
+                        }),
+                        withCheckIcon: false,
+                        data: hatcheryOptionForSelect,
+                        value: workspaceOptionSelected ? workspaceOptionSelected.value : null,
+                        placeholder: "-- Select workspace type --",
+                        onChange: (_value, option)=>setWorkspaceOptionSelected(option),
+                        classNames: {
+                            input: 'rounded-r-none'
+                        },
+                        color: "accent.3"
+                    }),
+                    /*#__PURE__*/ jsx(Button, {
+                        onClick: workspaceOptionLaunch,
+                        className: "rounded-l-none w-64 disabled:bg-accent-lighter disabled:text-accent-contrast",
+                        disabled: !workspaceOptionSelected?.value,
+                        color: "accent.3",
+                        children: "Launch Workspace"
+                    })
+                ]
+            });
+        }
+        return simpleLaunchWorkspaceBtn;
+    }, [
+        isHatcheryOptionsLoading,
+        workspaceOptionSelected,
+        containerHash
+    ]);
     if (status === WorkspaceStatus.StatusError) {
         return /*#__PURE__*/ jsx("div", {
             className: PanelStyle$2,
@@ -1001,25 +1075,17 @@ const MicroContainerReduxPanel = ()=>{
                     children: [
                         /*#__PURE__*/ jsx(Icon, {
                             icon: "gen3:run",
-                            width: 100,
-                            height: 100,
-                            className: "text-primary"
-                        }),
-                        /*#__PURE__*/ jsx("p", {
-                            className: "mt-2 max-w-sm text-sm text-base-darker",
-                            children: "Start your personal micro compute environment. Use it for light analysis — upgrade to a GPU kernel when you need to run large workflows."
+                            width: 60,
+                            height: 60,
+                            className: "text-accent"
                         }),
                         /*#__PURE__*/ jsx("p", {
-                            className: "mt-1 text-xs text-base-darker",
-                            children: "Included with your subscription · typically ready in under 60s"
+                            className: "mt-2 max-w-lg text-sm text-base-darker",
+                            children: "Start your personal micro compute environment. Use it for light analysis, upgrade to a GPU kernel when you need to run large workflows."
                         })
                     ]
                 }),
-                /*#__PURE__*/ jsx(Button, {
-                    variant: "outline",
-                    onClick: launch,
-                    children: "Launch Workspace"
-                })
+                enableOptions ? launchWorkspaceBtn : simpleLaunchWorkspaceBtn
             ]
         });
     }
@@ -1109,7 +1175,7 @@ const MicroContainerReduxPanel = ()=>{
                             children: "Terminate"
                         }),
                         /*#__PURE__*/ jsx(Button, {
-                            onClick: launch,
+                            onClick: ()=>launch(),
                             variant: "default",
                             children: "Retry"
                         })
@@ -1152,7 +1218,7 @@ const MicroContainerReduxPanel = ()=>{
 
 /**
  * Handle a Jupyter Enterprise Gateway session.
- */ const RemoteComputeWorkspace = /*#__PURE__*/ React.memo(/*#__PURE__*/ React.forwardRef(({ assetBaseUrl = '/api/workspace-assets/remote', tenantId, workspaceId, userId, notebookName = 'remote-workspace', onReady = ()=>{}, onError = ()=>{} }, ref)=>{
+ */ const RemoteComputeWorkspace = /*#__PURE__*/ React.memo(/*#__PURE__*/ React.forwardRef(({ assetBaseUrl = '/api/workspace-assets/remote', enableOptions = false, tenantId, workspaceId, userId, notebookName = 'remote-workspace', onReady = ()=>{}, onError = ()=>{} }, ref)=>{
     const [loading, setLoading] = useState(true);
     const [loadError, setLoadError] = useState(false);
     const [retryCount, setRetryCount] = useState(0);
@@ -1371,7 +1437,9 @@ const MicroContainerReduxPanel = ()=>{
     if (status !== WorkspaceStatus.Running) {
         return /*#__PURE__*/ jsx("div", {
             className: "w-full flex flex-col grow",
-            children: /*#__PURE__*/ jsx(MicroContainerReduxPanel, {})
+            children: /*#__PURE__*/ jsx(MicroContainerReduxPanel, {
+                enableOptions: enableOptions
+            })
         });
     }
     return /*#__PURE__*/ jsxs("div", {
@@ -3951,7 +4019,7 @@ const WorkspaceLayout = ({ children, tierConfiguration })=>{
                         width: tierConfiguration.dataAndTools.width
                     }),
                     children,
-                    /*#__PURE__*/ jsx(SettingsPanel, {
+                    tierConfiguration.settings.enabled && /*#__PURE__*/ jsx(SettingsPanel, {
                         showKernels: tierConfiguration.settings.showKernels,
                         expanded: settingsExpanded,
                         setExpanded: setSettingsExpanded,
@@ -4024,7 +4092,8 @@ const WorkspaceCenter = ({ workspaces, landingPage, tierConfiguration })=>{
                     children: /*#__PURE__*/ jsx(RemoteComputeWorkspace, {
                         tenantId: authContext?.tenantId || 'default',
                         workspaceId: authContext?.workspaceId || 'workspace-default',
-                        userId: authContext?.username || 'anonymous'
+                        userId: authContext?.username || 'anonymous',
+                        enableOptions: config?.enableOptions
                     })
                 })
             })
@@ -4072,6 +4141,7 @@ const DEFAULT_WORKSPACES_CONFIGURATION = {
                 showStatus: false
             },
             settings: {
+                enabled: true,
                 showKernels: false
             },
             dataAndTools: {
@@ -4088,13 +4158,15 @@ const DEFAULT_WORKSPACES_CONFIGURATION = {
         },
         remote: {
             baseUrl: process.env.REMOTE_COMPUTE_WORKSPACE_ASSETS_BASE_URL ?? '/api/workspace-assets/remote',
+            enableOptions: false,
             toolbar: {
-                label: 'Remote Compute Environment',
+                label: 'Trusted Research Environment',
                 description: 'Running with Remote Kernels',
                 showStop: true,
                 showStatus: true
             },
             settings: {
+                enabled: true,
                 showKernels: true
             },
             dataAndTools: {