@atlaskit/link-datasource 0.24.3 → 0.25.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/link-datasource
 
+## 0.25.0
+
+### Minor Changes
+
+- [`f427908df3d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f427908df3d) - change the datasource response type to include the meta data section and the data response will wrap in the data section
+
+### Patch Changes
+
+- Updated dependencies
+
+## 0.24.4
+
+### Patch Changes
+
+- [`b75c571b91b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b75c571b91b) - Fix up problem where we don't set react's "key" for list of content we show in each cell (like tags)
+- Updated dependencies
+
 ## 0.24.3
 
 ### Patch Changes

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -73,7 +73,7 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
               return column.key === col.key;
             });
           };
-          allColumns = result.schema.properties;
+          allColumns = result.data.schema.properties;
           newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
           newColumns.length > 0 && setColumns([].concat((0, _toConsumableArray2.default)(columns), (0, _toConsumableArray2.default)(newColumns)));
         case 9:
@@ -106,7 +106,8 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
       shouldRequestFirstPage,
       datasourceDataRequest,
       _yield$getDatasourceD,
-      data,
+      _yield$getDatasourceD2,
+      items,
       nextPageCursor,
       _totalCount,
       schema,
@@ -135,17 +136,18 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
           return getDatasourceData(datasourceId, datasourceDataRequest);
         case 9:
           _yield$getDatasourceD = _context2.sent;
-          data = _yield$getDatasourceD.data;
-          nextPageCursor = _yield$getDatasourceD.nextPageCursor;
-          _totalCount = _yield$getDatasourceD.totalCount;
-          schema = _yield$getDatasourceD.schema;
+          _yield$getDatasourceD2 = _yield$getDatasourceD.data;
+          items = _yield$getDatasourceD2.items;
+          nextPageCursor = _yield$getDatasourceD2.nextPageCursor;
+          _totalCount = _yield$getDatasourceD2.totalCount;
+          schema = _yield$getDatasourceD2.schema;
           setTotalCount(_totalCount);
           setNextCursor(nextPageCursor);
           setResponseItems(function (currentResponseItems) {
             if (shouldRequestFirstPage) {
-              return data;
+              return items;
             }
-            return [].concat((0, _toConsumableArray2.default)(currentResponseItems), (0, _toConsumableArray2.default)(data));
+            return [].concat((0, _toConsumableArray2.default)(currentResponseItems), (0, _toConsumableArray2.default)(items));
           });
           setStatus('resolved');
           setHasNextPage(Boolean(nextPageCursor));
@@ -155,17 +157,17 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
           if (isSchemaFromData && schema) {
             applySchemaProperties(schema.properties);
           }
-          _context2.next = 26;
+          _context2.next = 27;
           break;
-        case 23:
-          _context2.prev = 23;
+        case 24:
+          _context2.prev = 24;
           _context2.t0 = _context2["catch"](6);
           setStatus('rejected');
-        case 26:
+        case 27:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[6, 23]]);
+    }, _callee2, null, [[6, 24]]);
   })), [parameters, fieldKeys, getDatasourceData, datasourceId, nextCursor, applySchemaProperties]);
   var reset = (0, _react.useCallback)(function () {
     setStatus('empty');

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

@@ -262,7 +262,7 @@ var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
           });
           return {
             key: key,
-            content: content,
+            content: content.length === 1 ? content[0] : content,
             maxWidth: getColumnWidth(key, type)
           };
         }),
