@finos/legend-application-marketplace 0.0.19 → 0.0.21

package/src/pages/SearchResults/LegendMarketplaceSearchResults.tsx

@@ -16,7 +16,6 @@
 
 import { observer } from 'mobx-react-lite';
 import { LegendMarketplaceSearchBar } from '../../components/SearchBar/LegendMarketplaceSearchBar.js';
-import { LegendMarketplaceHeader } from '../../components/Header/LegendMarketplaceHeader.js';
 import { useApplicationStore } from '@finos/legend-application';
 import { generateSearchResultsRoute } from '../../__lib__/LegendMarketplaceNavigation.js';
 import { DataProductSearchResult } from '@finos/legend-server-marketplace';
@@ -30,6 +29,7 @@ import { assertErrorThrown } from '@finos/legend-shared';
 import { LegendMarketplaceSearchResultDrawerContent } from './LegendMarketplaceSearchResultDrawerContent.js';
 import { Drawer, Grid2 as Grid } from '@mui/material';
 import { LegendMarketplaceProductSearchCard } from '../../components/DataProductCard/LegendMarketplaceDataProductSearchCard.js';
+import { LegendMarketplacePage } from '../LegendMarketplacePage.js';
 
 export const LegendMarketplaceSearchResults = observer(() => {
   const applicationStore = useApplicationStore();
@@ -87,71 +87,64 @@ export const LegendMarketplaceSearchResults = observer(() => {
   };
 
   return (
-    <div className="app__page">
-      <div className="legend-marketplace-search-results">
-        <div className="legend-marketplace-search-results__body">
-          <LegendMarketplaceHeader />
-          <div className="legend-marketplace-search-results__content">
-            <div className="legend-marketplace-search-results__search-bar">
-              <LegendMarketplaceSearchBar
-                onSearch={onSearch}
-                initialValue={params.query?.trim() ?? ''}
-              />
-            </div>
-            <div className="legend-marketplace-search-results__results">
-              <CubesLoadingIndicator isLoading={isLoading}>
-                <CubesLoadingIndicatorIcon />
-              </CubesLoadingIndicator>
-              {isError ? (
-                <div>Error loading results</div>
-              ) : (
-                <Grid
-                  container={true}
-                  spacing={{ xs: 2, lg: 3, xl: 4 }}
-                  columns={{ xs: 1, sm: 2, lg: 3, xxl: 4, xxxl: 5, xxxxl: 6 }}
-                  className="legend-marketplace-search-results__results__cards"
-                >
-                  {results.map((result) => (
-                    <Grid
-                      key={`${result.vendor_name}-${result.data_product_name}`}
-                      size={1}
-                    >
-                      <LegendMarketplaceProductSearchCard
-                        productSearchResult={result}
-                        onPreviewClick={() => {
-                          setSelectedPreviewResult(result);
-                        }}
-                        onLearnMoreClick={() => {
-                          applicationStore.navigationService.navigator.visitAddress(
-                            result.data_product_link,
-                          );
-                        }}
-                      />
-                    </Grid>
-                  ))}
-                </Grid>
-              )}
-            </div>
-          </div>
-          <Drawer
-            anchor="right"
-            open={selectedPreviewResult !== undefined}
-            onClose={() => setSelectedPreviewResult(undefined)}
-            slotProps={{
-              paper: {
-                sx: {
-                  width: '40%',
-                  maxWidth: '100rem',
-                },
-              },
-            }}
+    <LegendMarketplacePage className="legend-marketplace-search-results">
+      <div className="legend-marketplace-search-results__search-bar">
+        <LegendMarketplaceSearchBar
+          onSearch={onSearch}
+          initialValue={params.query?.trim() ?? ''}
+        />
+      </div>
+      <div className="legend-marketplace-search-results__results">
+        <CubesLoadingIndicator isLoading={isLoading}>
+          <CubesLoadingIndicatorIcon />
+        </CubesLoadingIndicator>
+        {isError ? (
+          <div>Error loading results</div>
+        ) : (
+          <Grid
+            container={true}
+            spacing={{ xs: 4 }}
+            columns={{ xs: 1, sm: 2, lg: 3, xxl: 4, xxxl: 5, xxxxl: 6 }}
+            className="legend-marketplace-search-results__results__cards"
           >
-            <LegendMarketplaceSearchResultDrawerContent
-              productSearchResult={selectedPreviewResult}
-            />
-          </Drawer>
-        </div>
+            {results.map((result) => (
+              <Grid
+                key={`${result.vendor_name}-${result.data_product_name}`}
+                size={1}
+              >
+                <LegendMarketplaceProductSearchCard
+                  productSearchResult={result}
+                  onPreviewClick={() => {
+                    setSelectedPreviewResult(result);
+                  }}
+                  onLearnMoreClick={() => {
+                    applicationStore.navigationService.navigator.visitAddress(
+                      result.data_product_link,
+                    );
+                  }}
+                />
+              </Grid>
+            ))}
+          </Grid>
+        )}
       </div>
-    </div>
+      <Drawer
+        anchor="right"
+        open={selectedPreviewResult !== undefined}
+        onClose={() => setSelectedPreviewResult(undefined)}
+        slotProps={{
+          paper: {
+            sx: {
+              width: '40%',
+              maxWidth: '100rem',
+            },
+          },
+        }}
+      >
+        <LegendMarketplaceSearchResultDrawerContent
+          productSearchResult={selectedPreviewResult}
+        />
+      </Drawer>
+    </LegendMarketplacePage>
   );
 });

package/src/pages/VendorData/LegendMarketplaceVendorData.tsx

@@ -15,7 +15,6 @@
  */
 
 import { observer } from 'mobx-react-lite';
-import { LegendMarketplaceHeader } from '../../components/Header/LegendMarketplaceHeader.js';
 import { useEffect, useState } from 'react';
 import { LegendMarketplaceSearchBar } from '../../components/SearchBar/LegendMarketplaceSearchBar.js';
 import {
@@ -25,6 +24,7 @@ import {
   Checkbox,
   FormControlLabel,
   FormGroup,
+  Grid2 as Grid,
   Typography,
 } from '@mui/material';
 import { flowResult } from 'mobx';
@@ -33,6 +33,7 @@ import type { ProviderResult } from '@finos/legend-server-marketplace';
 import { LegendMarketplaceProviderCard } from '../../components/ProviderCard/LegendMarketplaceProviderCard.js';
 import type { LegendMarketPlaceVendorDataState } from '../../stores/LegendMarketPlaceVendorDataState.js';
 import { useLegendMarketplaceBaseStore } from '../../application/LegendMarketplaceFrameworkProvider.js';
+import { LegendMarketplacePage } from '../LegendMarketplacePage.js';
 
 export const RefinedVendorRadioSelector = observer(() => {
   const radioOptions = ['All', 'Datafeeds', 'Terminal License', 'Add-Ons'];
@@ -79,15 +80,21 @@ const SearchResultsRenderer = observer(
             <strong>See All&gt;</strong>
           </a>
         </div>
-        <div className="legend-marketplace-vendordata-main-search-results__card-group">
+        <Grid
+          container={true}
+          spacing={{ xs: 4 }}
+          columns={{ xs: 1, sm: 2, lg: 3, xxl: 4, xxxl: 5, xxxxl: 6 }}
+          className="legend-marketplace-vendordata-main-search-results__card-group"
+        >
           {providerResults.map((provider) => (
-            <LegendMarketplaceProviderCard
-              key={provider.id}
-              providerResult={provider}
-              onAddToCartClick={() => onAddToCartClick(provider)}
-            />
+            <Grid key={provider.id} size={1}>
+              <LegendMarketplaceProviderCard
+                providerResult={provider}
+                onAddToCartClick={() => onAddToCartClick(provider)}
+              />
+            </Grid>
           ))}
-        </div>
+        </Grid>
       </div>
     );
   },
@@ -163,41 +170,36 @@ export const LegendMarketPlaceVendorData = observer(() => {
   }, [marketPlaceVendorDataState, applicationStore]);
 
   return (
-    <div className="app__page">
-      <div className="legend-marketplace-vendor-data">
-        <LegendMarketplaceHeader />
-        <div className="legend-marketplace-vendor-data__content">
-          <div className="legend-marketplace-banner">
-            <div className="legend-marketplace-banner__title">Vendor Data</div>
-            <div className="legend-marketplace-banner__subtitle">
-              <p>Discover high quality data</p>
-            </div>
-          </div>
-          <div className="legend-marketplace-new-datasets">
-            <h3>Recently Onboarded</h3>
-            <div className="legend-marketplace-new-datasets__buttons">
-              {marketPlaceVendorDataState.dataFeedProviders
-                .slice(0, 10)
-                .map((vendor) => (
-                  <Badge
-                    className="legend-marketplace-new-datasets__providers"
-                    title={vendor.productName}
-                    key={vendor.id}
-                  >
-                    {vendor.productName}
-                  </Badge>
-                ))}
-            </div>
-          </div>
-          <div className="legend-marketplace-body__content">
-            <RefinedVendorRadioSelector />
-            <LegendMarketplaceSearchBar onSearch={onChange} />
-            <VendorDataMainContent
-              marketPlaceVendorDataState={marketPlaceVendorDataState}
-            />
-          </div>
+    <LegendMarketplacePage className="legend-marketplace-vendor-data">
+      <div className="legend-marketplace-banner">
+        <div className="legend-marketplace-banner__title">Vendor Data</div>
+        <div className="legend-marketplace-banner__subtitle">
+          <p>Discover high quality data</p>
+        </div>
+      </div>
+      <div className="legend-marketplace-new-datasets">
+        <h3>Recently Onboarded</h3>
+        <div className="legend-marketplace-new-datasets__buttons">
+          {marketPlaceVendorDataState.dataFeedProviders
+            .slice(0, 10)
+            .map((vendor) => (
+              <Badge
+                className="legend-marketplace-new-datasets__providers"
+                title={vendor.productName}
+                key={vendor.id}
+              >
+                {vendor.productName}
+              </Badge>
+            ))}
         </div>
       </div>
-    </div>
+      <div className="legend-marketplace-body__content">
+        <RefinedVendorRadioSelector />
+        <LegendMarketplaceSearchBar onSearch={onChange} />
+        <VendorDataMainContent
+          marketPlaceVendorDataState={marketPlaceVendorDataState}
+        />
+      </div>
+    </LegendMarketplacePage>
   );
 });

package/src/stores/LakehouseContractServerClient.ts

@@ -16,10 +16,13 @@
 
 import type {
   V1_ContractCreate_LegendDataProduct,
+  V1_CreateSubscriptionInput,
   V1_DataContract,
   V1_DataContractsRecord,
-  V1_TaskStatus,
+  V1_DataSubscriptionResponse,
   V1_PendingTasksRespond,
+  V1_TaskStatus,
+  V1_UserPendingContractsResponse,
 } from '@finos/legend-graph';
 import { AbstractServerClient, type PlainObject } from '@finos/legend-shared';
 
@@ -48,13 +51,6 @@ export class LakehouseContractServerClient extends AbstractServerClient {
 
   private _dataContracts = (): string => `${this.baseUrl}/datacontracts`;
 
-  getPendingContracts = (token?: string | undefined): Promise<PlainObject[]> =>
-    this.get(
-      `${this._dataContracts()}/pendingContractsForUser`,
-      {},
-      this._token(token),
-    );
-
   getDataContracts = (
     token: string | undefined,
   ): Promise<PlainObject<V1_DataContractsRecord>> =>
@@ -70,6 +66,16 @@ export class LakehouseContractServerClient extends AbstractServerClient {
       this._token(token),
     );
 
+  getApprovedUsersForDataContract = (
+    id: string,
+    token: string | undefined,
+  ): Promise<PlainObject<V1_DataContractsRecord>> =>
+    this.get(
+      `${this._dataContracts()}/${encodeURIComponent(id)}/approvedUsers`,
+      {},
+      this._token(token),
+    );
+
   getDataContractsFromDID = (
     body: PlainObject<AppendMode>[],
     token: string | undefined,
@@ -82,14 +88,33 @@ export class LakehouseContractServerClient extends AbstractServerClient {
     );
   };
 
+  getPendingContracts = (
+    user: string | undefined,
+    token: string | undefined,
+  ): Promise<PlainObject<V1_UserPendingContractsResponse>> => {
+    return this.get(
+      `${this._dataContracts()}/pendingContractsForUser`,
+      {},
+      this._token(token),
+      { user },
+    );
+  };
+
   createContract = (
     contractRequest: PlainObject<V1_ContractCreate_LegendDataProduct>,
+    token: string | undefined,
   ): Promise<V1_DataContract> =>
-    this.post(`${this._dataContracts()}/alloyDataProduct`, contractRequest);
+    this.post(
+      `${this._dataContracts()}/alloyDataProduct`,
+      contractRequest,
+      undefined,
+      this._token(token),
+    );
 
   // ------------------------------------------- Tasks -------------------------------------------
 
   private _tasks = (): string => `${this.baseUrl}/datacontracts/tasks`;
+  private _contract_tasks = (): string => `${this._tasks()}/query/contract`;
 
   getPendingTasks = (
     user: string | undefined,
@@ -100,6 +125,34 @@ export class LakehouseContractServerClient extends AbstractServerClient {
     });
   };
 
+  getTask = (
+    taskId: string,
+    token: string | undefined,
+  ): Promise<PlainObject<V1_PendingTasksRespond>> => {
+    return this.get(
+      `${this._tasks()}/${encodeURIComponent(taskId)}`,
+      {},
+      this._token(token),
+      {
+        user: taskId,
+      },
+    );
+  };
+
+  getContractTasks = (
+    contractId: string,
+    token: string | undefined,
+  ): Promise<PlainObject<V1_PendingTasksRespond>> => {
+    return this.get(
+      `${this._contract_tasks()}/${encodeURIComponent(contractId)}`,
+      {},
+      this._token(token),
+      {
+        user: contractId,
+      },
+    );
+  };
+
   approveTask = (
     id: string,
     token: string | undefined,
@@ -111,7 +164,7 @@ export class LakehouseContractServerClient extends AbstractServerClient {
       this._token(token),
     );
 
-  denyTaskTask = (
+  denyTask = (
     id: string,
     token: string | undefined,
   ): Promise<PlainObject<V1_TaskStatus>> =>
@@ -121,4 +174,19 @@ export class LakehouseContractServerClient extends AbstractServerClient {
       {},
       this._token(token),
     );
+
+  // --------------------------------------- Subscriptions ---------------------------------------
+
+  private _subscriptions = (): string => `${this.baseUrl}/subscriptions`;
+
+  getAllSubscriptions = (
+    token: string | undefined,
+  ): Promise<PlainObject<V1_DataSubscriptionResponse>[]> =>
+    this.get(this._subscriptions(), {}, this._token(token));
+
+  createSubscription = (
+    input: PlainObject<V1_CreateSubscriptionInput>,
+    token: string | undefined,
+  ): Promise<PlainObject<V1_DataSubscriptionResponse>> =>
+    this.post(`${this._subscriptions()}`, input, {}, this._token(token));
 }

package/src/stores/LegendMarketplaceBaseStore.ts

@@ -28,7 +28,11 @@ import {
 import { flow, makeObservable } from 'mobx';
 import { DepotServerClient } from '@finos/legend-server-depot';
 import { MarketplaceServerClient } from '@finos/legend-server-marketplace';
-import { getCurrentUserIDFromEngineServer } from '@finos/legend-graph';
+import {
+  getCurrentUserIDFromEngineServer,
+  type V1_EngineServerClient,
+  V1_RemoteEngine,
+} from '@finos/legend-graph';
 import type { LegendMarketplaceApplicationConfig } from '../application/LegendMarketplaceApplicationConfig.js';
 import type { LegendMarketplacePluginManager } from '../application/LegendMarketplacePluginManager.js';
 import { LegendMarketplaceEventHelper } from '../__lib__/LegendMarketplaceEventHelper.js';
@@ -46,6 +50,8 @@ export class LegendMarketplaceBaseStore {
   readonly depotServerClient: DepotServerClient;
   readonly lakehouseServerClient: LakehouseContractServerClient | undefined;
   readonly pluginManager: LegendMarketplacePluginManager;
+  readonly engineServerClient: V1_EngineServerClient;
+  readonly remoteEngine: V1_RemoteEngine;
 
   readonly initState = ActionState.create();
 
@@ -85,6 +91,15 @@ export class LegendMarketplaceBaseStore {
       );
     }
 
+    this.remoteEngine = new V1_RemoteEngine(
+      {
+        baseUrl: this.applicationStore.config.engineServerUrl,
+      },
+      applicationStore.logService,
+    );
+    this.engineServerClient = this.remoteEngine.getEngineServerClient();
+    this.engineServerClient.setTracerService(applicationStore.tracerService);
+
     this.marketplaceVendorDataState = new LegendMarketPlaceVendorDataState(
       this.applicationStore,
       this,

package/src/stores/lakehouse/DataProductDataAccessState.ts

@@ -14,26 +14,32 @@
  * limitations under the License.
  */
 
-import {
-  type V1_AccessPointGroup,
-  type V1_DataProduct,
+import type {
+  V1_DataContract,
+  V1_AccessPointGroup,
+  V1_DataProduct,
 } from '@finos/legend-graph';
 import type { DataProductViewerState } from './DataProductViewerState.js';
 import {
   ActionState,
   assertErrorThrown,
-  assertTrue,
   uuid,
   type GeneratorFn,
 } from '@finos/legend-shared';
 import {
   action,
   flow,
-  flowResult,
   makeAutoObservable,
   makeObservable,
   observable,
 } from 'mobx';
+import {
+  dataContractContainsAccessGroup,
+  isContractCompleted,
+  isContractPending,
+  isMemberOfContract,
+} from './LakehouseUtils.js';
+import { generateLakehouseContractPath } from '../../__lib__/LegendMarketplaceNavigation.js';
 
 export enum DataProductGroupAccess {
   // can be used to indicate fetching or resyncing of group access
@@ -48,15 +54,31 @@ const generatePromise = (time?: number | undefined) => {
   return new Promise((resolve) => setTimeout(resolve, time ?? 5000));
 };
 
+const getDataProductGroupAccessFromContract = (
+  val: V1_DataContract,
+): DataProductGroupAccess => {
+  if (isContractCompleted(val)) {
+    return DataProductGroupAccess.COMPLETED;
+  }
+
+  if (isContractPending(val)) {
+    return DataProductGroupAccess.PENDING;
+  }
+  return DataProductGroupAccess.UNKNOWN;
+};
+
 export class DataProductGroupAccessState {
   readonly accessState: DataProductDataAccessState;
   readonly group: V1_AccessPointGroup;
   id = uuid();
 
-  access = DataProductGroupAccess.UNKNOWN;
   fetchingAccessState = ActionState.create();
   requestingAccessState = ActionState.create();
 
+  // ASSUMPTION: one contract per user per group;
+  // false here mentions contracts have not been fetched
+  associatedContract: V1_DataContract | undefined | false = false;
+
   constructor(
     group: V1_AccessPointGroup,
     accessState: DataProductDataAccessState,
@@ -64,68 +86,56 @@ export class DataProductGroupAccessState {
     this.group = group;
     this.accessState = accessState;
     makeAutoObservable(this, {
-      access: observable,
-      setAccess: action,
-      requestAccess: flow,
-      handleClick: flow,
-      goToEtask: flow,
+      handleClick: action,
+      handleDataProductContracts: action,
       requestingAccessState: observable,
+      associatedContract: observable,
+      setAssociatedContract: action,
     });
   }
 
-  setAccess(val: DataProductGroupAccess): void {
-    this.access = val;
+  get access(): DataProductGroupAccess {
+    if (this.associatedContract === false) {
+      return DataProductGroupAccess.UNKNOWN;
+    }
+    if (this.associatedContract) {
+      return getDataProductGroupAccessFromContract(this.associatedContract);
+    } else {
+      return DataProductGroupAccess.NO_ACCESS;
+    }
   }
 
-  fetchGroupAccess(): void {}
-
-  *handleClick(): GeneratorFn<void> {
-    if (this.access === DataProductGroupAccess.NO_ACCESS) {
-      flowResult(this.requestAccess()).catch(
-        this.accessState.viewerState.applicationStore.alertUnhandledError,
-      );
-    } else if (this.access === DataProductGroupAccess.PENDING) {
-      flowResult(this.goToEtask()).catch(
-        this.accessState.viewerState.applicationStore.alertUnhandledError,
-      );
-    }
+  setAssociatedContract(val: V1_DataContract | undefined): void {
+    this.associatedContract = val;
   }
 
-  *requestAccess(): GeneratorFn<void> {
-    try {
-      this.requestingAccessState.inProgress();
-      this.accessState.viewerState.applicationStore.alertService.setBlockingAlert(
-        {
-          message: 'Requesting Access...',
-          showLoading: true,
-        },
+  handleDataProductContracts(contracts: V1_DataContract[]): void {
+    const groupContracts = contracts
+      .filter((_contract) =>
+        dataContractContainsAccessGroup(this.group, _contract),
+      )
+      .filter((_contract) =>
+        isMemberOfContract(
+          this.accessState.viewerState.applicationStore.identityService
+            .currentUser,
+          _contract,
+        ),
       );
-      assertTrue(
-        this.access === DataProductGroupAccess.NO_ACCESS,
-        `Access Group must be in no access state to request access`,
-      );
-      yield generatePromise();
-      this.setAccess(DataProductGroupAccess.PENDING);
-    } catch (error) {
-      assertErrorThrown(error);
-      this.requestingAccessState.complete();
-    } finally {
-      this.accessState.viewerState.applicationStore.alertService.setBlockingAlert(
-        undefined,
-      );
-    }
+    // ASSUMPTION: one contract per user per group
+    const userContract = groupContracts[0];
+    this.setAssociatedContract(userContract);
   }
 
-  *goToEtask(): GeneratorFn<void> {
-    try {
-      assertTrue(
-        this.access === DataProductGroupAccess.PENDING,
-        `Access Group must be in no access state to request access`,
-      );
-      yield generatePromise();
-      this.setAccess(DataProductGroupAccess.PENDING);
-    } catch (error) {
-      assertErrorThrown(error);
+  handleClick(): void {
+    if (this.access === DataProductGroupAccess.NO_ACCESS) {
+      this.accessState.viewerState.setDataContractAccessPointGroup(this.group);
+    } else if (this.access === DataProductGroupAccess.PENDING) {
+      const associatedContract = this.associatedContract;
+      if (associatedContract) {
+        this.accessState.viewerState.applicationStore.navigationService.navigator.updateCurrentLocation(
+          generateLakehouseContractPath(associatedContract.guid),
+        );
+      }
     }
   }
 }
@@ -153,12 +163,6 @@ export class DataProductDataAccessState {
       // dummy fetch to get access
       this.fetchingDataProductAccessState.inProgress();
       yield generatePromise();
-
-      if (this.accessGroupStates.length === 3) {
-        this.accessGroupStates[0]?.setAccess(DataProductGroupAccess.NO_ACCESS);
-        this.accessGroupStates[1]?.setAccess(DataProductGroupAccess.PENDING);
-        this.accessGroupStates[2]?.setAccess(DataProductGroupAccess.COMPLETED);
-      }
     } catch (error) {
       assertErrorThrown(error);
     } finally {