@finos/legend-application-marketplace 0.1.55 → 0.1.57

package/src/__lib__/LegendMarketplaceNavigation.ts

@@ -28,6 +28,8 @@ export enum LEGEND_MARKETPLACE_ROUTE_PATTERN_TOKEN {
   DATA_PRODUCT_ID = 'dataProductId',
   DEPLOYMENT_ID = 'deploymentId',
   TERMINAL_ID = 'terminalId',
+  DATA_CONTRACT_ID = 'dataContractId',
+  DATA_CONTRACT_TASK_ID = 'dataContractTaskId',
 }
 
 export enum LEGEND_MARKETPLACE_SEARCH_RESULTS_QUERY_PARAM_TOKEN {
@@ -48,6 +50,11 @@ export type LakehouseDataProductPathParams = {
   [LEGEND_MARKETPLACE_ROUTE_PATTERN_TOKEN.DEPLOYMENT_ID]: string;
 };
 
+export type LakehouseDataContractTaskPathParams = {
+  [LEGEND_MARKETPLACE_ROUTE_PATTERN_TOKEN.DATA_CONTRACT_ID]: string;
+  [LEGEND_MARKETPLACE_ROUTE_PATTERN_TOKEN.DATA_CONTRACT_TASK_ID]: string;
+};
+
 export type LakehouseSDLCDataProductPathParams = {
   [LEGEND_MARKETPLACE_ROUTE_PATTERN_TOKEN.GAV]: string;
   [LEGEND_MARKETPLACE_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_PATH]: string;
@@ -77,6 +84,7 @@ export const LEGEND_MARKETPLACE_ROUTE_PATTERN = Object.freeze({
   DATA_PRODUCT_SEARCH_RESULTS: '/dataProduct/results',
   // Lakehouse
   LAKEHOUSE_ENTITLEMENTS: '/lakehouse/entitlements',
+  LAKEHOUSE_ENTITLEMENTS_CONTRACT_TASK: `/lakehouse/entitlements/:${LEGEND_MARKETPLACE_ROUTE_PATTERN_TOKEN.DATA_CONTRACT_ID}/:${LEGEND_MARKETPLACE_ROUTE_PATTERN_TOKEN.DATA_CONTRACT_TASK_ID}`,
   LAKEHOUSE_ADMIN: '/lakehouse/admin',
   // Deprecated
   DEPRECATED_LAKEHOUSE: '/lakehouse',
@@ -94,6 +102,17 @@ export const generateLakehouseDataProductPath = (
     deploymentId: deploymentId.toString(),
   });
 
+export const generateContractPagePath = (
+  dataContractId: string,
+  dataContractTaskId: string,
+): string =>
+  generatePath(
+    LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_ENTITLEMENTS_CONTRACT_TASK,
+    {
+      dataContractId,
+      dataContractTaskId,
+    },
+  );
 export const generateLegacyDataProductPath = (
   gav: string,
   path: string,
@@ -103,9 +122,6 @@ export const generateLegacyDataProductPath = (
     path,
   });
 
-export const generateLakehouseTaskPath = (taskId: string): string =>
-  `${LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_ENTITLEMENTS}?selectedTasks=${taskId}`;
-
 export const generateLakehouseSearchResultsRoute = (
   query: string | undefined,
   useProducerSearch: boolean,

package/src/__lib__/LegendMarketplaceTelemetryHelper.ts

@@ -73,17 +73,71 @@ type MarketPlaceDataProductIntegration_TemeletryData =
     accessPointPath?: string | undefined;
   };
 
+export type MarketplaceUserSession = {
+  searchEventId: number;
+  searchSessionId: string | undefined;
+};
+
+export const SEARCH_SESSION_KEY = 'marketplace_user_session';
+
 export class LegendMarketplaceTelemetryHelper {
+  private static getSearchSession(): MarketplaceUserSession {
+    const stored = localStorage.getItem(SEARCH_SESSION_KEY);
+
+    if (stored) {
+      const session = JSON.parse(stored) as MarketplaceUserSession;
+      return session;
+    } else {
+      return this.clearSearchSession();
+    }
+  }
+
+  private static createNewSearchSession(
+    searchSessionId: string,
+  ): MarketplaceUserSession {
+    const newSearchSession: MarketplaceUserSession = {
+      searchEventId: 1,
+      searchSessionId: searchSessionId,
+    };
+
+    localStorage.setItem(SEARCH_SESSION_KEY, JSON.stringify(newSearchSession));
+    return newSearchSession;
+  }
+
+  static clearSearchSession(): MarketplaceUserSession {
+    const newSearchSession: MarketplaceUserSession = {
+      searchEventId: 0,
+      searchSessionId: undefined,
+    };
+
+    localStorage.setItem(SEARCH_SESSION_KEY, JSON.stringify(newSearchSession));
+    return newSearchSession;
+  }
+
+  private static updateSearchEventId() {
+    const currentSession = this.getSearchSession();
+    const updatedSession: MarketplaceUserSession = {
+      ...currentSession,
+      searchEventId: currentSession.searchEventId + 1,
+    };
+
+    localStorage.setItem(SEARCH_SESSION_KEY, JSON.stringify(updatedSession));
+    return updatedSession;
+  }
+
   static logEvent_ClickingDataProductCard(
     telemetryService: TelemetryService,
     dataProductData: MarketplaceDataProduct_TelemetryData,
     clickedFrom: LEGEND_MARKETPLACE_PAGE,
   ): void {
+    this.updateSearchEventId();
+    const session = this.getSearchSession();
     telemetryService.logEvent(
       LEGEND_MARKETPLACE_APP_EVENT.CLICK_DATA_PRODUCT_CARD,
       {
         ...dataProductData,
         clickedFrom: clickedFrom,
+        ...session,
       },
     );
   }
@@ -93,23 +147,26 @@ export class LegendMarketplaceTelemetryHelper {
     query: string | undefined,
     searchedFrom: LEGEND_MARKETPLACE_PAGE,
   ): void {
+    this.createNewSearchSession(telemetryService.applicationStore.uuid);
+    const session = this.getSearchSession();
     telemetryService.logEvent(LEGEND_MARKETPLACE_APP_EVENT.SEARCH_QUERY, {
       query: query,
       searchedFrom: searchedFrom,
+      ...session,
     });
   }
 
   static logEvent_ActionDataContracts(
     telemetryService: TelemetryService,
     selectedContracts: V1_ContractUserEventRecord[],
-    allContracts: V1_LiteDataContract[] | undefined,
+    pendingTaskContracts: V1_LiteDataContract[] | undefined,
     action: CONTRACT_ACTION,
     actionTakenBy: string,
     errors: string[] | undefined,
   ): void {
     const actionedContractsDetails = selectedContracts.map((contract) => {
-      const dataContract = allContracts?.find(
-        (_contract) => _contract.guid === contract.dataContractId,
+      const dataContract = pendingTaskContracts?.find(
+        (c) => c.guid === contract.dataContractId,
       );
       const accessPointGroup =
         dataContract?.resourceType === V1_ResourceType.ACCESS_POINT_GROUP
@@ -170,9 +227,15 @@ export class LegendMarketplaceTelemetryHelper {
     intTelemetryData: MarketPlaceDataProductIntegration_TemeletryData,
     error: string | undefined,
   ): void {
+    this.updateSearchEventId();
+    const session = this.getSearchSession();
     const telemetryData =
       error === undefined
-        ? { ...intTelemetryData, status: MARKETPLACE_EVENT_STATUS.SUCCESS }
+        ? {
+            ...intTelemetryData,
+            status: MARKETPLACE_EVENT_STATUS.SUCCESS,
+            ...session,
+          }
         : {
             ...intTelemetryData,
             status: MARKETPLACE_EVENT_STATUS.FAILURE,
@@ -261,4 +324,17 @@ export class LegendMarketplaceTelemetryHelper {
       tabTitle: tabTitle,
     });
   }
+
+  static logEvent_toggleProducerSearch(
+    telemetryService: TelemetryService,
+    isEnabled: boolean,
+  ): void {
+    telemetryService.logEvent(
+      LEGEND_MARKETPLACE_APP_EVENT.PRODUCER_SEARCH_TOGGLE,
+      {
+        isEnabled: isEnabled,
+        toggleAction: isEnabled ? 'enabled' : 'disabled',
+      },
+    );
+  }
 }

package/src/application/LegendMarketplaceWebApplication.tsx

@@ -79,6 +79,13 @@ const LakehouseEntitlements = React.lazy(() =>
     }),
   ),
 );
+const LakehouseDataContractTask = React.lazy(() =>
+  import('../pages/Lakehouse/entitlements/LakehouseDataContract.js').then(
+    (module) => ({
+      default: module.LakehouseDataContractTask,
+    }),
+  ),
+);
 const LakehouseAdmin = React.lazy(() =>
   import('../pages/Lakehouse/admin/LakehouseAdmin.js').then((module) => ({
     default: module.LakehouseAdmin,
@@ -309,6 +316,14 @@ export const LegendMarketplaceWebApplicationRouter = observer(() => {
               path={LEGEND_MARKETPLACE_ROUTE_PATTERN.LEGACY_DATA_PRODUCT}
               element={<LegacyDataProduct />}
             />
+            <Route
+              path={
+                LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_ENTITLEMENTS_CONTRACT_TASK
+              }
+              element={React.createElement(
+                useProtectedPage(LakehouseDataContractTask),
+              )}
+            />
             <Route
               path={LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_ENTITLEMENTS}
               element={React.createElement(

package/src/components/Header/LegendMarketplaceIconToolbar.tsx

@@ -18,7 +18,9 @@ import {
   HelpOutlineIcon,
   MenuContentDivider,
   MoonIcon,
+  OpenNewTabIcon,
   ShoppingCartOutlineIcon,
+  SimpleCalendarIcon,
   SunFilledIcon,
   UserCircleIcon,
 } from '@finos/legend-art';
@@ -233,6 +235,22 @@ export const LegendMarketplaceIconToolbar = observer(() => {
       )
       .filter(isNonNullable);
 
+    const handleShowDemo = (): void => {
+      marketplaceStore.setDemoModal(true);
+      setAnchorEl(null);
+    };
+
+    const handleNewsletterClick = (): void => {
+      applicationStore.navigationService.navigator.visitAddress(
+        applicationStore.config.options.newsletterUrl,
+      );
+      applicationStore.telemetryService.logEvent(
+        LEGEND_MARKETPLACE_APP_EVENT.CLICK_SUBSCRIBE_TO_NEWSLETTER,
+        {},
+      );
+      setAnchorEl(null);
+    };
+
     return (
       <>
         <IconButton
@@ -242,6 +260,17 @@ export const LegendMarketplaceIconToolbar = observer(() => {
           <HelpOutlineIcon />
         </IconButton>
         <Menu anchorEl={anchorEl} open={open} onClose={() => setAnchorEl(null)}>
+          {showDevFeatures && (
+            <MenuItem onClick={handleShowDemo}>
+              <SimpleCalendarIcon style={{ marginRight: '8px' }} />
+              Schedule a Demo
+            </MenuItem>
+          )}
+          <MenuItem onClick={handleNewsletterClick}>
+            <OpenNewTabIcon style={{ marginRight: '8px' }} />
+            Subscribe to our Newsletter
+          </MenuItem>
+          <MenuContentDivider />
           <MenuItem
             onClick={() => {
               setOpenAppInfo(true);

package/src/components/SearchBar/LegendMarketplaceSearchBar.tsx

@@ -27,6 +27,8 @@ import {
 import { clsx, SearchIcon, TuneIcon } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import { LegendMarketplaceInfoTooltip } from '../InfoTooltip/LegendMarketplaceInfoTooltip.js';
+import { LegendMarketplaceTelemetryHelper } from '../../__lib__/LegendMarketplaceTelemetryHelper.js';
+import { useLegendMarketplaceBaseStore } from '../../application/providers/LegendMarketplaceFrameworkProvider.js';
 
 export interface Vendor {
   provider: string;
@@ -54,6 +56,7 @@ export const LegendMarketplaceSearchBar = observer(
       initialUseProducerSearch,
     } = props;
 
+    const applicationStore = useLegendMarketplaceBaseStore().applicationStore;
     const [searchQuery, setSearchQuery] = useState<string>(initialValue ?? '');
     const [useProducerSearch, setUseProducerSearch] = useState(
       initialUseProducerSearch ?? false,
@@ -117,6 +120,10 @@ export const LegendMarketplaceSearchBar = observer(
                     checked={useProducerSearch}
                     onChange={(event) => {
                       setUseProducerSearch(event.target.checked);
+                      LegendMarketplaceTelemetryHelper.logEvent_toggleProducerSearch(
+                        applicationStore.telemetryService,
+                        event.target.checked,
+                      );
                     }}
                   />
                 }

package/src/pages/Lakehouse/MarketplaceLakehouseHome.tsx

@@ -23,8 +23,6 @@ import { useAuth } from 'react-oidc-context';
 import {
   CubesLoadingIndicator,
   CubesLoadingIndicatorIcon,
-  OpenNewTabIcon,
-  SimpleCalendarIcon,
 } from '@finos/legend-art';
 import { generateLakehouseSearchResultsRoute } from '../../__lib__/LegendMarketplaceNavigation.js';
 import {
@@ -40,7 +38,6 @@ import {
   LEGEND_MARKETPLACE_PAGE,
   LegendMarketplaceTelemetryHelper,
 } from '../../__lib__/LegendMarketplaceTelemetryHelper.js';
-import { LEGEND_MARKETPLACE_APP_EVENT } from '../../__lib__/LegendMarketplaceAppEvent.js';
 import type { ProductCardState } from '../../stores/lakehouse/dataProducts/ProductCardState.js';
 import { generatePathForDataProductSearchResult } from '../../utils/SearchUtils.js';
 import { logClickingDataProductCard } from '../../utils/LogUtils.js';
@@ -50,10 +47,6 @@ export const MarketplaceLakehouseHome = observer(() => {
   const legendMarketplaceBaseStore = useLegendMarketplaceBaseStore();
   const applicationStore = legendMarketplaceBaseStore.applicationStore;
   const auth = useAuth();
-  const configOptions = applicationStore.config.options;
-  const showDevFeatures = configOptions.showDevFeatures;
-  const adjacentUrl = applicationStore.config.adjacentEnvUrl;
-  const adjacentEnvState = legendMarketplaceBaseStore.adjacentEnvState;
 
   const isDarkMode =
     !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled;
@@ -63,6 +56,10 @@ export const MarketplaceLakehouseHome = observer(() => {
   >([]);
   const [loading, setLoading] = useState(false);
 
+  useEffect(() => {
+    LegendMarketplaceTelemetryHelper.clearSearchSession();
+  }, []);
+
   const [activeIndex, setActiveIndex] = useState(0);
   useEffect(() => {
     const loadDataProducts = async (): Promise<void> => {
@@ -142,55 +139,8 @@ export const MarketplaceLakehouseHome = observer(() => {
     return '';
   };
 
-  const newsletterNavigation = (): void => {
-    applicationStore.navigationService.navigator.visitAddress(
-      applicationStore.config.options.newsletterUrl,
-    );
-    applicationStore.telemetryService.logEvent(
-      LEGEND_MARKETPLACE_APP_EVENT.CLICK_SUBSCRIBE_TO_NEWSLETTER,
-      {},
-    );
-  };
-
-  const visitAdjacentEnv = (): void => {
-    if (adjacentUrl) {
-      applicationStore.navigationService.navigator.visitAddress(adjacentUrl);
-    }
-  };
-
-  const handleShowDemo = (): void => {
-    legendMarketplaceBaseStore.setDemoModal(true);
-  };
-
   return (
     <LegendMarketplacePage className="marketplace-lakehouse-home">
-      <div className="legend-marketplace-home__button-group">
-        {showDevFeatures && (
-          <button
-            onClick={handleShowDemo}
-            className="legend-marketplace-home__button"
-          >
-            <SimpleCalendarIcon className="legend-marketplace-home__button__icon" />
-            Schedule a Demo
-          </button>
-        )}
-        {adjacentUrl && adjacentEnvState && (
-          <button
-            className="legend-marketplace-home__button"
-            onClick={visitAdjacentEnv}
-          >
-            <OpenNewTabIcon className="legend-marketplace-home__button__icon" />
-            {`${adjacentEnvState.label} Env`}
-          </button>
-        )}
-        <button
-          className="legend-marketplace-home__button"
-          onClick={newsletterNavigation}
-        >
-          <OpenNewTabIcon className="legend-marketplace-home__button__icon" />
-          Subscribe to our Newsletter
-        </button>
-      </div>
       <Container className="marketplace-lakehouse-home__search-container">
         <Box className="marketplace-lakehouse-home__search-container__logo">
           <img

package/src/pages/Lakehouse/admin/LakehouseAdminContractsDashboard.tsx

@@ -35,8 +35,8 @@ import {
   EntitlementsDataContractViewerState,
 } from '@finos/legend-extension-dsl-data-product';
 import {
+  generateContractPagePath,
   generateLakehouseDataProductPath,
-  generateLakehouseTaskPath,
 } from '../../../__lib__/LegendMarketplaceNavigation.js';
 
 export const LakehouseAdminContractsDashboard = observer(
@@ -143,9 +143,9 @@ export const LakehouseAdminContractsDashboard = observer(
               )
             }
             onRefresh={() => adminStore.refresh()}
-            getContractTaskUrl={(taskId: string) =>
+            getContractTaskUrl={(contractId: string, taskId: string) =>
               adminStore.legendMarketplaceBaseStore.applicationStore.navigationService.navigator.generateAddress(
-                generateLakehouseTaskPath(taskId),
+                generateContractPagePath(contractId, taskId),
               )
             }
             getDataProductUrl={(dataProductId: string, deploymentId: number) =>