@atlaskit/link-datasource 0.15.0 → 0.16.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 0.16.0
+
+### Minor Changes
+
+- [`a68bac355b0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a68bac355b0) - Renaming `JiraIssuesTableView` into `DatasourceTableView` and changing its `parameters` property to be an `object`
+
+## 0.15.1
+
+### Patch Changes
+
+- [`3d4e152483b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3d4e152483b) - Move all the mocking outside into link-test-helpers and use it.
+
 ## 0.15.0
 
 ### Minor Changes

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.useDatasourceTableState = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
@@ -45,27 +44,25 @@ var useDatasourceTableState = function useDatasourceTableState(datasourceId, par
     getDatasourceData = _useDatasourceClientE.getDatasourceData,
     getDatasourceDetails = _useDatasourceClientE.getDatasourceDetails;
   var loadDatasourceDetails = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
-      var _getDatasourceDetails;
-      var cloudId, parameterValue, parameterType, result;
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(parameters) {
+      var result;
       return _regenerator.default.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 = {}, (0, _defineProperty2.default)(_getDatasourceDetails, parameterType, parameterValue), (0, _defineProperty2.default)(_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]);
   (0, _react.useEffect)(function () {
@@ -74,7 +71,7 @@ var useDatasourceTableState = function useDatasourceTableState(datasourceId, par
     }
   }, [loadDatasourceDetails, parameters]);
   var onNextPage = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-    var cloudId, parameterValue, parameterType, _yield$getDatasourceD, data, nextPageCursor, totalIssues;
+    var _yield$getDatasourceD, data, nextPageCursor, totalIssues;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -84,18 +81,15 @@ var useDatasourceTableState = function useDatasourceTableState(datasourceId, par
           }
           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: (0, _defineProperty2.default)({
-              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;
@@ -107,7 +101,7 @@ var useDatasourceTableState = function useDatasourceTableState(datasourceId, par
           });
           setStatus('resolved');
           setHasNextPage(Boolean(nextPageCursor));
-        case 15:
+        case 14:
         case "end":
           return _context2.stop();
       }

package/dist/cjs/index.js

@@ -3,17 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "JiraIssuesConfigModal", {
+Object.defineProperty(exports, "DatasourceTableView", {
   enumerable: true,
   get: function get() {
-    return _modal.JiraIssuesConfigModal;
+    return _datasourceTableView.DatasourceTableView;
   }
 });
-Object.defineProperty(exports, "JiraIssuesTableView", {
+Object.defineProperty(exports, "JiraIssuesConfigModal", {
   enumerable: true,
   get: function get() {
-    return _tableView.JiraIssuesTableView;
+    return _jiraIssuesModal.JiraIssuesConfigModal;
   }
 });
-var _modal = require("./ui/jira-issues/modal");
-var _tableView = require("./ui/jira-issues/tableView");
+var _jiraIssuesModal = require("./ui/jira-issues-modal");
+var _datasourceTableView = require("./ui/datasourceTableView");

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

@@ -4,12 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.JiraIssuesTableView = void 0;
+exports.DatasourceTableView = void 0;
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
-var _useDatasourceTableState = require("../../hooks/useDatasourceTableState");
-var _issueLikeTable = require("../issue-like-table");
+var _useDatasourceTableState = require("../hooks/useDatasourceTableState");
+var _issueLikeTable = require("./issue-like-table");
 var _tableFooter = require("./table-footer");
 /** @jsx jsx */
 
@@ -23,7 +23,7 @@ var TableViewWrapperStyles = (0, _react2.css)({
   paddingBottom: 0,
   boxSizing: 'border-box'
 });
-var JiraIssuesTableView = function JiraIssuesTableView(_ref) {
+var DatasourceTableView = function DatasourceTableView(_ref) {
   var datasourceId = _ref.datasourceId,
     parameters = _ref.parameters,
     visibleColumnKeys = _ref.visibleColumnKeys,
@@ -45,7 +45,7 @@ var JiraIssuesTableView = function JiraIssuesTableView(_ref) {
   return columns.length > 0 ? (0, _react2.jsx)("div", {
     css: TableViewWrapperStyles
   }, (0, _react2.jsx)(_issueLikeTable.IssueLikeDataTableView, {
-    testId: 'jira-issues-table-view',
+    testId: 'datasource-table-view',
     hasNextPage: hasNextPage,
     items: responseItems,
     onNextPage: onNextPage,
@@ -58,7 +58,7 @@ var JiraIssuesTableView = function JiraIssuesTableView(_ref) {
     onRefresh: reset,
     isLoading: status === 'loading'
   })) : (0, _react2.jsx)(_spinner.default, {
-    testId: 'jira-issues-table-view-spinner'
+    testId: 'datasource-table-view-spinner'
   });
 };
-exports.JiraIssuesTableView = JiraIssuesTableView;
+exports.DatasourceTableView = DatasourceTableView;

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

@@ -16,10 +16,10 @@ var _reactIntlNext = require("react-intl-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
 var _colors = require("@atlaskit/theme/colors");
-var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
-var _getAvailableJiraSites = require("../../../services/getAvailableJiraSites");
-var _issueLikeTable = require("../../issue-like-table");
-var _link = _interopRequireDefault(require("../../issue-like-table/render-type/link"));
+var _useDatasourceTableState = require("../../hooks/useDatasourceTableState");
+var _getAvailableJiraSites = require("../../services/getAvailableJiraSites");
+var _issueLikeTable = require("../issue-like-table");
+var _link = _interopRequireDefault(require("../issue-like-table/render-type/link"));
 var _jiraSearchContainer = require("./jira-search-container");
 var _messages = require("./messages");
 var _modeSwitcher = require("./mode-switcher");
@@ -59,10 +59,10 @@ 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 = (0, _useDatasourceTableState.useDatasourceTableState)(datasourceId, parameters, ['key']),
     reset = _useDatasourceTableSt.reset,
     status = _useDatasourceTableSt.status,

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

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

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

@@ -8,8 +8,8 @@ exports.JiraJQLEditor = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _jqlEditor = require("@atlassianlabs/jql-editor");
 var _jqlEditorAutocompleteRest = require("@atlassianlabs/jql-editor-autocomplete-rest");
-var _makeGetJqlAutocompleteData = require("../../../../services/makeGetJqlAutocompleteData");
-var _makeGetJqlSuggestionsData = require("../../../../services/makeGetJqlSuggestionsData");
+var _makeGetJqlAutocompleteData = require("../../../services/makeGetJqlAutocompleteData");
+var _makeGetJqlSuggestionsData = require("../../../services/makeGetJqlSuggestionsData");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var JiraJQLEditor = function JiraJQLEditor(props) {

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

@@ -7,17 +7,17 @@ exports.footerMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var footerMessages = (0, _reactIntlNext.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/cjs/ui/{jira-issues/table-footer → table-footer}/sync-info/messages.js

@@ -7,12 +7,12 @@ exports.messages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var messages = (0, _reactIntlNext.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/cjs/version.json

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

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -12,15 +12,8 @@ export const useDatasourceTableState = (datasourceId, parameters, fields) => {
     getDatasourceData,
     getDatasourceDetails
   } = useDatasourceClientExtension();
-  const loadDatasourceDetails = useCallback(async ({
-    cloudId,
-    value: parameterValue,
-    type: parameterType
-  }) => {
-    const result = await getDatasourceDetails(datasourceId, {
-      [parameterType]: parameterValue,
-      cloudId
-    });
+  const loadDatasourceDetails = useCallback(async parameters => {
+    const result = await getDatasourceDetails(datasourceId, parameters);
     setColumns(result.schema.properties);
     setDefaultVisibleColumnKeys(result.schema.defaultProperties);
   }, [datasourceId, getDatasourceDetails]);
@@ -33,21 +26,13 @@ export const useDatasourceTableState = (datasourceId, parameters, fields) => {
     if (!parameters) {
       return;
     }
-    const {
-      cloudId,
-      value: parameterValue,
-      type: parameterType
-    } = parameters;
     setStatus('loading');
     const {
       data,
       nextPageCursor,
       totalIssues
     } = await getDatasourceData(datasourceId, {
-      parameters: {
-        cloudId,
-        [parameterType]: parameterValue
-      },
+      parameters,
       pageSize: 10,
       pageCursor: nextCursor,
       fields

package/dist/es2019/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/es2019/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';
 const TableViewWrapperStyles = css({
   display: 'flex',
@@ -15,7 +15,7 @@ const TableViewWrapperStyles = css({
   paddingBottom: 0,
   boxSizing: 'border-box'
 });
-export const JiraIssuesTableView = ({
+export const DatasourceTableView = ({
   datasourceId,
   parameters,
   visibleColumnKeys,
@@ -39,7 +39,7 @@ export const JiraIssuesTableView = ({
   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,
@@ -52,6 +52,6 @@ export const JiraIssuesTableView = ({
     onRefresh: reset,
     isLoading: status === 'loading'
   })) : jsx(Spinner, {
-    testId: 'jira-issues-table-view-spinner'
+    testId: 'datasource-table-view-spinner'
   });
 };

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

@@ -6,10 +6,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';
@@ -41,10 +41,10 @@ export const JiraIssuesConfigModal = props => {
     onUpdateParameters,
     onVisibleColumnKeysChange
   } = props;
-  const isParametersSet = !!(parameters && parameters.value && parameters.cloudId);
+  const isParametersSet = !!(parameters && parameters.jql && parameters.cloudId);
   const {
     cloudId,
-    value: jql
+    jql
   } = parameters || {};
   const {
     reset,

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

@@ -20,7 +20,7 @@ export const JiraSearchContainer = props => {
   } = props;
   const {
     cloudId,
-    value: initialJql
+    jql: initialJql
   } = parameters || {};
   const {
     formatMessage
@@ -61,8 +61,7 @@ export const JiraSearchContainer = props => {
   };
   const handleSearch = () => {
     onSearch({
-      value: jql,
-      type: 'jql'
+      jql
     });
   };
   return jsx("div", {

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.0",
+	"version": "0.16.0",
 	"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/{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", {