@finos/legend-application-marketplace 0.1.56 → 0.1.57

package/lib/utils/EntitlementsUtils.js

@@ -0,0 +1,107 @@
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { getOrganizationalScopeTypeName, getOrganizationalScopeTypeDetails, UserRenderer, MultiUserRenderer, } from '@finos/legend-extension-dsl-data-product';
+import { V1_LiteDataContractWithUserStatus, V1_ResourceType, } from '@finos/legend-graph';
+import { formatOrderDate } from '../stores/orders/OrderHelpers.js';
+import { InfoCircleIcon } from '@finos/legend-art';
+import { Tooltip } from '@mui/material';
+import { observer } from 'mobx-react-lite';
+const TargetUserCellRenderer = observer((props) => {
+    const { dataContract, entitlementsStore } = props;
+    const userIds = dataContract instanceof V1_LiteDataContractWithUserStatus
+        ? [dataContract.user]
+        : (dataContract?.sortedMemberIds ?? []);
+    return (_jsx(MultiUserRenderer, { userIds: userIds, applicationStore: entitlementsStore.applicationStore, userSearchService: entitlementsStore.marketplaceBaseStore.userSearchService, disableOnClick: true, singleUserClassName: "marketplace-lakehouse-entitlements__grid__user-display" }));
+});
+export const getCommonEntitlementsColDefs = (dashboardState) => [
+    {
+        headerName: 'Date Created',
+        colId: 'dateCreated',
+        valueGetter: (params) => {
+            return (formatOrderDate(params.data?.contractResultLite.createdAt) ?? 'Unknown');
+        },
+        sort: 'desc',
+        comparator: (_, __, val1, val2) => {
+            const dateA = val1.data?.contractResultLite.createdAt
+                ? new Date(val1.data.contractResultLite.createdAt).getTime()
+                : 0;
+            const dateB = val2.data?.contractResultLite.createdAt
+                ? new Date(val2.data.contractResultLite.createdAt).getTime()
+                : 0;
+            return dateA - dateB;
+        },
+    },
+    {
+        colId: 'consumerType',
+        headerName: 'Consumer Type',
+        valueGetter: (params) => {
+            const consumer = params.data?.contractResultLite.consumer;
+            const typeName = consumer
+                ? getOrganizationalScopeTypeName(consumer, dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins())
+                : undefined;
+            return typeName ?? 'Unknown';
+        },
+        cellRenderer: (params) => {
+            const consumer = params.data?.contractResultLite.consumer;
+            const typeName = consumer
+                ? getOrganizationalScopeTypeName(consumer, dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins())
+                : undefined;
+            const typeDetails = consumer
+                ? getOrganizationalScopeTypeDetails(consumer, dashboardState.lakehouseEntitlementsStore.applicationStore.pluginManager.getApplicationPlugins())
+                : undefined;
+            return (_jsxs(_Fragment, { children: [typeName ?? 'Unknown', typeDetails !== undefined && (_jsx(Tooltip, { className: "marketplace-lakehouse-entitlements__grid__consumer-type__tooltip__icon", title: typeDetails, children: _jsx(InfoCircleIcon, {}) }))] }));
+        },
+    },
+    {
+        headerName: 'Target User(s)',
+        colId: 'targetUser',
+        valueGetter: (params) => {
+            const userIds = params.data instanceof V1_LiteDataContractWithUserStatus
+                ? [params.data.user]
+                : (params.data?.sortedMemberIds ?? []);
+            return userIds.length > 0 ? userIds.join(', ') : 'Unknown';
+        },
+        cellRenderer: (params) => (_jsx(TargetUserCellRenderer, { dataContract: params.data, entitlementsStore: dashboardState.lakehouseEntitlementsStore })),
+    },
+    {
+        headerName: 'Requester',
+        colId: 'requester',
+        valueGetter: (params) => params.data?.contractResultLite.createdBy ?? 'Unknown',
+        cellRenderer: (params) => {
+            const requester = params.data?.contractResultLite.createdBy;
+            return requester ? (_jsx(UserRenderer, { userId: requester, applicationStore: dashboardState.lakehouseEntitlementsStore.applicationStore, userSearchService: dashboardState.lakehouseEntitlementsStore.marketplaceBaseStore
+                    .userSearchService, disableOnClick: true, className: "marketplace-lakehouse-entitlements__grid__user-display" })) : (_jsx(_Fragment, { children: "Unknown" }));
+        },
+    },
+    {
+        headerName: 'Target Data Product',
+        valueGetter: (params) => {
+            return params.data?.contractResultLite.resourceId ?? 'Unknown';
+        },
+    },
+    {
+        headerName: 'Target Access Point Group',
+        valueGetter: (params) => {
+            const accessPointGroup = params.data?.contractResultLite.resourceType ===
+                V1_ResourceType.ACCESS_POINT_GROUP
+                ? params.data.contractResultLite.accessPointGroup
+                : `${params.data?.contractResultLite.accessPointGroup ?? 'Unknown'} (${params.data?.contractResultLite.resourceType ?? 'Unknown Type'})`;
+            return accessPointGroup ?? 'Unknown';
+        },
+    },
+];
+//# sourceMappingURL=EntitlementsUtils.js.map

package/lib/utils/EntitlementsUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntitlementsUtils.js","sourceRoot":"","sources":["../../src/utils/EntitlementsUtils.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-marketplace",
-  "version": "0.1.56",
+  "version": "0.1.57",
   "description": "Legend Marketplace application core",
   "keywords": [
     "legend",
@@ -45,16 +45,16 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "16.0.88",
-    "@finos/legend-art": "7.1.138",
-    "@finos/legend-code-editor": "2.0.143",
-    "@finos/legend-extension-dsl-data-product": "0.0.41",
-    "@finos/legend-extension-dsl-data-space": "10.4.182",
-    "@finos/legend-graph": "32.3.23",
-    "@finos/legend-lego": "2.0.158",
+    "@finos/legend-application": "16.0.89",
+    "@finos/legend-art": "7.1.139",
+    "@finos/legend-code-editor": "2.0.144",
+    "@finos/legend-extension-dsl-data-product": "0.0.42",
+    "@finos/legend-extension-dsl-data-space": "10.4.183",
+    "@finos/legend-graph": "32.3.24",
+    "@finos/legend-lego": "2.0.159",
     "@finos/legend-server-depot": "6.1.6",
-    "@finos/legend-server-lakehouse": "0.3.24",
-    "@finos/legend-server-marketplace": "0.1.34",
+    "@finos/legend-server-lakehouse": "0.3.25",
+    "@finos/legend-server-marketplace": "0.1.35",
     "@finos/legend-shared": "11.0.22",
     "@finos/legend-storage": "3.0.141",
     "@mui/material": "7.3.4",

package/src/__lib__/LegendMarketplaceTelemetryHelper.ts

@@ -159,14 +159,14 @@ export class LegendMarketplaceTelemetryHelper {
   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

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/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;
@@ -146,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