@atlaskit/link-datasource 1.26.2 → 1.27.0

package/dist/types-ts4.5/ui/{jira-issues-modal/basic-filters/ui/async-popup-select → common/modal/popup-select}/trigger.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
-import { BasicFilterFieldType, SelectOption } from '../../types';
+import { SelectOption } from './types';
 export interface PopupTriggerProps {
-    filterType: BasicFilterFieldType;
+    label: string;
+    testId?: string;
     selectedOptions?: ReadonlyArray<SelectOption>;
     isSelected?: boolean;
     isDisabled?: boolean;

package/dist/types-ts4.5/ui/common/modal/popup-select/types.d.ts

@@ -0,0 +1,22 @@
+import { ReactElement } from 'react';
+export interface OptionBase {
+    label: string;
+    value: string;
+}
+export type IconLabelOption = OptionBase & {
+    optionType: 'iconLabel';
+    icon: string;
+};
+export type LozengeLabelOption = OptionBase & {
+    optionType: 'lozengeLabel';
+    appearance?: LozengeAppearance;
+};
+export type LozengeAppearance = 'default' | 'inprogress' | 'moved' | 'new' | 'removed' | 'success';
+export type AvatarLabelOption = OptionBase & {
+    optionType: 'avatarLabel';
+    avatar?: string;
+    isSquare?: boolean;
+    isGroup?: boolean;
+};
+export type SelectOption = IconLabelOption | LozengeLabelOption | AvatarLabelOption;
+export type FormatOptionLabel = (option: SelectOption) => ReactElement;

package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/index.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export interface BasicFilterContainerProps {
+}
+declare const BasicFilterContainer: ({}: BasicFilterContainerProps) => JSX.Element;
+export default BasicFilterContainer;

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

@@ -44,4 +44,9 @@ export declare const confluenceSearchModalMessages: {
         description: string;
         defaultMessage: string;
     };
+    resultsCountSmartCardPlaceholderText: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
 };

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

