@atlaskit/link-datasource 3.8.6 → 3.8.8

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/link-datasource
 
+## 3.8.8
+
+### Patch Changes
+
+- [#163413](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/163413)
+  [`85d906a810a1d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/85d906a810a1d) -
+  Fix an issue where all columns don't load from server when picker is opened with React18
+
+## 3.8.7
+
+### Patch Changes
+
+- [`f72c22d3b02b0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f72c22d3b02b0) -
+  The changes here updates the default width, and adds a min-width to the Priority column in Jira
+  SLLV.
+
 ## 3.8.6
 
 ### Patch Changes

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

@@ -16,9 +16,6 @@ var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
 var _select = _interopRequireDefault(require("@atlaskit/select"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-// FilterOptionOption is used in the filterOption function which is part of the public API, but the type itself is not exported
-// eslint-disable-next-line import/no-extraneous-dependencies,no-restricted-imports
-
 var StatusEditType = function StatusEditType(props) {
   var _currentValue$values;
   var currentValue = props.currentValue,

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

@@ -233,7 +233,8 @@ var getOrderedColumns = exports.getOrderedColumns = function getOrderedColumns(c
 };
 var DEFAULT_WIDTH = _utils.COLUMN_BASE_WIDTH * 22;
 var keyBasedWidthMap = {
-  priority: _utils.COLUMN_BASE_WIDTH * 8,
+  priority: _utils.COLUMN_BASE_WIDTH * 13.75,
+  // 110px
   status: _utils.COLUMN_BASE_WIDTH * 15,
   summary: _utils.COLUMN_BASE_WIDTH * 45,
   description: _utils.COLUMN_BASE_WIDTH * 31,
@@ -309,10 +310,10 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     }
   }, [containerRef]);
   (0, _react.useEffect)(function () {
-    if (!hasFullSchema) {
+    if (orderedColumns.length !== columns.length) {
       setOrderedColumns(getOrderedColumns((0, _toConsumableArray2.default)(columns), (0, _toConsumableArray2.default)(visibleColumnKeys)));
     }
-  }, [columns, visibleColumnKeys, hasFullSchema]);
+  }, [columns, visibleColumnKeys, orderedColumns]);
   (0, _react.useEffect)(function () {
     if (experienceId && status === 'resolved') {
       (0, _ufoExperiences.succeedUfoExperience)({
@@ -601,6 +602,8 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     }, _callee, null, [[3, 9]]);
   })), [experienceId, extensionKey, hasFullSchema, onLoadDatasourceDetails]);
   var isEditable = onVisibleColumnKeysChange && hasData;
