@atlaskit/link-datasource 0.15.1 → 0.16.1

package/dist/es2019/ui/{jira-issues/modal → jira-issues-modal}/jql-editor/index.js

@@ -1,8 +1,8 @@
 import React, { useEffect, useRef } from 'react';
 import { JQLEditor } from '@atlassianlabs/jql-editor';
 import { useAutocompleteProvider } from '@atlassianlabs/jql-editor-autocomplete-rest';
-import { makeGetJqlAutocompleteData } from '../../../../services/makeGetJqlAutocompleteData';
-import { makeGetJqlSuggestionsData } from '../../../../services/makeGetJqlSuggestionsData';
+import { makeGetJqlAutocompleteData } from '../../../services/makeGetJqlAutocompleteData';
+import { makeGetJqlSuggestionsData } from '../../../services/makeGetJqlSuggestionsData';
 export const JiraJQLEditor = props => {
   const {
     cloudId,

package/dist/es2019/ui/{jira-issues/table-footer → table-footer}/messages.js

@@ -1,17 +1,17 @@
 import { defineMessages } from 'react-intl-next';
 export const footerMessages = defineMessages({
   issueText: {
-    id: 'linkDataSource.jira-issues.table-footer.issue',
+    id: 'linkDataSource.table-footer.issue',
     description: 'Text that appears after issue count number if there is only 1 issue.',
     defaultMessage: '{issueCount} {issueCount, plural, one {issue} other {issues}}'
   },
   loadingText: {
-    id: 'linkDataSource.jira-issues.table-footer.loading',
+    id: 'linkDataSource.table-footer.loading',
     description: 'Text that appears when table is loading.',
     defaultMessage: 'Loading...'
   },
   refreshLabel: {
-    id: 'linkDataSource.jira-issues.table-footer.refresh',
+    id: 'linkDataSource.table-footer.refresh',
     description: 'Label for refresh icon',
     defaultMessage: 'Refresh'
   }

package/dist/es2019/ui/{jira-issues/table-footer → table-footer}/sync-info/messages.js

@@ -1,12 +1,12 @@
 import { defineMessages } from 'react-intl-next';
 export const messages = defineMessages({
   underOneMinuteText: {
-    id: 'linkDataSource.jira-issues.table-footer.date_formatter.under_one_minute',
+    id: 'linkDataSource.table-footer.date_formatter.under_one_minute',
     defaultMessage: 'Synced just now',
     description: 'A text to indicate the last data fetch time was under a minute.'
   },
   overOneMinuteText: {
-    id: 'linkDataSource.jira-issues.table-footer.date_formatter.under_over_minute',
+    id: 'linkDataSource.table-footer.date_formatter.under_over_minute',
     defaultMessage: 'Synced {date}',
     description: 'A text to indicate the last data fetch time was over a minute.'
   }

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "0.15.1",
+	"version": "0.16.1",
 	"sideEffects": false
 }

package/dist/esm/hooks/useDatasourceTableState.js

@@ -1,5 +1,4 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -38,27 +37,25 @@ export var useDatasourceTableState = function useDatasourceTableState(datasource
     getDatasourceData = _useDatasourceClientE.getDatasourceData,
     getDatasourceDetails = _useDatasourceClientE.getDatasourceDetails;
   var loadDatasourceDetails = useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
-      var _getDatasourceDetails;
-      var cloudId, parameterValue, parameterType, result;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(parameters) {
+      var result;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            cloudId = _ref.cloudId, parameterValue = _ref.value, parameterType = _ref.type;
-            _context.next = 3;
-            return getDatasourceDetails(datasourceId, (_getDatasourceDetails = {}, _defineProperty(_getDatasourceDetails, parameterType, parameterValue), _defineProperty(_getDatasourceDetails, "cloudId", cloudId), _getDatasourceDetails));
-          case 3:
+            _context.next = 2;
+            return getDatasourceDetails(datasourceId, parameters);
+          case 2:
             result = _context.sent;
             setColumns(result.schema.properties);
             setDefaultVisibleColumnKeys(result.schema.defaultProperties);
-          case 6:
+          case 5:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function (_x) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }(), [datasourceId, getDatasourceDetails]);
   useEffect(function () {
@@ -67,7 +64,7 @@ export var useDatasourceTableState = function useDatasourceTableState(datasource
     }
   }, [loadDatasourceDetails, parameters]);
   var onNextPage = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-    var cloudId, parameterValue, parameterType, _yield$getDatasourceD, data, nextPageCursor, totalIssues;
+    var _yield$getDatasourceD, data, nextPageCursor, totalIssues;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -77,18 +74,15 @@ export var useDatasourceTableState = function useDatasourceTableState(datasource
           }
           return _context2.abrupt("return");
         case 2:
-          cloudId = parameters.cloudId, parameterValue = parameters.value, parameterType = parameters.type;
           setStatus('loading');
-          _context2.next = 6;
+          _context2.next = 5;
           return getDatasourceData(datasourceId, {
-            parameters: _defineProperty({
-              cloudId: cloudId
-            }, parameterType, parameterValue),
+            parameters: parameters,
             pageSize: 10,
             pageCursor: nextCursor,
             fields: fields
           });
-        case 6:
+        case 5:
           _yield$getDatasourceD = _context2.sent;
           data = _yield$getDatasourceD.data;
           nextPageCursor = _yield$getDatasourceD.nextPageCursor;
@@ -100,7 +94,7 @@ export var useDatasourceTableState = function useDatasourceTableState(datasource
           });
           setStatus('resolved');
           setHasNextPage(Boolean(nextPageCursor));
-        case 15:
+        case 14:
         case "end":
           return _context2.stop();
       }

package/dist/esm/index.js

@@ -1,2 +1,2 @@
-export { JiraIssuesConfigModal } from './ui/jira-issues/modal';
-export { JiraIssuesTableView } from './ui/jira-issues/tableView';
+export { JiraIssuesConfigModal } from './ui/jira-issues-modal';
+export { DatasourceTableView } from './ui/datasourceTableView';

package/dist/esm/ui/{jira-issues/tableView.js → datasourceTableView.js}

@@ -2,8 +2,8 @@
 import { useEffect } from 'react';
 import { css, jsx } from '@emotion/react';
 import Spinner from '@atlaskit/spinner';
-import { useDatasourceTableState } from '../../hooks/useDatasourceTableState';
-import { IssueLikeDataTableView } from '../issue-like-table';
+import { useDatasourceTableState } from '../hooks/useDatasourceTableState';
+import { IssueLikeDataTableView } from './issue-like-table';
 import { TableFooter } from './table-footer';
 var TableViewWrapperStyles = css({
   display: 'flex',
@@ -15,7 +15,7 @@ var TableViewWrapperStyles = css({
   paddingBottom: 0,
   boxSizing: 'border-box'
 });
-export var JiraIssuesTableView = function JiraIssuesTableView(_ref) {
+export var DatasourceTableView = function DatasourceTableView(_ref) {
   var datasourceId = _ref.datasourceId,
     parameters = _ref.parameters,
     visibleColumnKeys = _ref.visibleColumnKeys,
@@ -37,7 +37,7 @@ export var JiraIssuesTableView = function JiraIssuesTableView(_ref) {
   return columns.length > 0 ? jsx("div", {
     css: TableViewWrapperStyles
   }, jsx(IssueLikeDataTableView, {
-    testId: 'jira-issues-table-view',
+    testId: 'datasource-table-view',
     hasNextPage: hasNextPage,
     items: responseItems,
     onNextPage: onNextPage,
@@ -50,6 +50,6 @@ export var JiraIssuesTableView = function JiraIssuesTableView(_ref) {
     onRefresh: reset,
     isLoading: status === 'loading'
   })) : jsx(Spinner, {
-    testId: 'jira-issues-table-view-spinner'
+    testId: 'datasource-table-view-spinner'
   });
 };

package/dist/esm/ui/issue-like-table/index.js

@@ -232,7 +232,7 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
   var tableRows = useMemo(function () {
     return items.map(function (newRowData, rowIndex) {
       return {
-        key: "".concat(identityColumnKey && newRowData[identityColumnKey] || rowIndex),
+        key: "".concat(identityColumnKey && newRowData[identityColumnKey] && newRowData[identityColumnKey].value || rowIndex),
         cells: visibleSortedColumns.map(function (_ref9) {
           var key = _ref9.key,
             type = _ref9.type;

package/dist/esm/ui/issue-like-table/render-type/boolean/index.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useIntl } from 'react-intl-next';
 import TextRenderType from '../text';
 import { booleanTypeMessages } from './messages';
@@ -8,13 +8,19 @@ var BooleanRenderType = function BooleanRenderType(_ref) {
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? BOOLEAN_TYPE_TEST_ID : _ref$testId;
   var intl = useIntl();
-  if (typeof value !== 'boolean') {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
+  var booleanValue = value === null || value === void 0 ? void 0 : value.value;
   var TRUTHY_TEXT = intl.formatMessage(booleanTypeMessages.booleanTruthyValue);
   var FALSY_TEXT = intl.formatMessage(booleanTypeMessages.booleanFalsyValue);
+  var displayTextObject = useMemo(function () {
+    return {
+      value: booleanValue ? TRUTHY_TEXT : FALSY_TEXT
+    };
+  }, [booleanValue, TRUTHY_TEXT, FALSY_TEXT]);
+  if (typeof booleanValue !== 'boolean') {
+    return /*#__PURE__*/React.createElement(React.Fragment, null);
+  }
   return /*#__PURE__*/React.createElement(TextRenderType, {
-    text: value ? TRUTHY_TEXT : FALSY_TEXT,
+    text: displayTextObject,
     testId: testId
   });
 };

package/dist/esm/ui/issue-like-table/render-type/date-time/index.js

@@ -20,9 +20,10 @@ var DateTimeRenderType = function DateTimeRenderType(_ref) {
     testId = _ref$testId === void 0 ? DATETIME_TYPE_TEST_ID : _ref$testId,
     _ref$display = _ref.display,
     display = _ref$display === void 0 ? 'datetime' : _ref$display;
-  var date = new Date(value);
+  var dateString = value === null || value === void 0 ? void 0 : value.value;
+  var date = new Date(dateString);
   var intl = useIntl();
-  if (!value || isNaN(date.getTime())) {
+  if (!dateString || isNaN(date.getTime())) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   var options = {

package/dist/esm/ui/issue-like-table/render-type/number/index.js

@@ -4,10 +4,11 @@ var NumberRenderType = function NumberRenderType(_ref) {
   var number = _ref.number,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? NUMBER_TYPE_TEST_ID : _ref$testId;
-  if (typeof number !== 'number') {
+  var numberValue = number === null || number === void 0 ? void 0 : number.value;
+  if (typeof numberValue !== 'number') {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
-  var formattedNumber = Number.isInteger(number) ? number : "".concat(number.toFixed(2));
+  var formattedNumber = Number.isInteger(numberValue) ? numberValue : "".concat(numberValue.toFixed(2));
   return /*#__PURE__*/React.createElement("span", {
     "data-testid": testId
   }, formattedNumber);

package/dist/esm/ui/issue-like-table/render-type/tag/index.js

@@ -5,11 +5,12 @@ var TagRenderType = function TagRenderType(_ref) {
   var text = _ref.text,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? TAG_TYPE_TEST_ID : _ref$testId;
-  if (!text) {
+  var tag = text === null || text === void 0 ? void 0 : text.value;
+  if (!tag) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   return /*#__PURE__*/React.createElement(Tag, {
-    text: text,
+    text: tag,
     testId: testId,
     appearance: 'default',
     color: 'standard'

package/dist/esm/ui/issue-like-table/render-type/text/index.js

@@ -4,11 +4,12 @@ var TextRenderType = function TextRenderType(_ref) {
   var text = _ref.text,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? TEXT_TYPE_TEST_ID : _ref$testId;
-  if (!text) {
+  var textValue = text === null || text === void 0 ? void 0 : text.value;
+  if (!textValue) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }
   return /*#__PURE__*/React.createElement("span", {
     "data-testid": testId
-  }, text);
+  }, textValue);
 };
 export default TextRenderType;

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

@@ -9,10 +9,10 @@ import { FormattedMessage, IntlProvider, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/standard-button';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { B400, N0 } from '@atlaskit/theme/colors';
-import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
-import { getAvailableJiraSites } from '../../../services/getAvailableJiraSites';
-import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
-import LinkRenderType from '../../issue-like-table/render-type/link';
+import { useDatasourceTableState } from '../../hooks/useDatasourceTableState';
+import { getAvailableJiraSites } from '../../services/getAvailableJiraSites';
+import { EmptyState, IssueLikeDataTableView } from '../issue-like-table';
+import LinkRenderType from '../issue-like-table/render-type/link';
 import { JiraSearchContainer } from './jira-search-container';
 import { modalMessages } from './messages';
 import { ModeSwitcher } from './mode-switcher';
@@ -48,10 +48,10 @@ export var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
     onInsert = props.onInsert,
     onUpdateParameters = props.onUpdateParameters,
     onVisibleColumnKeysChange = props.onVisibleColumnKeysChange;
-  var isParametersSet = !!(parameters && parameters.value && parameters.cloudId);
+  var isParametersSet = !!(parameters && parameters.jql && parameters.cloudId);
   var _ref = parameters || {},
     cloudId = _ref.cloudId,
-    jql = _ref.value;
+    jql = _ref.jql;
   var _useDatasourceTableSt = useDatasourceTableState(datasourceId, parameters, ['key']),
     reset = _useDatasourceTableSt.reset,
     status = _useDatasourceTableSt.status,

package/dist/esm/ui/{jira-issues/modal → jira-issues-modal}/jira-search-container/index.js

@@ -19,7 +19,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     onSearch = props.onSearch;
   var _ref = parameters || {},
     cloudId = _ref.cloudId,
-    initialJql = _ref.value;
+    initialJql = _ref.jql;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var basicModeValue = 'basic';
@@ -75,8 +75,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
   };
   var handleSearch = function handleSearch() {
     onSearch({
-      value: jql,
-      type: 'jql'
+      jql: jql
     });
   };
   return jsx("div", {

package/dist/esm/ui/{jira-issues/modal → jira-issues-modal}/jql-editor/index.js

@@ -1,8 +1,8 @@
 import React, { useEffect, useRef } from 'react';
 import { JQLEditor } from '@atlassianlabs/jql-editor';
 import { useAutocompleteProvider } from '@atlassianlabs/jql-editor-autocomplete-rest';
-import { makeGetJqlAutocompleteData } from '../../../../services/makeGetJqlAutocompleteData';
-import { makeGetJqlSuggestionsData } from '../../../../services/makeGetJqlSuggestionsData';
+import { makeGetJqlAutocompleteData } from '../../../services/makeGetJqlAutocompleteData';
+import { makeGetJqlSuggestionsData } from '../../../services/makeGetJqlSuggestionsData';
 export var JiraJQLEditor = function JiraJQLEditor(props) {
   var cloudId = props.cloudId,
     onChange = props.onChange,

package/dist/esm/ui/{jira-issues/table-footer → table-footer}/messages.js

@@ -1,17 +1,17 @@
 import { defineMessages } from 'react-intl-next';
 export var footerMessages = defineMessages({
   issueText: {
-    id: 'linkDataSource.jira-issues.table-footer.issue',
+    id: 'linkDataSource.table-footer.issue',
     description: 'Text that appears after issue count number if there is only 1 issue.',
     defaultMessage: '{issueCount} {issueCount, plural, one {issue} other {issues}}'
   },
   loadingText: {
-    id: 'linkDataSource.jira-issues.table-footer.loading',
+    id: 'linkDataSource.table-footer.loading',
     description: 'Text that appears when table is loading.',
     defaultMessage: 'Loading...'
   },
   refreshLabel: {
-    id: 'linkDataSource.jira-issues.table-footer.refresh',
+    id: 'linkDataSource.table-footer.refresh',
     description: 'Label for refresh icon',
     defaultMessage: 'Refresh'
   }

package/dist/esm/ui/{jira-issues/table-footer → table-footer}/sync-info/messages.js

@@ -1,12 +1,12 @@
 import { defineMessages } from 'react-intl-next';
 export var messages = defineMessages({
   underOneMinuteText: {
-    id: 'linkDataSource.jira-issues.table-footer.date_formatter.under_one_minute',
+    id: 'linkDataSource.table-footer.date_formatter.under_one_minute',
     defaultMessage: 'Synced just now',
     description: 'A text to indicate the last data fetch time was under a minute.'
   },
   overOneMinuteText: {
-    id: 'linkDataSource.jira-issues.table-footer.date_formatter.under_over_minute',
+    id: 'linkDataSource.table-footer.date_formatter.under_over_minute',
     defaultMessage: 'Synced {date}',
     description: 'A text to indicate the last data fetch time was over a minute.'
   }

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "0.15.1",
+	"version": "0.16.1",
 	"sideEffects": false
 }

package/dist/types/hooks/useDatasourceTableState.d.ts

@@ -1,5 +1,4 @@
 import { DatasourceDataResponseItem, DatasourceResponseSchemaProperty, DatasourceTableStatusType } from '@atlaskit/linking-types';
-import { JiraIssueDatasourceParameters } from '../ui/jira-issues/types';
 export interface DatasourceTableState {
     status: DatasourceTableStatusType;
     onNextPage: () => void;
@@ -10,4 +9,4 @@ export interface DatasourceTableState {
     defaultVisibleColumnKeys: string[];
     totalIssueCount?: number;
 }
-export declare const useDatasourceTableState: (datasourceId: string, parameters?: JiraIssueDatasourceParameters, fields?: string[]) => DatasourceTableState;
+export declare const useDatasourceTableState: (datasourceId: string, parameters?: object, fields?: string[]) => DatasourceTableState;

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export { JiraIssuesConfigModal } from './ui/jira-issues/modal';
-export { JiraIssuesTableView } from './ui/jira-issues/tableView';
+export { JiraIssuesConfigModal } from './ui/jira-issues-modal';
+export { DatasourceTableView } from './ui/datasourceTableView';

package/dist/types/ui/datasourceTableView.d.ts

@@ -0,0 +1,9 @@
+import { jsx } from '@emotion/react';
+export interface DatasourceTableViewProps {
+    datasourceId: string;
+    parameters: object;
+    fields?: string[];
+    onVisibleColumnKeysChange?: (visibleColumnKeys: string[]) => void;
+    visibleColumnKeys?: string[];
+}
+export declare const DatasourceTableView: ({ datasourceId, parameters, visibleColumnKeys, onVisibleColumnKeysChange, }: DatasourceTableViewProps) => jsx.JSX.Element;

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

@@ -1,7 +1,8 @@
 /// <reference types="react" />
+import { BooleanType } from '@atlaskit/linking-types';
 interface BooleanProps {
     testId?: string;
-    value: boolean;
+    value: BooleanType['value'];
 }
 export declare const BOOLEAN_TYPE_TEST_ID = "link-datasource-render-type--boolean";
 declare const BooleanRenderType: ({ value, testId, }: BooleanProps) => JSX.Element;

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

@@ -1,7 +1,8 @@
 /// <reference types="react" />
+import { NumberType } from '@atlaskit/linking-types';
 interface NumberProps {
     testId?: string;
-    number: number;
+    number: NumberType['value'];
 }
 export declare const NUMBER_TYPE_TEST_ID = "link-datasource-render-type--number";
 declare const NumberRenderType: ({ number, testId, }: NumberProps) => JSX.Element;

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

@@ -1,7 +1,8 @@
 /// <reference types="react" />
+import { StringType } from '@atlaskit/linking-types';
 interface TextProps {
     testId?: string;
-    text: string;
+    text: StringType['value'];
 }
 export declare const TEXT_TYPE_TEST_ID = "link-datasource-render-type--text";
 declare const TextRenderType: ({ text, testId }: TextProps) => JSX.Element;

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

@@ -1,6 +1,6 @@
 import { jsx } from '@emotion/react';
 import { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common/types';
-import { JiraIssueDatasourceParameters } from '../types';
+import { JiraIssueDatasourceParameters } from './types';
 export interface JiraIssuesConfigModalProps {
     datasourceId: string;
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;

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

@@ -1,7 +1,7 @@
 import { jsx } from '@emotion/react';
-import { JiraIssueDatasourceParameters } from '../../types';
+import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
 export interface SearchContainerProps {
-    onSearch: (query: Omit<JiraIssueDatasourceParameters, 'cloudId'>) => void;
+    onSearch: (query: JiraIssueDatasourceParametersQuery) => void;
     parameters?: JiraIssueDatasourceParameters;
 }
 export declare const JiraSearchContainer: (props: SearchContainerProps) => jsx.JSX.Element;

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

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import { Site } from '../../../../services/getAvailableJiraSites';
+import { Site } from '../../../services/getAvailableJiraSites';
 export interface JiraSiteSelectorProps {
     availableSites: Site[];
     onSiteSelection: (selectedSite: Site) => void;

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

@@ -0,0 +1,15 @@
+type XOR<T1, T2> = (T1 & {
+    [k in Exclude<keyof T2, keyof T1>]?: never;
+}) | (T2 & {
+    [k in Exclude<keyof T1, keyof T2>]?: never;
+});
+export type JiraIssueDatasourceParametersQuery = XOR<{
+    jql: string;
+}, {
+    filter: string;
+}>;
+export type JiraIssueDatasourceParameters = {
+    cloudId: string;
+} & JiraIssueDatasourceParametersQuery;
+export type JiraIssueViewModes = 'issue' | 'count';
+export {};

package/dist/types-ts4.5/hooks/useDatasourceTableState.d.ts

@@ -1,5 +1,4 @@
 import { DatasourceDataResponseItem, DatasourceResponseSchemaProperty, DatasourceTableStatusType } from '@atlaskit/linking-types';
-import { JiraIssueDatasourceParameters } from '../ui/jira-issues/types';
 export interface DatasourceTableState {
     status: DatasourceTableStatusType;
     onNextPage: () => void;
@@ -10,4 +9,4 @@ export interface DatasourceTableState {
     defaultVisibleColumnKeys: string[];
     totalIssueCount?: number;
 }
-export declare const useDatasourceTableState: (datasourceId: string, parameters?: JiraIssueDatasourceParameters, fields?: string[]) => DatasourceTableState;
+export declare const useDatasourceTableState: (datasourceId: string, parameters?: object, fields?: string[]) => DatasourceTableState;

package/dist/types-ts4.5/index.d.ts

@@ -1,2 +1,2 @@
-export { JiraIssuesConfigModal } from './ui/jira-issues/modal';
-export { JiraIssuesTableView } from './ui/jira-issues/tableView';
+export { JiraIssuesConfigModal } from './ui/jira-issues-modal';
+export { DatasourceTableView } from './ui/datasourceTableView';

package/dist/types-ts4.5/ui/datasourceTableView.d.ts

@@ -0,0 +1,9 @@
+import { jsx } from '@emotion/react';
+export interface DatasourceTableViewProps {
+    datasourceId: string;
+    parameters: object;
+    fields?: string[];
+    onVisibleColumnKeysChange?: (visibleColumnKeys: string[]) => void;
+    visibleColumnKeys?: string[];
+}
+export declare const DatasourceTableView: ({ datasourceId, parameters, visibleColumnKeys, onVisibleColumnKeysChange, }: DatasourceTableViewProps) => jsx.JSX.Element;

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

@@ -1,7 +1,8 @@
 /// <reference types="react" />
+import { BooleanType } from '@atlaskit/linking-types';
 interface BooleanProps {
     testId?: string;
-    value: boolean;
+    value: BooleanType['value'];
 }
 export declare const BOOLEAN_TYPE_TEST_ID = "link-datasource-render-type--boolean";
 declare const BooleanRenderType: ({ value, testId, }: BooleanProps) => JSX.Element;

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

@@ -1,7 +1,8 @@
 /// <reference types="react" />
+import { NumberType } from '@atlaskit/linking-types';
 interface NumberProps {
     testId?: string;
-    number: number;
+    number: NumberType['value'];
 }
 export declare const NUMBER_TYPE_TEST_ID = "link-datasource-render-type--number";
 declare const NumberRenderType: ({ number, testId, }: NumberProps) => JSX.Element;

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

@@ -1,7 +1,8 @@
 /// <reference types="react" />
+import { StringType } from '@atlaskit/linking-types';
 interface TextProps {
     testId?: string;
-    text: string;
+    text: StringType['value'];
 }
 export declare const TEXT_TYPE_TEST_ID = "link-datasource-render-type--text";
 declare const TextRenderType: ({ text, testId }: TextProps) => JSX.Element;

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

@@ -1,6 +1,6 @@
 import { jsx } from '@emotion/react';
 import { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common/types';
-import { JiraIssueDatasourceParameters } from '../types';
+import { JiraIssueDatasourceParameters } from './types';
 export interface JiraIssuesConfigModalProps {
     datasourceId: string;
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;

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

@@ -1,7 +1,7 @@
 import { jsx } from '@emotion/react';
-import { JiraIssueDatasourceParameters } from '../../types';
+import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
 export interface SearchContainerProps {
-    onSearch: (query: Omit<JiraIssueDatasourceParameters, 'cloudId'>) => void;
+    onSearch: (query: JiraIssueDatasourceParametersQuery) => void;
     parameters?: JiraIssueDatasourceParameters;
 }
 export declare const JiraSearchContainer: (props: SearchContainerProps) => jsx.JSX.Element;

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

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import { Site } from '../../../../services/getAvailableJiraSites';
+import { Site } from '../../../services/getAvailableJiraSites';
 export interface JiraSiteSelectorProps {
     availableSites: Site[];
     onSiteSelection: (selectedSite: Site) => void;

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

@@ -0,0 +1,15 @@
+type XOR<T1, T2> = (T1 & {
+    [k in Exclude<keyof T2, keyof T1>]?: never;
+}) | (T2 & {
+    [k in Exclude<keyof T1, keyof T2>]?: never;
+});
+export type JiraIssueDatasourceParametersQuery = XOR<{
+    jql: string;
+}, {
+    filter: string;
+}>;
+export type JiraIssueDatasourceParameters = {
+    cloudId: string;
+} & JiraIssueDatasourceParametersQuery;
+export type JiraIssueViewModes = 'issue' | 'count';
+export {};

package/examples-helpers/buildIssueLikeTable.tsx

@@ -10,7 +10,7 @@ import { mockDatasourceFetchRequests } from '@atlaskit/link-test-helpers/datasou
 
 import { useDatasourceTableState } from '../src/hooks/useDatasourceTableState';
 import { IssueLikeDataTableView } from '../src/ui/issue-like-table';
-import { JiraIssueDatasourceParameters } from '../src/ui/jira-issues/types';
+import { JiraIssueDatasourceParameters } from '../src/ui/jira-issues-modal/types';
 
 import SmartLinkClient from './smartLinkCustomClient';
 
@@ -32,8 +32,7 @@ const ExampleBody = ({ isReadonly }: Props) => {
   const parameters = useMemo<JiraIssueDatasourceParameters>(
     () => ({
       cloudId: 'some-cloud-id',
-      type: 'jql',
-      value: 'some-jql',
+      jql: 'some-jql',
     }),
     [],
   );