@atlaskit/link-datasource 3.8.7 → 3.8.8

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @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

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

@@ -310,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)({
@@ -602,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
@@ -693,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/es2019/ui/issue-like-table/index.js

@@ -322,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({
@@ -573,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
@@ -665,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/esm/ui/issue-like-table/index.js

@@ -306,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({
@@ -598,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
@@ -689,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/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.7",
+	"version": "3.8.8",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",