@atlaskit/link-datasource 3.10.3 → 3.11.1

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/link-datasource
 
+## 3.11.1
+
+### Patch Changes
+
+- [#166969](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/166969)
+  [`ba7fe3ec68dad`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ba7fe3ec68dad) -
+  Feature flag removed - platform.linking-platform.datasource-assets_add_version_parameter
+
+## 3.11.0
+
+### Minor Changes
+
+- [#165662](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/165662)
+  [`acebc9f752656`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/acebc9f752656) -
+  [ux] EDM-10114 Improve priority edit dropdown in datasources behind feature flag
+
+### Patch Changes
+
+- [#166125](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/166125)
+  [`83c6d7ca56278`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/83c6d7ca56278) -
+  Typography uplift for Linking packages.
+- Updated dependencies
+
 ## 3.10.3
 
 ### Patch Changes

package/dist/cjs/ui/assets-modal/modal/index.js

@@ -15,7 +15,6 @@ var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
 var _modalDialog = require("@atlaskit/modal-dialog");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../../../analytics");
 var _constants = require("../../../analytics/constants");
 var _types = require("../../../analytics/types");
@@ -67,9 +66,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     schemaId = _useState4[0],
     setSchemaId = _useState4[1];
   var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  var _useState5 = (0, _react.useState)(
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
+  var _useState5 = (0, _react.useState)(apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     visibleColumnKeys = _useState6[0],
     setVisibleColumnKeys = _useState6[1];
@@ -124,13 +121,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   /* ------------------------------ END PERMISSIONS ------------------------------ */
 
   var parameters = (0, _react.useMemo)(function () {
-    return _objectSpread({
+    return {
       aql: aql || '',
       schemaId: schemaId || '',
-      workspaceId: workspaceId || ''
-    }, (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+      workspaceId: workspaceId || '',
       version: VERSION_TWO
-    } : {});
+    };
   }, [aql, schemaId, workspaceId]);
   var isParametersSet = !!(aql && workspaceId && schemaId);
   var _useDatasourceTableSt = (0, _useDatasourceTableState.useDatasourceTableState)({
@@ -213,13 +209,8 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch(false);
   }, []);
   (0, _react.useEffect)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter')) {
-      var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
-      setVisibleColumnKeys(newVisibleColumnKeys);
-    } else {
-      var _newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-      setVisibleColumnKeys(_newVisibleColumnKeys);
-    }
+    var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
+    setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
   (0, _react.useEffect)(function () {
     if (isNewSearch) {
@@ -268,13 +259,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     } else {
       onInsert((0, _adf.buildDatasourceAdf)({
         id: datasourceId,
-        parameters: _objectSpread({
+        parameters: {
           workspaceId: workspaceId,
           aql: aql,
-          schemaId: schemaId
-        }, (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+          schemaId: schemaId,
           version: VERSION_TWO
-        } : {}),
+        },
         views: [{
           type: 'table',
           properties: {

package/dist/cjs/ui/confluence-search-modal/basic-filters/filters/date-range-picker/styled.js

@@ -91,11 +91,10 @@ var SelectDateRangeButton = exports.SelectDateRangeButton = _styled.default.butt
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var DateRangeErrorMessage = exports.DateRangeErrorMessage = _styled.default.div({
   display: 'flex',
-  lineHeight: 1.3333,
   marginTop: "var(--ds-space-050, 2px)",
   gap: "var(--ds-space-025, 2px)",
   paddingInlineStart: "var(--ds-space-025, 2px)",
-  fontSize: '12px',
+  font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
   color: "var(--ds-text-danger, ".concat(_colors.R400, ")"),
   alignItems: 'center'
 });

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

@@ -22,7 +22,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 /**
  * Should be gated by FF rollout of platform-datasources-enable-two-way-sync-priority
  */
-var PriorityEditType = function PriorityEditType(props) {
+var IconEditType = function IconEditType(props) {
   var _currentValue$values;
   var currentValue = props.currentValue,
     executeFetch = props.executeFetch;
@@ -35,7 +35,7 @@ var PriorityEditType = function PriorityEditType(props) {
     defaultMenuIsOpen: true,
     blurInputOnSelect: true,
     getOptionValue: function getOptionValue(option) {
-      return option.label || '';
+      return option.text || '';
     },
     options: options,
     isLoading: isLoading,
@@ -131,4 +131,4 @@ var loadOptions = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
-var _default = exports.default = PriorityEditType;
+var _default = exports.default = IconEditType;

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

@@ -13,15 +13,14 @@ var labelStyles = (0, _primitives.xcss)({
   width: '100%'
 });
 /**
- * Renders a icon and label.
- * If the text is undefined, render the capitalised label.
+ * Renders a icon and text label.
+ * If the text is undefined, will not render the text label.
  */
 function SharedIconComponent(_ref) {
   var iconUrl = _ref.iconUrl,
     label = _ref.label,
     text = _ref.text,
     testId = _ref.testId;
-  var displayText = text === undefined || text === '' ? label ? label.charAt(0).toUpperCase() + label.slice(1) : undefined : text;
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     gap: "space.100",
     alignItems: "center",
@@ -35,8 +34,8 @@ function SharedIconComponent(_ref) {
       minWidth: '24px',
       maxWidth: '24px'
     } // having just width: '24px' shrinks it when table width is reduced
-  })), displayText && /*#__PURE__*/_react.default.createElement(_primitives.Box, {
+  })), text && /*#__PURE__*/_react.default.createElement(_primitives.Box, {
     xcss: labelStyles,
     testId: "".concat(testId, "-text")
-  }, displayText));
+  }, text));
 }

package/dist/cjs/ui/issue-like-table/table-cell-content/inline-edit.js

@@ -29,12 +29,14 @@ var editContainerStyles = (0, _primitives.xcss)({
   marginBlockStart: 'space.negative.100'
 });
 var getBackendUpdateValue = function getBackendUpdateValue(typedNewValue) {
-  var _typedNewValue$values;
+  var _typedNewValue$values, _typedNewValue$values2;
   switch (typedNewValue.type) {
     case 'string':
       return typedNewValue.values[0] || '';
     case 'status':
       return ((_typedNewValue$values = typedNewValue.values[0]) === null || _typedNewValue$values === void 0 ? void 0 : _typedNewValue$values.transitionId) || '';
+    case 'icon':
+      return ((_typedNewValue$values2 = typedNewValue.values[0]) === null || _typedNewValue$values2 === void 0 ? void 0 : _typedNewValue$values2.id) || '';
   }
   throw new Error("Datasource 2 way sync Backend update value not implemented for type ".concat(typedNewValue.type));
 };
@@ -45,6 +47,7 @@ var mapUpdatedItem = function mapUpdatedItem(existingItem, columnKey, newValue)
         data: newValue.values[0] || ''
       }));
     case 'status':
+    case 'icon':
       return newValue.values[0] ? _objectSpread(_objectSpread({}, existingItem), {}, (0, _defineProperty2.default)({}, columnKey, {
         data: newValue.values[0]
       })) : existingItem;

package/dist/cjs/ui/table-footer/index.js

@@ -60,7 +60,7 @@ var SyncWrapper = _styled.default.div({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
 var SyncTextWrapper = _styled.default.div({
   marginRight: "var(--ds-space-075, 6px)",
-  fontSize: '12px'
+  font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
 });
 var TableFooter = exports.TableFooter = function TableFooter(_ref) {
   var datasourceId = _ref.datasourceId,

package/dist/es2019/ui/assets-modal/modal/index.js

@@ -12,7 +12,6 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -55,9 +54,7 @@ const PlainAssetsConfigModal = props => {
   const [aql, setAql] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql);
   const [schemaId, setSchemaId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
   const apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  const [visibleColumnKeys, setVisibleColumnKeys] = useState(
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  fg('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
+  const [visibleColumnKeys, setVisibleColumnKeys] = useState(apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
   const [isNewSearch, setIsNewSearch] = useState(false);
   const [errorState, setErrorState] = useState();
   const {
@@ -108,9 +105,7 @@ const PlainAssetsConfigModal = props => {
     aql: aql || '',
     schemaId: schemaId || '',
     workspaceId: workspaceId || '',
-    ...(fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
-      version: VERSION_TWO
-    } : {})
+    version: VERSION_TWO
   }), [aql, schemaId, workspaceId]);
   const isParametersSet = !!(aql && workspaceId && schemaId);
   const {
@@ -194,13 +189,8 @@ const PlainAssetsConfigModal = props => {
     setIsNewSearch(false);
   }, []);
   useEffect(() => {
-    if (fg('platform.linking-platform.datasource-assets_add_version_parameter')) {
-      const newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
-      setVisibleColumnKeys(newVisibleColumnKeys);
-    } else {
-      const newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-      setVisibleColumnKeys(newVisibleColumnKeys);
-    }
+    const newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
+    setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
   useEffect(() => {
     if (isNewSearch) {
@@ -253,9 +243,7 @@ const PlainAssetsConfigModal = props => {
           workspaceId,
           aql,
           schemaId,
-          ...(fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
-            version: VERSION_TWO
-          } : {})
+          version: VERSION_TWO
         },
         views: [{
           type: 'table',

package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/date-range-picker/styled.js

@@ -81,11 +81,10 @@ export const SelectDateRangeButton = styled.button({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const DateRangeErrorMessage = styled.div({
   display: 'flex',
-  lineHeight: 1.3333,
   marginTop: "var(--ds-space-050, 2px)",
   gap: "var(--ds-space-025, 2px)",
   paddingInlineStart: "var(--ds-space-025, 2px)",
-  fontSize: '12px',
+  font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
   color: `var(--ds-text-danger, ${R400})`,
   alignItems: 'center'
 });

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

@@ -9,7 +9,7 @@ import { SharedIconComponent } from '../../shared-components/icon';
 /**
  * Should be gated by FF rollout of platform-datasources-enable-two-way-sync-priority
  */
-const PriorityEditType = props => {
+const IconEditType = props => {
   var _currentValue$values;
   const {
     currentValue,
@@ -24,7 +24,7 @@ const PriorityEditType = props => {
     autoFocus: true,
     defaultMenuIsOpen: true,
     blurInputOnSelect: true,
-    getOptionValue: option => option.label || '',
+    getOptionValue: option => option.text || '',
     options: options,
     isLoading: isLoading,
     defaultValue: currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$values = currentValue.values) === null || _currentValue$values === void 0 ? void 0 : _currentValue$values[0],
@@ -91,4 +91,4 @@ const loadOptions = async (_currentValue, executeFetch) => {
   }
   return [];
 };
-export default PriorityEditType;
+export default IconEditType;

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

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
-import PriorityEditType from './icon';
+import IconEditType from './icon';
 import StatusEditType from './status';
 import TextEditType, { toTextValue } from './text';
 
@@ -31,7 +31,7 @@ export const editType = ({
         editView: ({
           value,
           ...fieldProps
-        }) => /*#__PURE__*/React.createElement(PriorityEditType, _extends({}, fieldProps, {
+        }) => /*#__PURE__*/React.createElement(IconEditType, _extends({}, fieldProps, {
           currentValue: currentValue,
           setEditValues: setEditValues,
           id: ACTIVE_INLINE_EDIT_ID,

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

@@ -6,8 +6,8 @@ const labelStyles = xcss({
   width: '100%'
 });
 /**
- * Renders a icon and label.
- * If the text is undefined, render the capitalised label.
+ * Renders a icon and text label.
+ * If the text is undefined, will not render the text label.
  */
 export function SharedIconComponent({
   iconUrl,
@@ -15,7 +15,6 @@ export function SharedIconComponent({
   text,
   testId
 }) {
-  const displayText = text === undefined || text === '' ? label ? label.charAt(0).toUpperCase() + label.slice(1) : undefined : text;
   return /*#__PURE__*/React.createElement(Flex, {
     gap: "space.100",
     alignItems: "center",
@@ -29,8 +28,8 @@ export function SharedIconComponent({
       minWidth: '24px',
       maxWidth: '24px'
     } // having just width: '24px' shrinks it when table width is reduced
-  })), displayText && /*#__PURE__*/React.createElement(Box, {
+  })), text && /*#__PURE__*/React.createElement(Box, {
     xcss: labelStyles,
     testId: `${testId}-text`
-  }, displayText));
+  }, text));
 }

package/dist/es2019/ui/issue-like-table/table-cell-content/inline-edit.js

@@ -14,12 +14,14 @@ const editContainerStyles = xcss({
   marginBlockStart: 'space.negative.100'
 });
 const getBackendUpdateValue = typedNewValue => {
-  var _typedNewValue$values;
+  var _typedNewValue$values, _typedNewValue$values2;
   switch (typedNewValue.type) {
     case 'string':
       return typedNewValue.values[0] || '';
     case 'status':
       return ((_typedNewValue$values = typedNewValue.values[0]) === null || _typedNewValue$values === void 0 ? void 0 : _typedNewValue$values.transitionId) || '';
+    case 'icon':
+      return ((_typedNewValue$values2 = typedNewValue.values[0]) === null || _typedNewValue$values2 === void 0 ? void 0 : _typedNewValue$values2.id) || '';
   }
   throw new Error(`Datasource 2 way sync Backend update value not implemented for type ${typedNewValue.type}`);
 };
@@ -33,6 +35,7 @@ const mapUpdatedItem = (existingItem, columnKey, newValue) => {
         }
       };
     case 'status':
+    case 'icon':
       return newValue.values[0] ? {
         ...existingItem,
         [columnKey]: {

package/dist/es2019/ui/table-footer/index.js

@@ -47,7 +47,7 @@ const SyncWrapper = styled.div({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
 const SyncTextWrapper = styled.div({
   marginRight: "var(--ds-space-075, 6px)",
-  fontSize: '12px'
+  font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
 });
 export const TableFooter = ({
   datasourceId,

package/dist/esm/ui/assets-modal/modal/index.js

@@ -16,7 +16,6 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -63,9 +62,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     schemaId = _useState4[0],
     setSchemaId = _useState4[1];
   var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  var _useState5 = useState(
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
+  var _useState5 = useState(apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
     _useState6 = _slicedToArray(_useState5, 2),
     visibleColumnKeys = _useState6[0],
     setVisibleColumnKeys = _useState6[1];
@@ -120,13 +117,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   /* ------------------------------ END PERMISSIONS ------------------------------ */
 
   var parameters = useMemo(function () {
-    return _objectSpread({
+    return {
       aql: aql || '',
       schemaId: schemaId || '',
-      workspaceId: workspaceId || ''
-    }, fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+      workspaceId: workspaceId || '',
       version: VERSION_TWO
-    } : {});
+    };
   }, [aql, schemaId, workspaceId]);
   var isParametersSet = !!(aql && workspaceId && schemaId);
   var _useDatasourceTableSt = useDatasourceTableState({
@@ -209,13 +205,8 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch(false);
   }, []);
   useEffect(function () {
-    if (fg('platform.linking-platform.datasource-assets_add_version_parameter')) {
-      var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
-      setVisibleColumnKeys(newVisibleColumnKeys);
-    } else {
-      var _newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-      setVisibleColumnKeys(_newVisibleColumnKeys);
-    }
+    var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
+    setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
   useEffect(function () {
     if (isNewSearch) {
@@ -264,13 +255,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     } else {
       onInsert(buildDatasourceAdf({
         id: datasourceId,
-        parameters: _objectSpread({
+        parameters: {
           workspaceId: workspaceId,
           aql: aql,
-          schemaId: schemaId
-        }, fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+          schemaId: schemaId,
           version: VERSION_TWO
-        } : {}),
+        },
         views: [{
           type: 'table',
           properties: {

package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/styled.js

@@ -83,11 +83,10 @@ export var SelectDateRangeButton = styled.button({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var DateRangeErrorMessage = styled.div({
   display: 'flex',
-  lineHeight: 1.3333,
   marginTop: "var(--ds-space-050, 2px)",
   gap: "var(--ds-space-025, 2px)",
   paddingInlineStart: "var(--ds-space-025, 2px)",
-  fontSize: '12px',
+  font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
   color: "var(--ds-text-danger, ".concat(R400, ")"),
   alignItems: 'center'
 });

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

@@ -12,7 +12,7 @@ import { SharedIconComponent } from '../../shared-components/icon';
 /**
  * Should be gated by FF rollout of platform-datasources-enable-two-way-sync-priority
  */
-var PriorityEditType = function PriorityEditType(props) {
+var IconEditType = function IconEditType(props) {
   var _currentValue$values;
   var currentValue = props.currentValue,
     executeFetch = props.executeFetch;
@@ -25,7 +25,7 @@ var PriorityEditType = function PriorityEditType(props) {
     defaultMenuIsOpen: true,
     blurInputOnSelect: true,
     getOptionValue: function getOptionValue(option) {
-      return option.label || '';
+      return option.text || '';
     },
     options: options,
     isLoading: isLoading,
@@ -121,4 +121,4 @@ var loadOptions = /*#__PURE__*/function () {
     return _ref2.apply(this, arguments);
   };
 }();
-export default PriorityEditType;
+export default IconEditType;

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

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["value"];
 import React from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
-import PriorityEditType from './icon';
+import IconEditType from './icon';
 import StatusEditType from './status';
 import TextEditType, { toTextValue } from './text';
 
@@ -35,7 +35,7 @@ export var editType = function editType(_ref) {
         editView: function editView(_ref3) {
           var value = _ref3.value,
             fieldProps = _objectWithoutProperties(_ref3, _excluded);
-          return /*#__PURE__*/React.createElement(PriorityEditType, _extends({}, fieldProps, {
+          return /*#__PURE__*/React.createElement(IconEditType, _extends({}, fieldProps, {
             currentValue: currentValue,
             setEditValues: setEditValues,
             id: ACTIVE_INLINE_EDIT_ID,

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

@@ -6,15 +6,14 @@ var labelStyles = xcss({
   width: '100%'
 });
 /**
- * Renders a icon and label.
- * If the text is undefined, render the capitalised label.
+ * Renders a icon and text label.
+ * If the text is undefined, will not render the text label.
  */
 export function SharedIconComponent(_ref) {
   var iconUrl = _ref.iconUrl,
     label = _ref.label,
     text = _ref.text,
     testId = _ref.testId;
-  var displayText = text === undefined || text === '' ? label ? label.charAt(0).toUpperCase() + label.slice(1) : undefined : text;
   return /*#__PURE__*/React.createElement(Flex, {
     gap: "space.100",
     alignItems: "center",
@@ -28,8 +27,8 @@ export function SharedIconComponent(_ref) {
       minWidth: '24px',
       maxWidth: '24px'
     } // having just width: '24px' shrinks it when table width is reduced
-  })), displayText && /*#__PURE__*/React.createElement(Box, {
+  })), text && /*#__PURE__*/React.createElement(Box, {
     xcss: labelStyles,
     testId: "".concat(testId, "-text")
-  }, displayText));
+  }, text));
 }

package/dist/esm/ui/issue-like-table/table-cell-content/inline-edit.js

@@ -19,12 +19,14 @@ var editContainerStyles = xcss({
   marginBlockStart: 'space.negative.100'
 });
 var getBackendUpdateValue = function getBackendUpdateValue(typedNewValue) {
-  var _typedNewValue$values;
+  var _typedNewValue$values, _typedNewValue$values2;
   switch (typedNewValue.type) {
     case 'string':
       return typedNewValue.values[0] || '';
     case 'status':
       return ((_typedNewValue$values = typedNewValue.values[0]) === null || _typedNewValue$values === void 0 ? void 0 : _typedNewValue$values.transitionId) || '';
+    case 'icon':
+      return ((_typedNewValue$values2 = typedNewValue.values[0]) === null || _typedNewValue$values2 === void 0 ? void 0 : _typedNewValue$values2.id) || '';
   }
   throw new Error("Datasource 2 way sync Backend update value not implemented for type ".concat(typedNewValue.type));
 };
@@ -35,6 +37,7 @@ var mapUpdatedItem = function mapUpdatedItem(existingItem, columnKey, newValue)
         data: newValue.values[0] || ''
       }));
     case 'status':
+    case 'icon':
       return newValue.values[0] ? _objectSpread(_objectSpread({}, existingItem), {}, _defineProperty({}, columnKey, {
         data: newValue.values[0]
       })) : existingItem;

package/dist/esm/ui/table-footer/index.js

@@ -48,7 +48,7 @@ var SyncWrapper = styled.div({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
 var SyncTextWrapper = styled.div({
   marginRight: "var(--ds-space-075, 6px)",
-  fontSize: '12px'
+  font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
 });
 export var TableFooter = function TableFooter(_ref) {
   var datasourceId = _ref.datasourceId,

package/dist/types/ui/issue-like-table/edit-type/icon/index.d.ts

@@ -10,5 +10,5 @@ interface Props extends Omit<FieldProps<string>, 'value'> {
 /**
  * Should be gated by FF rollout of platform-datasources-enable-two-way-sync-priority
  */
-declare const PriorityEditType: (props: Props) => JSX.Element;
-export default PriorityEditType;
+declare const IconEditType: (props: Props) => JSX.Element;
+export default IconEditType;

package/dist/types/ui/issue-like-table/shared-components/icon/index.d.ts

@@ -16,8 +16,8 @@ interface SharedIconComponentProps {
     testId: string;
 }
 /**
- * Renders a icon and label.
- * If the text is undefined, render the capitalised label.
+ * Renders a icon and text label.
+ * If the text is undefined, will not render the text label.
  */
 export declare function SharedIconComponent({ iconUrl, label, text, testId }: SharedIconComponentProps): JSX.Element;
 export {};

package/dist/types-ts4.5/ui/issue-like-table/edit-type/icon/index.d.ts

@@ -10,5 +10,5 @@ interface Props extends Omit<FieldProps<string>, 'value'> {
 /**
  * Should be gated by FF rollout of platform-datasources-enable-two-way-sync-priority
  */
-declare const PriorityEditType: (props: Props) => JSX.Element;
-export default PriorityEditType;
+declare const IconEditType: (props: Props) => JSX.Element;
+export default IconEditType;

package/dist/types-ts4.5/ui/issue-like-table/shared-components/icon/index.d.ts

@@ -16,8 +16,8 @@ interface SharedIconComponentProps {
     testId: string;
 }
 /**
- * Renders a icon and label.
- * If the text is undefined, render the capitalised label.
+ * Renders a icon and text label.
+ * If the text is undefined, will not render the text label.
  */
 export declare function SharedIconComponent({ iconUrl, label, text, testId }: SharedIconComponentProps): JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.10.3",
+	"version": "3.11.1",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/flag": "^15.8.0",
 		"@atlaskit/form": "^10.5.0",
 		"@atlaskit/heading": "^3.1.0",
-		"@atlaskit/icon": "^22.24.0",
+		"@atlaskit/icon": "^22.25.0",
 		"@atlaskit/icon-object": "^6.7.0",
 		"@atlaskit/image": "^1.3.0",
 		"@atlaskit/inline-edit": "^13.7.0",
@@ -71,7 +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.2.0",
-		"@atlaskit/react-select": "^1.3.0",
+		"@atlaskit/react-select": "^1.4.0",
 		"@atlaskit/select": "^18.5.0",
 		"@atlaskit/smart-card": "^30.3.0",
 		"@atlaskit/smart-user-picker": "6.11.2",
@@ -79,7 +79,7 @@
 		"@atlaskit/tag": "^12.6.0",
 		"@atlaskit/textfield": "6.5.5",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tokens": "^2.2.0",
+		"@atlaskit/tokens": "^2.3.0",
 		"@atlaskit/tooltip": "^18.9.0",
 		"@atlaskit/ufo": "^0.3.0",
 		"@atlaskit/width-detector": "^4.3.0",
@@ -171,9 +171,6 @@
 		"platform-datasources-enable-two-way-sync-priority": {
 			"type": "boolean"
 		},
-		"platform.linking-platform.datasource-assets_add_version_parameter": {
-			"type": "boolean"
-		},
 		"platform.linking-platform.datasource-assets_update_refresh_button_dt3qk": {
 			"type": "boolean"
 		},