@atlaskit/link-datasource 2.3.3 → 2.3.4

package/dist/esm/ui/jira-issues-modal/modal/index.js

@@ -7,7 +7,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { FormattedMessage, FormattedNumber } from 'react-intl-next';
-import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
@@ -24,6 +23,7 @@ import { useDataRenderedUfoExperience } from '../../../analytics/ufoExperiences/
 import { mapSearchMethod } from '../../../analytics/utils';
 import { buildDatasourceAdf } from '../../../common/utils/adf';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
+import { DatasourceExperienceIdProvider, useDatasourceExperienceId } from '../../../contexts/datasource-experience-id';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
@@ -60,7 +60,7 @@ var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
   return itemCount === 1 ? DatasourceDisplay.INLINE : DatasourceDisplay.DATASOURCE_INLINE;
 };
 var jqlSupportDocumentLink = 'https://support.atlassian.com/jira-service-management-cloud/docs/use-advanced-search-with-jira-query-language-jql/';
-export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
+var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var datasourceId = props.datasourceId,
     initialColumnCustomSizes = props.columnCustomSizes,
     initialWrappedColumnKeys = props.wrappedColumnKeys,
@@ -139,8 +139,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     destinationObjectTypes = _useDatasourceTableSt.destinationObjectTypes;
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
-  var _useRef = useRef(uuidv4()),
-    modalRenderInstanceId = _useRef.current;
+  var experienceId = useDatasourceExperienceId();
   var analyticsPayload = useMemo(function () {
     return {
       extensionKey: extensionKey,
@@ -166,12 +165,12 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     if (shouldStartUfoExperience) {
       startUfoExperience({
         name: 'datasource-rendered'
-      }, modalRenderInstanceId);
+      }, experienceId);
     }
-  }, [modalRenderInstanceId, status]);
+  }, [experienceId, status]);
   useDataRenderedUfoExperience({
     status: status,
-    experienceId: modalRenderInstanceId,
+    experienceId: experienceId,
     itemCount: responseItems.length,
     canBeLink: currentViewMode === 'inline',
     extensionKey: extensionKey
@@ -229,7 +228,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
       fireCountViewedEvent();
     }
   }, [currentViewMode, status, fireIssueViewAnalytics, fireCountViewedEvent]);
-  useColumnPickerRenderedFailedUfoExperience(status, modalRenderInstanceId);
+  useColumnPickerRenderedFailedUfoExperience(status, experienceId);
   var onSearch = useCallback(function (newParameters, _ref) {
     var searchMethod = _ref.searchMethod,
       basicFilterSelections = _ref.basicFilterSelections,
@@ -372,14 +371,13 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
       onNextPage: handleOnNextPage,
       onLoadDatasourceDetails: loadDatasourceDetails,
       onVisibleColumnKeysChange: handleVisibleColumnKeysChange,
-      parentContainerRenderInstanceId: modalRenderInstanceId,
       extensionKey: extensionKey,
       columnCustomSizes: columnCustomSizes,
       onColumnResize: onColumnResize,
       wrappedColumnKeys: wrappedColumnKeys,
       onWrappedColumnChange: getBooleanFF('platform.linking-platform.datasource-word_wrap') ? onWrappedColumnChange : undefined
     }));
