@atlaskit/link-datasource 7.2.1 → 7.2.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/link-datasource
 
+## 7.2.2
+
+### Patch Changes
+
+- [`e2b29ef6280bc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e2b29ef6280bc) -
+  Clean up feature gate `platform_lp_jira_sllv_renderer_column_sorting`. Read-only Jira list views
+  permanently support session-local column sorting without persisting the sort direction.
+- Updated dependencies
+
 ## 7.2.1
 
 ### Patch Changes

package/dist/cjs/ui/datasource-table-view/datasourceTableView.js

@@ -69,8 +69,8 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var columnSortGetter = (0, _datasourceColumnSort.getDatasourceColumnSortGetter)(datasourceId);
   // Sorting is only owned by this view when parent callbacks are absent (read-only rendering mode).
   var isReadOnlyDatasourceTable = !onVisibleColumnKeysChange && !onColumnResize && !onWrappedColumnChange;
-  // Keep sort UI hidden unless datasource + ownership + feature gate all allow it.
-  var shouldEnableColumnSort = !!columnSortGetter && isReadOnlyDatasourceTable && (0, _fg.fg)('platform_lp_jira_sllv_renderer_column_sorting');
+  // Keep sort UI hidden unless the datasource supports sorting and the table is read-only.
+  var shouldEnableColumnSort = !!columnSortGetter && isReadOnlyDatasourceTable;
   (0, _useDeepEffect.useDeepEffect)(function () {
     // External parameter updates should always reset local sort/session state back to source-of-truth.
     sessionBaseParametersRef.current = parameters;
@@ -80,7 +80,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var isSessionBasedOnCurrentParameters = (0, _isEqual.default)(sessionBaseParametersRef.current, parameters);
   // Use session parameters only when they are known to be based on the current external parameters.
   // This avoids a one-render stale read during the deep-effect update cycle above.
-  var activeParameters = isSessionBasedOnCurrentParameters && (0, _fg.fg)('platform_lp_jira_sllv_renderer_column_sorting') ? sessionParameters : parameters;
+  var activeParameters = isSessionBasedOnCurrentParameters ? sessionParameters : parameters;
   var _useDatasourceTableSt = (0, _useDatasourceTableState.useDatasourceTableState)({
       datasourceId: datasourceId,
       parameters: activeParameters,
@@ -243,7 +243,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
     onVisibleColumnKeysChange: onVisibleColumnKeysChange,
     columnCustomSizes: columnCustomSizes,
     onColumnResize: onColumnResize
-  }, shouldEnableColumnSort && (0, _fg.fg)('platform_lp_jira_sllv_renderer_column_sorting') ? {
+  }, shouldEnableColumnSort ? {
     onColumnSort: onColumnSort,
     sortState: sortState
   } : {}, {

package/dist/cjs/ui/issue-like-table/issue-like-data-table-view.js

@@ -527,16 +527,10 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     }
   }, [tableRows.length]);
   var rows = (0, _react.useMemo)(function () {
-    if ((0, _fg.fg)('platform_lp_jira_sllv_renderer_column_sorting')) {
-      var hasPreviousRealRows = !!previousRealRowsCountRef.current;
-      var isLoadingState = status === 'loading' || status === 'empty' && hasPreviousRealRows;
-      if (!isLoadingState) {
-        return tableRows;
-      }
-    } else {
-      if (status !== 'loading') {
-        return tableRows;
-      }
+    var hasPreviousRealRows = !!previousRealRowsCountRef.current;
+    var isLoadingState = status === 'loading' || status === 'empty' && hasPreviousRealRows;
+    if (!isLoadingState) {
+      return tableRows;
     }
 
     // if there are table rows, only add 1 loading row
@@ -547,14 +541,11 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     }
     // if there are no table rows add 14 rows if it is compact (has scrollableContainerHeight or non-modal)
     // add 10 rows if it is modal (no scrollableContainerHeight)
-    var loadingRowsCount = scrollableContainerHeight ? 14 : 10;
-    if ((0, _fg.fg)('platform_lp_jira_sllv_renderer_column_sorting')) {
-      var defaultLoadingRowsCount = scrollableContainerHeight ? 14 : 10;
-      var previousRealRowsCount = previousRealRowsCountRef.current;
-      loadingRowsCount = defaultLoadingRowsCount;
-      if (previousRealRowsCount && previousRealRowsCount < defaultLoadingRowsCount) {
-        loadingRowsCount = previousRealRowsCount;
-      }
+    var defaultLoadingRowsCount = scrollableContainerHeight ? 14 : 10;
+    var previousRealRowsCount = previousRealRowsCountRef.current;
+    var loadingRowsCount = defaultLoadingRowsCount;
+    if (previousRealRowsCount && previousRealRowsCount < defaultLoadingRowsCount) {
+      loadingRowsCount = previousRealRowsCount;
     }
     return (0, _toConsumableArray2.default)(Array(loadingRowsCount)).map(function (_, index) {
       return _objectSpread(_objectSpread({}, loadingRow), {}, {
@@ -709,18 +700,17 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
         onIsWrappedChange: onWrappedColumnChange === null || onWrappedColumnChange === void 0 ? void 0 : onWrappedColumnChange.bind(null, key)
       }, heading);
     } else {
-      return /*#__PURE__*/React.createElement(TableHeading, (0, _extends2.default)({
+      return /*#__PURE__*/React.createElement(TableHeading, {
         key: key,
-        "data-testid": "".concat(key, "-column-heading")
-      }, (0, _fg.fg)('platform_lp_jira_sllv_renderer_column_sorting') ? {
-        'aria-sort': (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'ASC' ? 'ascending' : (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'DESC' ? 'descending' : undefined
-      } : {}, {
+        "data-testid": "".concat(key, "-column-heading"),
+        "aria-sort": (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'ASC' ? 'ascending' : (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'DESC' ? 'descending' : undefined
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+        ,
         style: (0, _getWidthCss.getWidthCss)({
           shouldUseWidth: shouldUseWidth,
           width: width
         })
-      }), heading);
+      }, heading);
     }
   }), onVisibleColumnKeysChange && (shouldShowTableSettingsMenu ? /*#__PURE__*/React.createElement(ColumnPickerHeaderWithSettings, null, /*#__PURE__*/React.createElement(_compiled.Inline, {
     alignBlock: "center",

package/dist/es2019/ui/datasource-table-view/datasourceTableView.js

@@ -53,8 +53,8 @@ const DatasourceTableViewWithoutAnalytics = ({
   const columnSortGetter = getDatasourceColumnSortGetter(datasourceId);
   // Sorting is only owned by this view when parent callbacks are absent (read-only rendering mode).
   const isReadOnlyDatasourceTable = !onVisibleColumnKeysChange && !onColumnResize && !onWrappedColumnChange;
-  // Keep sort UI hidden unless datasource + ownership + feature gate all allow it.
-  const shouldEnableColumnSort = !!columnSortGetter && isReadOnlyDatasourceTable && fg('platform_lp_jira_sllv_renderer_column_sorting');
+  // Keep sort UI hidden unless the datasource supports sorting and the table is read-only.
+  const shouldEnableColumnSort = !!columnSortGetter && isReadOnlyDatasourceTable;
   useDeepEffect(() => {
     // External parameter updates should always reset local sort/session state back to source-of-truth.
     sessionBaseParametersRef.current = parameters;
@@ -64,7 +64,7 @@ const DatasourceTableViewWithoutAnalytics = ({
   const isSessionBasedOnCurrentParameters = isEqual(sessionBaseParametersRef.current, parameters);
   // Use session parameters only when they are known to be based on the current external parameters.
   // This avoids a one-render stale read during the deep-effect update cycle above.
-  const activeParameters = isSessionBasedOnCurrentParameters && fg('platform_lp_jira_sllv_renderer_column_sorting') ? sessionParameters : parameters;
+  const activeParameters = isSessionBasedOnCurrentParameters ? sessionParameters : parameters;
   const {
     reset,
     status,
@@ -228,7 +228,7 @@ const DatasourceTableViewWithoutAnalytics = ({
     onVisibleColumnKeysChange: onVisibleColumnKeysChange,
     columnCustomSizes: columnCustomSizes,
     onColumnResize: onColumnResize
-  }, shouldEnableColumnSort && fg('platform_lp_jira_sllv_renderer_column_sorting') ? {
+  }, shouldEnableColumnSort ? {
     onColumnSort,
     sortState
   } : {}, {

package/dist/es2019/ui/issue-like-table/issue-like-data-table-view.js

@@ -469,16 +469,10 @@ export const IssueLikeDataTableView = ({
     }
   }, [tableRows.length]);
   const rows = useMemo(() => {
-    if (fg('platform_lp_jira_sllv_renderer_column_sorting')) {
-      const hasPreviousRealRows = !!previousRealRowsCountRef.current;
-      const isLoadingState = status === 'loading' || status === 'empty' && hasPreviousRealRows;
-      if (!isLoadingState) {
-        return tableRows;
-      }
-    } else {
-      if (status !== 'loading') {
-        return tableRows;
-      }
+    const hasPreviousRealRows = !!previousRealRowsCountRef.current;
+    const isLoadingState = status === 'loading' || status === 'empty' && hasPreviousRealRows;
+    if (!isLoadingState) {
+      return tableRows;
     }
 
     // if there are table rows, only add 1 loading row
@@ -490,14 +484,11 @@ export const IssueLikeDataTableView = ({
     }
     // if there are no table rows add 14 rows if it is compact (has scrollableContainerHeight or non-modal)
     // add 10 rows if it is modal (no scrollableContainerHeight)
-    let loadingRowsCount = scrollableContainerHeight ? 14 : 10;
-    if (fg('platform_lp_jira_sllv_renderer_column_sorting')) {
-      const defaultLoadingRowsCount = scrollableContainerHeight ? 14 : 10;
-      const previousRealRowsCount = previousRealRowsCountRef.current;
-      loadingRowsCount = defaultLoadingRowsCount;
-      if (previousRealRowsCount && previousRealRowsCount < defaultLoadingRowsCount) {
-        loadingRowsCount = previousRealRowsCount;
-      }
+    const defaultLoadingRowsCount = scrollableContainerHeight ? 14 : 10;
+    const previousRealRowsCount = previousRealRowsCountRef.current;
+    let loadingRowsCount = defaultLoadingRowsCount;
+    if (previousRealRowsCount && previousRealRowsCount < defaultLoadingRowsCount) {
+      loadingRowsCount = previousRealRowsCount;
     }
     return [...Array(loadingRowsCount)].map((_, index) => ({
       ...loadingRow,
@@ -631,18 +622,17 @@ export const IssueLikeDataTableView = ({
         onIsWrappedChange: onWrappedColumnChange === null || onWrappedColumnChange === void 0 ? void 0 : onWrappedColumnChange.bind(null, key)
       }, heading);
     } else {
-      return /*#__PURE__*/React.createElement(TableHeading, _extends({
+      return /*#__PURE__*/React.createElement(TableHeading, {
         key: key,
-        "data-testid": `${key}-column-heading`
-      }, fg('platform_lp_jira_sllv_renderer_column_sorting') ? {
-        'aria-sort': (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'ASC' ? 'ascending' : (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'DESC' ? 'descending' : undefined
-      } : {}, {
+        "data-testid": `${key}-column-heading`,
+        "aria-sort": (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'ASC' ? 'ascending' : (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'DESC' ? 'descending' : undefined
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+        ,
         style: getWidthCss({
           shouldUseWidth,
           width
         })
-      }), heading);
+      }, heading);
     }
   }), onVisibleColumnKeysChange && (shouldShowTableSettingsMenu ? /*#__PURE__*/React.createElement(ColumnPickerHeaderWithSettings, null, /*#__PURE__*/React.createElement(Inline, {
     alignBlock: "center",

package/dist/esm/ui/datasource-table-view/datasourceTableView.js

@@ -60,8 +60,8 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var columnSortGetter = getDatasourceColumnSortGetter(datasourceId);
   // Sorting is only owned by this view when parent callbacks are absent (read-only rendering mode).
   var isReadOnlyDatasourceTable = !onVisibleColumnKeysChange && !onColumnResize && !onWrappedColumnChange;
-  // Keep sort UI hidden unless datasource + ownership + feature gate all allow it.
-  var shouldEnableColumnSort = !!columnSortGetter && isReadOnlyDatasourceTable && fg('platform_lp_jira_sllv_renderer_column_sorting');
+  // Keep sort UI hidden unless the datasource supports sorting and the table is read-only.
+  var shouldEnableColumnSort = !!columnSortGetter && isReadOnlyDatasourceTable;
   useDeepEffect(function () {
     // External parameter updates should always reset local sort/session state back to source-of-truth.
     sessionBaseParametersRef.current = parameters;
@@ -71,7 +71,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var isSessionBasedOnCurrentParameters = isEqual(sessionBaseParametersRef.current, parameters);
   // Use session parameters only when they are known to be based on the current external parameters.
   // This avoids a one-render stale read during the deep-effect update cycle above.
-  var activeParameters = isSessionBasedOnCurrentParameters && fg('platform_lp_jira_sllv_renderer_column_sorting') ? sessionParameters : parameters;
+  var activeParameters = isSessionBasedOnCurrentParameters ? sessionParameters : parameters;
   var _useDatasourceTableSt = useDatasourceTableState({
       datasourceId: datasourceId,
       parameters: activeParameters,
@@ -234,7 +234,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
     onVisibleColumnKeysChange: onVisibleColumnKeysChange,
     columnCustomSizes: columnCustomSizes,
     onColumnResize: onColumnResize
-  }, shouldEnableColumnSort && fg('platform_lp_jira_sllv_renderer_column_sorting') ? {
+  }, shouldEnableColumnSort ? {
     onColumnSort: onColumnSort,
     sortState: sortState
   } : {}, {

package/dist/esm/ui/issue-like-table/issue-like-data-table-view.js

@@ -520,16 +520,10 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref7) {
     }
   }, [tableRows.length]);
   var rows = useMemo(function () {
-    if (fg('platform_lp_jira_sllv_renderer_column_sorting')) {
-      var hasPreviousRealRows = !!previousRealRowsCountRef.current;
-      var isLoadingState = status === 'loading' || status === 'empty' && hasPreviousRealRows;
-      if (!isLoadingState) {
-        return tableRows;
-      }
-    } else {
-      if (status !== 'loading') {
-        return tableRows;
-      }
+    var hasPreviousRealRows = !!previousRealRowsCountRef.current;
+    var isLoadingState = status === 'loading' || status === 'empty' && hasPreviousRealRows;
+    if (!isLoadingState) {
+      return tableRows;
     }
 
     // if there are table rows, only add 1 loading row
@@ -540,14 +534,11 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref7) {
     }
     // if there are no table rows add 14 rows if it is compact (has scrollableContainerHeight or non-modal)
     // add 10 rows if it is modal (no scrollableContainerHeight)
-    var loadingRowsCount = scrollableContainerHeight ? 14 : 10;
-    if (fg('platform_lp_jira_sllv_renderer_column_sorting')) {
-      var defaultLoadingRowsCount = scrollableContainerHeight ? 14 : 10;
-      var previousRealRowsCount = previousRealRowsCountRef.current;
-      loadingRowsCount = defaultLoadingRowsCount;
-      if (previousRealRowsCount && previousRealRowsCount < defaultLoadingRowsCount) {
-        loadingRowsCount = previousRealRowsCount;
-      }
+    var defaultLoadingRowsCount = scrollableContainerHeight ? 14 : 10;
+    var previousRealRowsCount = previousRealRowsCountRef.current;
+    var loadingRowsCount = defaultLoadingRowsCount;
+    if (previousRealRowsCount && previousRealRowsCount < defaultLoadingRowsCount) {
+      loadingRowsCount = previousRealRowsCount;
     }
     return _toConsumableArray(Array(loadingRowsCount)).map(function (_, index) {
       return _objectSpread(_objectSpread({}, loadingRow), {}, {
@@ -702,18 +693,17 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref7) {
         onIsWrappedChange: onWrappedColumnChange === null || onWrappedColumnChange === void 0 ? void 0 : onWrappedColumnChange.bind(null, key)
       }, heading);
     } else {
-      return /*#__PURE__*/React.createElement(TableHeading, _extends({
+      return /*#__PURE__*/React.createElement(TableHeading, {
         key: key,
-        "data-testid": "".concat(key, "-column-heading")
-      }, fg('platform_lp_jira_sllv_renderer_column_sorting') ? {
-        'aria-sort': (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'ASC' ? 'ascending' : (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'DESC' ? 'descending' : undefined
-      } : {}, {
+        "data-testid": "".concat(key, "-column-heading"),
+        "aria-sort": (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'ASC' ? 'ascending' : (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key && sortState.direction === 'DESC' ? 'descending' : undefined
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+        ,
         style: getWidthCss({
           shouldUseWidth: shouldUseWidth,
           width: width
         })
-      }), heading);
+      }, heading);
     }
   }), onVisibleColumnKeysChange && (shouldShowTableSettingsMenu ? /*#__PURE__*/React.createElement(ColumnPickerHeaderWithSettings, null, /*#__PURE__*/React.createElement(Inline, {
     alignBlock: "center",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "7.2.1",
+	"version": "7.2.2",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -93,10 +93,10 @@
 		"@atlaskit/textfield": "^10.2.0",
 		"@atlaskit/theme": "^28.2.0",
 		"@atlaskit/toggle": "^17.3.0",
-		"@atlaskit/tokens": "^20.2.0",
+		"@atlaskit/tokens": "^20.3.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/ufo": "^2.0.0",
-		"@atlaskit/user-picker": "^14.0.0",
+		"@atlaskit/user-picker": "^14.1.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
 		"@atlaskit/width-detector": "^7.2.0",
 		"@babel/runtime": "^7.0.0",
@@ -161,9 +161,6 @@
 		"lp_enable_datasource-table-view_height_override": {
 			"type": "boolean"
 		},
-		"platform_lp_jira_sllv_renderer_column_sorting": {
-			"type": "boolean"
-		},
 		"cc-units-ga": {
 			"type": "boolean",
 			"referenceOnly": true