@finos/legend-application-marketplace 0.0.20 → 0.0.21

package/lib/stores/lakehouse/entitlements/{DataContractTaskState.js → EntitlementsTaskViewerState.js}

@@ -13,23 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { assertErrorThrown, } from '@finos/legend-shared';
+import { ActionState, assertErrorThrown, } from '@finos/legend-shared';
 import { deserialize } from 'serializr';
 import { V1_TaskStatusChangeResponseModelSchema, V1_DataContractsRecordModelSchema, V1_pendingTasksRespondModelSchema, } from '@finos/legend-graph';
 import { makeObservable, flow, observable, flowResult, action } from 'mobx';
 import { TEST_USER, } from './LakehouseEntitlementsStore.js';
-import { buildDataContractDetail } from './DataContractState.js';
 import { LakehouseViewerState } from './LakehouseViewerState.js';
-export class DataContractTaskState extends LakehouseViewerState {
+import { buildTaskGridItemDetail, } from '../LakehouseUtils.js';
+import { generateLakehouseContractPath } from '../../../__lib__/LegendMarketplaceNavigation.js';
+export class EntitlementsTaskViewerState extends LakehouseViewerState {
     value;
+    approvalStatus = ActionState.create();
     canApprove;
     dataContract;
+    pendingAssociatedContractEvent;
+    changingTaskState = ActionState.create();
+    taskAssignees;
     constructor(value, state) {
         super(state);
-        this.value = value;
+        this.value = value.rec;
+        this.taskAssignees = value.assignees;
         makeObservable(this, {
-            value: observable,
             canApprove: observable,
+            pendingAssociatedContractEvent: observable,
+            setPendingAssociatedContractEvent: action,
             setCanApprove: action,
             approve: flow,
             deny: flow,
@@ -37,12 +44,16 @@ export class DataContractTaskState extends LakehouseViewerState {
             calculateApprovalRights: flow,
             fetchContract: flow,
             dataContract: observable,
+            taskAssignees: observable,
         });
         this.observeContract();
     }
     get id() {
         return this.value.taskId;
     }
+    setPendingAssociatedContractEvent(pendingAssociatedContractEvent) {
+        this.pendingAssociatedContractEvent = pendingAssociatedContractEvent;
+    }
     *init(token) {
         flowResult(this.calculateApprovalRights(token)).catch(this.state.applicationStore.alertUnhandledError);
         flowResult(this.fetchContract(token)).catch(this.state.applicationStore.alertUnhandledError);
@@ -57,20 +68,32 @@ export class DataContractTaskState extends LakehouseViewerState {
     }
     *approve(token) {
         try {
+            this.approvalStatus.inProgress();
             const response = (yield this.state.lakehouseServerClient.approveTask(this.value.taskId, token));
             const change = deserialize(V1_TaskStatusChangeResponseModelSchema, response);
             if (change.errorMessage) {
+                this.approvalStatus.fail();
                 throw new Error(`Unable to approve task: ${this.value.taskId}: ${change.errorMessage}`);
             }
             this.value.status = change.status;
             this.setCanApprove(false);
+            this.approvalStatus.pass();
+            this.state.applicationStore.notificationService.notifySuccess('Approval succeeded');
         }
         catch (error) {
+            this.approvalStatus.fail();
             assertErrorThrown(error);
+            this.state.applicationStore.notificationService.notifyError(`${error.message}`);
         }
     }
     *deny(token) {
         try {
+            this.changingTaskState.inProgress();
+            this.state.applicationStore.alertService.setBlockingAlert({
+                message: 'Denying Task',
+                prompt: 'Denying task...',
+                showLoading: true,
+            });
             const response = (yield this.state.lakehouseServerClient.denyTask(this.value.taskId, token));
             const change = deserialize(V1_TaskStatusChangeResponseModelSchema, response);
             if (change.errorMessage) {
@@ -78,9 +101,16 @@ export class DataContractTaskState extends LakehouseViewerState {
             }
             this.value.status = change.status;
             this.setCanApprove(false);
+            this.state.applicationStore.notificationService.notifySuccess(`Task has been denied`);
         }
         catch (error) {
             assertErrorThrown(error);
+            this.state.applicationStore.notificationService.notifyError(`${error.message}`);
+        }
+        finally {
+            this.changingTaskState.complete();
+            this.changingTaskState.setMessage(undefined);
+            this.state.applicationStore.alertService.setBlockingAlert(undefined);
         }
     }
     *calculateApprovalRights(token) {
@@ -108,21 +138,9 @@ export class DataContractTaskState extends LakehouseViewerState {
         }
     }
     get taskDetails() {
-        return [
-            {
-                name: 'Task ID',
-                value: this.value.taskId,
-            },
-            {
-                name: 'Task Status',
-                value: this.value.status.toString(),
-            },
-            {
-                name: 'Task Consumer',
-                value: this.value.consumer,
-            },
-            ...(this.dataContract ? buildDataContractDetail(this.dataContract) : []),
-        ];
+        return buildTaskGridItemDetail(this.value, this.taskAssignees, this.dataContract, (id) => {
+            this.state.applicationStore.navigationService.navigator.updateCurrentLocation(generateLakehouseContractPath(id));
+        }, this.state.directoryCallBack, this.state.applicationCallBack);
     }
 }
-//# sourceMappingURL=DataContractTaskState.js.map
+//# sourceMappingURL=EntitlementsTaskViewerState.js.map

package/lib/stores/lakehouse/entitlements/EntitlementsTaskViewerState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntitlementsTaskViewerState.js","sourceRoot":"","sources":["../../../../src/stores/lakehouse/entitlements/EntitlementsTaskViewerState.ts"],"names":[],"mappings":"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"}

package/lib/stores/lakehouse/entitlements/LakehouseEntitlementsStore.d.ts

@@ -19,14 +19,13 @@ import { ActionState, type GeneratorFn } from '@finos/legend-shared';
 import type { LakehouseViewerState } from './LakehouseViewerState.js';
 export declare const TEST_USER: undefined;
 export declare const TEST_USER2: undefined;
-export type GridItemDetail = {
-    name: string;
-    value: string | number;
-    onClick?: () => void;
-};
 export declare class LakehouseEntitlementsStore {
     readonly applicationStore: LegendMarketplaceApplicationStore;
     readonly lakehouseServerClient: LakehouseContractServerClient;
+    readonly directoryUrl: string | undefined;
+    readonly applicationIdUrl: string | undefined;
+    readonly directoryCallBack: ((user: string) => void) | undefined;
+    readonly applicationCallBack: ((applicationId: string) => void) | undefined;
     initializationState: ActionState;
     currentViewer: LakehouseViewerState | undefined;
     constructor(applicationStore: LegendMarketplaceApplicationStore, lakehouseServerClient: LakehouseContractServerClient);

package/lib/stores/lakehouse/entitlements/LakehouseEntitlementsStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LakehouseEntitlementsStore.d.ts","sourceRoot":"","sources":["../../../../src/stores/lakehouse/entitlements/LakehouseEntitlementsStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EACL,WAAW,EAGX,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAC;AAY9B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,eAAO,MAAM,SAAS,WAAY,CAAC;AACnC,eAAO,MAAM,UAAU,WAAY,CAAC;AAEpC,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;AAEF,qBAAa,0BAA0B;IACrC,QAAQ,CAAC,gBAAgB,EAAE,iCAAiC,CAAC;IAC7D,QAAQ,CAAC,qBAAqB,EAAE,6BAA6B,CAAC;IAC9D,mBAAmB,cAAwB;IAC3C,aAAa,EAAE,oBAAoB,GAAG,SAAS,CAAC;gBAG9C,gBAAgB,EAAE,iCAAiC,EACnD,qBAAqB,EAAE,6BAA6B;IAatD,gBAAgB,CAAC,GAAG,EAAE,oBAAoB,GAAG,SAAS,GAAG,IAAI;IAI5D,IAAI,CACH,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,WAAW,CAAC,IAAI,CAAC;IAmBnB,cAAc,CACb,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,WAAW,CAAC,IAAI,CAAC;IA8BnB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC;CAoB5E"}
+{"version":3,"file":"LakehouseEntitlementsStore.d.ts","sourceRoot":"","sources":["../../../../src/stores/lakehouse/entitlements/LakehouseEntitlementsStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EACL,WAAW,EAGX,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAC;AAY9B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,eAAO,MAAM,SAAS,WAAY,CAAC;AACnC,eAAO,MAAM,UAAU,WAAY,CAAC;AAEpC,qBAAa,0BAA0B;IACrC,QAAQ,CAAC,gBAAgB,EAAE,iCAAiC,CAAC;IAC7D,QAAQ,CAAC,qBAAqB,EAAE,6BAA6B,CAAC;IAC9D,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACjE,QAAQ,CAAC,mBAAmB,EAAE,CAAC,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC5E,mBAAmB,cAAwB;IAC3C,aAAa,EAAE,oBAAoB,GAAG,SAAS,CAAC;gBAG9C,gBAAgB,EAAE,iCAAiC,EACnD,qBAAqB,EAAE,6BAA6B;IAgCtD,gBAAgB,CAAC,GAAG,EAAE,oBAAoB,GAAG,SAAS,GAAG,IAAI;IAI5D,IAAI,CACH,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,WAAW,CAAC,IAAI,CAAC;IAmBnB,cAAc,CACb,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,WAAW,CAAC,IAAI,CAAC;IA2BnB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC;CA2B5E"}

package/lib/stores/lakehouse/entitlements/LakehouseEntitlementsStore.js

@@ -15,21 +15,39 @@
  */
 import { ActionState, assertErrorThrown, guaranteeNonNullable, } from '@finos/legend-shared';
 import { deserialize } from 'serializr';
-import { V1_pendingTasksRespondModelSchema, V1_DataContractsRecordModelSchema, } from '@finos/legend-graph';
+import { V1_deserializeTaskResponse, V1_DataContractsRecordModelSchema, } from '@finos/legend-graph';
 import { makeObservable, flow, observable, flowResult, action } from 'mobx';
-import { DataContractState } from './DataContractState.js';
-import { LakehouseEntitlementsMainViewState } from './LakehouseEntitlementsMainViewState.js';
-import { DataContractTaskState } from './DataContractTaskState.js';
+import { EntitlementsDataContractViewerState } from './EntitlementsDataContractViewerState.js';
+import { EntitlementsDashboardState } from './EntitlementsDashboardState.js';
+import { EntitlementsTaskViewerState } from './EntitlementsTaskViewerState.js';
 export const TEST_USER = undefined;
 export const TEST_USER2 = undefined;
 export class LakehouseEntitlementsStore {
     applicationStore;
     lakehouseServerClient;
+    directoryUrl;
+    applicationIdUrl;
+    directoryCallBack;
+    applicationCallBack;
     initializationState = ActionState.create();
     currentViewer;
     constructor(applicationStore, lakehouseServerClient) {
         this.applicationStore = applicationStore;
         this.lakehouseServerClient = lakehouseServerClient;
+        this.directoryUrl =
+            this.applicationStore.config.lakehouseEntitlementsConfig?.applicationDirectoryUrl;
+        this.applicationIdUrl =
+            this.applicationStore.config.lakehouseEntitlementsConfig?.applicationIDUrl;
+        this.directoryCallBack = this.directoryUrl
+            ? (user) => {
+                this.applicationStore.navigationService.navigator.visitAddress(`${this.directoryUrl}/${user}`);
+            }
+            : undefined;
+        this.applicationCallBack = this.applicationIdUrl
+            ? (id) => {
+                this.applicationStore.navigationService.navigator.visitAddress(`${this.applicationIdUrl}/${id}`);
+            }
+            : undefined;
         makeObservable(this, {
             init: flow,
             initWithTaskId: flow,
@@ -52,20 +70,17 @@ export class LakehouseEntitlementsStore {
             return;
         }
         // TODO: similiar logic should be used above ^
-        const currentViewer = new LakehouseEntitlementsMainViewState(this);
+        const currentViewer = new EntitlementsDashboardState(this);
         this.setCurrentViewer(currentViewer);
         currentViewer.init(token);
     }
     *initWithTaskId(taskId, token) {
         try {
             this.initializationState.inProgress();
-            // TEMP: for now we will assume task id is in pending user.
-            // Once 'getTaskId` is added in server we will use that to query task
-            const rawTasks = (yield this.lakehouseServerClient.getPendingTasks(TEST_USER, token));
-            const tasks = deserialize(V1_pendingTasksRespondModelSchema, rawTasks);
-            const allTasks = [...tasks.dataOwner, ...tasks.privilegeManager];
-            const task = guaranteeNonNullable(allTasks.find((e) => e.taskId === taskId), `Task with id '${taskId}' not found. Temprorary only have access to pending tasks you can approve. `);
-            const currentTask = new DataContractTaskState(task, this);
+            const rawTasks = (yield this.lakehouseServerClient.getTask(taskId, token));
+            const tasks = V1_deserializeTaskResponse(rawTasks);
+            const task = guaranteeNonNullable(tasks[0], `Task with id '${taskId}' not found`);
+            const currentTask = new EntitlementsTaskViewerState(task, this);
             this.setCurrentViewer(currentTask);
             flowResult(currentTask.init(token)).catch(this.applicationStore.alertUnhandledError);
         }
@@ -82,7 +97,9 @@ export class LakehouseEntitlementsStore {
             const dataContracts = (yield this.lakehouseServerClient.getDataContract(id, token));
             const dataContract = deserialize(V1_DataContractsRecordModelSchema, dataContracts).dataContracts[0]?.dataContract;
             const contract = guaranteeNonNullable(dataContract, 'Data Contract not found');
-            this.setCurrentViewer(new DataContractState(contract, this));
+            const currentViewer = new EntitlementsDataContractViewerState(contract, this);
+            this.setCurrentViewer(currentViewer);
+            flowResult(currentViewer.init(token)).catch(this.applicationStore.alertUnhandledError);
         }
         catch (error) {
             assertErrorThrown(error);

package/lib/stores/lakehouse/entitlements/LakehouseEntitlementsStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"LakehouseEntitlementsStore.js","sourceRoot":"","sources":["../../../../src/stores/lakehouse/entitlements/LakehouseEntitlementsStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LakehouseEntitlementsStore.js","sourceRoot":"","sources":["../../../../src/stores/lakehouse/entitlements/LakehouseEntitlementsStore.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-marketplace",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "Legend Marketplace application core",
   "keywords": [
     "legend",
@@ -45,10 +45,11 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "16.0.40",
+    "@finos/legend-application": "16.0.41",
     "@finos/legend-art": "7.1.95",
-    "@finos/legend-graph": "32.1.26",
-    "@finos/legend-lego": "2.0.72",
+    "@finos/legend-code-editor": "workspace:^",
+    "@finos/legend-graph": "32.1.27",
+    "@finos/legend-lego": "2.0.73",
     "@finos/legend-server-depot": "6.0.90",
     "@finos/legend-server-marketplace": "0.0.3",
     "@finos/legend-shared": "11.0.11",

package/src/__lib__/LegendMarketplaceNavigation.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { generatePath } from '@finos/legend-application/browser';
+import { generatePath, matchPath } from '@finos/legend-application/browser';
 import {
   addQueryParametersToUrl,
   stringifyQueryParams,
@@ -56,6 +56,20 @@ export const LEGEND_MARKETPLACE_ROUTE_PATTERN = Object.freeze({
   LAKEHOUSE_SUBSCRIPTIONS: '/lakehouse/subscriptions',
 });
 
+export const LAKEHOUSE_ROUTES = Object.freeze([
+  LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE,
+  LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_ENTITLEMENTS,
+  LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_ENTITLEMENTS_TASKS,
+  LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_ENTITLEMENTS_CONTRACTS,
+  LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_PRODUCT,
+  LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_SUBSCRIPTIONS,
+]);
+
+export const isLakehouseRoute = (pathName: string): boolean =>
+  LAKEHOUSE_ROUTES.some(
+    (route) => matchPath(route as string, pathName) !== null,
+  );
+
 export const generateLakehouseDataProduct = (
   gav: string,
   path: string,

package/src/application/LegendMarketplaceApplicationConfig.ts

@@ -60,12 +60,24 @@ export interface LegendMarketplaceApplicationConfigurationData
   };
   lakehouse?: {
     url: string;
+    entitlements: {
+      applicationDirectoryUrl: string;
+      applicationIDUrl: string;
+    };
   };
   studio?: {
     url: string;
   };
 }
 
+export class LegendLakehouseEntitlementsConfig {
+  applicationDirectoryUrl: string;
+  applicationIDUrl: string;
+  constructor(applicationDirectoryUrl: string, applicationIDUrl: string) {
+    this.applicationDirectoryUrl = applicationDirectoryUrl;
+    this.applicationIDUrl = applicationIDUrl;
+  }
+}
 export class LegendMarketplaceApplicationConfig extends LegendApplicationConfig {
   readonly options = new LegendMarketplaceApplicationCoreOptions();
 
@@ -74,6 +86,9 @@ export class LegendMarketplaceApplicationConfig extends LegendApplicationConfig
   readonly engineServerUrl: string;
   readonly depotServerUrl: string;
   readonly lakehouseServerUrl?: string;
+  readonly lakehouseEntitlementsConfig:
+    | LegendLakehouseEntitlementsConfig
+    | undefined;
   readonly studioServerUrl?: string;
 
   constructor(
@@ -127,6 +142,16 @@ export class LegendMarketplaceApplicationConfig extends LegendApplicationConfig
           `Can't configure application: 'lakehouse.url' field is missing or empty`,
         ),
       );
+      this.lakehouseEntitlementsConfig = new LegendLakehouseEntitlementsConfig(
+        guaranteeNonEmptyString(
+          input.configData.lakehouse.entitlements.applicationDirectoryUrl,
+          `Can't configure application: 'lakehouse.entitlements.applicationDirectoryUrl' field is missing or empty`,
+        ),
+        guaranteeNonEmptyString(
+          input.configData.lakehouse.entitlements.applicationIDUrl,
+          `Can't configure application: 'lakehouse.entitlements.applicationIDUrl' field is missing or empty`,
+        ),
+      );
     }
     // studio
     if (input.configData.studio) {

package/src/application/LegendMarketplaceWebApplication.tsx

@@ -25,6 +25,7 @@ import { flowResult } from 'mobx';
 import { useApplicationStore } from '@finos/legend-application';
 import {
   BrowserEnvironmentProvider,
+  Outlet,
   Route,
   Routes,
 } from '@finos/legend-application/browser';
@@ -33,8 +34,11 @@ import {
   useLegendMarketplaceApplicationStore,
   useLegendMarketplaceBaseStore,
 } from './LegendMarketplaceFrameworkProvider.js';
-import { LEGEND_MARKETPLACE_ROUTE_PATTERN } from '../__lib__/LegendMarketplaceNavigation.js';
-import { LakehouseMarketplace } from '../components/Lakehouse/LakehouseMarketplace.js';
+import {
+  isLakehouseRoute,
+  LEGEND_MARKETPLACE_ROUTE_PATTERN,
+} from '../__lib__/LegendMarketplaceNavigation.js';
+import { MarketplaceLakehouseHome } from '../pages/Lakehouse/MarketplaceLakehouseHome.js';
 import { LegendMarketplaceHome } from '../pages/Home/LegendMarketplaceHome.js';
 import { LegendMarketplaceSearchResults } from '../pages/SearchResults/LegendMarketplaceSearchResults.js';
 import {
@@ -44,10 +48,13 @@ import {
 } from 'react-oidc-context';
 import type { User } from 'oidc-client-ts';
 import type { LegendMarketplaceOidcConfig } from './LegendMarketplaceApplicationConfig.js';
-import { LakehouseDataProduct } from '../components/Lakehouse/LakehouseDataProduct.js';
+import { LakehouseDataProduct } from '../pages/Lakehouse/LakehouseDataProduct.js';
 import { LegendMarketPlaceVendorData } from '../pages/VendorData/LegendMarketplaceVendorData.js';
-import { LakehouseEntitlements } from '../components/Lakehouse/entitlements/LakehouseEntitlements.js';
-import { LakehouseSubscriptions } from '../components/Lakehouse/subscriptions/LakehouseSubscriptions.js';
+import { LakehouseEntitlements } from '../pages/Lakehouse/entitlements/LakehouseEntitlements.js';
+import { LakehouseSubscriptions } from '../pages/Lakehouse/subscriptions/LakehouseSubscriptions.js';
+import { LegendMarketplaceHeader } from '../components/Header/LegendMarketplaceHeader.js';
+import { MarketplaceLakehouseHeader } from '../components/Header/MarketplaceLakehouseHeader.js';
+import { LegendMarketplacePage } from '../pages/LegendMarketplacePage.js';
 
 const NotFoundPage = observer(() => {
   const applicationStore = useApplicationStore();
@@ -56,7 +63,7 @@ const NotFoundPage = observer(() => {
     applicationStore.navigationService.navigator.getCurrentLocation();
 
   return (
-    <div className="app__page legend-marketplace__app__page">
+    <LegendMarketplacePage className="legend-marketplace__not-found">
       <div className="not-found-screen not-found-screen--no-documentation">
         <div className="not-found-screen__icon">
           <div className="not-found-screen__icon__ghost">
@@ -89,7 +96,7 @@ const NotFoundPage = observer(() => {
           </div>
         </div>
       </div>
-    </div>
+    </LegendMarketplacePage>
   );
 });
 
@@ -104,7 +111,7 @@ export const LegendMarketplaceWebApplicationRouter = observer(() => {
   }, [applicationStore, baseStore]);
 
   const ProtectedLakehouseMarketplace = withAuthenticationRequired(
-    LakehouseMarketplace,
+    MarketplaceLakehouseHome,
     {
       OnRedirecting: () => (
         <CubesLoadingIndicator isLoading={true}>
@@ -162,8 +169,21 @@ export const LegendMarketplaceWebApplicationRouter = observer(() => {
   return (
     <div className="app">
       {baseStore.initState.hasCompleted && (
-        <>
-          <Routes>
+        <Routes>
+          <Route
+            element={
+              <>
+                {isLakehouseRoute(
+                  baseStore.applicationStore.navigationService.navigator.getCurrentLocation(),
+                ) ? (
+                  <MarketplaceLakehouseHeader />
+                ) : (
+                  <LegendMarketplaceHeader />
+                )}
+                <Outlet />
+              </>
+            }
+          >
             <Route
               path={LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_PRODUCT}
               element={<ProtectedLakehouseDataProduct />}
@@ -184,7 +204,6 @@ export const LegendMarketplaceWebApplicationRouter = observer(() => {
               path={LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE_ENTITLEMENTS}
               element={<ProtectedLakehouseEntitlements />}
             />
-
             <Route
               path={LEGEND_MARKETPLACE_ROUTE_PATTERN.LAKEHOUSE}
               element={<ProtectedLakehouseMarketplace />}
@@ -206,8 +225,8 @@ export const LegendMarketplaceWebApplicationRouter = observer(() => {
               element={<ProtectedLakehouseSubscriptions />}
             />
             <Route path="*" element={<NotFoundPage />} />
-          </Routes>
-        </>
+          </Route>
+        </Routes>
       )}
     </div>
   );

package/src/components/DataProductCard/LegendMarketplaceDataProductSearchCard.tsx

@@ -15,9 +15,10 @@
  */
 
 import { type JSX } from 'react';
-import { Button, Card, CardActions, CardContent } from '@mui/material';
+import { Button } from '@mui/material';
 import type { DataProductSearchResult } from '@finos/legend-server-marketplace';
 import DOMPurify from 'dompurify';
+import { LegendMarketplaceCard } from '../MarketplaceCard/LegendMarketplaceCard.js';
 
 const MAX_DESCRIPTION_LENGTH = 250;
 
@@ -42,40 +43,47 @@ export const LegendMarketplaceProductSearchCard = (props: {
         : DOMPurify.sanitize(productSearchResult.data_product_description),
   };
 
-  return (
-    <Card
-      variant="outlined"
-      className="legend-marketplace-product-search-result-card"
-    >
-      <CardContent className="legend-marketplace-product-search-result-card__content">
-        <div className="legend-marketplace-product-search-result-card__vendor-name">
-          {productSearchResult.vendor_name}
-        </div>
-        <div className="legend-marketplace-product-search-result-card__data-product-name">
-          {productSearchResult.data_product_name}
-        </div>
-        <div className="legend-marketplace-product-search-result-card__data-product-description">
-          {productSearchResult.data_product_description.length > 0 && (
-            <div dangerouslySetInnerHTML={descriptionHTML} />
-          )}
-        </div>
-      </CardContent>
-      <CardActions className="legend-marketplace-product-search-result-card__actions">
+  const content = (
+    <>
+      <div className="legend-marketplace-product-search-result-card__vendor-name">
+        {productSearchResult.vendor_name}
+      </div>
+      <div className="legend-marketplace-product-search-result-card__data-product-name">
+        {productSearchResult.data_product_name}
+      </div>
+      <div className="legend-marketplace-product-search-result-card__data-product-description">
+        {productSearchResult.data_product_description.length > 0 && (
+          <div dangerouslySetInnerHTML={descriptionHTML} />
+        )}
+      </div>
+    </>
+  );
+
+  const actions = (
+    <>
+      <Button
+        variant="outlined"
+        onClick={() => onPreviewClick(productSearchResult)}
+      >
+        Preview
+      </Button>
+      {productSearchResult.data_product_link && (
         <Button
-          variant="outlined"
-          onClick={() => onPreviewClick(productSearchResult)}
+          variant="contained"
+          onClick={() => onLearnMoreClick(productSearchResult)}
         >
-          Preview
+          Learn More
         </Button>
-        {productSearchResult.data_product_link && (
-          <Button
-            variant="contained"
-            onClick={() => onLearnMoreClick(productSearchResult)}
-          >
-            Learn More
-          </Button>
-        )}
-      </CardActions>
-    </Card>
+      )}
+    </>
+  );
+
+  return (
+    <LegendMarketplaceCard
+      size="large"
+      content={content}
+      actions={actions}
+      className="legend-marketplace-product-search-result-card"
+    />
   );
 };