+  var orderedColumnsAreUpToDate = orderedColumns.length === columns.length;
+  var shouldDisplayColumnsInPicker = hasFullSchema && orderedColumnsAreUpToDate;
   var view = (0, _react2.jsx)("div", {
     /* There is required contentEditable={true} in editor-card-plugin
      * But this brakes how DND works. We set contentEditable={false} to allow DND to work
@@ -692,8 +695,8 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
       }, heading);
     }
   }), onVisibleColumnKeysChange && (0, _react2.jsx)(ColumnPickerHeader, null, (0, _react2.jsx)(_columnPicker.ColumnPicker, {
-    columns: hasFullSchema ? orderedColumns : [],
-    selectedColumnKeys: hasFullSchema ? visibleColumnKeys : [],
+    columns: shouldDisplayColumnsInPicker ? orderedColumns : [],
+    selectedColumnKeys: shouldDisplayColumnsInPicker ? visibleColumnKeys : [],
     onSelectedColumnKeysChange: onSelectedColumnKeysChange,
     onOpen: handlePickerOpen
   })))), (0, _react2.jsx)("tbody", {

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

@@ -9,7 +9,8 @@ var COLUMN_BASE_WIDTH = exports.COLUMN_BASE_WIDTH = 8;
 var COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 4;
 var keyBasedMinWidthMap = {
   summary: COLUMN_BASE_WIDTH * 26,
-  status: COLUMN_BASE_WIDTH * 15
+  status: COLUMN_BASE_WIDTH * 15,
+  priority: COLUMN_BASE_WIDTH * 12.5 // 100px
 };
 var getColumnMinWidth = exports.getColumnMinWidth = function getColumnMinWidth(key) {
   return keyBasedMinWidthMap[key] || COLUMN_MIN_WIDTH;

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

@@ -2,9 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
 import { ActionOperationStatus } from '@atlaskit/linking-types';
 import Lozenge from '@atlaskit/lozenge';
-// FilterOptionOption is used in the filterOption function which is part of the public API, but the type itself is not exported
-// eslint-disable-next-line import/no-extraneous-dependencies,no-restricted-imports
-
 import Select from '@atlaskit/select';
 const StatusEditType = props => {
   var _currentValue$values;

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

@@ -259,7 +259,8 @@ export const getOrderedColumns = (columns, visibleColumnKeys) => {
 };
 const DEFAULT_WIDTH = COLUMN_BASE_WIDTH * 22;
 const keyBasedWidthMap = {
-  priority: COLUMN_BASE_WIDTH * 8,
+  priority: COLUMN_BASE_WIDTH * 13.75,
+  // 110px
   status: COLUMN_BASE_WIDTH * 15,
   summary: COLUMN_BASE_WIDTH * 45,
   description: COLUMN_BASE_WIDTH * 31,
@@ -321,10 +322,10 @@ export const IssueLikeDataTableView = ({
     }
   }, [containerRef]);
   useEffect(() => {
-    if (!hasFullSchema) {
+    if (orderedColumns.length !== columns.length) {
       setOrderedColumns(getOrderedColumns([...columns], [...visibleColumnKeys]));
     }
-  }, [columns, visibleColumnKeys, hasFullSchema]);
+  }, [columns, visibleColumnKeys, orderedColumns]);
   useEffect(() => {
     if (experienceId && status === 'resolved') {
       succeedUfoExperience({
@@ -572,6 +573,8 @@ export const IssueLikeDataTableView = ({
     }
   }, [experienceId, extensionKey, hasFullSchema, onLoadDatasourceDetails]);
   const isEditable = onVisibleColumnKeysChange && hasData;
+  const orderedColumnsAreUpToDate = orderedColumns.length === columns.length;
+  const shouldDisplayColumnsInPicker = hasFullSchema && orderedColumnsAreUpToDate;
   const view = jsx("div", {
     /* There is required contentEditable={true} in editor-card-plugin
      * But this brakes how DND works. We set contentEditable={false} to allow DND to work
@@ -664,8 +667,8 @@ export const IssueLikeDataTableView = ({
       }, heading);
     }
   }), onVisibleColumnKeysChange && jsx(ColumnPickerHeader, null, jsx(ColumnPicker, {
-    columns: hasFullSchema ? orderedColumns : [],
-    selectedColumnKeys: hasFullSchema ? visibleColumnKeys : [],
+    columns: shouldDisplayColumnsInPicker ? orderedColumns : [],
+    selectedColumnKeys: shouldDisplayColumnsInPicker ? visibleColumnKeys : [],
     onSelectedColumnKeysChange: onSelectedColumnKeysChange,
     onOpen: handlePickerOpen
   })))), jsx("tbody", {

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

@@ -3,7 +3,8 @@ export const COLUMN_BASE_WIDTH = 8;
 const COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 4;
 const keyBasedMinWidthMap = {
   summary: COLUMN_BASE_WIDTH * 26,
-  status: COLUMN_BASE_WIDTH * 15
+  status: COLUMN_BASE_WIDTH * 15,
+  priority: COLUMN_BASE_WIDTH * 12.5 // 100px
 };
 export const getColumnMinWidth = key => {
   return keyBasedMinWidthMap[key] || COLUMN_MIN_WIDTH;

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

@@ -5,9 +5,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useState } from 'react';
 import { ActionOperationStatus } from '@atlaskit/linking-types';
 import Lozenge from '@atlaskit/lozenge';
-// FilterOptionOption is used in the filterOption function which is part of the public API, but the type itself is not exported
-// eslint-disable-next-line import/no-extraneous-dependencies,no-restricted-imports
-
 import Select from '@atlaskit/select';
 var StatusEditType = function StatusEditType(props) {
   var _currentValue$values;

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

@@ -229,7 +229,8 @@ export var getOrderedColumns = function getOrderedColumns(columns, visibleColumn
 };
 var DEFAULT_WIDTH = COLUMN_BASE_WIDTH * 22;
 var keyBasedWidthMap = {
-  priority: COLUMN_BASE_WIDTH * 8,
+  priority: COLUMN_BASE_WIDTH * 13.75,
+  // 110px
   status: COLUMN_BASE_WIDTH * 15,
   summary: COLUMN_BASE_WIDTH * 45,
   description: COLUMN_BASE_WIDTH * 31,
@@ -305,10 +306,10 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref5) {
     }
   }, [containerRef]);
   useEffect(function () {
-    if (!hasFullSchema) {
+    if (orderedColumns.length !== columns.length) {
       setOrderedColumns(getOrderedColumns(_toConsumableArray(columns), _toConsumableArray(visibleColumnKeys)));
     }
-  }, [columns, visibleColumnKeys, hasFullSchema]);
+  }, [columns, visibleColumnKeys, orderedColumns]);
   useEffect(function () {
     if (experienceId && status === 'resolved') {
       succeedUfoExperience({
@@ -597,6 +598,8 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref5) {
     }, _callee, null, [[3, 9]]);
   })), [experienceId, extensionKey, hasFullSchema, onLoadDatasourceDetails]);
   var isEditable = onVisibleColumnKeysChange && hasData;
+  var orderedColumnsAreUpToDate = orderedColumns.length === columns.length;
+  var shouldDisplayColumnsInPicker = hasFullSchema && orderedColumnsAreUpToDate;
   var view = jsx("div", {
     /* There is required contentEditable={true} in editor-card-plugin
      * But this brakes how DND works. We set contentEditable={false} to allow DND to work
@@ -688,8 +691,8 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref5) {
       }, heading);
     }
   }), onVisibleColumnKeysChange && jsx(ColumnPickerHeader, null, jsx(ColumnPicker, {
-    columns: hasFullSchema ? orderedColumns : [],
-    selectedColumnKeys: hasFullSchema ? visibleColumnKeys : [],
+    columns: shouldDisplayColumnsInPicker ? orderedColumns : [],
+    selectedColumnKeys: shouldDisplayColumnsInPicker ? visibleColumnKeys : [],
     onSelectedColumnKeysChange: onSelectedColumnKeysChange,
     onOpen: handlePickerOpen
   })))), jsx("tbody", {

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

@@ -3,7 +3,8 @@ export var COLUMN_BASE_WIDTH = 8;
 var COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 4;
 var keyBasedMinWidthMap = {
   summary: COLUMN_BASE_WIDTH * 26,
-  status: COLUMN_BASE_WIDTH * 15
+  status: COLUMN_BASE_WIDTH * 15,
+  priority: COLUMN_BASE_WIDTH * 12.5 // 100px
 };
 export var getColumnMinWidth = function getColumnMinWidth(key) {
   return keyBasedMinWidthMap[key] || COLUMN_MIN_WIDTH;

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

@@ -19,7 +19,7 @@ export interface DatasourceTableState {
     /** Resets state of the hook to be as if it is a first time it is being called. */
     reset: (options?: ResetOptions) => void;
     /** Requests the available column schemas that can be displayed within the table */
-    loadDatasourceDetails: () => void;
+    loadDatasourceDetails: () => Promise<void>;
     /** Item ids to be hydrated from a store by consumers [NOTE: They must be in the same order as responseItems] */
     responseItemIds: string[];
     /** Items to be rendered within the table */

package/dist/types/ui/assets-modal/modal/render-assets-content/index.d.ts

@@ -11,7 +11,7 @@ export interface RenderAssetsContentProps {
     schemaId?: string;
     onNextPage: () => void;
     hasNextPage: boolean;
-    loadDatasourceDetails: () => void;
+    loadDatasourceDetails: () => Promise<void>;
     columns: DatasourceResponseSchemaProperty[];
     defaultVisibleColumnKeys: string[];
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;

package/dist/types/ui/issue-like-table/types.d.ts

@@ -34,7 +34,7 @@ export interface IssueLikeDataTableViewProps {
     items: DatasourceDataResponseItem[];
     itemIds: string[];
     onNextPage: NextPageType;
-    onLoadDatasourceDetails: () => void;
+    onLoadDatasourceDetails: () => Promise<void>;
     /**
      * A function to define new or override existing render components.
      * eg:

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

@@ -19,7 +19,7 @@ export interface DatasourceTableState {
     /** Resets state of the hook to be as if it is a first time it is being called. */
     reset: (options?: ResetOptions) => void;
     /** Requests the available column schemas that can be displayed within the table */
-    loadDatasourceDetails: () => void;
+    loadDatasourceDetails: () => Promise<void>;
     /** Item ids to be hydrated from a store by consumers [NOTE: They must be in the same order as responseItems] */
     responseItemIds: string[];
     /** Items to be rendered within the table */

package/dist/types-ts4.5/ui/assets-modal/modal/render-assets-content/index.d.ts

@@ -11,7 +11,7 @@ export interface RenderAssetsContentProps {
     schemaId?: string;
     onNextPage: () => void;
     hasNextPage: boolean;
-    loadDatasourceDetails: () => void;
+    loadDatasourceDetails: () => Promise<void>;
     columns: DatasourceResponseSchemaProperty[];
     defaultVisibleColumnKeys: string[];
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;

package/dist/types-ts4.5/ui/issue-like-table/types.d.ts

@@ -34,7 +34,7 @@ export interface IssueLikeDataTableViewProps {
     items: DatasourceDataResponseItem[];
     itemIds: string[];
     onNextPage: NextPageType;
-    onLoadDatasourceDetails: () => void;
+    onLoadDatasourceDetails: () => Promise<void>;
     /**
      * A function to define new or override existing render components.
      * eg:

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.8.6",
+	"version": "3.8.8",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -71,6 +71,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.2.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^13.1.0",
+		"@atlaskit/react-select": "^1.3.0",
 		"@atlaskit/select": "^18.5.0",
 		"@atlaskit/smart-card": "^30.2.0",
 		"@atlaskit/smart-user-picker": "6.11.1",
@@ -79,7 +80,7 @@
 		"@atlaskit/textfield": "6.5.4",
 		"@atlaskit/theme": "^14.0.0",
 		"@atlaskit/tokens": "^2.2.0",
-		"@atlaskit/tooltip": "^18.8.0",
+		"@atlaskit/tooltip": "^18.9.0",
 		"@atlaskit/ufo": "^0.3.0",
 		"@atlaskit/width-detector": "^4.3.0",
 		"@babel/runtime": "^7.0.0",