@atlaskit/link-datasource 0.15.1 → 0.16.0

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.0",
 	"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/{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/{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',
     }),
     [],
   );

package/examples-helpers/buildJiraIssuesTable.tsx

@@ -2,28 +2,26 @@ import React, { useMemo, useState } from 'react';
 
 import { mockDatasourceFetchRequests } from '@atlaskit/link-test-helpers/datasource';
 
-import { JiraIssuesTableView } from '../src/ui/jira-issues/tableView';
-import { JiraIssueDatasourceParameters } from '../src/ui/jira-issues/types';
+import { DatasourceTableView } from '../src/ui/datasourceTableView';
+import { JiraIssueDatasourceParameters } from '../src/ui/jira-issues-modal/types';
 
 mockDatasourceFetchRequests();
 
 export const ExampleJiraIssuesTableView = () => {
   const cloudId = 'some-cloud-id';
-  const parameterType = 'jql';
-  const parameterValue = 'some-jql';
 
   const [visibleColumnKeys, setVisibleColumnKeys] = useState<string[]>([]);
 
-  const parameters = useMemo<JiraIssueDatasourceParameters>(() => {
-    return {
+  const parameters = useMemo<JiraIssueDatasourceParameters>(
+    () => ({
       cloudId,
-      type: parameterType,
-      value: parameterValue,
-    };
-  }, [cloudId, parameterType, parameterValue]);
+      jql: 'some-jql',
+    }),
+    [cloudId],
+  );
 
   return (
-    <JiraIssuesTableView
+    <DatasourceTableView
       datasourceId={'some-datasource-id'}
       parameters={parameters}
       visibleColumnKeys={visibleColumnKeys}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -44,7 +44,7 @@
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^0.11.0",
     "@atlaskit/pragmatic-drag-and-drop-react-indicator": "^0.14.0",
     "@atlaskit/select": "^16.2.0",
-    "@atlaskit/smart-card": "^26.2.0",
+    "@atlaskit/smart-card": "^26.3.0",
     "@atlaskit/spinner": "^15.5.0",
     "@atlaskit/tag": "^11.5.0",
     "@atlaskit/textfield": "5.4.2",

package/report.api.md

@@ -20,17 +20,41 @@ import { InlineCardAdf } from '@atlaskit/linking-common/types';
 import { jsx } from '@emotion/react';
 
 // @public (undocumented)
-interface JiraIssueDatasourceParameters {
+export const DatasourceTableView: ({
+  datasourceId,
+  parameters,
+  visibleColumnKeys,
+  onVisibleColumnKeysChange,
+}: DatasourceTableViewProps) => jsx.JSX.Element;
+
+// @public (undocumented)
+interface DatasourceTableViewProps {
   // (undocumented)
-  cloudId: string;
+  datasourceId: string;
   // (undocumented)
-  type: JiraIssueDatasourceParameterType;
+  fields?: string[];
+  // (undocumented)
+  onVisibleColumnKeysChange?: (visibleColumnKeys: string[]) => void;
+  // (undocumented)
+  parameters: object;
   // (undocumented)
-  value: string;
+  visibleColumnKeys?: string[];
 }
 
 // @public (undocumented)
-type JiraIssueDatasourceParameterType = 'filter' | 'jql' | 'textQuery';
+type JiraIssueDatasourceParameters = {
+  cloudId: string;
+} & JiraIssueDatasourceParametersQuery;
+
+// @public (undocumented)
+type JiraIssueDatasourceParametersQuery = XOR<
+  {
+    jql: string;
+  },
+  {
+    filter: string;
+  }
+>;
 
 // @public (undocumented)
 export const JiraIssuesConfigModal: (
@@ -58,26 +82,13 @@ interface JiraIssuesConfigModalProps {
 }
 
 // @public (undocumented)
-export const JiraIssuesTableView: ({
-  datasourceId,
-  parameters,
-  visibleColumnKeys,
-  onVisibleColumnKeysChange,
-}: JiraIssuesTableViewProps) => jsx.JSX.Element;
-
-// @public (undocumented)
-interface JiraIssuesTableViewProps {
-  // (undocumented)
-  datasourceId: string;
-  // (undocumented)
-  fields?: string[];
-  // (undocumented)
-  onVisibleColumnKeysChange?: (visibleColumnKeys: string[]) => void;
-  // (undocumented)
-  parameters: JiraIssueDatasourceParameters;
-  // (undocumented)
-  visibleColumnKeys?: string[];
-}
+type XOR<T1, T2> =
+  | (T1 & {
+      [k in Exclude<keyof T2, keyof T1>]?: never;
+    })
+  | (T2 & {
+      [k in Exclude<keyof T1, keyof T2>]?: never;
+    });
 
 // (No @packageDocumentation comment for this package)
 ```

package/tmp/api-report-tmp.d.ts

@@ -9,17 +9,33 @@ import { InlineCardAdf } from '@atlaskit/linking-common/types';
 import { jsx } from '@emotion/react';
 
 // @public (undocumented)
-interface JiraIssueDatasourceParameters {
+export const DatasourceTableView: ({ datasourceId, parameters, visibleColumnKeys, onVisibleColumnKeysChange, }: DatasourceTableViewProps) => jsx.JSX.Element;
+
+// @public (undocumented)
+interface DatasourceTableViewProps {
     // (undocumented)
-    cloudId: string;
+    datasourceId: string;
+    // (undocumented)
+    fields?: string[];
     // (undocumented)
-    type: JiraIssueDatasourceParameterType;
+    onVisibleColumnKeysChange?: (visibleColumnKeys: string[]) => void;
+    // (undocumented)
+    parameters: object;
     // (undocumented)
-    value: string;
+    visibleColumnKeys?: string[];
 }
 
 // @public (undocumented)
-type JiraIssueDatasourceParameterType = 'filter' | 'jql' | 'textQuery';
+type JiraIssueDatasourceParameters = {
+    cloudId: string;
+} & JiraIssueDatasourceParametersQuery;
+
+// @public (undocumented)
+type JiraIssueDatasourceParametersQuery = XOR<{
+    jql: string;
+}, {
+    filter: string;
+}>;
 
 // @public (undocumented)
 export const JiraIssuesConfigModal: (props: JiraIssuesConfigModalProps) => jsx.JSX.Element;
@@ -43,21 +59,11 @@ interface JiraIssuesConfigModalProps {
 }
 
 // @public (undocumented)
-export const JiraIssuesTableView: ({ datasourceId, parameters, visibleColumnKeys, onVisibleColumnKeysChange, }: JiraIssuesTableViewProps) => jsx.JSX.Element;
-
-// @public (undocumented)
-interface JiraIssuesTableViewProps {
-    // (undocumented)
-    datasourceId: string;
-    // (undocumented)
-    fields?: string[];
-    // (undocumented)
-    onVisibleColumnKeysChange?: (visibleColumnKeys: string[]) => void;
-    // (undocumented)
-    parameters: JiraIssueDatasourceParameters;
-    // (undocumented)
-    visibleColumnKeys?: string[];
-}
+type XOR<T1, T2> = (T1 & {
+    [k in Exclude<keyof T2, keyof T1>]?: never;
+}) | (T2 & {
+    [k in Exclude<keyof T1, keyof T2>]?: never;
+});
 
 // (No @packageDocumentation comment for this package)
 

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

@@ -1,3 +0,0 @@
-import { jsx } from '@emotion/react';
-import { JiraIssuesTableViewProps } from './types';
-export declare const JiraIssuesTableView: ({ datasourceId, parameters, visibleColumnKeys, onVisibleColumnKeysChange, }: JiraIssuesTableViewProps) => jsx.JSX.Element;

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

@@ -1,14 +0,0 @@
-export interface JiraIssuesTableViewProps {
-    datasourceId: string;
-    parameters: JiraIssueDatasourceParameters;
-    fields?: string[];
-    onVisibleColumnKeysChange?: (visibleColumnKeys: string[]) => void;
-    visibleColumnKeys?: string[];
-}
-export type JiraIssueDatasourceParameterType = 'jql' | 'textQuery' | 'filter';
-export interface JiraIssueDatasourceParameters {
-    cloudId: string;
-    value: string;
-    type: JiraIssueDatasourceParameterType;
-}
-export type JiraIssueViewModes = 'issue' | 'count';

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

@@ -1,3 +0,0 @@
-import { jsx } from '@emotion/react';
-import { JiraIssuesTableViewProps } from './types';
-export declare const JiraIssuesTableView: ({ datasourceId, parameters, visibleColumnKeys, onVisibleColumnKeysChange, }: JiraIssuesTableViewProps) => jsx.JSX.Element;

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

@@ -1,14 +0,0 @@
-export interface JiraIssuesTableViewProps {
-    datasourceId: string;
-    parameters: JiraIssueDatasourceParameters;
-    fields?: string[];
-    onVisibleColumnKeysChange?: (visibleColumnKeys: string[]) => void;
-    visibleColumnKeys?: string[];
-}
-export type JiraIssueDatasourceParameterType = 'jql' | 'textQuery' | 'filter';
-export interface JiraIssueDatasourceParameters {
-    cloudId: string;
-    value: string;
-    type: JiraIssueDatasourceParameterType;
-}
-export type JiraIssueViewModes = 'issue' | 'count';