@atlaskit/link-datasource 1.24.5 → 1.24.7

package/dist/types-ts4.5/ui/confluence-search-modal/modal/messages.d.ts

@@ -0,0 +1,47 @@
+export declare const confluenceSearchModalMessages: {
+    cancelButtonText: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    insertResultsButtonText: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    searchLabel: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    insertIssuesTitle: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    insertIssuesTitleManySites: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    initialViewSearchTitle: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    initialViewSearchDescription: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    noAccessToConfluenceSitesTitle: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    noAccessToConfluenceSitesDescription: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.d.ts

@@ -1,5 +1,5 @@
 import { IntlShape } from 'react-intl-next';
-import type { Site } from '../../types';
+import type { Site } from '../../../../common/types';
 import { AvatarLabelOption, BasicFilterFieldType, SelectOption } from '../types';
 interface FilterOptionsProps {
     filterType: BasicFilterFieldType;

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { Site } from '../../../types';
+import type { Site } from '../../../../../common/types';
 import { BasicFilterFieldType, SelectOption } from '../../types';
 export interface AsyncPopupSelectProps {
     filterType: BasicFilterFieldType;

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { Site } from '../../types';
+import type { Site } from '../../../../common/types';
 import type { BasicFilterFieldType, SelectedOptionsMap, SelectOption } from '../types';
 export declare const availableBasicFilterTypes: BasicFilterFieldType[];
 export interface BasicFilterContainerProps {

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { JiraIssuesConfigModalProps } from './types';
+import { ConfigModalProps } from '../../common/types';
 export declare const JIRA_LIST_OF_LINKS_DATASOURCE_ID = "d8b75300-dfda-4519-b6cd-e49abbd50401";
-declare const JiraIssuesConfigModalWithWrappers: (props: JiraIssuesConfigModalProps) => JSX.Element;
+declare const JiraIssuesConfigModalWithWrappers: (props: ConfigModalProps) => JSX.Element;
 export default JiraIssuesConfigModalWithWrappers;

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

@@ -1,7 +1,7 @@
 import { jsx } from '@emotion/react';
-import type { JiraSearchMethod } from '../../../common/types';
+import type { JiraSearchMethod, Site } from '../../../common/types';
 import { SelectedOptionsMap } from '../basic-filters/types';
-import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery, Site } from '../types';
+import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
 export declare const DEFAULT_JQL_QUERY = "ORDER BY created DESC";
 export declare const ALLOWED_ORDER_BY_KEYS: string[];
 export declare const FILTER_SELECTION_DEBOUNCE_MS = 500;

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

@@ -3,18 +3,19 @@ import { jsx } from '@emotion/react';
 import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { InlineCardAdf } from '@atlaskit/linking-common/types';
 import { DatasourceAction } from '../../../analytics/types';
-import { JiraIssueDatasourceParameters, JiraIssuesConfigModalProps, JiraIssueViewModes } from '../types';
+import type { ConfigModalProps, IssueViewModes } from '../../../common/types';
+import { JiraIssueDatasourceParameters } from '../types';
 /**
  * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
  * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
  */
 export declare const getColumnAction: (oldVisibleColumnKeys: string[], newVisibleColumnKeys: string[]) => DatasourceAction;
-export declare const PlainJiraIssuesConfigModal: (props: JiraIssuesConfigModalProps) => jsx.JSX.Element;
+export declare const PlainJiraIssuesConfigModal: (props: ConfigModalProps) => jsx.JSX.Element;
 export declare const JiraIssuesConfigModal: import("react").ForwardRefExoticComponent<{
     datasourceId: string;
     url?: string | undefined;
-    parameters?: JiraIssueDatasourceParameters | undefined;
+    parameters?: import("@atlaskit/linking-types").DatasourceParameters | JiraIssueDatasourceParameters | undefined;
     onCancel: () => void;
-    onInsert: (adf: import("../types").JiraIssuesDatasourceAdf | InlineCardAdf, analyticsEvent?: UIAnalyticsEvent | undefined) => void;
-    viewMode?: JiraIssueViewModes | undefined;
+    onInsert: (adf: InlineCardAdf | import("@atlaskit/linking-common/types").DatasourceAdf<Record<string, unknown>>, analyticsEvent?: UIAnalyticsEvent | undefined) => void;
+    viewMode?: IssueViewModes | undefined;
 } & Partial<Pick<import("../../issue-like-table/types").IssueLikeDataTableViewProps, "visibleColumnKeys" | "wrappedColumnKeys" | "columnCustomSizes">> & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

package/dist/types-ts4.5/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.d.ts

@@ -0,0 +1,8 @@
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
+import { IssueViewModes } from '../../../../common/types';
+export type JiraDisplayViewDropDownProps = {
+    onViewModeChange: (value: IssueViewModes) => void;
+    viewMode: IssueViewModes;
+};
+export declare const JiraDisplayViewDropDown: ({ onViewModeChange, viewMode, }: JiraDisplayViewDropDownProps) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/jira-issues-modal/modal/jira-issues-initial-state-svg.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const JiraInitialStateSVG: () => JSX.Element;

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

@@ -49,4 +49,64 @@ export declare const modalMessages: {
         description: string;
         defaultMessage: string;
     };
+    searchJiraTitleDuplicate: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    searchJiraTitle: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    searchDescriptionForJiraBasicSearchDuplicate: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    searchDescriptionForJiraBasicSearch: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    searchDescriptionForJiraJQLSearchDuplicate: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    searchDescriptionForJiraJQLSearch: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    learnMoreLinkDuplicate: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    learnMoreLink: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    noAccessToJiraSitesTitleDuplicate: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    noAccessToJiraSitesTitle: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    noAccessToJiraSitesDescriptionDuplicate: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    noAccessToJiraSitesDescription: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
 };

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

@@ -1,6 +1,4 @@
-import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common/types';
-import { IssueLikeDataTableViewProps } from '../issue-like-table/types';
+import { DatasourceAdf } from '@atlaskit/linking-common/types';
 type XOR<T1, T2> = (T1 & {
     [k in Exclude<keyof T2, keyof T1>]?: never;
 }) | (T2 & {
@@ -14,30 +12,5 @@ export type JiraIssueDatasourceParametersQuery = XOR<{
 export type JiraIssueDatasourceParameters = {
     cloudId: string;
 } & JiraIssueDatasourceParametersQuery;
-export type JiraIssueViewModes = 'issue' | 'count';
-export interface Site {
-    cloudId: string;
-    displayName: string;
-    url: string;
-}
 export type JiraIssuesDatasourceAdf = DatasourceAdf<JiraIssueDatasourceParameters>;
-export type JiraIssuesConfigModalProps = {
-    /** Unique identifier for which type of datasource is being rendered and for making its requests */
-    datasourceId: string;
-    /** The url that was used to insert a Jira List of Links */
-    url?: string;
-    /** Parameters for making the data requests necessary to render data within the table */
-    parameters?: JiraIssueDatasourceParameters;
-    /** Callback function to be invoked when the modal is closed either via cancel button click, esc keydown, or modal blanket click */
-    onCancel: () => void;
-    /** Callback function to be invoked when the insert issues button is clicked */
-    onInsert: (adf: InlineCardAdf | JiraIssuesDatasourceAdf, analyticsEvent?: UIAnalyticsEvent) => void;
-    /** The view mode that the modal will show on open:
-     * - Table = Displays a list of links in table format
-     * - Inline link = Presents a smart link that shows the count of query results. However, if there's only one result, it converts to an inline smart link of that issue.
-  
-     * The view modes in 'JiraIssueViewModes' have not been changed from 'count' to 'inline link' and 'issue' to 'table'
-     * because it will introduce breaking changes to the public API requiring a major version bump*/
-    viewMode?: JiraIssueViewModes;
-} & Partial<Pick<IssueLikeDataTableViewProps, 'visibleColumnKeys' | 'wrappedColumnKeys' | 'columnCustomSizes'>>;
 export {};

package/examples-helpers/mockSmartLinkData.ts

@@ -64,4 +64,48 @@ export const mocks = {
       url: 'https://product-fabric.atlassian.net/browse/EDM-5941',
     },
   } as JsonLd.Response,
+  notFound: {
+    meta: {
+      visibility: 'not_found',
+      access: 'forbidden',
+      auth: [],
+      definitionId: 'd1',
+      key: 'object-provider',
+    },
+    data: {
+      '@context': {
+        '@vocab': 'https://www.w3.org/ns/activitystreams#',
+        atlassian: 'https://schema.atlassian.com/ns/vocabulary#',
+        schema: 'http://schema.org/',
+      },
+      '@type': 'Object',
+      name: 'I love cheese',
+      url: 'https://some.url',
+    },
+  } as JsonLd.Response,
+  forbidden: {
+    meta: {
+      visibility: 'restricted',
+      access: 'forbidden',
+      auth: [
+        {
+          key: 'some-flow',
+          displayName: 'Flow',
+          url: 'https://outbound-auth/flow',
+        },
+      ],
+      definitionId: 'd1',
+      key: 'object-provider',
+    },
+    data: {
+      '@context': {
+        '@vocab': 'https://www.w3.org/ns/activitystreams#',
+        atlassian: 'https://schema.atlassian.com/ns/vocabulary#',
+        schema: 'http://schema.org/',
+      },
+      '@type': 'Object',
+      name: 'I love cheese',
+      url: 'https://some.url',
+    },
+  } as JsonLd.Response,
 };

package/examples-helpers/smartLinkCustomClient.ts

@@ -8,27 +8,38 @@ import { mocks } from './mockSmartLinkData';
 
 const jqlUrlRegExp = /.+[jql=].+/;
 
-class SmartLinkClient extends CardClient {
-  fetchData(url: string): Promise<JsonLd.Response> {
-    switch (url) {
-      case 'https://product-fabric.atlassian.net/browse/EDM-5941':
-      case 'https://product-fabric.atlassian.net/browse/EDM-5591':
-        return Promise.resolve(mocks.resolved);
-      case 'https://link-that-does-not-resolve.com':
-        return Promise.reject(`Can't resolve from ${url}`);
-      case 'https://link-that-is-unsupported.com':
-        throw new APIError(
-          'fatal',
-          new URL(url).hostname,
-          'received unsupported error',
-          'ResolveUnsupportedError',
-        );
-      case jqlUrlRegExp.test(url) ? url : undefined:
-        return Promise.resolve(mockJqlSmartLinkData.resolved);
-      default:
-        return Promise.resolve(mocks.unauthorized);
-    }
+const mockedFetch = (url: string): Promise<JsonLd.Response> => {
+  switch (url) {
+    case 'https://product-fabric.atlassian.net/browse/EDM-5941':
+    case 'https://product-fabric.atlassian.net/browse/EDM-5591':
+      return Promise.resolve(mocks.resolved);
+    case 'https://link-that-does-not-resolve.com':
+      return Promise.reject(`Can't resolve from ${url}`);
+    case 'https://link-that-is-still-resolving.com/long-url/very-very-very-very-very-very-very-long':
+      return new Promise(() => {});
+    case 'https://link-that-is-unauthorized.com':
+      return Promise.resolve(mocks.unauthorized);
+    case 'https://link-that-is-not-found.com/long':
+      return Promise.resolve(mocks.notFound);
+    case 'https://link-that-is-forbidden.com':
+      return Promise.resolve(mocks.forbidden);
+    case 'https://link-that-is-unsupported.com':
+      throw new APIError(
+        'fatal',
+        new URL(url).hostname,
+        'received unsupported error',
+        'ResolveUnsupportedError',
+      );
+    case jqlUrlRegExp.test(url) ? url : undefined:
+      return Promise.resolve(mockJqlSmartLinkData.resolved);
+    default:
+      return Promise.resolve(mocks.unauthorized);
   }
+};
+
+class SmartLinkClient extends CardClient {
+  prefetchData = mockedFetch;
+  fetchData = mockedFetch;
 }
 
 export default SmartLinkClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.24.5",
+  "version": "1.24.7",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -66,7 +66,7 @@
     "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/tag": "^12.0.0",
     "@atlaskit/textfield": "6.1.3",
-    "@atlaskit/theme": "^12.6.0",
+    "@atlaskit/theme": "^12.7.0",
     "@atlaskit/tokens": "^1.42.0",
     "@atlaskit/tooltip": "^18.1.0",
     "@atlaskit/ufo": "^0.2.4",
@@ -152,6 +152,9 @@
     },
     "platform.linking-platform.datasource.enable-abort-controller": {
       "type": "boolean"
+    },
+    "platform.linking-platform.datasource.enable-stricter-jql-encoding": {
+      "type": "boolean"
     }
   }
 }

package/dist/cjs/ui/jira-issues-modal/initial-state-view/index.js

@@ -1,81 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.InitialStateView = void 0;
-var _react = require("react");
-var _react2 = require("@emotion/react");
-var _reactIntlNext = require("react-intl-next");
-var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _colors = require("@atlaskit/theme/colors");
-var _initialStateSvg = require("./assets/initial-state-svg");
-var _messages = require("./messages");
-/** @jsx jsx */
-
-var initialStateViewContainerStyles = (0, _react2.css)({
-  display: 'flex',
-  justifyContent: 'center',
-  height: '100%'
-});
-var svgAndTextsWrapperStyles = (0, _react2.css)({
-  textAlign: 'center',
-  alignSelf: 'center',
-  paddingTop: "var(--ds-space-600, 48px)",
-  paddingBottom: "var(--ds-space-600, 48px)",
-  width: '260px'
-});
-var betaTagStyles = (0, _react2.css)({
-  display: 'flex'
-});
-var searchTitleStyles = (0, _react2.css)({
-  color: "var(--ds-text-subtlest, ".concat(_colors.N300, ")"),
-  font: "var(--ds-font-heading-medium, normal 500 20px/24px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
-  paddingTop: "var(--ds-space-200, 16px)",
-  paddingBottom: "var(--ds-space-100, 8px)",
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center',
-  gap: "var(--ds-space-100, 8px)"
-});
-var mainTextStyles = (0, _react2.css)({
-  color: "var(--ds-text-subtlest, ".concat(_colors.N300, ")")
-});
-var learnMoreLinkStyles = (0, _react2.css)({
-  paddingTop: "var(--ds-space-200, 16px)",
-  display: 'inline-block'
-});
-var methodToDescriptionMessage = {
-  basic: _messages.initialStateViewMessages.searchDescriptionForBasicSearch,
-  jql: _messages.initialStateViewMessages.searchDescriptionForJQLSearch
-};
-var jqlSupportDocumentLink = 'https://support.atlassian.com/jira-service-management-cloud/docs/use-advanced-search-with-jira-query-language-jql/';
-var InitialStateView = exports.InitialStateView = function InitialStateView(_ref) {
-  var searchMethod = _ref.searchMethod;
-  var showBasicFilters = (0, _react.useMemo)(function () {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
-      return true;
-    }
-    return false;
-  }, []);
-  return (0, _react2.jsx)("div", {
-    css: initialStateViewContainerStyles,
-    "data-testid": "jlol-datasource-modal--initial-state-view"
-  }, (0, _react2.jsx)("div", {
-    css: svgAndTextsWrapperStyles
-  }, (0, _react2.jsx)(_initialStateSvg.InitialStateSVG, null), (0, _react2.jsx)("div", {
-    css: searchTitleStyles
-  }, !showBasicFilters && (0, _react2.jsx)("div", {
-    css: betaTagStyles
-  }, (0, _react2.jsx)(_lozenge.default, {
-    appearance: "new"
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.initialStateViewMessages.beta))), (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.initialStateViewMessages.searchTitle)), (0, _react2.jsx)("div", {
-    css: mainTextStyles
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, methodToDescriptionMessage[searchMethod])), searchMethod === 'jql' ? (0, _react2.jsx)("a", {
-    href: jqlSupportDocumentLink,
-    target: "_blank",
-    css: learnMoreLinkStyles
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.initialStateViewMessages.learnMoreLink)) : null));
-};

package/dist/types/services/getAvailableJiraSites.d.ts

@@ -1,2 +0,0 @@
-import type { Site } from '../ui/jira-issues-modal/types';
-export declare const getAvailableJiraSites: () => Promise<Site[]>;

package/dist/types/ui/jira-issues-modal/initial-state-view/assets/initial-state-svg.d.ts

@@ -1,2 +0,0 @@
-/// <reference types="react" />
-export declare const InitialStateSVG: () => JSX.Element;

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

@@ -1,8 +0,0 @@
-/** @jsx jsx */
-import { jsx } from '@emotion/react';
-import { JiraSearchMethod } from '../../../common/types';
-interface InitialStateViewProps {
-    searchMethod: JiraSearchMethod;
-}
-export declare const InitialStateView: ({ searchMethod }: InitialStateViewProps) => jsx.JSX.Element;
-export {};

package/dist/types/ui/jira-issues-modal/modal/display-view-dropdown/display-view-drop-down.d.ts

@@ -1,8 +0,0 @@
-/** @jsx jsx */
-import { jsx } from '@emotion/react';
-import { JiraIssueViewModes } from '../../types';
-export type DisplayViewDropDownProps = {
-    onViewModeChange: (value: JiraIssueViewModes) => void;
-    viewMode: JiraIssueViewModes;
-};
-export declare const DisplayViewDropDown: ({ onViewModeChange, viewMode, }: DisplayViewDropDownProps) => jsx.JSX.Element;

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

@@ -1,9 +0,0 @@
-import { jsx } from '@emotion/react';
-import type { Site } from '../types';
-export interface JiraSiteSelectorProps {
-    availableSites: Site[] | undefined;
-    onSiteSelection: (selectedSite: Site) => void;
-    selectedJiraSite?: Site;
-    testId?: string;
-}
-export declare const JiraSiteSelector: (props: JiraSiteSelectorProps) => jsx.JSX.Element;

package/dist/types-ts4.5/services/getAvailableJiraSites.d.ts

@@ -1,2 +0,0 @@
-import type { Site } from '../ui/jira-issues-modal/types';
-export declare const getAvailableJiraSites: () => Promise<Site[]>;

package/dist/types-ts4.5/ui/jira-issues-modal/initial-state-view/assets/initial-state-svg.d.ts

@@ -1,2 +0,0 @@
-/// <reference types="react" />
-export declare const InitialStateSVG: () => JSX.Element;

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

@@ -1,8 +0,0 @@
-/** @jsx jsx */
-import { jsx } from '@emotion/react';
-import { JiraSearchMethod } from '../../../common/types';
-interface InitialStateViewProps {
-    searchMethod: JiraSearchMethod;
-}
-export declare const InitialStateView: ({ searchMethod }: InitialStateViewProps) => jsx.JSX.Element;
-export {};

package/dist/types-ts4.5/ui/jira-issues-modal/modal/display-view-dropdown/display-view-drop-down.d.ts

@@ -1,8 +0,0 @@
-/** @jsx jsx */
-import { jsx } from '@emotion/react';
-import { JiraIssueViewModes } from '../../types';
-export type DisplayViewDropDownProps = {
-    onViewModeChange: (value: JiraIssueViewModes) => void;
-    viewMode: JiraIssueViewModes;
-};
-export declare const DisplayViewDropDown: ({ onViewModeChange, viewMode, }: DisplayViewDropDownProps) => jsx.JSX.Element;

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

@@ -1,9 +0,0 @@
-import { jsx } from '@emotion/react';
-import type { Site } from '../types';
-export interface JiraSiteSelectorProps {
-    availableSites: Site[] | undefined;
-    onSiteSelection: (selectedSite: Site) => void;
-    selectedJiraSite?: Site;
-    testId?: string;
-}
-export declare const JiraSiteSelector: (props: JiraSiteSelectorProps) => jsx.JSX.Element;