@finos/legend-application-marketplace 0.2.16 → 0.2.17

package/src/application/LegendMarketplaceWebApplication.tsx

@@ -97,13 +97,6 @@ const WorkflowDataAccessRequestTask = React.lazy(() =>
     }),
   ),
 );
-const PermitDataAccessRequestTask = React.lazy(() =>
-  import('../pages/Lakehouse/entitlements/PermitDataAccessRequest.js').then(
-    (module) => ({
-      default: module.PermitDataAccessRequestTask,
-    }),
-  ),
-);
 const LakehouseAdmin = React.lazy(() =>
   import('../pages/Lakehouse/admin/LakehouseAdmin.js').then((module) => ({
     default: module.LakehouseAdmin,
@@ -341,14 +334,6 @@ export const LegendMarketplaceWebApplicationRouter = observer(() => {
                 useProtectedPage(WorkflowDataAccessRequestTask),
               )}
             />
-            <Route
-              path={
-                LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_ENTITLEMENTS_PERMIT_DATA_ACCESS_REQUEST
-              }
-              element={React.createElement(
-                useProtectedPage(PermitDataAccessRequestTask),
-              )}
-            />
             <Route
               path={
                 LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_ENTITLEMENTS_CONTRACT_TASK

package/src/application/__test-utils__/LegendMarketplaceApplicationTestUtils.ts

@@ -42,7 +42,6 @@ const TEST_DATA__appConfig: LegendMarketplaceApplicationConfigurationData = {
     url: 'https://testLakehouseUrl',
     platformUrl: 'https://testLakehousePlatformUrl',
     workflowUrl: 'https://testLakehouseWorkflowUrl',
-    permitWorkflowUrl: 'https://testLakehousePermitWorkflowUrl',
     entitlements: {
       applicationDirectoryUrl: 'https://testApplicationDirectoryUrl',
       applicationIDUrl: 'https://testApplicationIDUrl',
@@ -95,12 +94,6 @@ const TEST_DATA__appConfig: LegendMarketplaceApplicationConfigurationData = {
         'Search for product catalog information',
         'Display user activity datasets',
       ],
-      defaultAISuggestedQueries: [
-        'What BVAL bond pricing data is available?',
-        'Show me credit risk data products',
-        'Find FX rates and currency data',
-        'What equity analytics data do we have?',
-      ],
     },
   },
   assets: {

package/src/pages/Agents/LegendMarketplaceAgents.tsx

@@ -14,162 +14,40 @@
  * limitations under the License.
  */
 
-import { useCallback, useState } from 'react';
 import { observer } from 'mobx-react-lite';
+import { LegendMarketplacePage } from '../LegendMarketplacePage.js';
+import { ComingSoonDisplay } from '../../components/ComingSoon/ComingSoonDisplay.js';
 import {
   AnalyticsIcon,
-  ArrowLeftIcon,
-  CaretRightIcon,
   PsychologyIcon,
   RobotOutlineIcon,
   SparkleStarsIcon,
 } from '@finos/legend-art';
-import { Container, Typography } from '@mui/material';
-import { LegendMarketplacePage } from '../LegendMarketplacePage.js';
-import { LegendMarketplaceAIChatStoreProvider } from '../../application/providers/LegendMarketplaceAIChatStoreProvider.js';
-import { MarketplaceAIChatView } from './MarketplaceAIChatView.js';
-import { LegendMarketplaceSearchBar } from '../../components/SearchBar/LegendMarketplaceSearchBar.js';
-import { useLegendMarketplaceBaseStore } from '../../application/providers/LegendMarketplaceFrameworkProvider.js';
-import { ComingSoonDisplay } from '../../components/ComingSoon/ComingSoonDisplay.js';
-
-const AGENT_DESCRIPTION =
-  'Ask questions about your data, discover data products, and run queries using natural language.';
-
-const AgentCardsView = observer(
-  (props: { onSelectAgent: (query?: string) => void }) => {
-    const { onSelectAgent } = props;
-    const legendMarketplaceBaseStore = useLegendMarketplaceBaseStore();
-    const applicationStore = legendMarketplaceBaseStore.applicationStore;
-    const isDarkMode =
-      !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled;
-
-    return (
-      <>
-        <Container className="marketplace-agents__search-container">
-          <LegendMarketplaceSearchBar
-            onSearch={onSelectAgent}
-            placeholder="Ask a question about your data..."
-            className="marketplace-agents__search-bar"
-            enableAutosuggest={false}
-          />
-        </Container>
-        <div className="marketplace-agents__section-bar">
-          <div className="marketplace-agents__section-bar__container">
-            <Typography
-              variant="h4"
-              className="marketplace-agents__section-title"
-            >
-              Intelligence &amp; AI Agents
-            </Typography>
-          </div>
-        </div>
-        <Container
-          maxWidth="xxxl"
-          className="marketplace-agents__content-container"
-        >
-          <div className="marketplace-agents__cards">
-            <button
-              type="button"
-              className="marketplace-agents__agent-card"
-              onClick={(): void => onSelectAgent()}
-            >
-              <div className="marketplace-agents__agent-card-icon">
-                <img
-                  src={
-                    isDarkMode
-                      ? '/assets/legendmarketplacehomelogodark.png'
-                      : '/assets/legendmarketplacehomelogolight.png'
-                  }
-                  alt="Legend Marketplace AI"
-                  className="marketplace-agents__agent-card-logo"
-                />
-              </div>
-              <div className="marketplace-agents__agent-card-content">
-                <h3 className="marketplace-agents__agent-card-title">
-                  Legend Marketplace AI
-                </h3>
-                <p className="marketplace-agents__agent-card-desc">
-                  {AGENT_DESCRIPTION}
-                </p>
-              </div>
-              <div className="marketplace-agents__agent-card-action">
-                Launch Agent <CaretRightIcon />
-              </div>
-            </button>
-          </div>
-        </Container>
-      </>
-    );
-  },
-);
 
 export const LegendMarketplaceAgents = observer(() => {
-  const legendMarketplaceBaseStore = useLegendMarketplaceBaseStore();
-  const applicationStore = legendMarketplaceBaseStore.applicationStore;
-  const showDevFeatures = applicationStore.config.options.showDevFeatures;
-
-  const [showChat, setShowChat] = useState(false);
-  const [initialQuery, setInitialQuery] = useState<string | undefined>(
-    undefined,
-  );
-
-  const handleSelectAgent = useCallback((query?: string): void => {
-    setInitialQuery(query);
-    setShowChat(true);
-  }, []);
-
-  if (!showDevFeatures) {
-    const featuresPreviewItems = [
-      {
-        icon: <SparkleStarsIcon />,
-        title: 'Smart Recommendations',
-      },
-      {
-        icon: <AnalyticsIcon />,
-        title: 'Data Analysis',
-      },
-      {
-        icon: <PsychologyIcon />,
-        title: 'Intelligent Insights',
-      },
-    ];
-
-    return (
-      <LegendMarketplacePage className="agents-coming-soon">
-        <ComingSoonDisplay
-          loadingIcon={<RobotOutlineIcon />}
-          title="Legend Intelligence"
-          description="Transform your data operations with intelligent AI agents that learn, adapt, and deliver autonomous insights. Experience the future of data-driven automation and decision-making excellence."
-          featuresPreviewItems={featuresPreviewItems}
-        />
-      </LegendMarketplacePage>
-    );
-  }
-
-  const initialQueryProp = initialQuery === undefined ? {} : { initialQuery };
+  const featuresPreviewItems = [
+    {
+      icon: <SparkleStarsIcon />,
+      title: 'Smart Recommendations',
+    },
+    {
+      icon: <AnalyticsIcon />,
+      title: 'Data Analysis',
+    },
+    {
+      icon: <PsychologyIcon />,
+      title: 'Intelligent Insights',
+    },
+  ];
 
   return (
-    <LegendMarketplacePage className="legend-marketplace-ai-page">
-      {showChat ? (
-        <LegendMarketplaceAIChatStoreProvider>
-          <div className="marketplace-agents__chat-wrapper">
-            <button
-              type="button"
-              className="marketplace-agents__back-btn"
-              onClick={(): void => {
-                setShowChat(false);
-                setInitialQuery(undefined);
-              }}
-            >
-              <ArrowLeftIcon />
-              <span>Back to Agents</span>
-            </button>
-            <MarketplaceAIChatView {...initialQueryProp} />
-          </div>
-        </LegendMarketplaceAIChatStoreProvider>
-      ) : (
-        <AgentCardsView onSelectAgent={handleSelectAgent} />
-      )}
+    <LegendMarketplacePage className="agents-coming-soon">
+      <ComingSoonDisplay
+        loadingIcon={<RobotOutlineIcon />}
+        title="Legend Intelligence"
+        description="Transform your data operations with intelligent AI agents that learn, adapt, and deliver autonomous insights. Experience the future of data-driven automation and decision-making excellence."
+        featuresPreviewItems={featuresPreviewItems}
+      />
     </LegendMarketplacePage>
   );
 });

package/src/pages/Lakehouse/entitlements/EntitlementsClosedContractsDashboard.tsx

@@ -15,12 +15,15 @@
  */
 
 import {
+  type V1_LiteDataContract,
+  GraphManagerState,
   V1_AdhocTeam,
   V1_ContractState,
   V1_LiteDataContractWithUserStatus,
 } from '@finos/legend-graph';
 import {
   DataGrid,
+  type DataGridCellClickedEvent,
   type DataGridColumnDefinition,
 } from '@finos/legend-lego/data-grid';
 import {
@@ -30,45 +33,34 @@ import {
   FormGroup,
   Switch,
 } from '@mui/material';
-import { useEffect, useMemo, useState } from 'react';
-import { startCase } from '@finos/legend-shared';
-import type { EntitlementsDashboardState } from '../../../stores/lakehouse/entitlements/EntitlementsDashboardState.js';
+import { useMemo, useState } from 'react';
+import type {
+  ContractCreatedByUserDetails,
+  EntitlementsDashboardState,
+} from '../../../stores/lakehouse/entitlements/EntitlementsDashboardState.js';
 import { useLegendMarketplaceBaseStore } from '../../../application/providers/LegendMarketplaceFrameworkProvider.js';
 import { observer } from 'mobx-react-lite';
 import { useAuth } from 'react-oidc-context';
 import {
   type ContractErrorLayer,
   DataAccessRequestViewer,
+  DataContractViewerState,
   isApprovalStatusTerminal,
   isContractInTerminalState,
 } from '@finos/legend-extension-dsl-data-product';
-import { flowResult } from 'mobx';
 import {
-  getCommonEntitlementsColDefs,
-  type EntitlementsRow,
-  getSelectedRowId,
-  getSelectedContractGuid,
-  EntitlementsColumnHeader,
-  ENTITLEMENTS_DEFAULT_COL_DEF,
-  ROW_KIND_CONTRACT,
-  ROW_KIND_REQUEST,
-  TERMINAL_DATA_REQUEST_STATES,
-  UNKNOWN,
-  useSelectedViewerState,
-  useGetDataProductUrl,
-} from '../../../utils/EntitlementsUtils.js';
+  generateContractPagePath,
+  generateLakehouseDataProductPath,
+} from '../../../__lib__/LegendMarketplaceNavigation.js';
+import { flowResult } from 'mobx';
+import { getCommonEntitlementsColDefs } from '../../../utils/EntitlementsUtils.js';
 
 export const EntitlementsClosedContractsDashboard = observer(
   (props: { dashboardState: EntitlementsDashboardState }): React.ReactNode => {
     const { dashboardState } = props;
-    const {
-      allContractsForUser,
-      allContractsCreatedByUser,
-      dataRequestsCreatedByUser,
-    } = dashboardState;
+    const { allContractsForUser, allContractsCreatedByUser } = dashboardState;
     const marketplaceBaseStore = useLegendMarketplaceBaseStore();
     const auth = useAuth();
-    const getDataProductUrl = useGetDataProductUrl();
 
     const myClosedContracts = useMemo(
       () =>
@@ -91,16 +83,8 @@ export const EntitlementsClosedContractsDashboard = observer(
       [allContractsCreatedByUser, myClosedContractIds],
     );
 
-    const closedDataRequests = useMemo(
-      () =>
-        (dataRequestsCreatedByUser ?? []).filter((dr) =>
-          TERMINAL_DATA_REQUEST_STATES.has(dr.dataRequest.state),
-        ),
-      [dataRequestsCreatedByUser],
-    );
-
-    const [selectedRow, setSelectedRow] = useState<
-      EntitlementsRow | undefined
+    const [selectedContract, setSelectedContract] = useState<
+      V1_LiteDataContract | undefined
     >();
     const [contractErrors, setContractErrors] = useState<
       ContractErrorLayer | undefined
@@ -109,91 +93,89 @@ export const EntitlementsClosedContractsDashboard = observer(
       myClosedContracts.length === 0 && closedContractsForOthers.length > 0,
     );
 
-    useEffect(() => {
+    const handleCellClicked = async (
+      event: DataGridCellClickedEvent<
+        V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
+      >,
+    ) => {
+      const contract = event.data?.contractResultLite;
+      setSelectedContract(contract);
       setContractErrors(undefined);
-      if (selectedRow?.kind === ROW_KIND_CONTRACT) {
-        const contract = selectedRow.data.contractResultLite;
+      if (contract !== undefined) {
         const isCompleted = contract.state === V1_ContractState.COMPLETED;
-        dashboardState
-          .getContractErrors(
-            contract.guid,
-            auth.user?.access_token,
-            isCompleted,
-          )
-          .then((result) => setContractErrors(result))
-          .catch(() => setContractErrors(undefined));
+        const result = await dashboardState.getContractErrors(
+          contract.guid,
+          auth.user?.access_token,
+          isCompleted,
+        );
+        setContractErrors(result);
       }
-    }, [selectedRow, auth.user?.access_token, dashboardState]);
+    };
+
+    const defaultColDef: DataGridColumnDefinition<
+      V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
+    > = useMemo(
+      () => ({
+        minWidth: 50,
+        sortable: true,
+        resizable: true,
+        flex: 1,
+      }),
+      [],
+    );
 
-    const selectedRowId = getSelectedRowId(selectedRow);
+    const colDefs: DataGridColumnDefinition<
+      V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
+    >[] = useMemo(
+      () => [
+        ...getCommonEntitlementsColDefs(dashboardState),
+        {
+          headerName: 'State',
+          valueGetter: (params) =>
+            params.data instanceof V1_LiteDataContractWithUserStatus
+              ? params.data.status
+              : (params.data?.contractResultLite.state ?? 'Unknown'),
+        },
+        {
+          headerName: 'Business Justification',
+          valueGetter: (p) => p.data?.contractResultLite.description,
+        },
+        {
+          hide: true,
+          headerName: 'Contract ID',
+          valueGetter: (p) => p.data?.contractResultLite.guid,
+        },
+      ],
+      [dashboardState],
+    );
 
-    const selectedViewerState = useSelectedViewerState(
-      selectedRow,
-      selectedRowId,
+    const gridRowData = useMemo(
+      () =>
+        showForOthers
+          ? [...myClosedContracts, ...closedContractsForOthers]
+          : myClosedContracts,
+      [myClosedContracts, closedContractsForOthers, showForOthers],
     );
 
     const getInitialUserForViewer = (): string | undefined => {
-      if (selectedRow?.kind !== ROW_KIND_CONTRACT) {
-        return undefined;
-      }
-      const contract = selectedRow.data.contractResultLite;
       const currentUser =
-        marketplaceBaseStore.applicationStore.identityService.currentUser;
-      if (myClosedContractIds.has(contract.guid)) {
+        dashboardState.lakehouseEntitlementsStore.applicationStore
+          .identityService.currentUser;
+      if (selectedContract && myClosedContractIds.has(selectedContract.guid)) {
         return currentUser;
       }
       if (
-        contract.consumer instanceof V1_AdhocTeam &&
-        contract.consumer.users.some((user) => user.name === currentUser)
+        selectedContract &&
+        selectedContract.consumer instanceof V1_AdhocTeam &&
+        selectedContract.consumer.users.some(
+          (user) => user.name === currentUser,
+        )
       ) {
         return currentUser;
       }
       return undefined;
     };
 
-    const selectedContractGuid = getSelectedContractGuid(selectedRow);
-
-    const colDefs: DataGridColumnDefinition<EntitlementsRow>[] = useMemo(
-      () => [
-        ...getCommonEntitlementsColDefs(dashboardState),
-        {
-          headerName: EntitlementsColumnHeader.STATE,
-          valueGetter: (params) => {
-            if (!params.data) {
-              return UNKNOWN;
-            }
-            if (params.data.kind === ROW_KIND_CONTRACT) {
-              return params.data.data instanceof
-                V1_LiteDataContractWithUserStatus
-                ? params.data.data.status
-                : params.data.data.contractResultLite.state;
-            }
-            return startCase(params.data.data.dataRequest.state);
-          },
-        },
-      ],
-      [dashboardState],
-    );
-
-    const gridRowData: EntitlementsRow[] = useMemo(() => {
-      const contracts = showForOthers
-        ? [...myClosedContracts, ...closedContractsForOthers]
-        : myClosedContracts;
-      return [
-        ...contracts.map(
-          (c): EntitlementsRow => ({ kind: ROW_KIND_CONTRACT, data: c }),
-        ),
-        ...closedDataRequests.map(
-          (r): EntitlementsRow => ({ kind: ROW_KIND_REQUEST, data: r }),
-        ),
-      ];
-    }, [
-      showForOthers,
-      myClosedContracts,
-      closedContractsForOthers,
-      closedDataRequests,
-    ]);
-
     return (
       <Box className="marketplace-lakehouse-entitlements__completed-contracts">
         <FormGroup className="marketplace-lakehouse-entitlements__completed-contracts__action-btns">
@@ -229,40 +211,61 @@ export const EntitlementsClosedContractsDashboard = observer(
             suppressFieldDotNotation={true}
             suppressContextMenu={false}
             columnDefs={colDefs}
-            onCellClicked={(event) => event.data && setSelectedRow(event.data)}
-            defaultColDef={ENTITLEMENTS_DEFAULT_COL_DEF}
-            rowHeight={45}
-            overlayNoRowsTemplate="You have no closed contracts or data requests"
-            loading={
-              dashboardState.fetchingContractsForUserState.isInProgress ||
-              dashboardState.fetchingDataRequestsCreatedByUserState.isInProgress
+            onCellClicked={(
+              event: DataGridCellClickedEvent<
+                V1_LiteDataContractWithUserStatus | ContractCreatedByUserDetails
+              >,
+            ) =>
+              // eslint-disable-next-line no-void
+              void handleCellClicked(event)
             }
-            overlayLoadingTemplate="Loading"
+            defaultColDef={defaultColDef}
+            rowHeight={45}
+            overlayNoRowsTemplate="You have no closed contracts"
+            loading={dashboardState.fetchingContractsForUserState.isInProgress}
+            overlayLoadingTemplate="Loading contracts"
           />
         </Box>
-        {selectedRow !== undefined && selectedViewerState !== undefined && (
+        {selectedContract !== undefined && (
           <DataAccessRequestViewer
             open={true}
             onClose={() => {
-              setSelectedRow(undefined);
+              setSelectedContract(undefined);
               setContractErrors(undefined);
             }}
             contractErrors={contractErrors}
-            viewerState={selectedViewerState}
+            viewerState={
+              new DataContractViewerState(
+                selectedContract,
+                (contractId: string, taskId: string) =>
+                  marketplaceBaseStore.applicationStore.navigationService.navigator.generateAddress(
+                    generateContractPagePath(contractId, taskId),
+                  ),
+                undefined,
+                marketplaceBaseStore.applicationStore,
+                marketplaceBaseStore.lakehouseContractServerClient,
+                new GraphManagerState(
+                  marketplaceBaseStore.applicationStore.pluginManager,
+                  marketplaceBaseStore.applicationStore.logService,
+                ),
+                marketplaceBaseStore.userSearchService,
+              )
+            }
             initialSelectedUser={getInitialUserForViewer()}
-            {...(selectedContractGuid
-              ? {
-                  onRefresh: async () => {
-                    await flowResult(
-                      dashboardState.updateContract(
-                        selectedContractGuid,
-                        auth.user?.access_token,
-                      ),
-                    );
-                  },
-                }
-              : {})}
-            getDataProductUrl={getDataProductUrl}
+            onRefresh={async () => {
+              await flowResult(
+                dashboardState.updateContract(
+                  selectedContract.guid,
+                  auth.user?.access_token,
+                ),
+              );
+            }}
+            getDataProductUrl={(dataProductId: string, deploymentId: number) =>
+              marketplaceBaseStore.applicationStore.navigationService.navigator.generateAddress(
+                generateLakehouseDataProductPath(dataProductId, deploymentId),
+              )
+            }
+            //Derives environment from the fact that other environments are filtered out
             dataProductEnvironment={
               marketplaceBaseStore.envState.lakehouseEnvironment
             }