@@ -1,6 +1,6 @@
-import { DatasourceAdf } from '@atlaskit/linking-common/types';
+import { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common/types';
 import { ConfigModalProps } from '../../common/types';
-export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<ConfluenceSearchDatasourceAdf, ConfluenceSearchDatasourceParameters> {
+export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<InlineCardAdf | ConfluenceSearchDatasourceAdf, ConfluenceSearchDatasourceParameters> {
 }
 export type ConfluenceSearchDatasourceParameters = {
     cloudId: string;

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

@@ -1,4 +1,3 @@
-import { ReactElement } from 'react';
 export type BasicFilterFieldType = 'project' | 'assignee' | 'type' | 'status';
 export interface OptionBase {
     label: string;
@@ -23,7 +22,6 @@ export type SelectOption = IconLabelOption | LozengeLabelOption | AvatarLabelOpt
 export type SelectedOptionsMap = {
     [key in BasicFilterFieldType]?: SelectOption[];
 };
-export type FormatOptionLabel = (option: SelectOption) => ReactElement;
 export declare const appearanceMap: {
     readonly BLUE_GRAY: "default";
     readonly MEDIUM_GRAY: "default";

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

@@ -1,14 +1,4 @@
 export declare const asyncPopupSelectMessages: {
-    selectPlaceholder: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    paginationDetails: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
     projectLabel: {
         id: string;
         description: string;
@@ -29,9 +19,4 @@ export declare const asyncPopupSelectMessages: {
         description: string;
         defaultMessage: string;
     };
-    showMoreMessage: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
 };

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

@@ -14,26 +14,6 @@ export declare const modalMessages: {
         description: string;
         defaultMessage: string;
     };
-    tableViewModeLabel: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    tableViewModeDescription: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    inlineLinkViewModeLabel: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    inlineLinkViewModeDescription: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
     issuesCountSmartCardPlaceholderText: {
         id: string;
         description: string;

package/examples-helpers/mockSmartLinkData.ts

@@ -108,4 +108,53 @@ export const mocks = {
       url: 'https://some.url',
     },
   } as JsonLd.Response,
+  confluenceSearchResolved: {
+    meta: {
+      auth: [],
+      definitionId: 'confluence-object-provider',
+      product: 'confluence',
+      visibility: 'restricted',
+      access: 'granted',
+      resourceType: 'search',
+      objectId: 'text=searchsomething',
+      tenantId: 'DUMMY-a5a01d21-1cc3-4f29-9565-f2bb8cd969f5',
+      category: 'object',
+      key: 'confluence-object-provider',
+    },
+    data: {
+      '@context': {
+        '@vocab': 'https://www.w3.org/ns/activitystreams#',
+        atlassian: 'https://schema.atlassian.com/ns/vocabulary#',
+        schema: 'http://schema.org/',
+      },
+      generator: {
+        '@type': 'Application',
+        '@id': 'https://www.atlassian.com/#Confluence',
+        name: 'Confluence',
+        icon: {
+          '@type': 'Image',
+          url: 'https://cdn.bfldr.com/K3MHR9G8/at/hcwrtqnwvz33bn73b84ncpt5/confluence-mark-contained-gradient-blue.svg?auto=webp&format=png&width=320&height=320',
+        },
+      },
+      '@type': ['Object'],
+      url: 'https://pug.jira-dev.com/wiki/search?text=searchsomething',
+      name: '55 Results',
+      'atlassian:titlePrefix': {
+        text: '',
+        '@type': 'atlassian:Emoji',
+      },
+    },
+    datasources: [
+      {
+        key: 'datasource-confluence-search',
+        parameters: {
+          searchString: 'searchsomething',
+        },
+        id: '768fc736-3af4-4a8f-b27e-203602bff8ca',
+        ari: 'ari:cloud:linking-platform::datasource/768fc736-3af4-4a8f-b27e-203602bff8ca',
+        description: 'For extracting a list of Confluence search results',
+        name: 'Confluence search',
+      },
+    ],
+  } as JsonLd.Response,
 };

package/examples-helpers/smartLinkCustomClient.ts

@@ -6,9 +6,16 @@ import { APIError } from '@atlaskit/linking-common';
 import { mockJqlSmartLinkData } from './mockJqlSmartLinkData';
 import { mocks } from './mockSmartLinkData';
 
-const jqlUrlRegExp = /.+[jql=].+/;
+const jqlUrlRegExp = /.*[?&]jql=.*/;
+const confluenceSearchRegExp = /^https?:\/\/[^\/]+\/wiki\/spaces\/.*/;
 
 const mockedFetch = (url: string): Promise<JsonLd.Response> => {
+  if (confluenceSearchRegExp.test(url)) {
+    return Promise.resolve(mocks.confluenceSearchResolved);
+  }
+  if (jqlUrlRegExp.test(url)) {
+    return Promise.resolve(mockJqlSmartLinkData.resolved);
+  }
   switch (url) {
     case 'https://product-fabric.atlassian.net/browse/EDM-5941':
     case 'https://product-fabric.atlassian.net/browse/EDM-5591':
@@ -30,8 +37,6 @@ const mockedFetch = (url: string): Promise<JsonLd.Response> => {
         'received unsupported error',
         'ResolveUnsupportedError',
       );
-    case jqlUrlRegExp.test(url) ? url : undefined:
-      return Promise.resolve(mockJqlSmartLinkData.resolved);
     default:
       return Promise.resolve(mocks.unauthorized);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.26.2",
+  "version": "1.27.0",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -36,7 +36,7 @@
     "@atlaskit/avatar": "^21.5.0",
     "@atlaskit/avatar-group": "^9.5.0",
     "@atlaskit/badge": "^16.0.0",
-    "@atlaskit/button": "^17.11.0",
+    "@atlaskit/button": "^17.12.0",
     "@atlaskit/dropdown-menu": "^12.8.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/empty-state": "^7.7.0",
@@ -62,7 +62,7 @@
     "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
     "@atlaskit/primitives": "^5.5.0",
     "@atlaskit/select": "^17.6.0",
-    "@atlaskit/smart-card": "^26.52.0",
+    "@atlaskit/smart-card": "^26.54.0",
     "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/tag": "^12.0.0",
     "@atlaskit/textfield": "6.1.3",
@@ -144,6 +144,9 @@
     "platform.linking-platform.datasource.show-jlol-basic-filters": {
       "type": "boolean"
     },
+    "platform.linking-platform.datasource.show-clol-basic-filters": {
+      "type": "boolean"
+    },
     "platform.linking-platform.datasource-word_wrap": {
       "type": "boolean"
     },

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/showMoreButton.js

@@ -1,22 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _reactIntlNext = require("react-intl-next");
-var _button = _interopRequireDefault(require("@atlaskit/button"));
-var _messages = require("./messages");
-var ShowMoreButton = function ShowMoreButton(_ref) {
-  var onShowMore = _ref.onShowMore;
-  var _useIntl = (0, _reactIntlNext.useIntl)(),
-    formatMessage = _useIntl.formatMessage;
-  return /*#__PURE__*/_react.default.createElement(_button.default, {
-    onClick: onShowMore,
-    appearance: "link",
-    testId: "jlol-basic-filter-popup-select--show-more-button"
-  }, formatMessage(_messages.asyncPopupSelectMessages.showMoreMessage));
-};
-var _default = exports.default = ShowMoreButton;

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/showMoreButton.js

@@ -1,17 +0,0 @@
-import React from 'react';
-import { useIntl } from 'react-intl-next';
-import Button from '@atlaskit/button';
-import { asyncPopupSelectMessages } from './messages';
-const ShowMoreButton = ({
-  onShowMore
-}) => {
-  const {
-    formatMessage
-  } = useIntl();
-  return /*#__PURE__*/React.createElement(Button, {
-    onClick: onShowMore,
-    appearance: "link",
-    testId: "jlol-basic-filter-popup-select--show-more-button"
-  }, formatMessage(asyncPopupSelectMessages.showMoreMessage));
-};
-export default ShowMoreButton;

package/dist/es2019/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.js

@@ -1,55 +0,0 @@
-/** @jsx jsx */
-import { jsx } from '@emotion/react';
-import { FormattedMessage, useIntl } from 'react-intl-next';
-import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdown-menu';
-import TableIcon from '@atlaskit/icon/glyph/table';
-import { Box, xcss } from '@atlaskit/primitives';
-import { modalMessages } from '../messages';
-const dropDownItemGroupStyles = xcss({
-  width: '320px',
-  height: '140px',
-  paddingTop: 'space.050',
-  paddingBottom: 'space.050',
-  borderRadius: 'border.radius'
-});
-const InlineIcon = jsx("svg", {
-  xmlns: "http://www.w3.org/2000/svg",
-  width: "24",
-  height: "24",
-  viewBox: "0 0 24 24",
-  fill: "none"
-}, jsx("path", {
-  fillRule: "evenodd",
-  clipRule: "evenodd",
-  d: "M4 9C2.89543 9 2 9.67155 2 10.5V13.5C2 14.3285 2.89543 15 4 15H20C21.1046 15 22 14.3285 22 13.5V10.5C22 9.67155 21.1046 9 20 9H4ZM4.22222 11.25C4.22222 10.5 4.22222 10.5 5 10.5H7C7.55556 10.5 7.55556 10.5 7.55556 11.25V13C7.55556 13.5 7.55556 13.5 7 13.5H5C4.22222 13.5 4.22222 13.5 4.22222 13V11.25ZM9 12C9 11.7929 9.2239 11.625 9.5 11.625H19.5C19.7761 11.625 20 11.7929 20 12C20 12.2071 19.7761 12.375 19.5 12.375H9.5C9.2239 12.375 9 12.2071 9 12Z",
-  fill: 'currentColor'
-}));
-export const JiraDisplayViewDropDown = ({
-  onViewModeChange,
-  viewMode
-}) => {
-  const {
-    formatMessage
-  } = useIntl();
-  const triggerText = viewMode === 'issue' ? formatMessage(modalMessages.tableViewModeLabel) : formatMessage(modalMessages.inlineLinkViewModeLabel);
-  return jsx(DropdownMenu, {
-    trigger: triggerText,
-    testId: "jira-datasource-modal--view-drop-down"
-  }, jsx(Box, {
-    xcss: dropDownItemGroupStyles
-  }, jsx(DropdownItemGroup, null, jsx(DropdownItem, {
-    testId: "dropdown-item-table",
-    onClick: () => onViewModeChange('issue'),
-    isSelected: viewMode === 'issue',
-    description: formatMessage(modalMessages.tableViewModeDescription),
-    elemBefore: jsx(TableIcon, {
-      label: "table icon"
-    })
-  }, jsx(FormattedMessage, modalMessages.tableViewModeLabel)), jsx(DropdownItem, {
-    testId: "dropdown-item-inline-link",
-    onClick: () => onViewModeChange('count'),
-    isSelected: viewMode === 'count',
-    description: formatMessage(modalMessages.inlineLinkViewModeDescription),
-    elemBefore: InlineIcon
-  }, jsx(FormattedMessage, modalMessages.inlineLinkViewModeLabel)))));
-};

package/dist/esm/ui/jira-issues-modal/basic-filters/ui/async-popup-select/showMoreButton.js

@@ -1,15 +0,0 @@
-import React from 'react';
-import { useIntl } from 'react-intl-next';
-import Button from '@atlaskit/button';
-import { asyncPopupSelectMessages } from './messages';
-var ShowMoreButton = function ShowMoreButton(_ref) {
-  var onShowMore = _ref.onShowMore;
-  var _useIntl = useIntl(),
-    formatMessage = _useIntl.formatMessage;
-  return /*#__PURE__*/React.createElement(Button, {
-    onClick: onShowMore,
-    appearance: "link",
-    testId: "jlol-basic-filter-popup-select--show-more-button"
-  }, formatMessage(asyncPopupSelectMessages.showMoreMessage));
-};
-export default ShowMoreButton;

package/dist/esm/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.js

@@ -1,57 +0,0 @@
-/** @jsx jsx */
-import { jsx } from '@emotion/react';
-import { FormattedMessage, useIntl } from 'react-intl-next';
-import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdown-menu';
-import TableIcon from '@atlaskit/icon/glyph/table';
-import { Box, xcss } from '@atlaskit/primitives';
-import { modalMessages } from '../messages';
-var dropDownItemGroupStyles = xcss({
-  width: '320px',
-  height: '140px',
-  paddingTop: 'space.050',
-  paddingBottom: 'space.050',
-  borderRadius: 'border.radius'
-});
-var InlineIcon = jsx("svg", {
-  xmlns: "http://www.w3.org/2000/svg",
-  width: "24",
-  height: "24",
-  viewBox: "0 0 24 24",
-  fill: "none"
-}, jsx("path", {
-  fillRule: "evenodd",
-  clipRule: "evenodd",
-  d: "M4 9C2.89543 9 2 9.67155 2 10.5V13.5C2 14.3285 2.89543 15 4 15H20C21.1046 15 22 14.3285 22 13.5V10.5C22 9.67155 21.1046 9 20 9H4ZM4.22222 11.25C4.22222 10.5 4.22222 10.5 5 10.5H7C7.55556 10.5 7.55556 10.5 7.55556 11.25V13C7.55556 13.5 7.55556 13.5 7 13.5H5C4.22222 13.5 4.22222 13.5 4.22222 13V11.25ZM9 12C9 11.7929 9.2239 11.625 9.5 11.625H19.5C19.7761 11.625 20 11.7929 20 12C20 12.2071 19.7761 12.375 19.5 12.375H9.5C9.2239 12.375 9 12.2071 9 12Z",
-  fill: 'currentColor'
-}));
-export var JiraDisplayViewDropDown = function JiraDisplayViewDropDown(_ref) {
-  var onViewModeChange = _ref.onViewModeChange,
-    viewMode = _ref.viewMode;
-  var _useIntl = useIntl(),
-    formatMessage = _useIntl.formatMessage;
-  var triggerText = viewMode === 'issue' ? formatMessage(modalMessages.tableViewModeLabel) : formatMessage(modalMessages.inlineLinkViewModeLabel);
-  return jsx(DropdownMenu, {
-    trigger: triggerText,
-    testId: "jira-datasource-modal--view-drop-down"
-  }, jsx(Box, {
-    xcss: dropDownItemGroupStyles
-  }, jsx(DropdownItemGroup, null, jsx(DropdownItem, {
-    testId: "dropdown-item-table",
-    onClick: function onClick() {
-      return onViewModeChange('issue');
-    },
-    isSelected: viewMode === 'issue',
-    description: formatMessage(modalMessages.tableViewModeDescription),
-    elemBefore: jsx(TableIcon, {
-      label: "table icon"
-    })
-  }, jsx(FormattedMessage, modalMessages.tableViewModeLabel)), jsx(DropdownItem, {
-    testId: "dropdown-item-inline-link",
-    onClick: function onClick() {
-      return onViewModeChange('count');
-    },
-    isSelected: viewMode === 'count',
-    description: formatMessage(modalMessages.inlineLinkViewModeDescription),
-    elemBefore: InlineIcon
-  }, jsx(FormattedMessage, modalMessages.inlineLinkViewModeLabel)))));
-};

package/dist/types/ui/jira-issues-modal/basic-filters/ui/menu-list/errorMessage.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-import { FilterOptionsState } from '../../hooks/useFilterOptions';
-import { BasicFilterFieldType } from '../../types';
-declare const CustomErrorMessage: ({ filterType, errors, }: {
-    filterType: BasicFilterFieldType;
-    errors?: unknown[] | undefined;
-}) => JSX.Element;
-export default CustomErrorMessage;

package/dist/types/ui/jira-issues-modal/basic-filters/ui/menu-list/index.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="react" />
-import { MenuListComponentProps } from '@atlaskit/select';
-import { SelectOption } from '../../types';
-declare const CustomMenuList: ({ children, ...props }: MenuListComponentProps<SelectOption, true>) => JSX.Element;
-export default CustomMenuList;

package/dist/types/ui/jira-issues-modal/basic-filters/ui/menu-list/noOptionsMessage.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="react" />
-import { BasicFilterFieldType } from '../../types';
-declare const CustomNoOptionsMessage: ({ filterType, }: {
-    filterType: BasicFilterFieldType;
-}) => JSX.Element;
-export default CustomNoOptionsMessage;

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

@@ -1,8 +0,0 @@
-/** @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/basic-filters/ui/menu-list/errorMessage.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-import { FilterOptionsState } from '../../hooks/useFilterOptions';
-import { BasicFilterFieldType } from '../../types';
-declare const CustomErrorMessage: ({ filterType, errors, }: {
-    filterType: BasicFilterFieldType;
-    errors?: unknown[] | undefined;
-}) => JSX.Element;
-export default CustomErrorMessage;

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

@@ -1,5 +0,0 @@
-/// <reference types="react" />
-import { MenuListComponentProps } from '@atlaskit/select';
-import { SelectOption } from '../../types';
-declare const CustomMenuList: ({ children, ...props }: MenuListComponentProps<SelectOption, true>) => JSX.Element;
-export default CustomMenuList;

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

@@ -1,6 +0,0 @@
-/// <reference types="react" />
-import { BasicFilterFieldType } from '../../types';
-declare const CustomNoOptionsMessage: ({ filterType, }: {
-    filterType: BasicFilterFieldType;
-}) => JSX.Element;
-export default CustomNoOptionsMessage;

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

@@ -1,8 +0,0 @@
-/** @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;