-  }, [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, handleOnNextPage, loadDatasourceDetails, handleVisibleColumnKeysChange, modalRenderInstanceId, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
+  }, [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, handleOnNextPage, loadDatasourceDetails, handleVisibleColumnKeysChange, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
   var renderCountModeContent = useCallback(function () {
     var selectedJiraSiteUrl = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
     if (status === 'unauthorized') {
@@ -482,7 +480,9 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   }, jsx(LinkUrl, {
     href: jqlUrl,
     target: "_blank",
-    testId: "item-count-url",
+    testId: "item-count-url"
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
+    ,
     style: {
       color: "var(--ds-text-accent-gray, ".concat(N800, ")")
     }
@@ -512,4 +512,6 @@ var analyticsContextData = _objectSpread(_objectSpread({}, componentMetadata.con
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
-export var JiraIssuesConfigModal = withAnalyticsContext(contextData)(PlainJiraIssuesConfigModal);
+export var JiraIssuesConfigModal = withAnalyticsContext(contextData)(function (props) {
+  return jsx(DatasourceExperienceIdProvider, null, jsx(PlainJiraIssuesConfigModal, props));
+});

package/dist/types/contexts/datasource-experience-id/index.d.ts

@@ -0,0 +1,4 @@
+import { type PropsWithChildren } from 'react';
+declare const DatasourceExperienceIdProvider: ({ children, }: PropsWithChildren<{}>) => JSX.Element;
+declare const useDatasourceExperienceId: () => string;
+export { DatasourceExperienceIdProvider, useDatasourceExperienceId };

package/dist/types/ui/assets-modal/modal/render-assets-content/index.d.ts

@@ -14,7 +14,6 @@ export interface RenderAssetsContentProps {
     columns: DatasourceResponseSchemaProperty[];
     defaultVisibleColumnKeys: string[];
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;
-    modalRenderInstanceId: string;
 }
 export declare const MODAL_HEIGHT = 420;
 export declare const RenderAssetsContent: (props: RenderAssetsContentProps) => jsx.JSX.Element;

package/dist/types/ui/issue-like-table/column-picker/index.d.ts

@@ -1,3 +1,3 @@
 import { jsx } from '@emotion/react';
 import { type ColumnPickerProps } from './types';
-export declare const ColumnPicker: ({ columns, selectedColumnKeys, onSelectedColumnKeysChange, onOpen, parentContainerRenderInstanceId, }: ColumnPickerProps) => jsx.JSX.Element;
+export declare const ColumnPicker: ({ columns, selectedColumnKeys, onSelectedColumnKeysChange, onOpen, }: ColumnPickerProps) => jsx.JSX.Element;

package/dist/types/ui/issue-like-table/column-picker/types.d.ts

@@ -4,5 +4,4 @@ export type ColumnPickerProps = {
     selectedColumnKeys: string[];
     onSelectedColumnKeysChange: (selectedColumnKeys: string[]) => void;
     onOpen?: () => void;
-    parentContainerRenderInstanceId?: string;
 };

package/dist/types/ui/issue-like-table/index.d.ts

@@ -22,5 +22,5 @@ export interface RowCellType {
     content?: React.ReactNode | string;
 }
 export declare const getOrderedColumns: (columns: DatasourceResponseSchemaProperty[], visibleColumnKeys: string[]) => DatasourceResponseSchemaProperty[];
-export declare const IssueLikeDataTableView: ({ testId, onNextPage, onLoadDatasourceDetails, items, columns, renderItem, visibleColumnKeys, onVisibleColumnKeysChange, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange, status, hasNextPage, scrollableContainerHeight, parentContainerRenderInstanceId, extensionKey, }: IssueLikeDataTableViewProps) => jsx.JSX.Element;
+export declare const IssueLikeDataTableView: ({ testId, onNextPage, onLoadDatasourceDetails, items, columns, renderItem, visibleColumnKeys, onVisibleColumnKeysChange, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange, status, hasNextPage, scrollableContainerHeight, extensionKey, }: IssueLikeDataTableViewProps) => jsx.JSX.Element;
 export declare const EmptyState: ({ isCompact, testId }: import("./empty-state").Props) => jsx.JSX.Element;

package/dist/types/ui/issue-like-table/types.d.ts

@@ -15,10 +15,6 @@ export interface ColumnSizesMap {
 }
 export interface IssueLikeDataTableViewProps {
     testId?: string;
-    /**
-     * Unique ID to indicate parent component instance to be used for UFO experiences
-     */
-    parentContainerRenderInstanceId?: string;
     /**
      * Datasource extension key. Optional as value may not have been returned yet
      */

package/dist/types/ui/jira-issues-modal/modal/index.d.ts

@@ -1,5 +1,3 @@
 /// <reference types="react" />
-import { jsx } from '@emotion/react';
 import type { JiraConfigModalProps } from '../types';
-export declare const PlainJiraIssuesConfigModal: (props: JiraConfigModalProps) => jsx.JSX.Element;
 export declare const JiraIssuesConfigModal: import("react").ForwardRefExoticComponent<JiraConfigModalProps & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

package/dist/types-ts4.5/contexts/datasource-experience-id/index.d.ts

@@ -0,0 +1,4 @@
+import { type PropsWithChildren } from 'react';
+declare const DatasourceExperienceIdProvider: ({ children, }: PropsWithChildren<{}>) => JSX.Element;
+declare const useDatasourceExperienceId: () => string;
+export { DatasourceExperienceIdProvider, useDatasourceExperienceId };

package/dist/types-ts4.5/ui/assets-modal/modal/render-assets-content/index.d.ts

@@ -14,7 +14,6 @@ export interface RenderAssetsContentProps {
     columns: DatasourceResponseSchemaProperty[];
     defaultVisibleColumnKeys: string[];
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;
-    modalRenderInstanceId: string;
 }
 export declare const MODAL_HEIGHT = 420;
 export declare const RenderAssetsContent: (props: RenderAssetsContentProps) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/issue-like-table/column-picker/index.d.ts

@@ -1,3 +1,3 @@
 import { jsx } from '@emotion/react';
 import { type ColumnPickerProps } from './types';
-export declare const ColumnPicker: ({ columns, selectedColumnKeys, onSelectedColumnKeysChange, onOpen, parentContainerRenderInstanceId, }: ColumnPickerProps) => jsx.JSX.Element;
+export declare const ColumnPicker: ({ columns, selectedColumnKeys, onSelectedColumnKeysChange, onOpen, }: ColumnPickerProps) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/issue-like-table/column-picker/types.d.ts

@@ -4,5 +4,4 @@ export type ColumnPickerProps = {
     selectedColumnKeys: string[];
     onSelectedColumnKeysChange: (selectedColumnKeys: string[]) => void;
     onOpen?: () => void;
-    parentContainerRenderInstanceId?: string;
 };

package/dist/types-ts4.5/ui/issue-like-table/index.d.ts

@@ -22,5 +22,5 @@ export interface RowCellType {
     content?: React.ReactNode | string;
 }
 export declare const getOrderedColumns: (columns: DatasourceResponseSchemaProperty[], visibleColumnKeys: string[]) => DatasourceResponseSchemaProperty[];
-export declare const IssueLikeDataTableView: ({ testId, onNextPage, onLoadDatasourceDetails, items, columns, renderItem, visibleColumnKeys, onVisibleColumnKeysChange, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange, status, hasNextPage, scrollableContainerHeight, parentContainerRenderInstanceId, extensionKey, }: IssueLikeDataTableViewProps) => jsx.JSX.Element;
+export declare const IssueLikeDataTableView: ({ testId, onNextPage, onLoadDatasourceDetails, items, columns, renderItem, visibleColumnKeys, onVisibleColumnKeysChange, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange, status, hasNextPage, scrollableContainerHeight, extensionKey, }: IssueLikeDataTableViewProps) => jsx.JSX.Element;
 export declare const EmptyState: ({ isCompact, testId }: import("./empty-state").Props) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/issue-like-table/types.d.ts

@@ -15,10 +15,6 @@ export interface ColumnSizesMap {
 }
 export interface IssueLikeDataTableViewProps {
     testId?: string;
-    /**
-     * Unique ID to indicate parent component instance to be used for UFO experiences
-     */
-    parentContainerRenderInstanceId?: string;
     /**
      * Datasource extension key. Optional as value may not have been returned yet
      */

package/dist/types-ts4.5/ui/jira-issues-modal/modal/index.d.ts

@@ -1,5 +1,3 @@
 /// <reference types="react" />
-import { jsx } from '@emotion/react';
 import type { JiraConfigModalProps } from '../types';
-export declare const PlainJiraIssuesConfigModal: (props: JiraConfigModalProps) => jsx.JSX.Element;
 export declare const JiraIssuesConfigModal: import("react").ForwardRefExoticComponent<JiraConfigModalProps & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

package/examples-helpers/buildIssueLikeTable.tsx

@@ -9,6 +9,7 @@ import { SmartCardProvider } from '@atlaskit/link-provider';
 import { mockDatasourceFetchRequests } from '@atlaskit/link-test-helpers/datasource';
 
 import { fetchMessagesForLocale } from '../src/common/utils/locale/fetch-messages-for-locale';
+import { DatasourceExperienceIdProvider } from '../src/contexts/datasource-experience-id';
 import { useDatasourceTableState } from '../src/hooks/useDatasourceTableState';
 import { IssueLikeDataTableView } from '../src/ui/issue-like-table';
 import { type JiraIssueDatasourceParameters } from '../src/ui/jira-issues-modal/types';
@@ -113,14 +114,16 @@ export const ExampleIssueLikeTable = ({
   skipIntl,
 }: Props) => {
   return (
-    <IntlMessagesProvider loaderFn={fetchMessagesForLocale}>
-      <SmartCardProvider client={new SmartLinkClient()}>
-        <ExampleBody
-          isReadonly={isReadonly}
-          canResizeColumns={canResizeColumns}
-          canControlWrapping={canControlWrapping}
-        />
-      </SmartCardProvider>
-    </IntlMessagesProvider>
+    <DatasourceExperienceIdProvider>
+      <IntlMessagesProvider loaderFn={fetchMessagesForLocale}>
+        <SmartCardProvider client={new SmartLinkClient()}>
+          <ExampleBody
+            isReadonly={isReadonly}
+            canResizeColumns={canResizeColumns}
+            canControlWrapping={canControlWrapping}
+          />
+        </SmartCardProvider>
+      </IntlMessagesProvider>
+    </DatasourceExperienceIdProvider>
   );
 };

package/examples-helpers/buildJiraIssuesTable.tsx

@@ -7,6 +7,7 @@ import { type DatasourceParameters } from '@atlaskit/linking-types';
 
 import { DatasourceTableView } from '../src';
 import { fetchMessagesForLocale } from '../src/common/utils/locale/fetch-messages-for-locale';
+import { DatasourceExperienceIdProvider } from '../src/contexts/datasource-experience-id';
 import { type JiraIssueDatasourceParameters } from '../src/ui/jira-issues-modal/types';
 
 import SmartLinkClient from './smartLinkCustomClient';
@@ -66,10 +67,12 @@ export const ExampleJiraIssuesTableView = ({
   }, [mockDatasourceFetchRequest]);
 
   return (
-    <IntlMessagesProvider loaderFn={fetchMessagesForLocale}>
-      <SmartCardProvider client={new SmartLinkClient()}>
-        <JiraIssuesTableView parameters={parameters} />
-      </SmartCardProvider>
-    </IntlMessagesProvider>
+    <DatasourceExperienceIdProvider>
+      <IntlMessagesProvider loaderFn={fetchMessagesForLocale}>
+        <SmartCardProvider client={new SmartLinkClient()}>
+          <JiraIssuesTableView parameters={parameters} />
+        </SmartCardProvider>
+      </IntlMessagesProvider>
+    </DatasourceExperienceIdProvider>
   );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "UI Components to support linking platform dataset feature",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -40,7 +40,7 @@
     "@atlaskit/avatar": "^21.9.0",
     "@atlaskit/avatar-group": "^9.6.0",
     "@atlaskit/badge": "^16.1.0",
-    "@atlaskit/button": "^17.16.0",
+    "@atlaskit/button": "^17.17.0",
     "@atlaskit/datetime-picker": "^13.5.0",
     "@atlaskit/dropdown-menu": "^12.10.0",
     "@atlaskit/editor-prosemirror": "4.0.1",