@atlaskit/link-datasource 2.3.5 → 2.3.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/link-datasource
 
+## 2.3.6
+
+### Patch Changes
+
+- [#107913](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107913)
+  [`d3405be767646`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d3405be767646) -
+  Introduce version param to the Assets Config Modal
+- Updated dependencies
+
 ## 2.3.5
 
 ### Patch Changes

package/LICENSE.md

@@ -1,13 +1,11 @@
 Copyright 2024 Atlassian Pty Ltd
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing permissions and limitations under the
+License.

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -170,9 +170,9 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
     }
 
     /*Jira adds identifier fields like id and key to all data responses
-    Since defaultProperties already send back the keyField, we are accounting only
-    for the idField when we are using defaultProperties
-    */
+       Since defaultProperties already send back the keyField, we are accounting only
+       for the idField when we are using defaultProperties
+       */
     if (properties.length > fieldKeys.length + idFieldCount + keyFieldCount && properties.length > defaultProperties.length + idFieldCount) {
       setFullSchema(schema);
     }

package/dist/cjs/hooks/useValidateAqlText.js

@@ -88,9 +88,9 @@ var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlTex
   }(), [workspaceId, fireEvent]);
 
   /* Debounce async validation for input, validation is also called on every field change
-  in a form so we need to also memoize. The async validate function is expected to either:
-  Immediately return a promise (which is then collected into an array, every single time validation is run),
-  or immediately return either undefined or an error message */
+   in a form so we need to also memoize. The async validate function is expected to either:
+   Immediately return a promise (which is then collected into an array, every single time validation is run),
+   or immediately return either undefined or an error message */
   var debouncedValidation = function debouncedValidation(value) {
     return new Promise(function (resolve) {
       if (timeout.current) {

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

@@ -15,6 +15,7 @@ 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");
@@ -39,6 +40,7 @@ var _messages = require("./messages");
 var _renderAssetsContent = require("./render-assets-content");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /** @jsx jsx */
+var VERSION_TWO = '2';
 var modalBodyErrorWrapperStyles = (0, _react2.css)({
   alignItems: 'center',
   display: 'grid',
@@ -60,7 +62,8 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     schemaId = _useState4[0],
     setSchemaId = _useState4[1];
-  var _useState5 = (0, _react.useState)(initialVisibleColumnKeys),
+  var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
+  var _useState5 = (0, _react.useState)((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     visibleColumnKeys = _useState6[0],
     setVisibleColumnKeys = _useState6[1];
@@ -115,11 +118,13 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   /* ------------------------------ END PERMISSIONS ------------------------------ */
 
   var parameters = (0, _react.useMemo)(function () {
-    return {
+    return _objectSpread({
       aql: aql || '',
       schemaId: schemaId || '',
       workspaceId: workspaceId || ''
-    };
+    }, (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+      version: VERSION_TWO
+    } : {});
   }, [aql, schemaId, workspaceId]);
   var isParametersSet = !!(aql && workspaceId && schemaId);
   var _useDatasourceTableSt = (0, _useDatasourceTableState.useDatasourceTableState)({
@@ -201,9 +206,14 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch(false);
   }, []);
   (0, _react.useEffect)(function () {
-    var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-    setVisibleColumnKeys(newVisibleColumnKeys);
-  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
+    if ((0, _platformFeatureFlags.getBooleanFF)('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);
+    }
+  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
   (0, _react.useEffect)(function () {
     if (isNewSearch) {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
@@ -251,11 +261,13 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     } else {
       onInsert((0, _adf.buildDatasourceAdf)({
         id: datasourceId,
-        parameters: {
+        parameters: _objectSpread({
           workspaceId: workspaceId,
           aql: aql,
           schemaId: schemaId
-        },
+        }, (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+          version: VERSION_TWO
+        } : {}),
         views: [{
           type: 'table',
           properties: {
@@ -268,7 +280,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
         }]
       }), consumerEvent);
     }
-  }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys, userInteractions]);
+  }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, userInteractions, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
   var handleOnSearch = (0, _react.useCallback)(function (searchAql, searchSchemaId) {
     if (schemaId !== searchSchemaId || aql !== searchAql || status === 'rejected') {
       searchCount.current++;

package/dist/cjs/ui/common/modal/popup-select/index.js

@@ -174,10 +174,10 @@ var FilterPopupSelect = exports.FilterPopupSelect = function FilterPopupSelect(_
     testId: "".concat(filterName, "-popup-select"),
     inputId: "".concat(filterName, "-popup-select--input")
     /*
-      this threshold controls the display of the search control (input field for search)
-      if this threshold is less than 0, when typing a search string that returns no results it will not remove the search control
-      if this threshold is 0 or higher, it will remove the search control when there are no results, the user will be unable to clear the search to see more results
-    */,
+         this threshold controls the display of the search control (input field for search)
+         if this threshold is less than 0, when typing a search string that returns no results it will not remove the search control
+         if this threshold is 0 or higher, it will remove the search control when there are no results, the user will be unable to clear the search to see more results
+       */,
     searchThreshold: -1,
     inputValue: searchTerm,
     closeMenuOnSelect: false,

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

@@ -66,9 +66,9 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var visibleColumnCount = (0, _react.useRef)((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
 
   /*  Need this to make sure that the datasource in the editor gets updated new info if any edits are made in the modal
-      But we don't want to call it on initial load. This screws up useDatasourceTableState's internal
-      mechanism of initial loading. Use of ref here makes it basically work as a `componentDidUpdate` but not `componentDidMount`
-   */
+       But we don't want to call it on initial load. This screws up useDatasourceTableState's internal
+       mechanism of initial loading. Use of ref here makes it basically work as a `componentDidUpdate` but not `componentDidMount`
+    */
   var isInitialRender = (0, _react.useRef)(true);
   var hasColumns = !!columns.length;
   var isDataReady = hasColumns && responseItems.length > 0 && totalCount && totalCount > 0;

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

@@ -33,10 +33,10 @@ function getFormattedDate(value) {
   var display = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'datetime';
   var formatDate = arguments.length > 2 ? arguments[2] : undefined;
   /* In some cases we get a value of `2023-12-20` which when parsed by JS assumes meantime timezone, causing the date
-    to be one day off in some timezones. We want it to display the date without converting timezones and a solution
-   is to replace the hyphens with slashes. So it should be 20th Dec regardless of the timezone in this case.
-    See https://stackoverflow.com/a/31732581
-   */
+     to be one day off in some timezones. We want it to display the date without converting timezones and a solution
+    is to replace the hyphens with slashes. So it should be 20th Dec regardless of the timezone in this case.
+     See https://stackoverflow.com/a/31732581
+    */
   var dateValue = /^\d{4}-\d{2}-\d{2}$/.exec(value) ? value.replace(/-/g, '/') : value;
   var date = new Date(dateValue);
   if (!value || isNaN(date.getTime())) {

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

@@ -44,12 +44,12 @@ var TableHeading = exports.TableHeading = _styled.default.th((_styled$th = {}, (
   borderRight: "0.5px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")")),
   borderBottom: "2px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")")),
   /*
-    lineHeight * 2 -> Max height of two lined header
-    verticalPadding * 2 -> padding for this component itself
-    verticalPadding * 2 -> padding inside span (--container)
-    2px -> Bottom border
-    Last two terms are needed because of border-box box sizing.
-  */
+      lineHeight * 2 -> Max height of two lined header
+      verticalPadding * 2 -> padding for this component itself
+      verticalPadding * 2 -> padding inside span (--container)
+      2px -> Bottom border
+      Last two terms are needed because of border-box box sizing.
+    */
   height: "calc(".concat(lineHeight, " * 2 + ").concat(verticalPadding, " * 4 + 2px)"),
   verticalAlign: 'bottom',
   backgroundColor: "var(--ds-elevation-surface-current, #FFF)"
@@ -62,7 +62,7 @@ var TableHeading = exports.TableHeading = _styled.default.th((_styled$th = {}, (
 }), (0, _defineProperty2.default)(_styled$th, "& [data-testid='datasource-header-content--container']", {
   width: '100%',
   /* With Button now being a parent for this component it adds its lineHeight value and spoils
-    `height` calculation above. */
+      `height` calculation above. */
   lineHeight: lineHeight,
   padding: "".concat(verticalPadding, " ", "var(--ds-space-050, 4px)"),
   display: '-webkit-box',

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -92,9 +92,9 @@ export const useDatasourceTableState = ({
     }
 
     /*Jira adds identifier fields like id and key to all data responses
-    Since defaultProperties already send back the keyField, we are accounting only
-    for the idField when we are using defaultProperties
-    */
+       Since defaultProperties already send back the keyField, we are accounting only
+       for the idField when we are using defaultProperties
+       */
     if (properties.length > fieldKeys.length + idFieldCount + keyFieldCount && properties.length > defaultProperties.length + idFieldCount) {
       setFullSchema(schema);
     }

package/dist/es2019/hooks/useValidateAqlText.js

@@ -51,9 +51,9 @@ export const useValidateAqlText = (workspaceId, initialValue) => {
   }, [workspaceId, fireEvent]);
 
   /* Debounce async validation for input, validation is also called on every field change
-  in a form so we need to also memoize. The async validate function is expected to either:
-  Immediately return a promise (which is then collected into an array, every single time validation is run),
-  or immediately return either undefined or an error message */
+   in a form so we need to also memoize. The async validate function is expected to either:
+   Immediately return a promise (which is then collected into an array, every single time validation is run),
+   or immediately return either undefined or an error message */
   const debouncedValidation = value => new Promise(resolve => {
     if (timeout.current) {
       timeout.current();

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

@@ -7,6 +7,7 @@ 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -29,6 +30,7 @@ import { AssetsSearchContainer } from '../search-container';
 import { AssetsSearchContainerLoading } from '../search-container/loading-state';
 import { modalMessages } from './messages';
 import { MODAL_HEIGHT, RenderAssetsContent } from './render-assets-content';
+const VERSION_TWO = '2';
 const modalBodyErrorWrapperStyles = css({
   alignItems: 'center',
   display: 'grid',
@@ -46,7 +48,8 @@ const PlainAssetsConfigModal = props => {
   } = 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 [visibleColumnKeys, setVisibleColumnKeys] = useState(initialVisibleColumnKeys);
+  const apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
+  const [visibleColumnKeys, setVisibleColumnKeys] = useState(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
   const [isNewSearch, setIsNewSearch] = useState(false);
   const [errorState, setErrorState] = useState();
   const {
@@ -96,7 +99,10 @@ const PlainAssetsConfigModal = props => {
   const parameters = useMemo(() => ({
     aql: aql || '',
     schemaId: schemaId || '',
-    workspaceId: workspaceId || ''
+    workspaceId: workspaceId || '',
+    ...(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+      version: VERSION_TWO
+    } : {})
   }), [aql, schemaId, workspaceId]);
   const isParametersSet = !!(aql && workspaceId && schemaId);
   const {
@@ -179,9 +185,14 @@ const PlainAssetsConfigModal = props => {
     setIsNewSearch(false);
   }, []);
   useEffect(() => {
-    const newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-    setVisibleColumnKeys(newVisibleColumnKeys);
-  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
+    if (getBooleanFF('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);
+    }
+  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
   useEffect(() => {
     if (isNewSearch) {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
@@ -232,7 +243,10 @@ const PlainAssetsConfigModal = props => {
         parameters: {
           workspaceId,
           aql,
-          schemaId
+          schemaId,
+          ...(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+            version: VERSION_TWO
+          } : {})
         },
         views: [{
           type: 'table',
@@ -244,7 +258,7 @@ const PlainAssetsConfigModal = props => {
         }]
       }), consumerEvent);
     }
-  }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys, userInteractions]);
+  }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, userInteractions, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
   const handleOnSearch = useCallback((searchAql, searchSchemaId) => {
     if (schemaId !== searchSchemaId || aql !== searchAql || status === 'rejected') {
       searchCount.current++;

package/dist/es2019/ui/common/modal/popup-select/index.js

@@ -127,10 +127,10 @@ export const FilterPopupSelect = ({
     testId: `${filterName}-popup-select`,
     inputId: `${filterName}-popup-select--input`
     /*
-      this threshold controls the display of the search control (input field for search)
-      if this threshold is less than 0, when typing a search string that returns no results it will not remove the search control
-      if this threshold is 0 or higher, it will remove the search control when there are no results, the user will be unable to clear the search to see more results
-    */,
+         this threshold controls the display of the search control (input field for search)
+         if this threshold is less than 0, when typing a search string that returns no results it will not remove the search control
+         if this threshold is 0 or higher, it will remove the search control when there are no results, the user will be unable to clear the search to see more results
+       */,
     searchThreshold: -1,
     inputValue: searchTerm,
     closeMenuOnSelect: false,

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

@@ -60,9 +60,9 @@ const DatasourceTableViewWithoutAnalytics = ({
   const visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
 
   /*  Need this to make sure that the datasource in the editor gets updated new info if any edits are made in the modal
-      But we don't want to call it on initial load. This screws up useDatasourceTableState's internal
-      mechanism of initial loading. Use of ref here makes it basically work as a `componentDidUpdate` but not `componentDidMount`
-   */
+       But we don't want to call it on initial load. This screws up useDatasourceTableState's internal
+       mechanism of initial loading. Use of ref here makes it basically work as a `componentDidUpdate` but not `componentDidMount`
+    */
   const isInitialRender = useRef(true);
   const hasColumns = !!columns.length;
   const isDataReady = hasColumns && responseItems.length > 0 && totalCount && totalCount > 0;

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

@@ -20,10 +20,10 @@ const DateTimeWrapper = styled.span({
 });
 export function getFormattedDate(value, display = 'datetime', formatDate) {
   /* In some cases we get a value of `2023-12-20` which when parsed by JS assumes meantime timezone, causing the date
-    to be one day off in some timezones. We want it to display the date without converting timezones and a solution
-   is to replace the hyphens with slashes. So it should be 20th Dec regardless of the timezone in this case.
-    See https://stackoverflow.com/a/31732581
-   */
+     to be one day off in some timezones. We want it to display the date without converting timezones and a solution
+    is to replace the hyphens with slashes. So it should be 20th Dec regardless of the timezone in this case.
+     See https://stackoverflow.com/a/31732581
+    */
   const dateValue = /^\d{4}-\d{2}-\d{2}$/.exec(value) ? value.replace(/-/g, '/') : value;
   const date = new Date(dateValue);
   if (!value || isNaN(date.getTime())) {

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

@@ -37,12 +37,12 @@ export const TableHeading = styled.th({
     borderRight: `0.5px solid ${`var(--ds-border, ${N40})`}`,
     borderBottom: `2px solid ${`var(--ds-border, ${N40})`}`,
     /*
-      lineHeight * 2 -> Max height of two lined header
-      verticalPadding * 2 -> padding for this component itself
-      verticalPadding * 2 -> padding inside span (--container)
-      2px -> Bottom border
-      Last two terms are needed because of border-box box sizing.
-    */
+        lineHeight * 2 -> Max height of two lined header
+        verticalPadding * 2 -> padding for this component itself
+        verticalPadding * 2 -> padding inside span (--container)
+        2px -> Bottom border
+        Last two terms are needed because of border-box box sizing.
+      */
     height: `calc(${lineHeight} * 2 + ${verticalPadding} * 4 + 2px)`,
     verticalAlign: 'bottom',
     backgroundColor: "var(--ds-elevation-surface-current, #FFF)"
@@ -59,7 +59,7 @@ export const TableHeading = styled.th({
   "& [data-testid='datasource-header-content--container']": {
     width: '100%',
     /* With Button now being a parent for this component it adds its lineHeight value and spoils
-      `height` calculation above. */
+        `height` calculation above. */
     lineHeight: lineHeight,
     padding: `${verticalPadding} ${"var(--ds-space-050, 4px)"}`,
     display: '-webkit-box',

package/dist/esm/hooks/useDatasourceTableState.js

@@ -163,9 +163,9 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
     }
 
     /*Jira adds identifier fields like id and key to all data responses
-    Since defaultProperties already send back the keyField, we are accounting only
-    for the idField when we are using defaultProperties
-    */
+       Since defaultProperties already send back the keyField, we are accounting only
+       for the idField when we are using defaultProperties
+       */
     if (properties.length > fieldKeys.length + idFieldCount + keyFieldCount && properties.length > defaultProperties.length + idFieldCount) {
       setFullSchema(schema);
     }

package/dist/esm/hooks/useValidateAqlText.js

@@ -81,9 +81,9 @@ export var useValidateAqlText = function useValidateAqlText(workspaceId, initial
   }(), [workspaceId, fireEvent]);
 
   /* Debounce async validation for input, validation is also called on every field change
-  in a form so we need to also memoize. The async validate function is expected to either:
-  Immediately return a promise (which is then collected into an array, every single time validation is run),
-  or immediately return either undefined or an error message */
+   in a form so we need to also memoize. The async validate function is expected to either:
+   Immediately return a promise (which is then collected into an array, every single time validation is run),
+   or immediately return either undefined or an error message */
   var debouncedValidation = function debouncedValidation(value) {
     return new Promise(function (resolve) {
       if (timeout.current) {

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

@@ -11,6 +11,7 @@ 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -33,6 +34,7 @@ import { AssetsSearchContainer } from '../search-container';
 import { AssetsSearchContainerLoading } from '../search-container/loading-state';
 import { modalMessages } from './messages';
 import { MODAL_HEIGHT, RenderAssetsContent } from './render-assets-content';
+var VERSION_TWO = '2';
 var modalBodyErrorWrapperStyles = css({
   alignItems: 'center',
   display: 'grid',
@@ -54,7 +56,8 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     schemaId = _useState4[0],
     setSchemaId = _useState4[1];
-  var _useState5 = useState(initialVisibleColumnKeys),
+  var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
+  var _useState5 = useState(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
     _useState6 = _slicedToArray(_useState5, 2),
     visibleColumnKeys = _useState6[0],
     setVisibleColumnKeys = _useState6[1];
@@ -109,11 +112,13 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   /* ------------------------------ END PERMISSIONS ------------------------------ */
 
   var parameters = useMemo(function () {
-    return {
+    return _objectSpread({
       aql: aql || '',
       schemaId: schemaId || '',
       workspaceId: workspaceId || ''
-    };
+    }, getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+      version: VERSION_TWO
+    } : {});
   }, [aql, schemaId, workspaceId]);
   var isParametersSet = !!(aql && workspaceId && schemaId);
   var _useDatasourceTableSt = useDatasourceTableState({
@@ -195,9 +200,14 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch(false);
   }, []);
   useEffect(function () {
-    var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-    setVisibleColumnKeys(newVisibleColumnKeys);
-  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
+    if (getBooleanFF('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);
+    }
+  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
   useEffect(function () {
     if (isNewSearch) {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
@@ -245,11 +255,13 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     } else {
       onInsert(buildDatasourceAdf({
         id: datasourceId,
-        parameters: {
+        parameters: _objectSpread({
           workspaceId: workspaceId,
           aql: aql,
           schemaId: schemaId
-        },
+        }, getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+          version: VERSION_TWO
+        } : {}),
         views: [{
           type: 'table',
           properties: {
@@ -262,7 +274,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
         }]
       }), consumerEvent);
     }
-  }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys, userInteractions]);
+  }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, userInteractions, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
   var handleOnSearch = useCallback(function (searchAql, searchSchemaId) {
     if (schemaId !== searchSchemaId || aql !== searchAql || status === 'rejected') {
       searchCount.current++;

package/dist/esm/ui/common/modal/popup-select/index.js

@@ -164,10 +164,10 @@ export var FilterPopupSelect = function FilterPopupSelect(_ref) {
     testId: "".concat(filterName, "-popup-select"),
     inputId: "".concat(filterName, "-popup-select--input")
     /*
-      this threshold controls the display of the search control (input field for search)
-      if this threshold is less than 0, when typing a search string that returns no results it will not remove the search control
-      if this threshold is 0 or higher, it will remove the search control when there are no results, the user will be unable to clear the search to see more results
-    */,
+         this threshold controls the display of the search control (input field for search)
+         if this threshold is less than 0, when typing a search string that returns no results it will not remove the search control
+         if this threshold is 0 or higher, it will remove the search control when there are no results, the user will be unable to clear the search to see more results
+       */,
     searchThreshold: -1,
     inputValue: searchTerm,
     closeMenuOnSelect: false,

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

@@ -58,9 +58,9 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
 
   /*  Need this to make sure that the datasource in the editor gets updated new info if any edits are made in the modal
-      But we don't want to call it on initial load. This screws up useDatasourceTableState's internal
-      mechanism of initial loading. Use of ref here makes it basically work as a `componentDidUpdate` but not `componentDidMount`
-   */
+       But we don't want to call it on initial load. This screws up useDatasourceTableState's internal
+       mechanism of initial loading. Use of ref here makes it basically work as a `componentDidUpdate` but not `componentDidMount`
+    */
   var isInitialRender = useRef(true);
   var hasColumns = !!columns.length;
   var isDataReady = hasColumns && responseItems.length > 0 && totalCount && totalCount > 0;

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

@@ -25,10 +25,10 @@ export function getFormattedDate(value) {
   var display = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'datetime';
   var formatDate = arguments.length > 2 ? arguments[2] : undefined;
   /* In some cases we get a value of `2023-12-20` which when parsed by JS assumes meantime timezone, causing the date
-    to be one day off in some timezones. We want it to display the date without converting timezones and a solution
-   is to replace the hyphens with slashes. So it should be 20th Dec regardless of the timezone in this case.
-    See https://stackoverflow.com/a/31732581
-   */
+     to be one day off in some timezones. We want it to display the date without converting timezones and a solution
+    is to replace the hyphens with slashes. So it should be 20th Dec regardless of the timezone in this case.
+     See https://stackoverflow.com/a/31732581
+    */
   var dateValue = /^\d{4}-\d{2}-\d{2}$/.exec(value) ? value.replace(/-/g, '/') : value;
   var date = new Date(dateValue);
   if (!value || isNaN(date.getTime())) {

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

@@ -37,12 +37,12 @@ export var TableHeading = styled.th((_styled$th = {}, _defineProperty(_styled$th
   borderRight: "0.5px solid ".concat("var(--ds-border, ".concat(N40, ")")),
   borderBottom: "2px solid ".concat("var(--ds-border, ".concat(N40, ")")),
   /*
-    lineHeight * 2 -> Max height of two lined header
-    verticalPadding * 2 -> padding for this component itself
-    verticalPadding * 2 -> padding inside span (--container)
-    2px -> Bottom border
-    Last two terms are needed because of border-box box sizing.
-  */
+      lineHeight * 2 -> Max height of two lined header
+      verticalPadding * 2 -> padding for this component itself
+      verticalPadding * 2 -> padding inside span (--container)
+      2px -> Bottom border
+      Last two terms are needed because of border-box box sizing.
+    */
   height: "calc(".concat(lineHeight, " * 2 + ").concat(verticalPadding, " * 4 + 2px)"),
   verticalAlign: 'bottom',
   backgroundColor: "var(--ds-elevation-surface-current, #FFF)"
@@ -55,7 +55,7 @@ export var TableHeading = styled.th((_styled$th = {}, _defineProperty(_styled$th
 }), _defineProperty(_styled$th, "& [data-testid='datasource-header-content--container']", {
   width: '100%',
   /* With Button now being a parent for this component it adds its lineHeight value and spoils
-    `height` calculation above. */
+      `height` calculation above. */
   lineHeight: lineHeight,
   padding: "".concat(verticalPadding, " ", "var(--ds-space-050, 4px)"),
   display: '-webkit-box',

package/dist/types/contexts/datasource-experience-id/index.d.ts

@@ -1,4 +1,4 @@
 import { type PropsWithChildren } from 'react';
-declare const DatasourceExperienceIdProvider: ({ children, }: PropsWithChildren<{}>) => JSX.Element;
+declare const DatasourceExperienceIdProvider: ({ children }: PropsWithChildren<{}>) => JSX.Element;
 declare const useDatasourceExperienceId: () => string;
 export { DatasourceExperienceIdProvider, useDatasourceExperienceId };

package/dist/types/contexts/user-interactions/index.d.ts

@@ -4,7 +4,7 @@ interface UserInteractions {
     add: (action: DatasourceAction) => void;
     get: () => DatasourceAction[];
 }
-declare const UserInteractionsProvider: ({ children, }: PropsWithChildren<{}>) => JSX.Element;
+declare const UserInteractionsProvider: ({ children }: PropsWithChildren<{}>) => JSX.Element;
 /**
  * Use this hook to track user activities. This is mainly used to populate analytic events with
  * a trail of user activities.

package/dist/types/index.d.ts

@@ -5,7 +5,7 @@ export { default as DatasourceTableView } from './ui/datasource-table-view';
 export { default as JSMAssetsConfigModal } from './ui/assets-modal';
 export { buildDatasourceAdf } from './common/utils/adf';
 export type { JiraIssuesDatasourceAdf, JiraIssueDatasourceParameters, } from './ui/jira-issues-modal/types';
-export type { AssetsDatasourceAdf, AssetsDatasourceParameters, } from './ui/assets-modal/types';
+export type { AssetsDatasourceAdf, AssetsDatasourceParameters } from './ui/assets-modal/types';
 export type { ConfluenceSearchDatasourceAdf, ConfluenceSearchDatasourceParameters, } from './ui/confluence-search-modal/types';
 export { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from './ui/jira-issues-modal';
 export { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from './ui/assets-modal';