@@ -366,11 +366,11 @@ var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
       "data-testid": testId && "".concat(testId, "--row-").concat(key),
       ref: ref
     }, cells.map(function (_ref13, cellIndex) {
-      var key = _ref13.key,
+      var cellKey = _ref13.key,
         content = _ref13.content,
         maxWidth = _ref13.maxWidth;
       return (0, _react2.jsx)("td", {
-        key: key,
+        key: cellKey,
         "data-testid": testId && "".concat(testId, "--cell-").concat(cellIndex),
         colSpan: cellIndex + 1 === cells.length ? 2 : undefined,
         css: truncatedCellStyles,

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

@@ -16,6 +16,7 @@ var _tag = _interopRequireDefault(require("./tag"));
 var _text = _interopRequireDefault(require("./text"));
 var _user = _interopRequireDefault(require("./user"));
 var fallbackRenderType = function fallbackRenderType(item) {
+  var _item$value, _item$value2;
   switch (item.type) {
     case 'boolean':
       return /*#__PURE__*/_react.default.createElement(_boolean.default, {
@@ -47,6 +48,7 @@ var fallbackRenderType = function fallbackRenderType(item) {
       });
     case 'tag':
       return /*#__PURE__*/_react.default.createElement(_tag.default, {
+        key: ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.id) || ((_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : _item$value2.text),
         tag: item.value
       });
     case 'time':

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

@@ -193,7 +193,11 @@ var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
             views: [{
               type: 'table',
               properties: {
-                columnKeys: visibleColumnKeys
+                columns: visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.map(function (key) {
+                  return {
+                    key: key
+                  };
+                })
               }
             }]
           }

package/dist/cjs/version.json

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

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -25,7 +25,7 @@ export const useDatasourceTableState = ({
       parameters
     });
     const isColumnNotPresentInCurrentColumnsList = col => !columns.find(column => column.key === col.key);
-    const allColumns = result.schema.properties;
+    const allColumns = result.data.schema.properties;
     const newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
     newColumns.length > 0 && setColumns([...columns, ...newColumns]);
   }, [columns, datasourceId, getDatasourceDetails, parameters]);
@@ -62,18 +62,20 @@ export const useDatasourceTableState = ({
     setStatus('loading');
     try {
       const {
-        data,
-        nextPageCursor,
-        totalCount,
-        schema
+        data: {
+          items,
+          nextPageCursor,
+          totalCount,
+          schema
+        }
       } = await getDatasourceData(datasourceId, datasourceDataRequest);
       setTotalCount(totalCount);
       setNextCursor(nextPageCursor);
       setResponseItems(currentResponseItems => {
         if (shouldRequestFirstPage) {
-          return data;
+          return items;
         }
-        return [...currentResponseItems, ...data];
+        return [...currentResponseItems, ...items];
       });
       setStatus('resolved');
       setHasNextPage(Boolean(nextPageCursor));

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

@@ -230,7 +230,7 @@ export const IssueLikeDataTableView = ({
       }));
       return {
         key,
-        content,
+        content: content.length === 1 ? content[0] : content,
         maxWidth: getColumnWidth(key, type)
       };
     }),
@@ -309,11 +309,11 @@ export const IssueLikeDataTableView = ({
     "data-testid": testId && `${testId}--row-${key}`,
     ref: ref
   }, cells.map(({
-    key,
+    key: cellKey,
     content,
     maxWidth
   }, cellIndex) => jsx("td", {
-    key: key,
+    key: cellKey,
     "data-testid": testId && `${testId}--cell-${cellIndex}`,
     colSpan: cellIndex + 1 === cells.length ? 2 : undefined,
     css: truncatedCellStyles,

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

@@ -9,6 +9,7 @@ import TagRenderType from './tag';
 import StringRenderType from './text';
 import UserRenderType from './user';
 export const fallbackRenderType = item => {
+  var _item$value, _item$value2;
   switch (item.type) {
     case 'boolean':
       return /*#__PURE__*/React.createElement(BooleanRenderType, {
@@ -40,6 +41,7 @@ export const fallbackRenderType = item => {
       });
     case 'tag':
       return /*#__PURE__*/React.createElement(TagRenderType, {
+        key: ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.id) || ((_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : _item$value2.text),
         tag: item.value
       });
     case 'time':

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

@@ -144,7 +144,9 @@ export const JiraIssuesConfigModal = props => {
             views: [{
               type: 'table',
               properties: {
-                columnKeys: visibleColumnKeys
+                columns: visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.map(key => ({
+                  key
+                }))
               }
             }]
           }

package/dist/es2019/version.json

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

package/dist/esm/hooks/useDatasourceTableState.js

@@ -66,7 +66,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
               return column.key === col.key;
             });
           };
-          allColumns = result.schema.properties;
+          allColumns = result.data.schema.properties;
           newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
           newColumns.length > 0 && setColumns([].concat(_toConsumableArray(columns), _toConsumableArray(newColumns)));
         case 9:
@@ -99,7 +99,8 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       shouldRequestFirstPage,
       datasourceDataRequest,
       _yield$getDatasourceD,
-      data,
+      _yield$getDatasourceD2,
+      items,
       nextPageCursor,
       _totalCount,
       schema,
@@ -128,17 +129,18 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           return getDatasourceData(datasourceId, datasourceDataRequest);
         case 9:
           _yield$getDatasourceD = _context2.sent;
-          data = _yield$getDatasourceD.data;
-          nextPageCursor = _yield$getDatasourceD.nextPageCursor;
-          _totalCount = _yield$getDatasourceD.totalCount;
-          schema = _yield$getDatasourceD.schema;
+          _yield$getDatasourceD2 = _yield$getDatasourceD.data;
+          items = _yield$getDatasourceD2.items;
+          nextPageCursor = _yield$getDatasourceD2.nextPageCursor;
+          _totalCount = _yield$getDatasourceD2.totalCount;
+          schema = _yield$getDatasourceD2.schema;
           setTotalCount(_totalCount);
           setNextCursor(nextPageCursor);
           setResponseItems(function (currentResponseItems) {
             if (shouldRequestFirstPage) {
-              return data;
+              return items;
             }
-            return [].concat(_toConsumableArray(currentResponseItems), _toConsumableArray(data));
+            return [].concat(_toConsumableArray(currentResponseItems), _toConsumableArray(items));
           });
           setStatus('resolved');
           setHasNextPage(Boolean(nextPageCursor));
@@ -148,17 +150,17 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           if (isSchemaFromData && schema) {
             applySchemaProperties(schema.properties);
           }
-          _context2.next = 26;
+          _context2.next = 27;
           break;
-        case 23:
-          _context2.prev = 23;
+        case 24:
+          _context2.prev = 24;
           _context2.t0 = _context2["catch"](6);
           setStatus('rejected');
-        case 26:
+        case 27:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[6, 23]]);
+    }, _callee2, null, [[6, 24]]);
   })), [parameters, fieldKeys, getDatasourceData, datasourceId, nextCursor, applySchemaProperties]);
   var reset = useCallback(function () {
     setStatus('empty');

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

@@ -256,7 +256,7 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
           });
           return {
             key: key,
-            content: content,
+            content: content.length === 1 ? content[0] : content,
             maxWidth: getColumnWidth(key, type)
           };
         }),
