@atlaskit/link-datasource 3.21.5 → 3.22.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/link-datasource
 
+## 3.22.0
+
+### Minor Changes
+
+- [#120472](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/120472)
+  [`73c800ab5f2fc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/73c800ab5f2fc) -
+  ED-26766 update adf-schema from 47.2.1 to 47.6.0 and adf-schema-json from 1.27.0 to 1.31.0
+
+### Patch Changes
+
+- [#120487](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/120487)
+  [`13dfc62850467`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/13dfc62850467) -
+  [ux] Update JSM Assets branding to be standalone Assets
+
 ## 3.21.5
 
 ### Patch Changes

package/dist/cjs/ui/assets-modal/search-container/object-schema-select/index.js

@@ -130,6 +130,8 @@ var AssetsObjectSchemaSelect = exports.AssetsObjectSchemaSelect = function Asset
       onChange: function onChange(newOption) {
         return newOption && _onChange(newOption);
       }
-    }, selectInAModalStyleFixProps, restFieldProps));
+    }, selectInAModalStyleFixProps, restFieldProps, {
+      label: formatMessage(_messages.objectSchemaSelectMessages.placeholder)
+    }));
   }));
 };

package/dist/cjs/ui/common/modal/basic-search-input/basic-search-input-old.js

@@ -74,6 +74,7 @@ var BasicSearchInputOld = exports.BasicSearchInputOld = function BasicSearchInpu
     onChange: onChange,
     placeholder: formatMessage(placeholder),
     testId: "".concat(testId, "--basic-search-input"),
-    value: searchTerm
+    value: searchTerm,
+    "aria-label": formatMessage(placeholder)
   }));
 };

package/dist/cjs/ui/common/modal/basic-search-input/index.js

@@ -67,7 +67,8 @@ var BasicSearchInputNew = exports.BasicSearchInputNew = function BasicSearchInpu
     onChange: onChange,
     placeholder: formatMessage(placeholder),
     testId: "".concat(testId, "--basic-search-input"),
-    value: searchTerm
+    value: searchTerm,
+    "aria-label": formatMessage(placeholder)
   }));
 };
 var BasicSearchInput = exports.BasicSearchInput = function BasicSearchInput(props) {

package/dist/cjs/ui/common/modal/site-selector/index.js

@@ -91,6 +91,7 @@ var SiteSelectorNew = function SiteSelectorNew(props) {
     },
     testId: testId,
     value: selectedSiteOption,
+    label: formatMessage(_messages.siteSelectorMessages.chooseSite),
     className: (0, _runtime.ax)(["_11c81oud _1pbyibnn"])
   })));
 };

package/dist/cjs/ui/common/modal/site-selector/site-selector-old.js

@@ -86,6 +86,7 @@ var SiteSelectorOld = exports.SiteSelectorOld = function SiteSelectorOld(props)
       }
     },
     testId: testId,
-    value: selectedSiteOption
+    value: selectedSiteOption,
+    label: formatMessage(_messages.siteSelectorMessages.chooseSite)
   })));
 };

package/dist/cjs/ui/issue-like-table/render-type/icon/icon-old.js

@@ -31,7 +31,8 @@ var ICON_TYPE_TEXT_TEST_ID = exports.ICON_TYPE_TEXT_TEST_ID = "".concat(ICON_TYP
  * `platform-datasources-enable-two-way-sync-priority` rollout.
  */
 var IconRenderType = function IconRenderType(_ref) {
-  var label = _ref.label,
+  var _ref$label = _ref.label,
+    label = _ref$label === void 0 ? '' : _ref$label,
     text = _ref.text,
     source = _ref.source,
     _ref$testId = _ref.testId,

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

@@ -45,7 +45,8 @@ var ICON_TYPE_TEXT_TEST_ID = exports.ICON_TYPE_TEXT_TEST_ID = "".concat(ICON_TYP
  * `platform-datasources-enable-two-way-sync-priority` rollout.
  */
 var IconRenderType = function IconRenderType(_ref2) {
-  var label = _ref2.label,
+  var _ref2$label = _ref2.label,
+    label = _ref2$label === void 0 ? '' : _ref2$label,
     text = _ref2.text,
     source = _ref2.source,
     _ref2$testId = _ref2.testId,

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

@@ -18,7 +18,8 @@ var labelStyles = (0, _primitives.xcss)({
  */
 function SharedIconComponentOld(_ref) {
   var iconUrl = _ref.iconUrl,
-    label = _ref.label,
+    _ref$label = _ref.label,
+    label = _ref$label === void 0 ? '' : _ref$label,
     text = _ref.text,
     testId = _ref.testId;
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {

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

@@ -17,12 +17,13 @@ var styles = {
   labelStyles: "_1reo15vq _18m915vq _1bto1l2s _1bsb1osq"
 };
 /**
- * Renders a icon and text label.
- * If the text is undefined, will not render the text label.
- */
+  * Renders a icon and text label.
+  * If the text is undefined, will not render the text label.
+  */
 function SharedIconComponentNew(_ref) {
   var iconUrl = _ref.iconUrl,
-    label = _ref.label,
+    _ref$label = _ref.label,
+    label = _ref$label === void 0 ? '' : _ref$label,
     text = _ref.text,
     testId = _ref.testId;
   return /*#__PURE__*/_react.default.createElement(_compiled.Flex, {

package/dist/cjs/ui/jira-issues-modal/jql-editor/index.js

@@ -42,6 +42,7 @@ var JiraJQLEditor = exports.JiraJQLEditor = function JiraJQLEditor(_ref) {
     onUpdate: onChange,
     isSearching: isSearching,
     inputRef: inputRef,
-    query: query
+    query: query,
+    "aria-label": "JQL Query Editor"
   });
 };

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

@@ -127,7 +127,7 @@ var TableFooterNew = function TableFooterNew(_ref5) {
     prefixTextType: "item",
     testId: "item-count"
   })), datasourceId === _assetsModal.ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? /*#__PURE__*/React.createElement(_poweredByJsmAssets.PoweredByJSMAssets, {
-    text: intl.formatMessage(_messages.footerMessages.powerByJSM)
+    text: intl.formatMessage((0, _platformFeatureFlags.fg)('assets_as_an_app_v2') ? _messages.footerMessages.poweredByAssets : _messages.footerMessages.powerByJSM)
   }) : null, /*#__PURE__*/React.createElement(SyncWrapper, null, onRefresh && /*#__PURE__*/React.createElement(_react.Fragment, null, /*#__PURE__*/React.createElement(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? /*#__PURE__*/React.createElement(_reactIntlNext.FormattedMessage, _messages.footerMessages.loadingText) : /*#__PURE__*/React.createElement(_syncInfo.SyncInfo, {

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

@@ -25,5 +25,10 @@ var footerMessages = exports.footerMessages = (0, _reactIntlNext.defineMessages)
     id: 'linkDataSource.table-footer.power-by-jsm',
     description: 'Displayed on the issue like table footer to increase JSM Assets visibility',
     defaultMessage: 'Powered by Assets in Jira Service Management'
+  },
+  poweredByAssets: {
+    id: 'linkDataSource.table-footer.powered-by-assets',
+    description: 'Displayed on the issue like table footer to increase Assets visibility',
+    defaultMessage: 'Powered by Assets'
   }
 });

package/dist/cjs/ui/table-footer/powered-by-jsm-assets/index.js

@@ -10,6 +10,7 @@ require("./index.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireDefault(require("react"));
 var _logo = require("@atlaskit/logo");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _analytics = require("../../../analytics");
 var styles = {
@@ -18,6 +19,7 @@ var styles = {
 };
 var PoweredByJSMAssets = exports.PoweredByJSMAssets = function PoweredByJSMAssets(props) {
   var ASSETS_LINK = '/jira/servicedesk/assets';
+  var ASSETS_APP_LINK = '/jira/assets';
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
@@ -31,7 +33,7 @@ var PoweredByJSMAssets = exports.PoweredByJSMAssets = function PoweredByJSMAsset
         extensionKey: 'jsm-cmdb-gateway'
       });
     },
-    href: ASSETS_LINK,
+    href: (0, _platformFeatureFlags.fg)('assets_as_an_app_v2') ? ASSETS_APP_LINK : ASSETS_LINK,
     rel: "noreferrer",
     target: "_blank",
     style: {
@@ -40,7 +42,7 @@ var PoweredByJSMAssets = exports.PoweredByJSMAssets = function PoweredByJSMAsset
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
       alignItems: 'center'
     }
-  }, /*#__PURE__*/_react.default.createElement(_logo.JiraServiceManagementIcon, {
+  }, (0, _platformFeatureFlags.fg)('assets_as_an_app_v2') ? /*#__PURE__*/_react.default.createElement(AssetsIcon, null) : /*#__PURE__*/_react.default.createElement(_logo.JiraServiceManagementIcon, {
     size: "xsmall",
     appearance: "brand",
     label: props.text
@@ -52,4 +54,57 @@ var PoweredByJSMAssets = exports.PoweredByJSMAssets = function PoweredByJSMAsset
       fontSize: 'small'
     }
   }, props.text)));
+};
+
+// TODO: JDW-5554 use the AssetsIcon from @atlaskit/temp-nav-app-icons once it becomes a public package
+var AssetsIcon = function AssetsIcon() {
+  return (
+    /*#__PURE__*/
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+    _react.default.createElement("span", {
+      style: {
+        display: 'flex'
+      },
+      role: "img",
+      "aria-label": "Assets icon"
+    }, /*#__PURE__*/_react.default.createElement("svg", {
+      width: "24",
+      height: "24",
+      viewBox: "0 0 24 24",
+      fill: "none",
+      xmlns: "http://www.w3.org/2000/svg"
+    }, /*#__PURE__*/_react.default.createElement("path", {
+      d: "M0 6C0 2.68629 2.68629 0 6 0H18C21.3137 0 24 2.68629 24 6V18C24 21.3137 21.3137 24 18 24H6C2.68629 24 0 21.3137 0 18V6Z",
+      fill: "#1868DB"
+    }), /*#__PURE__*/_react.default.createElement("g", {
+      clipPath: "url(#clip0_2912_2)"
+    }, /*#__PURE__*/_react.default.createElement("path", {
+      fillRule: "evenodd",
+      clipRule: "evenodd",
+      d: "M8.50003 11.5354C10.0832 11.338 11.338 10.0832 11.5355 8.5H13.75V6.75H11.3081C10.7889 5.46732 9.53138 4.5625 8.06253 4.5625C6.12953 4.5625 4.56253 6.1295 4.56253 8.0625C4.56253 9.53135 5.46735 10.7889 6.75003 11.3081L6.75003 13.75H8.50003V11.5354ZM8.06253 9.375C8.7874 9.375 9.37503 8.78737 9.37503 8.0625C9.37503 7.33763 8.7874 6.75 8.06253 6.75C7.33766 6.75 6.75003 7.33763 6.75003 8.0625C6.75003 8.78737 7.33766 9.375 8.06253 9.375Z",
+      fill: "white"
+    }), /*#__PURE__*/_react.default.createElement("path", {
+      d: "M19 7.625C19 8.83312 18.0207 9.8125 16.8125 9.8125C15.6044 9.8125 14.625 8.83312 14.625 7.625C14.625 6.41688 15.6044 5.4375 16.8125 5.4375C18.0207 5.4375 19 6.41688 19 7.625Z",
+      fill: "white"
+    }), /*#__PURE__*/_react.default.createElement("path", {
+      d: "M7.62503 19C8.83315 19 9.81253 18.0206 9.81253 16.8125C9.81253 15.6044 8.83315 14.625 7.62503 14.625C6.41691 14.625 5.43753 15.6044 5.43753 16.8125C5.43753 18.0206 6.41691 19 7.62503 19Z",
+      fill: "white"
+    }), /*#__PURE__*/_react.default.createElement("path", {
+      d: "M16.8125 19C18.0207 19 19 18.0206 19 16.8125C19 15.6044 18.0207 14.625 16.8125 14.625C15.6044 14.625 14.625 15.6044 14.625 16.8125C14.625 18.0206 15.6044 19 16.8125 19Z",
+      fill: "white"
+    }), /*#__PURE__*/_react.default.createElement("path", {
+      d: "M13.75 15.9375H10.6875V17.6875H13.75V15.9375Z",
+      fill: "white"
+    }), /*#__PURE__*/_react.default.createElement("path", {
+      d: "M15.9375 10.6875V13.75H17.6875V10.6875H15.9375Z",
+      fill: "white"
+    })), /*#__PURE__*/_react.default.createElement("defs", null, /*#__PURE__*/_react.default.createElement("clipPath", {
+      id: "clip0_2912_2"
+    }, /*#__PURE__*/_react.default.createElement("rect", {
+      width: "21",
+      height: "21",
+      fill: "white",
+      transform: "translate(1.5 1.5)"
+    })))))
+  );
 };

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

@@ -13,6 +13,7 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _reactIntlNext = require("react-intl-next");
 var _button = _interopRequireDefault(require("@atlaskit/button"));
 var _refresh = _interopRequireDefault(require("@atlaskit/icon/core/migration/refresh"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _colors = require("@atlaskit/theme/colors");
 var _assetsModal = require("../assets-modal");
@@ -94,7 +95,7 @@ var TableFooterOld = exports.TableFooterOld = function TableFooterOld(_ref) {
     prefixTextType: "item",
     testId: "item-count"
   })), datasourceId === _assetsModal.ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? (0, _react2.jsx)(_poweredByJsmAssets.PoweredByJSMAssets, {
-    text: intl.formatMessage(_messages.footerMessages.powerByJSM)
+    text: intl.formatMessage((0, _platformFeatureFlags.fg)('assets_as_an_app_v2') ? _messages.footerMessages.poweredByAssets : _messages.footerMessages.powerByJSM)
   }) : null, (0, _react2.jsx)(SyncWrapper, null, onRefresh && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.footerMessages.loadingText) : (0, _react2.jsx)(_syncInfo.SyncInfo, {

package/dist/es2019/ui/assets-modal/search-container/object-schema-select/index.js

@@ -93,5 +93,7 @@ export const AssetsObjectSchemaSelect = ({
     loadOptions: debouncedLoadOptions,
     placeholder: formatMessage(objectSchemaSelectMessages.placeholder),
     onChange: newOption => newOption && onChange(newOption)
-  }, selectInAModalStyleFixProps, restFieldProps))));
+  }, selectInAModalStyleFixProps, restFieldProps, {
+    label: formatMessage(objectSchemaSelectMessages.placeholder)
+  }))));
 };

package/dist/es2019/ui/common/modal/basic-search-input/basic-search-input-old.js

@@ -69,6 +69,7 @@ export const BasicSearchInputOld = ({
     onChange: onChange,
     placeholder: formatMessage(placeholder),
     testId: `${testId}--basic-search-input`,
-    value: searchTerm
+    value: searchTerm,
+    "aria-label": formatMessage(placeholder)
   }));
 };

package/dist/es2019/ui/common/modal/basic-search-input/index.js

@@ -60,7 +60,8 @@ export const BasicSearchInputNew = ({
     onChange: onChange,
     placeholder: formatMessage(placeholder),
     testId: `${testId}--basic-search-input`,
-    value: searchTerm
+    value: searchTerm,
+    "aria-label": formatMessage(placeholder)
   }));
 };
 export const BasicSearchInput = props => {

package/dist/es2019/ui/common/modal/site-selector/index.js

@@ -72,6 +72,7 @@ const SiteSelectorNew = props => {
     },
     testId: testId,
     value: selectedSiteOption,
+    label: formatMessage(siteSelectorMessages.chooseSite),
     className: ax(["_11c81oud _1pbyibnn"])
   })));
 };

package/dist/es2019/ui/common/modal/site-selector/site-selector-old.js

@@ -72,6 +72,7 @@ export const SiteSelectorOld = props => {
       })
     },
     testId: testId,
-    value: selectedSiteOption
+    value: selectedSiteOption,
+    label: formatMessage(siteSelectorMessages.chooseSite)
   })));
 };

package/dist/es2019/ui/issue-like-table/render-type/icon/icon-old.js

@@ -24,7 +24,7 @@ export const ICON_TYPE_TEXT_TEST_ID = `${ICON_TYPE_TEST_ID}-text`;
  * `platform-datasources-enable-two-way-sync-priority` rollout.
  */
 const IconRenderType = ({
-  label,
+  label = '',
   text,
   source,
   testId = ICON_TYPE_TEST_ID

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

@@ -34,7 +34,7 @@ export const ICON_TYPE_TEXT_TEST_ID = `${ICON_TYPE_TEST_ID}-text`;
  * `platform-datasources-enable-two-way-sync-priority` rollout.
  */
 const IconRenderType = ({
-  label,
+  label = '',
   text,
   source,
   testId = ICON_TYPE_TEST_ID

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

@@ -11,7 +11,7 @@ const labelStyles = xcss({
  */
 export function SharedIconComponentOld({
   iconUrl,
-  label,
+  label = '',
   text,
   testId
 }) {

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

@@ -9,12 +9,12 @@ const styles = {
   labelStyles: "_1reo15vq _18m915vq _1bto1l2s _1bsb1osq"
 };
 /**
- * Renders a icon and text label.
- * If the text is undefined, will not render the text label.
- */
+  * Renders a icon and text label.
+  * If the text is undefined, will not render the text label.
+  */
 export function SharedIconComponentNew({
   iconUrl,
-  label,
+  label = '',
   text,
   testId
 }) {

package/dist/es2019/ui/jira-issues-modal/jql-editor/index.js

@@ -34,6 +34,7 @@ export const JiraJQLEditor = ({
     onUpdate: onChange,
     isSearching: isSearching,
     inputRef: inputRef,
-    query: query
+    query: query,
+    "aria-label": "JQL Query Editor"
   });
 };

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

@@ -110,7 +110,7 @@ const TableFooterNew = ({
     prefixTextType: "item",
     testId: "item-count"
   })), datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? /*#__PURE__*/React.createElement(PoweredByJSMAssets, {
-    text: intl.formatMessage(footerMessages.powerByJSM)
+    text: intl.formatMessage(fg('assets_as_an_app_v2') ? footerMessages.poweredByAssets : footerMessages.powerByJSM)
   }) : null, /*#__PURE__*/React.createElement(SyncWrapper, null, onRefresh && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? /*#__PURE__*/React.createElement(FormattedMessage, footerMessages.loadingText) : /*#__PURE__*/React.createElement(SyncInfo, {

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

@@ -19,5 +19,10 @@ export const footerMessages = defineMessages({
     id: 'linkDataSource.table-footer.power-by-jsm',
     description: 'Displayed on the issue like table footer to increase JSM Assets visibility',
     defaultMessage: 'Powered by Assets in Jira Service Management'
+  },
+  poweredByAssets: {
+    id: 'linkDataSource.table-footer.powered-by-assets',
+    description: 'Displayed on the issue like table footer to increase Assets visibility',
+    defaultMessage: 'Powered by Assets'
   }
 });

package/dist/es2019/ui/table-footer/powered-by-jsm-assets/index.js

@@ -3,6 +3,7 @@ import "./index.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { JiraServiceManagementIcon } from '@atlaskit/logo';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 const styles = {
@@ -11,6 +12,7 @@ const styles = {
 };
 export const PoweredByJSMAssets = props => {
   const ASSETS_LINK = '/jira/servicedesk/assets';
+  const ASSETS_APP_LINK = '/jira/assets';
   const {
     fireEvent
   } = useDatasourceAnalyticsEvents();
@@ -23,7 +25,7 @@ export const PoweredByJSMAssets = props => {
       componentHierarchy: 'datasourceTable',
       extensionKey: 'jsm-cmdb-gateway'
     }),
-    href: ASSETS_LINK,
+    href: fg('assets_as_an_app_v2') ? ASSETS_APP_LINK : ASSETS_LINK,
     rel: "noreferrer",
     target: "_blank",
     style: {
@@ -32,7 +34,7 @@ export const PoweredByJSMAssets = props => {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
       alignItems: 'center'
     }
-  }, /*#__PURE__*/React.createElement(JiraServiceManagementIcon, {
+  }, fg('assets_as_an_app_v2') ? /*#__PURE__*/React.createElement(AssetsIcon, null) : /*#__PURE__*/React.createElement(JiraServiceManagementIcon, {
     size: "xsmall",
     appearance: "brand",
     label: props.text
@@ -44,4 +46,57 @@ export const PoweredByJSMAssets = props => {
       fontSize: 'small'
     }
   }, props.text)));
+};
+
+// TODO: JDW-5554 use the AssetsIcon from @atlaskit/temp-nav-app-icons once it becomes a public package
+const AssetsIcon = () => {
+  return (
+    /*#__PURE__*/
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+    React.createElement("span", {
+      style: {
+        display: 'flex'
+      },
+      role: "img",
+      "aria-label": "Assets icon"
+    }, /*#__PURE__*/React.createElement("svg", {
+      width: "24",
+      height: "24",
+      viewBox: "0 0 24 24",
+      fill: "none",
+      xmlns: "http://www.w3.org/2000/svg"
+    }, /*#__PURE__*/React.createElement("path", {
+      d: "M0 6C0 2.68629 2.68629 0 6 0H18C21.3137 0 24 2.68629 24 6V18C24 21.3137 21.3137 24 18 24H6C2.68629 24 0 21.3137 0 18V6Z",
+      fill: "#1868DB"
+    }), /*#__PURE__*/React.createElement("g", {
+      clipPath: "url(#clip0_2912_2)"
+    }, /*#__PURE__*/React.createElement("path", {
+      fillRule: "evenodd",
+      clipRule: "evenodd",
+      d: "M8.50003 11.5354C10.0832 11.338 11.338 10.0832 11.5355 8.5H13.75V6.75H11.3081C10.7889 5.46732 9.53138 4.5625 8.06253 4.5625C6.12953 4.5625 4.56253 6.1295 4.56253 8.0625C4.56253 9.53135 5.46735 10.7889 6.75003 11.3081L6.75003 13.75H8.50003V11.5354ZM8.06253 9.375C8.7874 9.375 9.37503 8.78737 9.37503 8.0625C9.37503 7.33763 8.7874 6.75 8.06253 6.75C7.33766 6.75 6.75003 7.33763 6.75003 8.0625C6.75003 8.78737 7.33766 9.375 8.06253 9.375Z",
+      fill: "white"
+    }), /*#__PURE__*/React.createElement("path", {
+      d: "M19 7.625C19 8.83312 18.0207 9.8125 16.8125 9.8125C15.6044 9.8125 14.625 8.83312 14.625 7.625C14.625 6.41688 15.6044 5.4375 16.8125 5.4375C18.0207 5.4375 19 6.41688 19 7.625Z",
+      fill: "white"
+    }), /*#__PURE__*/React.createElement("path", {
+      d: "M7.62503 19C8.83315 19 9.81253 18.0206 9.81253 16.8125C9.81253 15.6044 8.83315 14.625 7.62503 14.625C6.41691 14.625 5.43753 15.6044 5.43753 16.8125C5.43753 18.0206 6.41691 19 7.62503 19Z",
+      fill: "white"
+    }), /*#__PURE__*/React.createElement("path", {
+      d: "M16.8125 19C18.0207 19 19 18.0206 19 16.8125C19 15.6044 18.0207 14.625 16.8125 14.625C15.6044 14.625 14.625 15.6044 14.625 16.8125C14.625 18.0206 15.6044 19 16.8125 19Z",
+      fill: "white"
+    }), /*#__PURE__*/React.createElement("path", {
+      d: "M13.75 15.9375H10.6875V17.6875H13.75V15.9375Z",
+      fill: "white"
+    }), /*#__PURE__*/React.createElement("path", {
+      d: "M15.9375 10.6875V13.75H17.6875V10.6875H15.9375Z",
+      fill: "white"
+    })), /*#__PURE__*/React.createElement("defs", null, /*#__PURE__*/React.createElement("clipPath", {
+      id: "clip0_2912_2"
+    }, /*#__PURE__*/React.createElement("rect", {
+      width: "21",
+      height: "21",
+      fill: "white",
+      transform: "translate(1.5 1.5)"
+    })))))
+  );
 };

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

@@ -11,6 +11,7 @@ import styled from '@emotion/styled';
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import RefreshIcon from '@atlaskit/icon/core/migration/refresh';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { N0, N40 } from '@atlaskit/theme/colors';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
@@ -79,7 +80,7 @@ export const TableFooterOld = ({
     prefixTextType: "item",
     testId: "item-count"
   })), datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? jsx(PoweredByJSMAssets, {
-    text: intl.formatMessage(footerMessages.powerByJSM)
+    text: intl.formatMessage(fg('assets_as_an_app_v2') ? footerMessages.poweredByAssets : footerMessages.powerByJSM)
   }) : null, jsx(SyncWrapper, null, onRefresh && jsx(Fragment, null, jsx(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? jsx(FormattedMessage, footerMessages.loadingText) : jsx(SyncInfo, {

package/dist/esm/ui/assets-modal/search-container/object-schema-select/index.js

@@ -121,6 +121,8 @@ export var AssetsObjectSchemaSelect = function AssetsObjectSchemaSelect(_ref2) {
       onChange: function onChange(newOption) {
         return newOption && _onChange(newOption);
       }
-    }, selectInAModalStyleFixProps, restFieldProps));
+    }, selectInAModalStyleFixProps, restFieldProps, {
+      label: formatMessage(objectSchemaSelectMessages.placeholder)
+    }));
   }));
 };

package/dist/esm/ui/common/modal/basic-search-input/basic-search-input-old.js

@@ -66,6 +66,7 @@ export var BasicSearchInputOld = function BasicSearchInputOld(_ref) {
     onChange: onChange,
     placeholder: formatMessage(placeholder),
     testId: "".concat(testId, "--basic-search-input"),
-    value: searchTerm
+    value: searchTerm,
+    "aria-label": formatMessage(placeholder)
   }));
 };

package/dist/esm/ui/common/modal/basic-search-input/index.js

@@ -57,7 +57,8 @@ export var BasicSearchInputNew = function BasicSearchInputNew(_ref) {
     onChange: onChange,
     placeholder: formatMessage(placeholder),
     testId: "".concat(testId, "--basic-search-input"),
-    value: searchTerm
+    value: searchTerm,
+    "aria-label": formatMessage(placeholder)
   }));
 };
 export var BasicSearchInput = function BasicSearchInput(props) {

package/dist/esm/ui/common/modal/site-selector/index.js

@@ -81,6 +81,7 @@ var SiteSelectorNew = function SiteSelectorNew(props) {
     },
     testId: testId,
     value: selectedSiteOption,
+    label: formatMessage(siteSelectorMessages.chooseSite),
     className: ax(["_11c81oud _1pbyibnn"])
   })));
 };

package/dist/esm/ui/common/modal/site-selector/site-selector-old.js

@@ -80,6 +80,7 @@ export var SiteSelectorOld = function SiteSelectorOld(props) {
       }
     },
     testId: testId,
-    value: selectedSiteOption
+    value: selectedSiteOption,
+    label: formatMessage(siteSelectorMessages.chooseSite)
   })));
 };

package/dist/esm/ui/issue-like-table/render-type/icon/icon-old.js

@@ -24,7 +24,8 @@ export var ICON_TYPE_TEXT_TEST_ID = "".concat(ICON_TYPE_TEST_ID, "-text");
  * `platform-datasources-enable-two-way-sync-priority` rollout.
  */
 var IconRenderType = function IconRenderType(_ref) {
-  var label = _ref.label,
+  var _ref$label = _ref.label,
+    label = _ref$label === void 0 ? '' : _ref$label,
     text = _ref.text,
     source = _ref.source,
     _ref$testId = _ref.testId,

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

@@ -36,7 +36,8 @@ export var ICON_TYPE_TEXT_TEST_ID = "".concat(ICON_TYPE_TEST_ID, "-text");
  * `platform-datasources-enable-two-way-sync-priority` rollout.
  */
 var IconRenderType = function IconRenderType(_ref2) {
-  var label = _ref2.label,
+  var _ref2$label = _ref2.label,
+    label = _ref2$label === void 0 ? '' : _ref2$label,
     text = _ref2.text,
     source = _ref2.source,
     _ref2$testId = _ref2.testId,

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

@@ -11,7 +11,8 @@ var labelStyles = xcss({
  */
 export function SharedIconComponentOld(_ref) {
   var iconUrl = _ref.iconUrl,
-    label = _ref.label,
+    _ref$label = _ref.label,
+    label = _ref$label === void 0 ? '' : _ref$label,
     text = _ref.text,
     testId = _ref.testId;
   return /*#__PURE__*/React.createElement(Flex, {

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

@@ -9,12 +9,13 @@ var styles = {
   labelStyles: "_1reo15vq _18m915vq _1bto1l2s _1bsb1osq"
 };
 /**
- * Renders a icon and text label.
- * If the text is undefined, will not render the text label.
- */
+  * Renders a icon and text label.
+  * If the text is undefined, will not render the text label.
+  */
 export function SharedIconComponentNew(_ref) {
   var iconUrl = _ref.iconUrl,
-    label = _ref.label,
+    _ref$label = _ref.label,
+    label = _ref$label === void 0 ? '' : _ref$label,
     text = _ref.text,
     testId = _ref.testId;
   return /*#__PURE__*/React.createElement(Flex, {

package/dist/esm/ui/jira-issues-modal/jql-editor/index.js

@@ -33,6 +33,7 @@ export var JiraJQLEditor = function JiraJQLEditor(_ref) {
     onUpdate: onChange,
     isSearching: isSearching,
     inputRef: inputRef,
-    query: query
+    query: query,
+    "aria-label": "JQL Query Editor"
   });
 };

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

@@ -118,7 +118,7 @@ var TableFooterNew = function TableFooterNew(_ref5) {
     prefixTextType: "item",
     testId: "item-count"
   })), datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? /*#__PURE__*/React.createElement(PoweredByJSMAssets, {
-    text: intl.formatMessage(footerMessages.powerByJSM)
+    text: intl.formatMessage(fg('assets_as_an_app_v2') ? footerMessages.poweredByAssets : footerMessages.powerByJSM)
   }) : null, /*#__PURE__*/React.createElement(SyncWrapper, null, onRefresh && /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? /*#__PURE__*/React.createElement(FormattedMessage, footerMessages.loadingText) : /*#__PURE__*/React.createElement(SyncInfo, {

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

@@ -19,5 +19,10 @@ export var footerMessages = defineMessages({
     id: 'linkDataSource.table-footer.power-by-jsm',
     description: 'Displayed on the issue like table footer to increase JSM Assets visibility',
     defaultMessage: 'Powered by Assets in Jira Service Management'
+  },
+  poweredByAssets: {
+    id: 'linkDataSource.table-footer.powered-by-assets',
+    description: 'Displayed on the issue like table footer to increase Assets visibility',
+    defaultMessage: 'Powered by Assets'
   }
 });

package/dist/esm/ui/table-footer/powered-by-jsm-assets/index.js

@@ -3,6 +3,7 @@ import "./index.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { JiraServiceManagementIcon } from '@atlaskit/logo';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 var styles = {
@@ -11,6 +12,7 @@ var styles = {
 };
 export var PoweredByJSMAssets = function PoweredByJSMAssets(props) {
   var ASSETS_LINK = '/jira/servicedesk/assets';
+  var ASSETS_APP_LINK = '/jira/assets';
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   return /*#__PURE__*/React.createElement(Box, {
@@ -24,7 +26,7 @@ export var PoweredByJSMAssets = function PoweredByJSMAssets(props) {
         extensionKey: 'jsm-cmdb-gateway'
       });
     },
-    href: ASSETS_LINK,
+    href: fg('assets_as_an_app_v2') ? ASSETS_APP_LINK : ASSETS_LINK,
     rel: "noreferrer",
     target: "_blank",
     style: {
@@ -33,7 +35,7 @@ export var PoweredByJSMAssets = function PoweredByJSMAssets(props) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
       alignItems: 'center'
     }
-  }, /*#__PURE__*/React.createElement(JiraServiceManagementIcon, {
+  }, fg('assets_as_an_app_v2') ? /*#__PURE__*/React.createElement(AssetsIcon, null) : /*#__PURE__*/React.createElement(JiraServiceManagementIcon, {
     size: "xsmall",
     appearance: "brand",
     label: props.text
@@ -45,4 +47,57 @@ export var PoweredByJSMAssets = function PoweredByJSMAssets(props) {
       fontSize: 'small'
     }
   }, props.text)));
+};
+
+// TODO: JDW-5554 use the AssetsIcon from @atlaskit/temp-nav-app-icons once it becomes a public package
+var AssetsIcon = function AssetsIcon() {
+  return (
+    /*#__PURE__*/
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+    React.createElement("span", {
+      style: {
+        display: 'flex'
+      },
+      role: "img",
+      "aria-label": "Assets icon"
+    }, /*#__PURE__*/React.createElement("svg", {
+      width: "24",
+      height: "24",
+      viewBox: "0 0 24 24",
+      fill: "none",
+      xmlns: "http://www.w3.org/2000/svg"
+    }, /*#__PURE__*/React.createElement("path", {
+      d: "M0 6C0 2.68629 2.68629 0 6 0H18C21.3137 0 24 2.68629 24 6V18C24 21.3137 21.3137 24 18 24H6C2.68629 24 0 21.3137 0 18V6Z",
+      fill: "#1868DB"
+    }), /*#__PURE__*/React.createElement("g", {
+      clipPath: "url(#clip0_2912_2)"
+    }, /*#__PURE__*/React.createElement("path", {
+      fillRule: "evenodd",
+      clipRule: "evenodd",
+      d: "M8.50003 11.5354C10.0832 11.338 11.338 10.0832 11.5355 8.5H13.75V6.75H11.3081C10.7889 5.46732 9.53138 4.5625 8.06253 4.5625C6.12953 4.5625 4.56253 6.1295 4.56253 8.0625C4.56253 9.53135 5.46735 10.7889 6.75003 11.3081L6.75003 13.75H8.50003V11.5354ZM8.06253 9.375C8.7874 9.375 9.37503 8.78737 9.37503 8.0625C9.37503 7.33763 8.7874 6.75 8.06253 6.75C7.33766 6.75 6.75003 7.33763 6.75003 8.0625C6.75003 8.78737 7.33766 9.375 8.06253 9.375Z",
+      fill: "white"
+    }), /*#__PURE__*/React.createElement("path", {
+      d: "M19 7.625C19 8.83312 18.0207 9.8125 16.8125 9.8125C15.6044 9.8125 14.625 8.83312 14.625 7.625C14.625 6.41688 15.6044 5.4375 16.8125 5.4375C18.0207 5.4375 19 6.41688 19 7.625Z",
+      fill: "white"
+    }), /*#__PURE__*/React.createElement("path", {
+      d: "M7.62503 19C8.83315 19 9.81253 18.0206 9.81253 16.8125C9.81253 15.6044 8.83315 14.625 7.62503 14.625C6.41691 14.625 5.43753 15.6044 5.43753 16.8125C5.43753 18.0206 6.41691 19 7.62503 19Z",
+      fill: "white"
+    }), /*#__PURE__*/React.createElement("path", {
+      d: "M16.8125 19C18.0207 19 19 18.0206 19 16.8125C19 15.6044 18.0207 14.625 16.8125 14.625C15.6044 14.625 14.625 15.6044 14.625 16.8125C14.625 18.0206 15.6044 19 16.8125 19Z",
+      fill: "white"
+    }), /*#__PURE__*/React.createElement("path", {
+      d: "M13.75 15.9375H10.6875V17.6875H13.75V15.9375Z",
+      fill: "white"
+    }), /*#__PURE__*/React.createElement("path", {
+      d: "M15.9375 10.6875V13.75H17.6875V10.6875H15.9375Z",
+      fill: "white"
+    })), /*#__PURE__*/React.createElement("defs", null, /*#__PURE__*/React.createElement("clipPath", {
+      id: "clip0_2912_2"
+    }, /*#__PURE__*/React.createElement("rect", {
+      width: "21",
+      height: "21",
+      fill: "white",
+      transform: "translate(1.5 1.5)"
+    })))))
+  );
 };

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

@@ -12,6 +12,7 @@ import styled from '@emotion/styled';
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import RefreshIcon from '@atlaskit/icon/core/migration/refresh';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { N0, N40 } from '@atlaskit/theme/colors';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
@@ -82,7 +83,7 @@ export var TableFooterOld = function TableFooterOld(_ref) {
     prefixTextType: "item",
     testId: "item-count"
   })), datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? jsx(PoweredByJSMAssets, {
-    text: intl.formatMessage(footerMessages.powerByJSM)
+    text: intl.formatMessage(fg('assets_as_an_app_v2') ? footerMessages.poweredByAssets : footerMessages.powerByJSM)
   }) : null, jsx(SyncWrapper, null, onRefresh && jsx(Fragment, null, jsx(SyncTextWrapper, {
     "data-testid": "sync-text"
   }, isLoading ? jsx(FormattedMessage, footerMessages.loadingText) : jsx(SyncInfo, {

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

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

package/dist/types/ui/table-footer/messages.d.ts

@@ -19,4 +19,9 @@ export declare const footerMessages: {
         description: string;
         defaultMessage: string;
     };
+    poweredByAssets: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
 };

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

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

package/dist/types-ts4.5/ui/table-footer/messages.d.ts

@@ -19,4 +19,9 @@ export declare const footerMessages: {
         description: string;
         defaultMessage: string;
     };
+    poweredByAssets: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.21.5",
+	"version": "3.22.0",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"ak-postbuild": "ls -d dist/* | xargs -n 1 copyfiles -u 1 -V src/**/*.{svg,png}"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^47.2.1",
+		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/atlassian-context": "^0.2.0",
 		"@atlaskit/avatar": "^24.0.0",
@@ -65,7 +65,7 @@
 		"@atlaskit/linking-common": "^8.0.0",
 		"@atlaskit/linking-types": "^9.6.0",
 		"@atlaskit/logo": "^16.0.0",
-		"@atlaskit/lozenge": "^12.0.0",
+		"@atlaskit/lozenge": "^12.1.0",
 		"@atlaskit/modal-dialog": "^13.0.0",
 		"@atlaskit/outbound-auth-flow-client": "^3.4.5",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
@@ -83,7 +83,7 @@
 		"@atlaskit/tag": "^14.0.0",
 		"@atlaskit/textfield": "8.0.0",
 		"@atlaskit/theme": "^17.0.0",
-		"@atlaskit/tokens": "^4.2.0",
+		"@atlaskit/tokens": "^4.3.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -191,6 +191,9 @@
 		},
 		"platform-component-visual-refresh": {
 			"type": "boolean"
+		},
+		"assets_as_an_app_v2": {
+			"type": "boolean"
 		}
 	}
 }