@@ -360,11 +360,11 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
       "data-testid": testId && "".concat(testId, "--row-").concat(key),
       ref: ref
     }, cells.map(function (_ref13, cellIndex) {
-      var key = _ref13.key,
+      var cellKey = _ref13.key,
         content = _ref13.content,
         maxWidth = _ref13.maxWidth;
       return jsx("td", {
-        key: key,
+        key: cellKey,
         "data-testid": testId && "".concat(testId, "--cell-").concat(cellIndex),
         colSpan: cellIndex + 1 === cells.length ? 2 : undefined,
         css: truncatedCellStyles,

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

@@ -9,6 +9,7 @@ import TagRenderType from './tag';
 import StringRenderType from './text';
 import UserRenderType from './user';
 export var fallbackRenderType = function fallbackRenderType(item) {
+  var _item$value, _item$value2;
   switch (item.type) {
     case 'boolean':
       return /*#__PURE__*/React.createElement(BooleanRenderType, {
@@ -40,6 +41,7 @@ export var fallbackRenderType = function fallbackRenderType(item) {
       });
     case 'tag':
       return /*#__PURE__*/React.createElement(TagRenderType, {
+        key: ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.id) || ((_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : _item$value2.text),
         tag: item.value
       });
     case 'time':

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

@@ -182,7 +182,11 @@ export var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
             views: [{
               type: 'table',
               properties: {
-                columnKeys: visibleColumnKeys
+                columns: visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.map(function (key) {
+                  return {
+                    key: key
+                  };
+                })
               }
             }]
           }

package/dist/esm/version.json

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

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

@@ -23,7 +23,9 @@ export interface JiraIssuesDatasourceAdf extends DatasourceAdf {
                 {
                     type: 'table';
                     properties?: {
-                        columnKeys: string[];
+                        columns: {
+                            key: string;
+                        }[];
                     };
                 }
             ];

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

@@ -23,7 +23,9 @@ export interface JiraIssuesDatasourceAdf extends DatasourceAdf {
                 {
                     type: 'table';
                     properties?: {
-                        columnKeys: string[];
+                        columns: {
+                            key: string;
+                        }[];
                     };
                 }
             ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "0.24.3",
+  "version": "0.25.0",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -28,15 +28,15 @@
   },
   "dependencies": {
     "@atlaskit/avatar": "^21.3.0",
-    "@atlaskit/button": "^16.7.0",
-    "@atlaskit/dropdown-menu": "^11.9.0",
+    "@atlaskit/button": "^16.8.0",
+    "@atlaskit/dropdown-menu": "^11.10.0",
     "@atlaskit/heading": "^1.3.0",
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/image": "^1.1.0",
-    "@atlaskit/link-client-extension": "^1.2.1",
-    "@atlaskit/linking-common": "^2.15.0",
-    "@atlaskit/linking-types": "^6.0.0",
+    "@atlaskit/link-client-extension": "^1.3.0",
+    "@atlaskit/linking-common": "^3.0.0",
+    "@atlaskit/linking-types": "^7.0.0",
     "@atlaskit/lozenge": "^11.4.0",
     "@atlaskit/modal-dialog": "^12.6.0",
     "@atlaskit/pragmatic-drag-and-drop": "^0.19.0",
@@ -49,7 +49,7 @@
     "@atlaskit/tag": "^11.5.0",
     "@atlaskit/textfield": "5.5.2",
     "@atlaskit/theme": "^12.5.0",
-    "@atlaskit/tokens": "^1.8.0",
+    "@atlaskit/tokens": "^1.9.0",
     "@atlassianlabs/jql-editor": "^1.2.0",
     "@atlassianlabs/jql-editor-autocomplete-rest": "^1.0.1",
     "@babel/runtime": "^7.0.0",
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@atlaskit/link-provider": "^1.6.0",
-    "@atlaskit/link-test-helpers": "^4.0.0",
+    "@atlaskit/link-test-helpers": "^4.1.0",
     "@atlaskit/ssr": "*",
     "@atlaskit/visual-regression": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",

package/report.api.md

@@ -97,7 +97,9 @@ export interface JiraIssuesDatasourceAdf extends DatasourceAdf {
         {
           type: 'table';
           properties?: {
-            columnKeys: string[];
+            columns: {
+              key: string;
+            }[];
           };
         },
       ];

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

@@ -78,7 +78,9 @@ export interface JiraIssuesDatasourceAdf extends DatasourceAdf {
                 {
                 type: 'table';
                 properties?: {
-                    columnKeys: string[];
+                    columns: {
+                        key: string;
+                    }[];
                 };
             }
             ];